@dhis2/analytics 999.9.9-TE-alpha.3 → 999.9.9-interpretations-for-dashboard.alpha.2

package/build/cjs/api/analytics/Analytics.js

@@ -9,7 +9,6 @@ var _AnalyticsEnrollments = _interopRequireDefault(require("./AnalyticsEnrollmen
 var _AnalyticsEvents = _interopRequireDefault(require("./AnalyticsEvents.js"));
 var _AnalyticsRequest = _interopRequireDefault(require("./AnalyticsRequest.js"));
 var _AnalyticsResponse = _interopRequireDefault(require("./AnalyticsResponse.js"));
-var _AnalyticsTrackedEntities = _interopRequireDefault(require("./AnalyticsTrackedEntities.js"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * @module analytics
@@ -20,8 +19,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * Analytics class used to request analytics data from Web API.
  *
  * @requires analytics.AnalyticsAggregate
- * @requires analytics.AnalyticsTrackedEntities
- * @requires analytics.AnalyticsEnrollments
  * @requires analytics.AnalyticsEvents
  * @requires analytics.AnalyticsRequest
  * @requires analytics.AnalyticsResponse
@@ -41,7 +38,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 class Analytics {
   /**
    * @param {!module:analytics.AnalyticsAggregate} analyticsAggregate The AnalyticsAggregate instance
-   * @param {!module:analytics.AnalyticsTrackedEntities} analyticsTrackedEntities The AnalyticsTrackedEntities instance
    * @param {!module:analytics.AnalyticsEnrollments} analyticsEnrollments The AnalyticsEnrollments instance
    * @param {!module:analytics.AnalyticsEvents} analyticsEvents The AnalyticsEvents instance
    * @param {!module:analytics.AnalyticsRequest} analyticsRequest The AnalyticsRequest class
@@ -50,14 +46,12 @@ class Analytics {
   constructor(_ref) {
     let {
       aggregate,
-      trackedEntities,
       enrollments,
       events,
       request,
       response
     } = _ref;
     this.aggregate = aggregate;
-    this.trackedEntities = trackedEntities;
     this.enrollments = enrollments;
     this.events = events;
     this.request = request;
@@ -80,7 +74,6 @@ class Analytics {
     if (!Analytics.getAnalytics.analytics) {
       Analytics.getAnalytics.analytics = new Analytics({
         aggregate: new _AnalyticsAggregate.default(dataEngine),
-        trackedEntities: new _AnalyticsTrackedEntities.default(dataEngine),
         enrollments: new _AnalyticsEnrollments.default(dataEngine),
         events: new _AnalyticsEvents.default(dataEngine),
         request: _AnalyticsRequest.default,

package/build/cjs/api/analytics/AnalyticsBase.js

@@ -6,21 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 var _AnalyticsRequest = _interopRequireDefault(require("./AnalyticsRequest.js"));
-var _utils = require("./utils.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const analyticsQuery = {
   resource: 'analytics',
   id: _ref => {
     let {
       path,
-      program,
-      trackedEntityType
+      program
     } = _ref;
-    return (0, _utils.formatRequestPath)({
-      path,
-      program,
-      trackedEntityType
-    });
+    return [path, program].filter(Boolean).join('/');
   },
   params: _ref2 => {
     let {
@@ -40,14 +34,9 @@ const analyticsDataQuery = {
   id: _ref3 => {
     let {
       path,
-      program,
-      trackedEntityType
+      program
     } = _ref3;
-    return (0, _utils.formatRequestPath)({
-      path,
-      program,
-      trackedEntityType
-    });
+    return [path, program].filter(Boolean).join('/');
   },
   params: _ref4 => {
     let {
@@ -69,14 +58,9 @@ const analyticsMetaDataQuery = {
   id: _ref5 => {
     let {
       path,
-      program,
-      trackedEntityType
+      program
     } = _ref5;
-    return (0, _utils.formatRequestPath)({
-      path,
-      program,
-      trackedEntityType
-    });
+    return [path, program].filter(Boolean).join('/');
   },
   params: _ref6 => {
     let {
@@ -168,7 +152,6 @@ class AnalyticsBase {
       variables: {
         path: req.path,
         program: req.program,
-        trackedEntityType: req.trackedEntityType,
         dimensions: generateDimensionStrings(req.dimensions),
         filters: generateDimensionStrings(req.filters),
         parameters: req.parameters,
@@ -211,7 +194,6 @@ class AnalyticsBase {
       variables: {
         path: req.path,
         program: req.program,
-        trackedEntityType: req.trackedEntityType,
         dimensions: generateDimensionStrings(req.dimensions, options),
         filters: generateDimensionStrings(req.filters, options),
         parameters: req.parameters

package/build/cjs/api/analytics/AnalyticsRequest.js

@@ -10,7 +10,6 @@ var _AnalyticsRequestBase = _interopRequireDefault(require("./AnalyticsRequestBa
 var _AnalyticsRequestDimensionsMixin = _interopRequireDefault(require("./AnalyticsRequestDimensionsMixin.js"));
 var _AnalyticsRequestFiltersMixin = _interopRequireDefault(require("./AnalyticsRequestFiltersMixin.js"));
 var _AnalyticsRequestPropertiesMixin = _interopRequireDefault(require("./AnalyticsRequestPropertiesMixin.js"));
-var _utils = require("./utils.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * @description
@@ -48,7 +47,6 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
   fromVisualization(visualization) {
     let passFilterAsDimension = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     let request = this;
-    const outputType = visualization.outputType;
 
     // extract dimensions from visualization
     const columns = visualization.columns || [];
@@ -59,28 +57,19 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
       if ((_d$legendSet = d.legendSet) !== null && _d$legendSet !== void 0 && _d$legendSet.id) {
         dimension += `-${d.legendSet.id}`;
       }
+      if ((_d$programStage = d.programStage) !== null && _d$programStage !== void 0 && _d$programStage.id) {
+        dimension = `${d.programStage.id}.${dimension}`;
+      }
       if (d.filter) {
         dimension += `:${d.filter}`;
       }
-      const programStageId = (_d$programStage = d.programStage) === null || _d$programStage === void 0 ? void 0 : _d$programStage.id;
       if ((_d$repetition = d.repetition) !== null && _d$repetition !== void 0 && (_d$repetition$indexes = _d$repetition.indexes) !== null && _d$repetition$indexes !== void 0 && _d$repetition$indexes.length) {
         d.repetition.indexes.forEach(index => {
-          var _d$program;
-          request = request.addDimension((0, _utils.formatDimension)({
-            programId: (_d$program = d.program) === null || _d$program === void 0 ? void 0 : _d$program.id,
-            programStageId: `${programStageId}[${index}]`,
-            dimension,
-            outputType
-          }));
+          request = request.addDimension(dimension.replace(/\./, `[${index}].`));
         });
       } else {
-        var _d$program2, _d$items;
-        request = request.addDimension((0, _utils.formatDimension)({
-          programId: (_d$program2 = d.program) === null || _d$program2 === void 0 ? void 0 : _d$program2.id,
-          programStageId,
-          dimension,
-          outputType
-        }), (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
+        var _d$items;
+        request = request.addDimension(dimension, (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
       }
     });
 
@@ -95,29 +84,17 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
         request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
       } else {
         var _f$programStage, _f$repetition, _f$repetition$indexes;
-        let filterString = f.dimension;
+        let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? `${f.programStage.id}.${f.dimension}` : f.dimension;
         if (f.filter) {
           filterString += `:${f.filter}`;
         }
-        const programStageId = (_f$programStage = f.programStage) === null || _f$programStage === void 0 ? void 0 : _f$programStage.id;
         if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition$indexes = _f$repetition.indexes) !== null && _f$repetition$indexes !== void 0 && _f$repetition$indexes.length) {
           f.repetition.indexes.forEach(index => {
-            var _f$program;
-            request = request.addFilter((0, _utils.formatDimension)({
-              programId: (_f$program = f.program) === null || _f$program === void 0 ? void 0 : _f$program.id,
-              programStageId: `${programStageId}[${index}]`,
-              dimension: filterString,
-              outputType
-            }));
+            request = request.addFilter(filterString.replace(/\./, `[${index}].`));
           });
         } else {
-          var _f$program2, _f$items2;
-          request = request.addFilter((0, _utils.formatDimension)({
-            programId: (_f$program2 = f.program) === null || _f$program2 === void 0 ? void 0 : _f$program2.id,
-            programStageId,
-            dimension: filterString,
-            outputType
-          }), (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+          var _f$items2;
+          request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
         }
       }
     });

package/build/cjs/api/analytics/AnalyticsRequestBase.js

@@ -24,7 +24,6 @@ class AnalyticsRequestBase {
       format = 'json',
       path,
       program,
-      trackedEntityType,
       dimensions = [],
       filters = [],
       parameters = {}
@@ -33,7 +32,6 @@ class AnalyticsRequestBase {
     this.format = format.toLowerCase();
     this.path = path;
     this.program = program;
-    this.trackedEntityType = trackedEntityType;
     this.dimensions = dimensions;
     this.filters = filters;
     this.parameters = {
@@ -72,7 +70,7 @@ class AnalyticsRequestBase {
       }
       return dimension;
     });
-    const endPoint = [this.endPoint, this.path, this.program, this.trackedEntityType].filter(Boolean).join('/');
+    const endPoint = [this.endPoint, this.path, this.program].filter(e => !!e).join('/');
     return `${endPoint}.${this.format}?dimension=${encodedDimensions.join('&dimension=')}`;
   }
 

package/build/cjs/api/analytics/AnalyticsRequestPropertiesMixin.js

@@ -497,25 +497,6 @@ class extends base {
     return new _AnalyticsRequest.default(this);
   }
 
-  /**
-   * Sets the tracked entity type for the request.
-   * It appends the tracked entity type id to the request's path.
-   *
-   * @param {!String} trackedEntityType The tracked entity type id
-   *
-   * @returns {AnalyticsRequest} A new instance of the class for chaining purposes
-   *
-   * @example
-   * const req = new analytics.request()
-   *    .withTrackedEntityType('nEenWmSyUEp');
-   */
-  withTrackedEntityType(trackedEntityType) {
-    if (trackedEntityType) {
-      this.trackedEntityType = trackedEntityType;
-    }
-    return new _AnalyticsRequest.default(this);
-  }
-
   /**
    * Sets the program for the request.
    * It appends the program id to the request's path.

package/build/cjs/api/analytics/__tests__/AnalyticsTrackedEntities.spec.js

@@ -0,0 +1,44 @@
+"use strict";
+
+var _fixtures = _interopRequireDefault(require("../../../__fixtures__/fixtures.js"));
+var _DataEngine = _interopRequireDefault(require("../__mocks__/DataEngine.js"));
+var _AnalyticsRequest = _interopRequireDefault(require("../AnalyticsRequest.js"));
+var _AnalyticsTrackedEntities = _interopRequireDefault(require("../AnalyticsTrackedEntities.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+describe.skip('analytics.trackedEntity', () => {
+  let enrollments;
+  let request;
+  let dataEngineMock;
+  let fixture;
+  beforeEach(() => {
+    dataEngineMock = new _DataEngine.default();
+    _DataEngine.default.mockClear();
+    enrollments = new _AnalyticsTrackedEntities.default();
+  });
+  it('should not be allowed to be called without new', () => {
+    expect(() => (0, _AnalyticsTrackedEntities.default)()).toThrowErrorMatchingSnapshot();
+  });
+  it('should use the dataEngine object when it is passed', () => {
+    const dataEngineMockObject = {};
+    enrollments = new _AnalyticsTrackedEntities.default(dataEngineMockObject);
+    expect(enrollments.dataEngine).toBe(dataEngineMockObject);
+  });
+  describe('.getQuery()', () => {
+    beforeEach(() => {
+      enrollments = new _AnalyticsTrackedEntities.default(new _DataEngine.default());
+      request = new _AnalyticsRequest.default().addOrgUnitDimension('ImspTQPwCqd').addDimension('WZbXY0S00lP.de0FEHSIoxh').addDimension('WZbXY0S00lP.sWoqcoByYmD').addPeriodFilter('LAST_MONTH').withTrackedEntity('nEenWmSyUEp').withAsc('ENROLLMENTDATE').withOuMode('DESCENDANTS').withColumns('w75KJ2mc4zz').withPage(1).withPageSize(10);
+      fixture = _fixtures.default.get('/api/analytics/enrollments'); // XXX
+
+      dataEngineMock.query.mockReturnValue(Promise.resolve({
+        data: fixture
+      }));
+    });
+    it('should be a function', () => {
+      expect(enrollments.getQuery).toBeInstanceOf(Function);
+    });
+    it('should resolve a promise with data', () => enrollments.getQuery(request).then(data => {
+      expect(data.width).toEqual(fixture.width);
+      expect(data.height).toEqual(fixture.height);
+    }));
+  });
+});

package/build/cjs/api/analytics/__tests__/__snapshots__/AnalyticsTrackedEntities.spec.js.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`analytics.trackedEntity should not be allowed to be called without new 1`] = `"Class constructor AnalyticsTrackedEntities cannot be invoked without 'new'"`;

package/build/cjs/api/analytics/utils.js

@@ -3,31 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatRequestPath = exports.formatDimension = exports.customEncodeURIComponent = void 0;
+exports.customEncodeURIComponent = void 0;
 // Define our very own special list of characters that we don't want to encode in the URI
 const whitelistURI = ',&$=/;:';
 const whitelistURICodes = whitelistURI.split('').map(c => encodeURIComponent(c));
 const whitelistRegExp = new RegExp(`(?:${whitelistURICodes.join('|')})`, 'g');
 const customEncodeURIComponent = uri => encodeURIComponent(uri).replace(whitelistRegExp, decodeURIComponent);
-exports.customEncodeURIComponent = customEncodeURIComponent;
-const formatRequestPath = _ref => {
-  let {
-    path,
-    program,
-    trackedEntityType
-  } = _ref;
-  return [path, program, trackedEntityType].filter(Boolean).join('/');
-};
-exports.formatRequestPath = formatRequestPath;
-const formatDimension = _ref2 => {
-  let {
-    outputType,
-    programId,
-    programStageId,
-    dimension
-  } = _ref2;
-  return [
-  // XXX it would be clearer to have this consistent with what is sent in the request as for EVENT/ENROLLMENT
-  outputType === 'TRACKED_ENTITY_INSTANCE' ? programId : undefined, programStageId, dimension].filter(Boolean).join('.');
-};
-exports.formatDimension = formatDimension;
+exports.customEncodeURIComponent = customEncodeURIComponent;

package/build/cjs/components/Interpretations/InterpretationModal/InterpretationThread.js

@@ -25,7 +25,8 @@ const InterpretationThread = _ref => {
     onInterpretationDeleted,
     initialFocus,
     onThreadUpdated,
-    downloadMenuComponent: DownloadMenu
+    downloadMenuComponent: DownloadMenu,
+    dashboardRedirectUrl
   } = _ref;
   const {
     fromServerDate
@@ -40,18 +41,19 @@ const InterpretationThread = _ref => {
   }, [initialFocus]);
   const interpretationAccess = (0, _index.getInterpretationAccess)(interpretation, currentUser);
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-1846557365" + " " + ((0, _classnames.default)('container', {
-      fetching
+    className: "jsx-3292109121" + " " + ((0, _classnames.default)('container', {
+      fetching,
+      dashboard: !!dashboardRedirectUrl
     }) || "")
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-1846557365" + " " + 'title'
+    className: "jsx-3292109121" + " " + 'title'
   }, /*#__PURE__*/_react.default.createElement(_ui.IconClock16, {
     color: _ui.colors.grey700
   }), (0, _moment.default)(fromServerDate(interpretation.created)).format('LLL')), DownloadMenu && /*#__PURE__*/_react.default.createElement(DownloadMenu, {
     relativePeriodDate: interpretation.created,
-    className: "jsx-1846557365"
+    className: "jsx-3292109121"
   }), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-1846557365" + " " + 'thread'
+    className: "jsx-3292109121" + " " + 'thread'
   }, /*#__PURE__*/_react.default.createElement(_index.Interpretation, {
     currentUser: currentUser,
     interpretation: interpretation,
@@ -61,9 +63,10 @@ const InterpretationThread = _ref => {
     } : null,
     onUpdated: () => onThreadUpdated(true),
     onDeleted: onInterpretationDeleted,
+    dashboardRedirectUrl: dashboardRedirectUrl,
     isInThread: true
   }), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-1846557365" + " " + 'comments'
+    className: "jsx-3292109121" + " " + 'comments'
   }, interpretation.comments.map(comment => /*#__PURE__*/_react.default.createElement(_Comment.Comment, {
     key: comment.id,
     comment: comment,
@@ -77,8 +80,8 @@ const InterpretationThread = _ref => {
     onSave: () => onThreadUpdated(true),
     focusRef: focusRef
   }), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: "1846557365"
-  }, [".thread.jsx-1846557365{margin-top:var(--spacers-dp16);overflow-y:auto;-webkit-scroll-behavior:smooth;-moz-scroll-behavior:smooth;-ms-scroll-behavior:smooth;scroll-behavior:smooth;}", ".container.jsx-1846557365{position:relative;overflow:auto;max-height:calc(100vh - 285px);display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}", ".container.fetching.jsx-1846557365::before{content:'';position:absolute;inset:0px;background-color:rgba(255,255,255,0.8);}", ".container.fetching.jsx-1846557365::after{content:'';position:absolute;top:calc(50% - 12px);left:calc(50% - 12px);width:24px;height:24px;border-width:4px;border-style:solid;border-color:rgba(110,122,138,0.15) rgba(110,122,138,0.15) rgb(20,124,215);border-image:initial;border-radius:50%;-webkit-animation:1s linear 0s infinite normal none running rotation-jsx-1846557365;animation:1s linear 0s infinite normal none running rotation-jsx-1846557365;}", ".title.jsx-1846557365{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;gap:var(--spacers-dp8);color:var(--colors-grey900);font-size:14px;line-height:18px;}", ".comments.jsx-1846557365{padding-left:16px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;padding-top:var(--spacers-dp4);gap:var(--spacers-dp4);}", "@-webkit-keyframes rotation-jsx-1846557365{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0);}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg);}}", "@keyframes rotation-jsx-1846557365{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0);}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg);}}"]));
+    id: "3292109121"
+  }, [".thread.jsx-3292109121{margin-top:var(--spacers-dp16);overflow-y:auto;-webkit-scroll-behavior:smooth;-moz-scroll-behavior:smooth;-ms-scroll-behavior:smooth;scroll-behavior:smooth;}", ".dashboard.jsx-3292109121 .thread.jsx-3292109121{overflow-y:hidden;}", ".container.jsx-3292109121{position:relative;overflow:auto;max-height:calc(100vh - 285px);display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}", ".container.dashboard.jsx-3292109121{max-height:none;}", ".container.fetching.jsx-3292109121::before{content:'';position:absolute;inset:0px;background-color:rgba(255,255,255,0.8);}", ".container.fetching.jsx-3292109121::after{content:'';position:absolute;top:calc(50% - 12px);left:calc(50% - 12px);width:24px;height:24px;border-width:4px;border-style:solid;border-color:rgba(110,122,138,0.15) rgba(110,122,138,0.15) rgb(20,124,215);border-image:initial;border-radius:50%;-webkit-animation:1s linear 0s infinite normal none running rotation-jsx-3292109121;animation:1s linear 0s infinite normal none running rotation-jsx-3292109121;}", ".title.jsx-3292109121{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;gap:var(--spacers-dp8);color:var(--colors-grey900);font-size:14px;line-height:18px;}", ".comments.jsx-3292109121{padding-left:16px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;padding-top:var(--spacers-dp4);gap:var(--spacers-dp4);}", "@-webkit-keyframes rotation-jsx-3292109121{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0);}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg);}}", "@keyframes rotation-jsx-3292109121{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0);}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg);}}"]));
 };
 exports.InterpretationThread = InterpretationThread;
 InterpretationThread.propTypes = {
@@ -86,6 +89,7 @@ InterpretationThread.propTypes = {
   fetching: _propTypes.default.bool.isRequired,
   interpretation: _propTypes.default.object.isRequired,
   onInterpretationDeleted: _propTypes.default.func.isRequired,
+  dashboardRedirectUrl: _propTypes.default.string,
   downloadMenuComponent: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.func]),
   initialFocus: _propTypes.default.bool,
   onThreadUpdated: _propTypes.default.func

