@dhis2/analytics 26.0.8 → 26.0.9

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

@@ -4,54 +4,43 @@ const booleanMap = {
   0: 'No',
   // XXX i18n.no || 'No',
   1: 'Yes' // i18n.yes || 'Yes',
-
 };
+
 const OUNAME = 'ouname';
 const OU = 'ou';
 const DEFAULT_COLLECT_IGNORE_HEADERS = ['psi', 'ps', 'eventdate', 'longitude', 'latitude', 'ouname', 'oucode', 'eventdate', 'eventdate'];
 const DEFAULT_PREFIX_IGNORE_HEADERS = ['dy', ...DEFAULT_COLLECT_IGNORE_HEADERS];
-
 const getParseMiddleware = type => {
   switch (type) {
     case 'STRING':
     case VALUE_TYPE_TEXT:
-      return value => "".concat(value);
-
+      return value => `${value}`;
     case VALUE_TYPE_INTEGER:
     case VALUE_TYPE_NUMBER:
       return value => !Number.isNaN(+value) && Number.isFinite(+value) ? parseFloat(+value) : value;
-
     default:
       return value => value;
   }
 };
-
 const isPrefixHeader = (header, dimensions) => {
   if (DEFAULT_PREFIX_IGNORE_HEADERS.includes(header.name)) {
     return false;
   }
-
   return Boolean(Array.isArray(dimensions) && dimensions.length === 0);
 };
-
 const isCollectHeader = (header, dimensions) => {
   if (DEFAULT_COLLECT_IGNORE_HEADERS.includes(header.name)) {
     return false;
   }
-
   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 === VALUE_TYPE_BOOLEAN) {
     return booleanMap[id];
   }
-
   return id;
 };
-
 class AnalyticsResponse {
   constructor(response) {
     if (response) {
@@ -61,7 +50,6 @@ class AnalyticsResponse {
       this.metaData = this.extractMetadata();
     }
   }
-
   extractHeaders() {
     const dimensions = this.response.metaData.dimensions;
     const headers = this.response.headers || [];
@@ -71,51 +59,50 @@ class AnalyticsResponse {
       index
     }));
   }
-
   extractRows() {
     const headersWithOptionSet = this.headers.filter(header => header.optionSet);
     let rows = this.response.rows;
-
     if (headersWithOptionSet.length) {
       rows = rows.slice();
-      const optionCodeIdMap = this.optionCodeIdMap(); // replace option code with option uid
+      const optionCodeIdMap = this.optionCodeIdMap();
 
+      // replace option code with option uid
       headersWithOptionSet.forEach(header => {
         rows.forEach((row, index) => {
           const id = optionCodeIdMap[header.name][row[header.index]];
-
           if (id) {
             rows[index][header.index] = id;
           }
         });
       });
     }
-
     return rows;
   }
-
   extractMetadata() {
-    const metaData = { ...this.response.metaData
+    const metaData = {
+      ...this.response.metaData
     };
     const {
       dimensions,
       items
-    } = metaData; // populate metaData dimensions and items
+    } = metaData;
 
+    // populate metaData dimensions and items
     this.headers.filter(header => !DEFAULT_COLLECT_IGNORE_HEADERS.includes(header.name)).forEach(header => {
-      let ids; // collect row values
+      let ids;
 
+      // collect row values
       if (header.isCollect) {
         ids = this.getSortedUniqueRowIdStringsByHeader(header);
         dimensions[header.name] = ids;
       } else {
         ids = dimensions[header.name];
       }
-
       if (header.isPrefix) {
         // create prefixed dimensions array
-        dimensions[header.name] = ids.map(id => getPrefixedId(id, header.name)); // create items
+        dimensions[header.name] = ids.map(id => getPrefixedId(id, header.name));
 
+        // create items
         dimensions[header.name].forEach((prefixedId, index) => {
           const id = ids[index];
           const valueType = header.valueType;
@@ -125,8 +112,9 @@ class AnalyticsResponse {
           };
         });
       }
-    }); // for events, add items from 'ouname'
+    });
 
