@dhis2/analytics 20.6.3 → 21.0.0-alpha.2

package/build/cjs/visualizations/config/index.js

@@ -34,15 +34,15 @@ function _default({
   const _generator = _generators.default[outputFormat];
 
   if (_validator === _validators.default.noValidation) {
-    onWarning("No validation implementation for config input format \"".concat(inputFormat, "\""));
+    onWarning(`No validation implementation for config input format "${inputFormat}"`);
   }
 
   if (!_adapter) {
-    onError("No config tranformation implementation for format \"".concat(inputFormat, "\" to format \"").concat(outputFormat, "\""));
+    onError(`No config tranformation implementation for format "${inputFormat}" to format "${outputFormat}"`);
   }
 
   if (!_generator) {
-    onError("No visualization implementation for format ".concat(outputFormat));
+    onError(`No visualization implementation for format ${outputFormat}`);
   }
 
   const DEFAULT_EXTRA_OPTIONS = {

package/build/cjs/visualizations/store/adapters/dhis_dhis/index.js

@@ -41,7 +41,7 @@ function getDefault(acc, seriesIds, categoryIds, idValueMap, metaData) {
   seriesIds.forEach(seriesId => {
     const serieData = [];
     categoryIds.forEach(categoryId => {
-      const value = idValueMap.get("".concat(seriesId, "-").concat(categoryId)); // DHIS2-1261: 0 is a valid value
+      const value = idValueMap.get(`${seriesId}-${categoryId}`); // DHIS2-1261: 0 is a valid value
       // undefined value means the key was not found within the rows
       // in that case null is returned as value in the serie
 

package/build/cjs/visualizations/store/adapters/dhis_highcharts/index.js

@@ -56,7 +56,7 @@ function getDefault(acc, series, categories, idValueMap, metaData) {
   series[0].forEach(serieItemId => {
     const serieData = [];
     categories[0].forEach(categoryItemId => {
-      const value = idValueMap.get("".concat(serieItemId, "-").concat(categoryItemId)); // DHIS2-1261: 0 is a valid value
+      const value = idValueMap.get(`${serieItemId}-${categoryItemId}`); // DHIS2-1261: 0 is a valid value
       // undefined value means the key was not found within the rows
       // in that case null is returned as value in the serie
       // this is to keep the correct indexes for the values within the serie array

package/build/cjs/visualizations/store/adapters/dhis_highcharts/twoCategory.js

@@ -16,7 +16,7 @@ function _default(acc, series, categories, idValueMap, metaData) {
     categories[0].forEach(category1ItemId => {
       const groupData = [];
       categories[1].forEach(category2ItemId => {
-        const value = idValueMap.get("".concat(seriesItemId, "-").concat(category1ItemId, "-").concat(category2ItemId));
+        const value = idValueMap.get(`${seriesItemId}-${category1ItemId}-${category2ItemId}`);
         groupData.push(value === undefined ? null : parseFloat(value));
       });
       groupedData.push(groupData);

package/build/cjs/visualizations/store/index.js

@@ -25,11 +25,11 @@ function _default({
   const _adapter = _adapters.default[inputFormat + '_' + outputFormat];
 
   if (_validator === _validators.default.noValidation) {
-    warning("Validation not supported for data input format \"".concat(inputFormat, "\""));
+    warning(`Validation not supported for data input format "${inputFormat}"`);
   }
 
   if (!_adapter) {
-    error("Data tranformation from \"".concat(inputFormat, "\" to \"").concat(outputFormat, "\" is not supported"));
+    error(`Data tranformation from "${inputFormat}" to "${outputFormat}" is not supported`);
   }
 
   this.data = data;

package/build/cjs/visualizations/util/axisId.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.getAxisStringFromId = void 0;
 const AXIS_ID_PREFIX = 'AXIS_';
 
-const getAxisStringFromId = id => "".concat(AXIS_ID_PREFIX).concat(id);
+const getAxisStringFromId = id => `${AXIS_ID_PREFIX}${id}`;
 
 exports.getAxisStringFromId = getAxisStringFromId;

package/build/cjs/visualizations/util/getFilterText.js

@@ -54,9 +54,9 @@ function _default(filters, metaData) {
           } // otherwise use the values directly
           // this is a temporary fix to avoid app crashing when using filters with data items in EV
           else {
-              sectionParts.push(metaData.items[filter.dimension].name + ': ' + filterItems.join(', '));
-              break;
-            }
+            sectionParts.push(metaData.items[filter.dimension].name + ': ' + filterItems.join(', '));
+            break;
+          }
         }
 
         titleFragments.push(sectionParts.join(', '));

package/build/es/__demo__/OpenFileDialog.stories.js

@@ -12,7 +12,7 @@ const user = {
   username: 'admin'
 };
 
-const onFileSelect = id => alert("Opening ".concat(id));
+const onFileSelect = id => alert(`Opening ${id}`);
 
 storiesOf('OpenFileDialog', module).add('List of visualizations', () => /*#__PURE__*/React.createElement(Provider, {
   config: configMock

package/build/es/__demo__/OrgUnitDimension.stories.js

@@ -0,0 +1,84 @@
+import { DataProvider } from '@dhis2/app-runtime';
+import { storiesOf } from '@storybook/react';
+import React, { useState } from 'react';
+import OrgUnitDimension from '../components/OrgUnitDimension/OrgUnitDimension';
+
+const Wrapper = story => /*#__PURE__*/React.createElement(DataProvider, {
+  baseUrl: "http://localhost:8080/",
+  apiVersion: ""
+}, story());
+
+const rootOrgUnit = 'ImspTQPwCqd'; // Sierra Leone
+
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('None selected', () => {
+  const [selected, setSelected] = useState([]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    root: rootOrgUnit
+  });
+});
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Root selected', () => {
+  const [selected, setSelected] = useState([{
+    id: 'ImspTQPwCqd',
+    path: '/ImspTQPwCqd',
+    name: 'Sierra Leone'
+  }]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    root: rootOrgUnit
+  });
+});
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Single level 2 child selected', () => {
+  const [selected, setSelected] = useState([{
+    id: 'fdc6uOvgoji',
+    path: '/ImspTQPwCqd/fdc6uOvgoji',
+    name: 'Bombali'
+  }]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    root: rootOrgUnit
+  });
+});
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple level 2 children selected', () => {
+  const [selected, setSelected] = useState([{
+    id: 'O6uvpzGd5pu',
+    path: '/ImspTQPwCqd/O6uvpzGd5pu',
+    name: 'Bo'
+  }, {
+    id: 'fdc6uOvgoji',
+    path: '/ImspTQPwCqd/fdc6uOvgoji',
+    name: 'Bombali'
+  }, {
+    id: 'lc3eMKXaEfw',
+    path: '/ImspTQPwCqd/lc3eMKXaEfw',
+    name: 'Bonthe'
+  }]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    root: rootOrgUnit
+  });
+});
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple selected across different levels', () => {
+  const [selected, setSelected] = useState([{
+    id: 'fdc6uOvgoji',
+    path: '/ImspTQPwCqd/fdc6uOvgoji',
+    name: 'Bombali'
+  }, {
+    id: 'KKkLOTpMXGV',
+    path: '/ImspTQPwCqd/fdc6uOvgoji/KKkLOTpMXGV',
+    name: 'Bombali Sebora'
+  }, {
+    id: 'GQcsUZf81vP',
+    path: '/ImspTQPwCqd/fdc6uOvgoji/KKkLOTpMXGV/GQcsUZf81vP',
+    name: 'Govt. Hosp. Makeni'
+  }]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    root: rootOrgUnit
+  });
+});

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

@@ -76,7 +76,7 @@ const generateDimensionStrings = (dimensions = [], options) => {
         items.sort();
       }
 
-      return "".concat(dimension, ":").concat(items.join(';'));
+      return `${dimension}:${items.join(';')}`;
     }
 
     return dimension;

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

@@ -46,7 +46,7 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
       let dimension = d.dimension;
 
       if (d.filter) {
-        dimension += ":".concat(d.filter);
+        dimension += `:${d.filter}`;
       }
 
       request = request.addDimension(dimension, d.items.map(item => item.id));

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

@@ -62,13 +62,13 @@ class AnalyticsRequestBase {
           encodedItems.sort();
         }
 
-        return "".concat(dimension, ":").concat(encodedItems.join(';'));
+        return `${dimension}:${encodedItems.join(';')}`;
       }
 
       return dimension;
     });
     const endPoint = [this.endPoint, this.path, this.program].filter(e => !!e).join('/');
-    return "".concat(endPoint, ".").concat(this.format, "?dimension=").concat(encodedDimensions.join('&dimension='));
+    return `${endPoint}.${this.format}?dimension=${encodedDimensions.join('&dimension=')}`;
   }
   /**
    * @private
@@ -103,7 +103,7 @@ class AnalyticsRequestBase {
           encodedItems.sort();
         }
 
-        return "".concat(dimension, ":").concat(encodedItems.join(';'));
+        return `${dimension}:${encodedItems.join(';')}`;
       }
 
       return dimension;

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

@@ -97,7 +97,7 @@ class extends base {
     if (aggregationTypes.has(aggregationType)) {
       this.parameters.aggregationType = aggregationType;
     } else if (aggregationType !== 'DEFAULT') {
-      console.warn("analytics.request.withAggregationType(): \"".concat(value, "\" not listed as possible value"));
+      console.warn(`analytics.request.withAggregationType(): "${value}" not listed as possible value`);
       this.parameters.aggregationType = value;
     }
 
@@ -333,7 +333,7 @@ class extends base {
     if (displayProperties.has(displayProperty)) {
       this.parameters.displayProperty = displayProperty;
     } else {
-      console.warn("analytics.request.withDisplayProperty(): \"".concat(value, "\" not listed as possible value"));
+      console.warn(`analytics.request.withDisplayProperty(): "${value}" not listed as possible value`);
       this.parameters.displayProperty = value;
     }
 
@@ -580,7 +580,7 @@ class extends base {
     if (eventStatuses.has(eventStatus)) {
       this.parameters.eventStatus = eventStatus;
     } else {
-      console.warn("analytics.request.withEventStatus(): \"".concat(value, "\" not listed as possible value"));
+      console.warn(`analytics.request.withEventStatus(): "${value}" not listed as possible value`);
       this.parameters.eventStatus = value;
     }
 
@@ -606,7 +606,7 @@ class extends base {
     if (programStatuses.has(programStatus)) {
       this.parameters.programStatus = programStatus;
     } else {
-      console.warn("analytics.request.withProgramStatus(): \"".concat(value, "\" not listed as possible value"));
+      console.warn(`analytics.request.withProgramStatus(): "${value}" not listed as possible value`);
       this.parameters.programStatus = value;
     }
 
@@ -632,7 +632,7 @@ class extends base {
     if (ouModes.has(ouMode)) {
       this.parameters.ouMode = ouMode;
     } else {
-      console.warn("analytics.request.withOuMode(): \"".concat(value, "\" not listed as possible value"));
+      console.warn(`analytics.request.withOuMode(): "${value}" not listed as possible value`);
       this.parameters.ouMode = value;
     }
 
@@ -770,7 +770,7 @@ class extends base {
     if (sortOrders.has(sortOrder)) {
       this.parameters.sortOrder = sortOrder;
     } else {
-      console.warn("analytics.request.withSortOrder(): \"".concat(value, "\" not listed as possible value"));
+      console.warn(`analytics.request.withSortOrder(): "${value}" not listed as possible value`);
       this.parameters.sortOrder = value;
     }
 
@@ -817,7 +817,7 @@ class extends base {
     if (outputTypes.has(type)) {
       this.parameters.outputType = type;
     } else {
-      console.warn("analytics.request.withOutputType(): \"".concat(value, "\" not listed as possible value"));
+      console.warn(`analytics.request.withOutputType(): "${value}" not listed as possible value`);
       this.parameters.outputType = value;
     }
 

package/build/es/api/analytics/AnalyticsResponse.js

@@ -14,7 +14,7 @@ const getParseMiddleware = type => {
   switch (type) {
     case 'STRING':
     case 'TEXT':
-      return value => "".concat(value);
+      return value => `${value}`;
 
     case 'INTEGER':
     case 'NUMBER':
@@ -41,7 +41,7 @@ const isCollectHeader = (header, dimensions) => {
   return Boolean(Array.isArray(dimensions) && dimensions.length === 0);
 };
 
-const getPrefixedId = (id, prefix) => "".concat(prefix || '', " ").concat(id);
+const getPrefixedId = (id, prefix) => `${prefix || ''} ${id}`;
 
 const getNameByIdsByValueType = (id, valueType) => {
   if (valueType === 'BOOLEAN') {

package/build/es/api/analytics/__tests__/AnalyticsAggregate.spec.js

@@ -2,7 +2,17 @@ import fixtures from '../../../__fixtures__/fixtures';
 import DataEngineMock from '../__mocks__/DataEngine';
 import AnalyticsAggregate from '../AnalyticsAggregate';
 import AnalyticsRequest from '../AnalyticsRequest';
-const debugSqlFixture = "select de.name as de_name, de.uid as de_uid, de.dataelementid as de_id, pe.startdate as\nstart_date, pe.enddate as end_date, pt.name as pt_name, ou.name as ou_name, ou.uid as ou_uid, ou.organisationunitid as\nou_id, coc.name as coc_name, coc.uid as coc_uid, coc.categoryoptioncomboid as coc_id, aoc.name as aoc_name, aoc.uid as\naoc_uid, aoc.categoryoptioncomboid as aoc_id, dv.value as datavalue from datavalue dv inner join dataelement de on\ndv.dataelementid = de.dataelementid inner join period pe on dv.periodid = pe.periodid inner join periodtype pt on\npe.periodtypeid = pt.periodtypeid inner join organisationunit ou on dv.sourceid = ou.organisationunitid inner join\ncategoryoptioncombo coc on dv.categoryoptioncomboid = coc.categoryoptioncomboid inner join categoryoptioncombo aoc on\ndv.attributeoptioncomboid = aoc.categoryoptioncomboid where dv.dataelementid in (359596,359597) and ((pe.startdate >=\n    '2016-01-01' and pe.enddate <= '2016-03-31') or (pe.startdate >= '2016-04-01' and pe.enddate <= '2016-06-30') ) and\n((dv.sourceid in (select organisationunitid from _orgunitstructure where idlevel2 = 264)) ) and dv.deleted is false\nlimit 100000";
+const debugSqlFixture = `select de.name as de_name, de.uid as de_uid, de.dataelementid as de_id, pe.startdate as
+start_date, pe.enddate as end_date, pt.name as pt_name, ou.name as ou_name, ou.uid as ou_uid, ou.organisationunitid as
+ou_id, coc.name as coc_name, coc.uid as coc_uid, coc.categoryoptioncomboid as coc_id, aoc.name as aoc_name, aoc.uid as
+aoc_uid, aoc.categoryoptioncomboid as aoc_id, dv.value as datavalue from datavalue dv inner join dataelement de on
+dv.dataelementid = de.dataelementid inner join period pe on dv.periodid = pe.periodid inner join periodtype pt on
+pe.periodtypeid = pt.periodtypeid inner join organisationunit ou on dv.sourceid = ou.organisationunitid inner join
+categoryoptioncombo coc on dv.categoryoptioncomboid = coc.categoryoptioncomboid inner join categoryoptioncombo aoc on
+dv.attributeoptioncomboid = aoc.categoryoptioncomboid where dv.dataelementid in (359596,359597) and ((pe.startdate >=
+    '2016-01-01' and pe.enddate <= '2016-03-31') or (pe.startdate >= '2016-04-01' and pe.enddate <= '2016-06-30') ) and
+((dv.sourceid in (select organisationunitid from _orgunitstructure where idlevel2 = 264)) ) and dv.deleted is false
+limit 100000`;
 describe('Analytics.aggregate', () => {
   let aggregate;
   let request;

package/build/es/api/analytics/__tests__/AnalyticsRequest.spec.js

@@ -3,7 +3,7 @@ import AnalyticsRequest from '../AnalyticsRequest';
 let request;
 let expectedParameters;
 
-const getFuncName = parameter => "with".concat(parameter.charAt(0).toUpperCase()).concat(parameter.slice(1));
+const getFuncName = parameter => `with${parameter.charAt(0).toUpperCase()}${parameter.slice(1)}`;
 
 describe('AnalyticsRequest', () => {
   beforeEach(() => {
@@ -234,12 +234,12 @@ describe('AnalyticsRequest', () => {
       ;
       ['aggregateData', 'coordinatesOnly', 'collapseDataDimensions', 'hideEmptyRows', 'hideEmptyColumns', 'hierarchyMeta', 'ignoreLimit', 'includeClusterPoints', 'includeNumDen', 'showHierarchy', 'skipData', 'skipMeta', 'skipRounding', 'tableLayout', 'includeMetadataDetails'].forEach(parameter => {
         const funcName = getFuncName(parameter);
-        it("should add the ".concat(parameter, " parameter with default value"), () => {
+        it(`should add the ${parameter} parameter with default value`, () => {
           request[funcName]();
           expectedParameters[parameter] = true;
           expect(request.parameters).toEqual(expectedParameters);
         });
-        it("should replace the ".concat(parameter, " parameter on subsequent calls with the specified value"), () => {
+        it(`should replace the ${parameter} parameter on subsequent calls with the specified value`, () => {
           request[funcName](false);
           expectedParameters[parameter] = false;
           expect(request.parameters).toEqual(expectedParameters);
@@ -255,18 +255,18 @@ describe('AnalyticsRequest', () => {
       'stage', 'startDate', 'userOrgUnit', 'value' // XXX
       ].forEach(parameter => {
         const funcName = getFuncName(parameter);
-        it("should add the ".concat(parameter, " parameter with the specified value"), () => {
+        it(`should add the ${parameter} parameter with the specified value`, () => {
           request[funcName]('test');
           expectedParameters[parameter] = 'test';
           expect(request.parameters).toEqual(expectedParameters);
         });
-        it("should replace the ".concat(parameter, " parameter on subsequent calls with the specified value"), () => {
+        it(`should replace the ${parameter} parameter on subsequent calls with the specified value`, () => {
           request = request[funcName]('test');
           request[funcName]('test2');
           expectedParameters[parameter] = 'test2';
           expect(request.parameters).toEqual(expectedParameters);
         });
-        it("should not replace the ".concat(parameter, " parameter when called without passing a value"), () => {
+        it(`should not replace the ${parameter} parameter when called without passing a value`, () => {
           request = request[funcName]('test');
           request[funcName]();
           expectedParameters[parameter] = 'test';
@@ -282,17 +282,17 @@ describe('AnalyticsRequest', () => {
       Object.entries(params).forEach(([key, value]) => {
         const parameter = key;
         const funcName = getFuncName(parameter);
-        it("should add the ".concat(parameter, " parameter with the default value"), () => {
+        it(`should add the ${parameter} parameter with the default value`, () => {
           request[funcName]();
           expectedParameters[parameter] = value;
           expect(request.parameters).toEqual(expectedParameters);
         });
-        it("should add the ".concat(parameter, " parameter with the specified value"), () => {
+        it(`should add the ${parameter} parameter with the specified value`, () => {
           request[funcName](10);
           expectedParameters[parameter] = 10;
           expect(request.parameters).toEqual(expectedParameters);
         });
-        it("should replace the ".concat(parameter, " parameter on subsequent calls with the specified value"), () => {
+        it(`should replace the ${parameter} parameter on subsequent calls with the specified value`, () => {
           request = request[funcName](10);
           request[funcName](20);
           expectedParameters[parameter] = 20;

package/build/es/api/analytics/__tests__/AnalyticsRequestBase.spec.js

@@ -1,13 +1,13 @@
 import AnalyticsRequestBase from '../AnalyticsRequestBase';
 import { customEncodeURIComponent } from '../utils';
 jest.mock('../utils', () => ({
-  customEncodeURIComponent: jest.fn(x => "<".concat(x, ">"))
+  customEncodeURIComponent: jest.fn(x => `<${x}>`)
 }));
 const endPoint = 'foo';
 const path = 'bar';
 const program = 'census';
 const format = 'json';
-const basePath = "".concat(endPoint, "/").concat(path, "/").concat(program, ".").concat(format);
+const basePath = `${endPoint}/${path}/${program}.${format}`;
 const dimensions = [{
   dimension: 'ou',
   items: ['mars', 'earth']
@@ -44,7 +44,7 @@ describe('AnalyticsRequestBase', () => {
     });
     const url = request.buildUrl();
     expect(customEncodeURIComponent).toHaveBeenCalledTimes(4);
-    expect(url).toBe("".concat(basePath, "?dimension=ou:<mars>;<earth>&dimension=dx:<population>&dimension=question&dimension=answer:<42>"));
+    expect(url).toBe(`${basePath}?dimension=ou:<mars>;<earth>&dimension=dx:<population>&dimension=question&dimension=answer:<42>`);
   });
   it('Should build a URL with sorted dimension parameters when options.sorted=true', () => {
     const request = buildRequest({
@@ -54,7 +54,7 @@ describe('AnalyticsRequestBase', () => {
       sorted: true
     });
     expect(customEncodeURIComponent).toHaveBeenCalledTimes(4);
-    expect(url).toBe("".concat(basePath, "?dimension=answer:<42>&dimension=dx:<population>&dimension=ou:<earth>;<mars>&dimension=question"));
+    expect(url).toBe(`${basePath}?dimension=answer:<42>&dimension=dx:<population>&dimension=ou:<earth>;<mars>&dimension=question`);
   });
   it('Should not choke on a null or empty filter array', () => {
     const request = buildRequest();

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

@@ -1,5 +1,5 @@
 // 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("(?:".concat(whitelistURICodes.join('|'), ")"), 'g');
+const whitelistRegExp = new RegExp(`(?:${whitelistURICodes.join('|')})`, 'g');
 export const customEncodeURIComponent = uri => encodeURIComponent(uri).replace(whitelistRegExp, decodeURIComponent);