package/build/cjs/components/Interpretations/InterpretationModal/index.js

@@ -9,4 +9,11 @@ Object.defineProperty(exports, "InterpretationModal", {
     return _InterpretationModal.InterpretationModal;
   }
 });
-var _InterpretationModal = require("./InterpretationModal.js");
+Object.defineProperty(exports, "InterpretationThread", {
+  enumerable: true,
+  get: function () {
+    return _InterpretationThread.InterpretationThread;
+  }
+});
+var _InterpretationModal = require("./InterpretationModal.js");
+var _InterpretationThread = require("./InterpretationThread.js");

package/build/cjs/components/Interpretations/InterpretationsUnit/InterpretationList.js

@@ -30,7 +30,8 @@ const InterpretationList = _ref => {
     onInterpretationClick,
     onReplyIconClick,
     refresh,
-    disabled
+    disabled,
+    dashboardRedirectUrl
   } = _ref;
   const {
     fromServerDate
@@ -67,7 +68,8 @@ const InterpretationList = _ref => {
     onReplyIconClick: onReplyIconClick,
     onDeleted: refresh,
     onUpdated: refresh,
-    disabled: disabled
+    disabled: disabled,
+    dashboardRedirectUrl: dashboardRedirectUrl
   }))))), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: "4058400613",
     dynamic: [_ui.spacers.dp8, _ui.spacers.dp8, _ui.spacers.dp16, _ui.colors.grey800, _ui.spacers.dp12, _ui.spacers.dp12, _ui.spacers.dp32, _ui.spacers.dp4]
