# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1537140946 -7200
# Node ID df751568fda6c4ba03b940692c08f20166d981c8
# Parent  7af67d500dd5d1017adf6e79405c2543376f5c4f
Add dashboardId for calculating discussionId

diff -r 7af67d500dd5 -r df751568fda6 clientjs/packages/annotation-dashboard-explorunivers/src/store.js
--- a/clientjs/packages/annotation-dashboard-explorunivers/src/store.js	Mon Sep 17 00:28:58 2018 +0200
+++ b/clientjs/packages/annotation-dashboard-explorunivers/src/store.js	Mon Sep 17 01:35:46 2018 +0200
@@ -7,6 +7,8 @@
 
 import { rootReducer, actions } from 'dashboard-components';
 
+import { dashboardId } from './config.json';
+
 const { fetchAnnotations } = actions;
 
 let middlewares = [thunkMiddleware];
@@ -29,7 +31,7 @@
   componentWillMount() {
     const apiUrl = process.env.REACT_APP_API_URL;
     const discussionUrl = process.env.REACT_APP_DISCUSSION_URL;
-    store.dispatch(fetchAnnotations(apiUrl, discussionUrl));
+    store.dispatch(fetchAnnotations(apiUrl, discussionUrl, dashboardId));
   }
 
   render() {
diff -r 7af67d500dd5 -r df751568fda6 clientjs/packages/dashboard-components/src/actions.js
--- a/clientjs/packages/dashboard-components/src/actions.js	Mon Sep 17 00:28:58 2018 +0200
+++ b/clientjs/packages/dashboard-components/src/actions.js	Mon Sep 17 01:35:46 2018 +0200
@@ -2,7 +2,7 @@
 import fetch from 'isomorphic-fetch';
 import _ from 'lodash';
 
-import { getTerms, toBase64 } from './utils';
+import { getTerms, getTermId } from './utils';
 
 
 export const REQUEST_ANNOTATIONS = 'REQUEST_ANNOTATIONS';
@@ -45,9 +45,9 @@
 }
 
 export const FETCH_MESSAGES_COUNT = 'FETCH_MESSAGES_COUNT';
-export function fetchMessagesCount(terms, discussionUrl) {
+export function fetchMessagesCount(terms, discussionUrl, dashboardId) {
   const url = `${discussionUrl}count`;
-  const terms64 = _.map(terms, toBase64);
+  const terms64 = _.map(terms, term => getTermId(term, dashboardId));
 
   return function (dispatch) {
     dispatch(requestMessagesCount(url, terms, terms64));
@@ -74,7 +74,7 @@
 }
 
 export const FETCH_ANNOTATIONS = 'FETCH_ANNOTATIONS';
-export function fetchAnnotations(url, discussionUrl) {
+export function fetchAnnotations(url, discussionUrl, dashboardId) {
   return function (dispatch) {
     dispatch(requestAnnotations(url));
 
@@ -87,7 +87,7 @@
         const annotations = json.rows;
         const terms = getTerms(annotations);
 
-        dispatch(fetchMessagesCount(Object.keys(terms), discussionUrl));
+        dispatch(fetchMessagesCount(Object.keys(terms), discussionUrl, dashboardId));
         dispatch(receiveAnnotations(url, annotations, terms));
       });
   };
diff -r 7af67d500dd5 -r df751568fda6 clientjs/packages/dashboard-components/src/pages/term.jsx
--- a/clientjs/packages/dashboard-components/src/pages/term.jsx	Mon Sep 17 00:28:58 2018 +0200
+++ b/clientjs/packages/dashboard-components/src/pages/term.jsx	Mon Sep 17 01:35:46 2018 +0200
@@ -13,7 +13,7 @@
 import AnnotationsCards from '../ui/AnnotationsCards';
 import DefinitionsCards from '../ui/DefinitionsCards';
 import IssoThread from '../ui/IssoThread';
-import { toBase64 } from '../utils';
+import { getTermId } from '../utils';
 
 import './term.scss';
 
@@ -118,7 +118,7 @@
 
     const defAndRef = term ? state.terms[term] : {};
 
-    const term64 = toBase64(dashboardId ? `${dashboardId}::${term}` : term);
+    const term64 = getTermId(term, dashboardId);
 
     const { messageId } = (params || {});
 
diff -r 7af67d500dd5 -r df751568fda6 clientjs/packages/dashboard-components/src/utils.js
--- a/clientjs/packages/dashboard-components/src/utils.js	Mon Sep 17 00:28:58 2018 +0200
+++ b/clientjs/packages/dashboard-components/src/utils.js	Mon Sep 17 01:35:46 2018 +0200
@@ -100,3 +100,7 @@
 export function toBase64(msg) {
   return Buffer.from(msg).toString('base64');
 }
+
+export function getTermId(term, dashboardId) {
+  return toBase64(dashboardId ? `${dashboardId}::${term}` : term);
+}