@dhis2/analytics 26.2.0-alpha.2 → 26.2.0-cumulative-values-alpha.1

package/build/cjs/__demo__/PivotTable.stories.js

@@ -830,14 +830,15 @@ ResizingPivotTable.propTypes = {
     visualization: visualization
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('empty columns (weekly) - hidden', (_, _ref36) => {
+(0, _react.storiesOf)('PivotTable', module).add('cumulative + empty columns (weekly) - shown', (_, _ref36) => {
   let {
     pivotTableOptions
   } = _ref36;
   const visualization = {
     ..._weeklyColumnsVisualization.default,
     ...pivotTableOptions,
-    hideEmptyColumns: true
+    hideEmptyColumns: false,
+    cumulativeValues: true
   };
   return /*#__PURE__*/_react2.default.createElement("div", {
     style: {
@@ -849,10 +850,49 @@ ResizingPivotTable.propTypes = {
     visualization: visualization
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('empty columns + assigned cats (shown)', (_, _ref37) => {
+(0, _react.storiesOf)('PivotTable', module).add('empty columns (weekly) - hidden', (_, _ref37) => {
   let {
     pivotTableOptions
   } = _ref37;
+  const visualization = {
+    ..._weeklyColumnsVisualization.default,
+    ...pivotTableOptions,
+    hideEmptyColumns: true
+  };
+  return /*#__PURE__*/_react2.default.createElement("div", {
+    style: {
+      width: 800,
+      height: 600
+    }
+  }, /*#__PURE__*/_react2.default.createElement(_index.PivotTable, {
+    data: weeklyColumnsData,
+    visualization: visualization
+  }));
+});
+(0, _react.storiesOf)('PivotTable', module).add('cumulative + empty columns (weekly) - hidden', (_, _ref38) => {
+  let {
+    pivotTableOptions
+  } = _ref38;
+  const visualization = {
+    ..._weeklyColumnsVisualization.default,
+    ...pivotTableOptions,
+    hideEmptyColumns: true,
+    cumulativeValues: true
+  };
+  return /*#__PURE__*/_react2.default.createElement("div", {
+    style: {
+      width: 800,
+      height: 600
+    }
+  }, /*#__PURE__*/_react2.default.createElement(_index.PivotTable, {
+    data: weeklyColumnsData,
+    visualization: visualization
+  }));
+});
+(0, _react.storiesOf)('PivotTable', module).add('empty columns + assigned cats (shown)', (_, _ref39) => {
+  let {
+    pivotTableOptions
+  } = _ref39;
   const visualization = {
     ..._emptyColumnsVisualization.default,
     ...visualizationReset,
@@ -869,10 +909,10 @@ ResizingPivotTable.propTypes = {
     visualization: visualization
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('empty columns + assigned cats (hidden)', (_, _ref38) => {
+(0, _react.storiesOf)('PivotTable', module).add('empty columns + assigned cats (hidden)', (_, _ref40) => {
   let {
     pivotTableOptions
-  } = _ref38;
+  } = _ref40;
   const visualization = {
     ..._emptyColumnsVisualization.default,
     ...visualizationReset,
@@ -889,10 +929,10 @@ ResizingPivotTable.propTypes = {
     visualization: visualization
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('legend - fixed (light fill)', (_, _ref39) => {
+(0, _react.storiesOf)('PivotTable', module).add('legend - fixed (light fill)', (_, _ref41) => {
   let {
     pivotTableOptions
-  } = _ref39;
+  } = _ref41;
   const visualization = {
     ..._targetWithLegendVisualization.default,
     ...visualizationReset,
@@ -917,10 +957,10 @@ ResizingPivotTable.propTypes = {
     legendSets: [_underAbove100LegendSet.default]
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('legend - fixed (dark fill)', (_, _ref40) => {
+(0, _react.storiesOf)('PivotTable', module).add('legend - fixed (dark fill)', (_, _ref42) => {
   let {
     pivotTableOptions
-  } = _ref40;
+  } = _ref42;
   const visualization = {
     ..._targetWithLegendVisualization.default,
     ...visualizationReset,
@@ -946,10 +986,10 @@ ResizingPivotTable.propTypes = {
     legendSets: [legendSet]
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('legend - fixed (text)', (_, _ref41) => {
+(0, _react.storiesOf)('PivotTable', module).add('legend - fixed (text)', (_, _ref43) => {
   let {
     pivotTableOptions
-  } = _ref41;
+  } = _ref43;
   const visualization = {
     ..._targetWithLegendVisualization.default,
     ...visualizationReset,
@@ -970,10 +1010,10 @@ ResizingPivotTable.propTypes = {
     legendSets: [_underAbove100LegendSet.default]
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('legend - fixed (% row)', (_, _ref42) => {
+(0, _react.storiesOf)('PivotTable', module).add('legend - fixed (% row)', (_, _ref44) => {
   let {
     pivotTableOptions
-  } = _ref42;
+  } = _ref44;
   const visualization = {
     ..._targetWithLegendVisualization.default,
     ...visualizationReset,
@@ -997,10 +1037,10 @@ ResizingPivotTable.propTypes = {
     legendSets: [_underAbove100LegendSet.default]
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('legend - by data item', (_, _ref43) => {
+(0, _react.storiesOf)('PivotTable', module).add('legend - by data item', (_, _ref45) => {
   let {
     pivotTableOptions
-  } = _ref43;
+  } = _ref45;
   const visualization = {
     ..._targetWithLegendVisualization.default,
     ...visualizationReset,
@@ -1028,10 +1068,10 @@ ResizingPivotTable.propTypes = {
     legendSets: [_underAbove100LegendSet.default, customLegendSet]
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('hierarchy - none', (_, _ref44) => {
+(0, _react.storiesOf)('PivotTable', module).add('hierarchy - none', (_, _ref46) => {
   let {
     pivotTableOptions
-  } = _ref44;
+  } = _ref46;
   const visualization = {
     ..._hierarchyVisualization.default,
     ...visualizationReset,
@@ -1052,10 +1092,10 @@ ResizingPivotTable.propTypes = {
     visualization: visualization
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('hierarchy - rows', (_, _ref45) => {
+(0, _react.storiesOf)('PivotTable', module).add('hierarchy - rows', (_, _ref47) => {
   let {
     pivotTableOptions
-  } = _ref45;
+  } = _ref47;
   const visualization = {
     ..._hierarchyVisualization.default,
     ...visualizationReset,
@@ -1075,10 +1115,10 @@ ResizingPivotTable.propTypes = {
     visualization: visualization
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('hierarchy - columns', (_, _ref46) => {
+(0, _react.storiesOf)('PivotTable', module).add('hierarchy - columns', (_, _ref48) => {
   let {
     pivotTableOptions
-  } = _ref46;
+  } = _ref48;
   const visualization = {
     ..._hierarchyVisualization.default,
     ...visualizationReset,
@@ -1100,10 +1140,10 @@ ResizingPivotTable.propTypes = {
     visualization: visualization
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('narrative', (_, _ref47) => {
+(0, _react.storiesOf)('PivotTable', module).add('narrative', (_, _ref49) => {
   let {
     pivotTableOptions
-  } = _ref47;
+  } = _ref49;
   const visualization = {
     ..._narrativeVisualization.default,
     ...visualizationReset,
@@ -1121,10 +1161,10 @@ ResizingPivotTable.propTypes = {
     visualization: visualization
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('narrative - data as filter', (_, _ref48) => {
+(0, _react.storiesOf)('PivotTable', module).add('narrative - data as filter', (_, _ref50) => {
   let {
     pivotTableOptions
-  } = _ref48;
+  } = _ref50;
   const visualization = {
     ..._narrativeVisualization.default,
     ...visualizationReset,
@@ -1148,10 +1188,10 @@ ResizingPivotTable.propTypes = {
     visualization: visualization
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('DEGS', (_, _ref49) => {
+(0, _react.storiesOf)('PivotTable', module).add('DEGS', (_, _ref51) => {
   let {
     pivotTableOptions
-  } = _ref49;
+  } = _ref51;
   const visualization = {
     ..._degsVisualization.default,
     ...visualizationReset,
@@ -1167,10 +1207,10 @@ ResizingPivotTable.propTypes = {
     visualization: visualization
   }));
 });
-(0, _react.storiesOf)('PivotTable', module).add('Truncated header cell', (_, _ref50) => {
+(0, _react.storiesOf)('PivotTable', module).add('Truncated header cell', (_, _ref52) => {
   let {
     pivotTableOptions
-  } = _ref50;
+  } = _ref52;
   const widths = [250, 200, 500];
   const [width, setWidth] = (0, _react2.useState)(250);
   const toggleWidth = () => setWidth(currentWidth => {

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' ? programId : undefined, programStageId, dimension].filter(Boolean).join('.');
-};
-exports.formatDimension = formatDimension;
+exports.customEncodeURIComponent = customEncodeURIComponent;

package/build/cjs/components/Options/VisualizationOptions.js

@@ -68,7 +68,7 @@ const VisualizationOptions = _ref => {
       }, label);
     })), _VisualizationOptionsStyle.tabBar.styles), /*#__PURE__*/_react.default.createElement("div", {
       className: _VisualizationOptionsStyle.tabContent.className
-    }, tabs[activeTabIndex].content, _VisualizationOptionsStyle.tabContent.styles, _VisualizationOptionsStyle.tabSection.styles, _VisualizationOptionsStyle.tabSectionTitle.styles, _VisualizationOptionsStyle.tabSectionTitleMargin.styles, _VisualizationOptionsStyle.tabSectionOption.styles, _VisualizationOptionsStyle.tabSectionOptionItem.styles, _VisualizationOptionsStyle.tabSectionOptionToggleable.styles, _VisualizationOptionsStyle.tabSectionToggleableSubsection.styles, _VisualizationOptionsStyle.tabSectionOptionComplexInline.styles, _VisualizationOptionsStyle.tabSectionOptionText.styles, _VisualizationOptionsStyle.tabSectionOptionIcon.styles));
+    }, tabs[activeTabIndex].content, _VisualizationOptionsStyle.tabContent.styles, _VisualizationOptionsStyle.tabSection.styles, _VisualizationOptionsStyle.tabSectionTitle.styles, _VisualizationOptionsStyle.tabSectionTitleDisabled.styles, _VisualizationOptionsStyle.tabSectionTitleMargin.styles, _VisualizationOptionsStyle.tabSectionOption.styles, _VisualizationOptionsStyle.tabSectionOptionItem.styles, _VisualizationOptionsStyle.tabSectionOptionToggleable.styles, _VisualizationOptionsStyle.tabSectionToggleableSubsection.styles, _VisualizationOptionsStyle.tabSectionOptionComplexInline.styles, _VisualizationOptionsStyle.tabSectionOptionText.styles, _VisualizationOptionsStyle.tabSectionOptionIcon.styles));
   };
   return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
     onClose: onClose,

package/build/cjs/components/Options/styles/VisualizationOptions.style.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tabSectionToggleableSubsection = exports.tabSectionTitleMargin = exports.tabSectionTitle = exports.tabSectionOptionToggleable = exports.tabSectionOptionText = exports.tabSectionOptionItem = exports.tabSectionOptionIcon = exports.tabSectionOptionComplexInline = exports.tabSectionOption = exports.tabSectionContent = exports.tabSection = exports.tabContent = exports.tabBar = exports.modalContent = void 0;
+exports.tabSectionToggleableSubsection = exports.tabSectionTitleMargin = exports.tabSectionTitleDisabled = exports.tabSectionTitle = exports.tabSectionOptionToggleable = exports.tabSectionOptionText = exports.tabSectionOptionItem = exports.tabSectionOptionIcon = exports.tabSectionOptionComplexInline = exports.tabSectionOption = exports.tabSectionContent = exports.tabSection = exports.tabContent = exports.tabBar = exports.modalContent = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 var _ui = require("@dhis2/ui");
 var _react = _interopRequireDefault(require("react"));
@@ -52,6 +52,13 @@ const tabSectionTitle = {
   className: "jsx-3115295887"
 };
 exports.tabSectionTitle = tabSectionTitle;
+const tabSectionTitleDisabled = {
+  styles: /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: "3352433486"
+  }, [`span.jsx-3352433486{color:${_ui.colors.grey600};}`]),
+  className: "jsx-3352433486"
+};
+exports.tabSectionTitleDisabled = tabSectionTitleDisabled;
 const tabSectionTitleMargin = {
   styles: /*#__PURE__*/_react.default.createElement(_style.default, {
     id: "642558349"

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;