@@ -80,5 +82,6 @@ InterpretationList.propTypes = {
   refresh: _propTypes.default.func.isRequired,
   onInterpretationClick: _propTypes.default.func.isRequired,
   onReplyIconClick: _propTypes.default.func.isRequired,
+  dashboardRedirectUrl: _propTypes.default.string,
   disabled: _propTypes.default.bool
 };

package/build/cjs/components/Interpretations/InterpretationsUnit/InterpretationsUnit.js

@@ -40,7 +40,8 @@ const InterpretationsUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
     onInterpretationClick,
     onReplyIconClick,
     disabled,
-    renderId
+    renderId,
+    dashboardRedirectUrl
   } = _ref2;
   const [isExpanded, setIsExpanded] = (0, _react.useState)(true);
   const showNoTimeDimensionHelpText = type === 'eventVisualization' && !visualizationHasTimeDimension;
@@ -103,7 +104,8 @@ const InterpretationsUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
     onInterpretationClick: onInterpretationClick,
     onReplyIconClick: onReplyIconClick,
     refresh: onCompleteAction,
-    disabled: disabled
+    disabled: disabled,
+    dashboardRedirectUrl: dashboardRedirectUrl
   }))), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: "4120713286",
     dynamic: [_ui.spacers.dp16, _ui.colors.grey400, _ui.colors.white, _ui.spacers.dp32, _ui.colors.grey900]