+    // for events, add items from 'ouname'
     if (this.hasHeader(OUNAME) && this.hasHeader(OU)) {
       const ouNameHeaderIndex = this.getHeader(OUNAME).getIndex();
       const ouHeaderIndex = this.getHeader(OU).getIndex();
@@ -134,7 +122,6 @@ class AnalyticsResponse {
       let ouName;
       this.rows.forEach(row => {
         ouId = row[ouHeaderIndex];
-
         if (items[ouId] === undefined) {
           ouName = row[ouNameHeaderIndex];
           items[ouId] = {
@@ -143,27 +130,24 @@ class AnalyticsResponse {
         }
       });
     }
-
     return metaData;
   }
-
   getHeader(name) {
     return this.headers.find(header => header.name === name);
   }
-
   hasHeader(name) {
     return this.getHeader(name) !== undefined;
   }
-
   getSortedUniqueRowIdStringsByHeader(header) {
     const parseByType = getParseMiddleware(header.valueType);
     const parseString = getParseMiddleware('STRING');
-    const rowIds = Array.from( // unique values
-    new Set(this.rows.map(responseRow => parseByType(responseRow[header.index]))) // remove empty values
+    const rowIds = Array.from(
+    // unique values
+    new Set(this.rows.map(responseRow => parseByType(responseRow[header.index])))
+    // remove empty values
     ).filter(id => id !== '');
     return rowIds.sort().map(id => parseString(id));
   }
-
   optionCodeIdMap() {
     const {
       dimensions,
@@ -178,7 +162,6 @@ class AnalyticsResponse {
     });
     return map;
   }
-
   sortOrganisationUnitsHierarchy() {
     const organisationUnits = this.metaData.dimensions.ou;
     organisationUnits.forEach((organisationUnit, i) => {
@@ -197,21 +180,18 @@ class AnalyticsResponse {
         id: organisationUnit,
         fullName: hierarchyNames.join(' / ')
       };
-    }); // XXX how does this work with different languages/collations?
+    });
 
+    // XXX how does this work with different languages/collations?
     organisationUnits.sort((a, b) => {
       const aFullName = a.fullName;
       const bFullName = b.fullName;
-
       if (aFullName < bFullName) {
         return -1;
       }
-
       return aFullName > bFullName ? 1 : 0;
     });
     this.metaData.dimensions.ou = organisationUnits.map(ou => ou.id);
   }
-
 }
-
 export default AnalyticsResponse;

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

@@ -8,19 +8,14 @@ class AnalyticsResponseHeader {
     };
     Object.assign(this, header, options);
   }
-
   getIndex() {
     return this.index;
   }
-
   setIndex(value) {
     const index = +value;
-
     if (!Number.isNaN(index) && Number.isFinite(index)) {
       this.index = parseInt(index, 10);
     }
   }
-
 }
-
 export default AnalyticsResponseHeader;

package/build/es/api/analytics/__mocks__/DataEngine.js

@@ -1,19 +1,15 @@
 let dataEngineMock;
-
 function mockInit() {
   dataEngineMock = {
     query: jest.fn()
   };
 }
-
 function values(object) {
   return Object.keys(object).map(key => object[key]);
 }
-
 function mockClear() {
   values(dataEngineMock).filter(property => typeof property === 'function').forEach(spyFn => spyFn.mockClear());
 }
-
 export default function DataEngine() {
   return dataEngineMock;
 }

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

@@ -2,7 +2,17 @@ import fixtures from '../../../__fixtures__/fixtures.js';
 import DataEngineMock from '../__mocks__/DataEngine.js';
 import AnalyticsAggregate from '../AnalyticsAggregate.js';
 import AnalyticsRequest from '../AnalyticsRequest.js';
-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

@@ -2,9 +2,7 @@ import fixtures from '../../../__fixtures__/fixtures.js';
 import AnalyticsRequest from '../AnalyticsRequest.js';
 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(() => {
     request = new AnalyticsRequest();
@@ -233,12 +231,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);
@@ -247,25 +245,29 @@ describe('AnalyticsRequest', () => {
     });
     describe('with value parameter', () => {
       ;
-      ['approvalLevel', 'asc', // XXX
-      'bbox', 'clusterSize', 'columns', // XXX
-      'desc', // XXX
-      'endDate', 'inputIdScheme', 'measureCriteria', 'outputIdScheme', 'preAggregationMeasureCriteria', 'relativePeriodDate', 'rows', // XXX
+      ['approvalLevel', 'asc',
+      // XXX
+      'bbox', 'clusterSize', 'columns',
+      // XXX
+      'desc',
+      // XXX
+      'endDate', 'inputIdScheme', 'measureCriteria', 'outputIdScheme', 'preAggregationMeasureCriteria', 'relativePeriodDate', 'rows',
+      // XXX
       '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 +284,17 @@ describe('AnalyticsRequest', () => {
         let [key, value] = _ref;
         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.js';
 import { customEncodeURIComponent } from '../utils.js';
 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']
@@ -20,7 +20,6 @@ const dimensions = [{
   dimension: 'answer',
   items: ['42']
 }];
-
 const buildRequest = overrides => {
   return new AnalyticsRequestBase({
     endPoint,
@@ -33,7 +32,6 @@ const buildRequest = overrides => {
     ...overrides
   });
 };
-
 describe('AnalyticsRequestBase', () => {
   beforeEach(() => {
     customEncodeURIComponent.mockClear();
@@ -44,7 +42,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 +52,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/__tests__/AnalyticsResponse.spec.js

@@ -32,7 +32,9 @@ describe('AnalyticsResponse', () => {
         const metadata = response.extractMetadata();
         expect(metadata.dimensions).toEqual(fixture.metaData.dimensions);
         expect(metadata.items).toEqual(fixture.metaData.items);
-      }); // TODO
+      });
+
+      // TODO
       // test with OUNAME case
     });
   });

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

@@ -32,7 +32,8 @@ describe('AnalyticsResponseHeader', () => {
         optionSet: 'pC3N9N77UmT'
       };
       responseHeader = new AnalyticsResponseHeader(header);
-      expectedResponseHeader = { ...header,
+      expectedResponseHeader = {
+        ...header,
         ...flags
       };
       Object.keys(expectedResponseHeader).forEach(key => {

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);