From 3d13380fccd3365b516cceb86fca353924aa9731 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 1 Mar 2017 15:49:39 -0700
Subject: [PATCH] Touched up embed + stream query

---
 client/coral-embed/src/index.js               | 39 ++++++++++++-------
 .../coral-framework/graphql/queries/index.js  | 23 +++++++----
 .../graphql/queries/streamQuery.graphql       |  6 +--
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index a75706c8e..d3715b44d 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -5,24 +5,30 @@ const Coral = {};
 const Talk = Coral.Talk = {};
 
 // build the URL to load in the pym iframe
-function buildStreamIframeUrl(talkBaseUrl, asset, comment) {
+function buildStreamIframeUrl(talkBaseUrl, asset_url, comment, asset_id) {
   let iframeArray = [
     talkBaseUrl,
     (talkBaseUrl.match(/\/$/) ? '' : '/'), // make sure no double-'/' if opts.talk already ends with '/'
     'embed/stream?asset_url=',
-    encodeURIComponent(asset)
+    encodeURIComponent(asset_url)
   ];
 
   if (comment) {
     iframeArray.push('&comment_id=');
     iframeArray.push(encodeURIComponent(comment));
   }
+
+  if (asset_id) {
+    iframeArray.push('&asset_id=');
+    iframeArray.push(encodeURIComponent(asset_id));
+  }
+
   return iframeArray.join('');
 }
 
 // Set up postMessage listeners/handlers on the pymParent
 // e.g. to resize the iframe, and navigate the host page
-function configurePymParent(pymParent, assetUrl) {
+function configurePymParent(pymParent, asset_url) {
   let notificationOffset = 200;
   let ready = false;
 
@@ -52,7 +58,7 @@ function configurePymParent(pymParent, assetUrl) {
         window.clearInterval(interval);
 
         // @todo - It's weird to me that this is sent here in addition to the iframe URL. Could it just be in one place?
-        pymParent.sendMessage('DOMContentLoaded', assetUrl);
+        pymParent.sendMessage('DOMContentLoaded', asset_url);
       }
     }, 100);
   });
@@ -88,11 +94,11 @@ function configurePymParent(pymParent, assetUrl) {
  * @param {Object} opts - Configuration options for talk
  * @param {String} opts.talk - Talk base URL
  * @param {String} [opts.title] - Title of Stream (rendered in iframe)
- * @param {String} [opts.asset] - parent Asset ID or URL. Comments in the
- * stream will replies to this asset
+ * @param {String} [opts.asset_url] - Asset URL
+ * @param {String} [opts.asset_id] - Asset ID
  */
 Talk.render = function (el, opts) {
-  if ( ! el) {
+  if (!el) {
     throw new Error('Please provide Coral.Talk.render() the HTMLElement you want to render Talk in.');
   }
   if (typeof el !== 'object') {
@@ -101,7 +107,7 @@ Talk.render = function (el, opts) {
   opts = opts || {};
 
   // @todo infer this URL without explicit user input (if possible, may have to be added at build/render time of this script)
-  if (! opts.talk) {
+  if (!opts.talk) {
     throw new Error('Coral.Talk.render() expects opts.talk as the Talk Base URL');
   }
 
@@ -110,16 +116,23 @@ Talk.render = function (el, opts) {
     el.id = `_${Math.random()}`;
   }
 
-  let asset = opts.asset || window.location.href.split('#')[0];
+  let asset_url = opts.asset_url || window.location.href.split('#')[0];
   let comment = window.location.hash.slice(1);
-  let pymParent = new pym.Parent(el.id, buildStreamIframeUrl(opts.talk, asset, comment), {
+
+  let query = {
     title: opts.title,
-    asset_url: asset,
+    asset_url: asset_url,
     id: `${el.id}_iframe`,
     name: `${el.id}_iframe`
-  });
+  };
 
-  configurePymParent(pymParent, asset);
+  if (opts.asset_id && opts.asset_id.length > 0) {
+    query.asset_id = opts.asset_id;
+  }
+
+  let pymParent = new pym.Parent(el.id, buildStreamIframeUrl(opts.talk, asset_url, comment), query);
+
+  configurePymParent(pymParent, asset_url);
 };
 
 export default Coral;
diff --git a/client/coral-framework/graphql/queries/index.js b/client/coral-framework/graphql/queries/index.js
index 26a72498d..fa9d0f866 100644
--- a/client/coral-framework/graphql/queries/index.js
+++ b/client/coral-framework/graphql/queries/index.js
@@ -14,8 +14,8 @@ function getQueryVariable(variable) {
     }
   }
 
-  // If no query is included, return a default string for development
-  return 'http://localhost/default/stream';
+  // If not found, return null.
+  return null;
 }
 
 export const getCounts = (data) => ({asset_id, limit, sort}) => {
@@ -85,12 +85,19 @@ export const loadMore = (data) => ({limit, cursor, parent_id, asset_id, sort}, n
 };
 
 export const queryStream = graphql(STREAM_QUERY, {
-  options: () => ({
-    variables: {
-      asset_url: getQueryVariable('asset_url'),
-      comment_id: getQueryVariable('comment_id')
-    }
-  }),
+  options: () => {
+    let comment_id = getQueryVariable('comment_id');
+    let has_comment = comment_id != null;
+
+    return {
+      variables: {
+        asset_id: getQueryVariable('asset_id'),
+        asset_url: getQueryVariable('asset_url'),
+        comment_id: has_comment ? comment_id : 'no-comment',
+        has_comment
+      }
+    };
+  },
   props: ({data}) => ({
     data,
     loadMore: loadMore(data),
diff --git a/client/coral-framework/graphql/queries/streamQuery.graphql b/client/coral-framework/graphql/queries/streamQuery.graphql
index 4f09f628e..e9f4c827c 100644
--- a/client/coral-framework/graphql/queries/streamQuery.graphql
+++ b/client/coral-framework/graphql/queries/streamQuery.graphql
@@ -1,7 +1,7 @@
 #import "../fragments/commentView.graphql"
 
-query AssetQuery($asset_url: String!, $comment_id: ID!) {
-    comment(id: $comment_id) {
+query AssetQuery($asset_id: ID, $asset_url: String!, $comment_id: ID!, $has_comment: Boolean!) {
+    comment(id: $comment_id) @include(if: $has_comment) {
       ...commentView
       parent {
         ...commentView
@@ -10,7 +10,7 @@ query AssetQuery($asset_url: String!, $comment_id: ID!) {
         }
       }
     }
-    asset(url: $asset_url) {
+    asset(id: $asset_id, url: $asset_url) {
         id
         title
         url