@@ -119,6 +121,7 @@ InterpretationsUnit.propTypes = {
   currentUser: _propTypes.default.object.isRequired,
   id: _propTypes.default.string.isRequired,
   type: _propTypes.default.string.isRequired,
+  dashboardRedirectUrl: _propTypes.default.string,
   disabled: _propTypes.default.bool,
   renderId: _propTypes.default.number,
   visualizationHasTimeDimension: _propTypes.default.bool,

package/build/cjs/components/Interpretations/common/Interpretation/Interpretation.js

@@ -24,6 +24,7 @@ const Interpretation = _ref => {
     onDeleted,
     disabled,
     onReplyIconClick,
+    dashboardRedirectUrl,
     isInThread
   } = _ref;
   const [isUpdateMode, setIsUpdateMode] = (0, _react.useState)(false);
@@ -37,7 +38,7 @@ const Interpretation = _ref => {
     currentUser,
     onComplete: onUpdated
   });
-  const shouldShowButton = !!onClick && !disabled;
+  const shouldShowButton = Boolean(!!onClick && !disabled & !dashboardRedirectUrl);
   const interpretationAccess = (0, _index.getInterpretationAccess)(interpretation, currentUser);
   let tooltip = _d2I18n.default.t('Reply');
   if (!interpretationAccess.comment) {
@@ -51,6 +52,9 @@ const Interpretation = _ref => {
       tooltip = _d2I18n.default.t('View replies');
     }
   }
+
+  // Maps still uses old url style /?id= instead of hash
+  const getAppInterpretationUrl = () => dashboardRedirectUrl.includes('?') ? `${dashboardRedirectUrl}&interpretationId=${interpretation.id}` : `${dashboardRedirectUrl}?interpretationId=${interpretation.id}`;
   return isUpdateMode ? /*#__PURE__*/_react.default.createElement(_InterpretationUpdateForm.InterpretationUpdateForm, {
     close: () => setIsUpdateMode(false),
     id: interpretation.id,
@@ -77,6 +81,16 @@ const Interpretation = _ref => {
     count: interpretation.comments.length,
     dataTest: "interpretation-reply-button",
     viewOnly: isInThread && !interpretationAccess.comment
+  }), dashboardRedirectUrl && !isInThread && /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
+    tooltipContent: _d2I18n.default.t('See interpretation'),
+    iconComponent: _ui.IconView16,
+    onClick: () => onClick(interpretation.id),
+    dataTest: "interpretation-view-button"
+  }), dashboardRedirectUrl && /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
+    tooltipContent: _d2I18n.default.t('Open in app'),
+    iconComponent: _ui.IconLaunch16,
+    onClick: () => window.open(getAppInterpretationUrl(), '_blank'),
+    dataTest: "interpretation-launch-in-app-button"
   }), interpretationAccess.share && /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
     iconComponent: _ui.IconShare16,
     tooltipContent: _d2I18n.default.t('Share'),
@@ -111,6 +125,7 @@ Interpretation.propTypes = {
   onDeleted: _propTypes.default.func.isRequired,
   onReplyIconClick: _propTypes.default.func.isRequired,
   onUpdated: _propTypes.default.func.isRequired,
+  dashboardRedirectUrl: _propTypes.default.string,
   disabled: _propTypes.default.bool,
   isInThread: _propTypes.default.bool,
   onClick: _propTypes.default.func

package/build/cjs/components/Interpretations/common/RichTextEditor/styles/RichTextEditor.style.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.tooltipAnchorClasses = exports.toolbarClasses = exports.mainClasses = exports.emojisPopoverClasses = void 0;
 var _ui = require("@dhis2/ui");
-const mainClasses = [".container.jsx-2278350860{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;width:100%;}", `.preview.jsx-2278350860{font-size:14px;line-height:19px;color:${_ui.colors.grey900};}`, `.textarea.jsx-2278350860{width:100%;box-sizing:border-box;padding:${_ui.spacers.dp8} ${_ui.spacers.dp12};color:${_ui.colors.grey900};background-color:${_ui.colors.white};border:1px solid ${_ui.colors.grey500};border-radius:3px;box-shadow:inset 0 0 0 1px rgba(102,113,123,0.15), inset 0 1px 2px 0 rgba(102,113,123,0.1);outline:0;font-size:14px;line-height:${_ui.spacers.dp16};-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text;}`, `.textarea.jsx-2278350860:focus{outline:none;box-shadow:0 0 0 3px ${_ui.theme.focus};}`, `.textarea.jsx-2278350860:disabled{background-color:${_ui.colors.grey100};border-color:${_ui.colors.grey500};color:${_ui.theme.disabled};cursor:not-allowed;}`];
+const mainClasses = [".container.jsx-1273817287{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;width:100%;}", `.preview.jsx-1273817287{font-size:14px;line-height:19px;color:${_ui.colors.grey900};}`, `.textarea.jsx-1273817287{width:100%;box-sizing:border-box;padding:${_ui.spacers.dp8} ${_ui.spacers.dp12};color:${_ui.colors.grey900};background-color:${_ui.colors.white};border:1px solid ${_ui.colors.grey500};border-radius:3px;box-shadow:inset 0 0 0 1px rgba(102,113,123,0.15), inset 0 1px 2px 0 rgba(102,113,123,0.1);outline:0;font-size:14px;line-height:${_ui.spacers.dp16};-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text;}`, `.textarea.jsx-1273817287:focus{outline:none;box-shadow:0 0 0 3px ${_ui.theme.focus};width:calc(100% - 3px);}`, `.textarea.jsx-1273817287:disabled{background-color:${_ui.colors.grey100};border-color:${_ui.colors.grey500};color:${_ui.theme.disabled};cursor:not-allowed;}`];
 exports.mainClasses = mainClasses;
-mainClasses.__hash = "2278350860";
+mainClasses.__hash = "1273817287";
 const toolbarClasses = [`.toolbar.jsx-2267496677{background:${_ui.colors.grey050};border-radius:3px;border:1px solid ${_ui.colors.grey300};margin-bottom:${_ui.spacers.dp4};}`, `.actionsWrapper.jsx-2267496677{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;gap:${_ui.spacers.dp4};-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:${_ui.spacers.dp4};}`, `.mainActions.jsx-2267496677{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:${_ui.spacers.dp4};margin-top:${_ui.spacers.dp2};}`, ".sideActions.jsx-2267496677{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;}", `.previewWrapper.jsx-2267496677{margin:${_ui.spacers.dp4};text-align:right;}`];
 exports.toolbarClasses = toolbarClasses;
 toolbarClasses.__hash = "2267496677";

package/build/cjs/components/RichText/Editor.bk/Editor.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = _interopRequireWildcard(require("react"));
+var _convertCtrlKey = _interopRequireDefault(require("./convertCtrlKey.js"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+class Editor extends _react.Component {
+  constructor() {
+    super(...arguments);
+    _defineProperty(this, "onKeyDown", event => {
+      (0, _convertCtrlKey.default)(event, this.props.onEdit);
+    });
+  }
+  render() {
+    const {
+      children
+    } = this.props;
+    return /*#__PURE__*/_react.default.createElement("div", {
+      onKeyDown: this.onKeyDown
+    }, children);
+  }
+}
+Editor.defaultProps = {
+  onEdit: null
+};
+Editor.propTypes = {
+  children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]),
+  onEdit: _propTypes.default.func
+};
+var _default = Editor;
+exports.default = _default;

package/build/cjs/components/RichText/Editor.bk/__tests__/Editor.spec.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _enzyme = require("enzyme");
+var _react = _interopRequireDefault(require("react"));
+var _convertCtrlKey = _interopRequireDefault(require("../convertCtrlKey.js"));
+var _Editor = _interopRequireDefault(require("../Editor.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+jest.mock('../convertCtrlKey');
+describe('RichText: Editor component', () => {
+  let richTextEditor;
+  const componentProps = {
+    onEdit: jest.fn()
+  };
+  beforeEach(() => {
+    _convertCtrlKey.default.mockClear();
+  });
+  const renderComponent = props => {
+    return (0, _enzyme.shallow)( /*#__PURE__*/_react.default.createElement(_Editor.default, props, /*#__PURE__*/_react.default.createElement("input", null)));
+  };
+  it('renders a result', () => {
+    richTextEditor = renderComponent(componentProps);
+    expect(richTextEditor).toHaveLength(1);
+  });
+  it('calls convertCtrlKey on keydown', () => {
+    richTextEditor = renderComponent(componentProps);
+    richTextEditor.simulate('keyDown');
+    expect(_convertCtrlKey.default).toHaveBeenCalled();
+  });
+});