@dhis2/analytics 21.0.0-alpha.3 → 21.0.0-alpha.4

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

@@ -8,9 +8,9 @@ var _Filter = _interopRequireDefault(require("../components/Filter/Filter"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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 _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
-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 _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 FilterWithState() {
   const [text, setText] = (0, _react2.useState)(null);

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

@@ -8,9 +8,9 @@ var _FixedPeriodSelect = _interopRequireDefault(require("../components/PeriodDim
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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 _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
-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 _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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; }
 
 (0, _react.storiesOf)('FixedPeriodSelect', module).add('No value', () => {
   const [value, setValue] = (0, _react2.useState)();

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

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

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

@@ -10,9 +10,9 @@ var _OrgUnitDimension = _interopRequireDefault(require("../components/OrgUnitDim
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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 _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
-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 _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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; }
 
 const Wrapper = story => /*#__PURE__*/_react2.default.createElement(_appRuntime.DataProvider, {
   baseUrl: "http://localhost:8080/",

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

@@ -88,9 +88,9 @@ var _weeklyColumnsMetadata = _interopRequireDefault(require("./data/weeklyColumn
 
 var _weeklyColumnsVisualization = _interopRequireDefault(require("./data/weeklyColumns.visualization.json"));
 
-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 _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
-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 _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 }; }
 

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

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

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

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

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

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

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

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

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

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

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

@@ -10,17 +10,7 @@ var _AnalyticsRequest = _interopRequireDefault(require("../AnalyticsRequest"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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`;
+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";
 describe('Analytics.aggregate', () => {
   let aggregate;
   let request;

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

@@ -9,7 +9,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 let request;
 let expectedParameters;
 
-const getFuncName = parameter => `with${parameter.charAt(0).toUpperCase()}${parameter.slice(1)}`;
+const getFuncName = parameter => "with".concat(parameter.charAt(0).toUpperCase()).concat(parameter.slice(1));
 
 describe('AnalyticsRequest', () => {
   beforeEach(() => {
@@ -241,12 +241,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 ${parameter} parameter with default value`, () => {
+        it("should add the ".concat(parameter, " parameter with default value"), () => {
           request[funcName]();
           expectedParameters[parameter] = true;
           expect(request.parameters).toEqual(expectedParameters);
         });
-        it(`should replace the ${parameter} parameter on subsequent calls with the specified value`, () => {
+        it("should replace the ".concat(parameter, " parameter on subsequent calls with the specified value"), () => {
           request[funcName](false);
           expectedParameters[parameter] = false;
           expect(request.parameters).toEqual(expectedParameters);
@@ -262,18 +262,18 @@ describe('AnalyticsRequest', () => {
       'stage', 'startDate', 'userOrgUnit', 'value' // XXX
       ].forEach(parameter => {
         const funcName = getFuncName(parameter);
-        it(`should add the ${parameter} parameter with the specified value`, () => {
+        it("should add the ".concat(parameter, " parameter with the specified value"), () => {
           request[funcName]('test');
           expectedParameters[parameter] = 'test';
           expect(request.parameters).toEqual(expectedParameters);
         });
-        it(`should replace the ${parameter} parameter on subsequent calls with the specified value`, () => {
+        it("should replace the ".concat(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 ${parameter} parameter when called without passing a value`, () => {
+        it("should not replace the ".concat(parameter, " parameter when called without passing a value"), () => {
           request = request[funcName]('test');
           request[funcName]();
           expectedParameters[parameter] = 'test';
@@ -289,17 +289,17 @@ describe('AnalyticsRequest', () => {
       Object.entries(params).forEach(([key, value]) => {
         const parameter = key;
         const funcName = getFuncName(parameter);
-        it(`should add the ${parameter} parameter with the default value`, () => {
+        it("should add the ".concat(parameter, " parameter with the default value"), () => {
           request[funcName]();
           expectedParameters[parameter] = value;
           expect(request.parameters).toEqual(expectedParameters);
         });
-        it(`should add the ${parameter} parameter with the specified value`, () => {
+        it("should add the ".concat(parameter, " parameter with the specified value"), () => {
           request[funcName](10);
           expectedParameters[parameter] = 10;
           expect(request.parameters).toEqual(expectedParameters);
         });
-        it(`should replace the ${parameter} parameter on subsequent calls with the specified value`, () => {
+        it("should replace the ".concat(parameter, " parameter on subsequent calls with the specified value"), () => {
           request = request[funcName](10);
           request[funcName](20);
           expectedParameters[parameter] = 20;

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

@@ -7,13 +7,13 @@ var _utils = require("../utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 jest.mock('../utils', () => ({
-  customEncodeURIComponent: jest.fn(x => `<${x}>`)
+  customEncodeURIComponent: jest.fn(x => "<".concat(x, ">"))
 }));
 const endPoint = 'foo';
 const path = 'bar';
 const program = 'census';
 const format = 'json';
-const basePath = `${endPoint}/${path}/${program}.${format}`;
+const basePath = "".concat(endPoint, "/").concat(path, "/").concat(program, ".").concat(format);
 const dimensions = [{
   dimension: 'ou',
   items: ['mars', 'earth']
@@ -50,7 +50,7 @@ describe('AnalyticsRequestBase', () => {
     });
     const url = request.buildUrl();
     expect(_utils.customEncodeURIComponent).toHaveBeenCalledTimes(4);
-    expect(url).toBe(`${basePath}?dimension=ou:<mars>;<earth>&dimension=dx:<population>&dimension=question&dimension=answer:<42>`);
+    expect(url).toBe("".concat(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({
@@ -60,7 +60,7 @@ describe('AnalyticsRequestBase', () => {
       sorted: true
     });
     expect(_utils.customEncodeURIComponent).toHaveBeenCalledTimes(4);
-    expect(url).toBe(`${basePath}?dimension=answer:<42>&dimension=dx:<population>&dimension=ou:<earth>;<mars>&dimension=question`);
+    expect(url).toBe("".concat(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/cjs/api/analytics/utils.js

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

package/build/cjs/api/dimensions.js

@@ -19,8 +19,8 @@ const dimensionsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: `id,${nameProp}~rename(name),dimensionType,dataDimensionType`,
-    order: `${nameProp}:asc`,
+    fields: "id,".concat(nameProp, "~rename(name),dimensionType,dataDimensionType"),
+    order: "".concat(nameProp, ":asc"),
     paging: false
   })
 };
@@ -34,11 +34,11 @@ const recommendedDimensionsQuery = {
     const dimensions = [];
 
     if (dxIds.length) {
-      dimensions.push(`dx:${dxIds.join(';')}`);
+      dimensions.push("dx:".concat(dxIds.join(';')));
     }
 
     if (ouIds.length) {
-      dimensions.push(`ou:${ouIds.join(';')}`);
+      dimensions.push("ou:".concat(ouIds.join(';')));
     }
 
     return {
@@ -58,22 +58,22 @@ const dataItemsQuery = {
     const filters = []; // TODO: Extract all of this logic out of the query?
 
     if ((filter === null || filter === void 0 ? void 0 : filter.dataType) === _dataTypes.EVENT_DATA_ITEMS) {
-      filters.push(`dimensionItemType:in:[${_dataTypes.PROGRAM_DATA_ELEMENT},${_dataTypes.PROGRAM_ATTRIBUTE}]`);
+      filters.push("dimensionItemType:in:[".concat(_dataTypes.PROGRAM_DATA_ELEMENT, ",").concat(_dataTypes.PROGRAM_ATTRIBUTE, "]"));
     } else if (filter !== null && filter !== void 0 && filter.dataType && filter.dataType !== _dataTypes.ALL_ID) {
-      filters.push(`dimensionItemType:eq:${filter.dataType}`);
+      filters.push("dimensionItemType:eq:".concat(filter.dataType));
     }
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID && [_dataTypes.EVENT_DATA_ITEMS, _dataTypes.PROGRAM_INDICATORS].includes(filter.dataType)) {
-      filters.push(`programId:eq:${filter.group}`);
+      filters.push("programId:eq:".concat(filter.group));
     }
 
     if (searchTerm) {
-      filters.push(`${nameProp}:ilike:${searchTerm}`);
+      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
     }
 
     return (0, _objectClean.default)({
-      fields: `id,${nameProp}~rename(name),dimensionItemType`,
-      order: `${nameProp}:asc`,
+      fields: "id,".concat(nameProp, "~rename(name),dimensionItemType"),
+      order: "".concat(nameProp, ":asc"),
       filter: filters,
       paging: true,
       page
@@ -92,16 +92,16 @@ const indicatorsQuery = {
     const filters = [];
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
-      filters.push(`indicatorGroups.id:eq:${filter.group}`);
+      filters.push("indicatorGroups.id:eq:".concat(filter.group));
     }
 
     if (searchTerm) {
-      filters.push(`${nameProp}:ilike:${searchTerm}`);
+      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
     }
 
     return {
-      fields: `id,${nameProp}~rename(name),dimensionItemType`,
-      order: `${nameProp}:asc`,
+      fields: "id,".concat(nameProp, "~rename(name),dimensionItemType"),
+      order: "".concat(nameProp, ":asc"),
       filter: filters,
       paging: true,
       page
@@ -114,8 +114,8 @@ const indicatorGroupsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: `id,${nameProp}~rename(name)`,
-    order: `${nameProp}:asc`,
+    fields: "id,".concat(nameProp, "~rename(name)"),
+    order: "".concat(nameProp, ":asc"),
     paging: false
   })
 };
@@ -132,16 +132,16 @@ const dataElementsQuery = {
     const filters = ['domainType:eq:AGGREGATE'];
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
-      filters.push(`dataElementGroups.id:eq:${filter.group}`);
+      filters.push("dataElementGroups.id:eq:".concat(filter.group));
     }
 
     if (searchTerm) {
-      filters.push(`${nameProp}:ilike:${searchTerm}`);
+      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
     }
 
     return {
-      fields: `${idField},${nameProp}~rename(name),dimensionItemType`,
-      order: `${nameProp}:asc`,
+      fields: "".concat(idField, ",").concat(nameProp, "~rename(name),dimensionItemType"),
+      order: "".concat(nameProp, ":asc"),
       filter: filters,
       paging: true,
       page
@@ -154,17 +154,17 @@ const dataElementGroupsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: `id,${nameProp}~rename(name)`,
-    order: `${nameProp}:asc`,
+    fields: "id,".concat(nameProp, "~rename(name)"),
+    order: "".concat(nameProp, ":asc"),
     paging: false
   })
 };
 exports.dataElementGroupsQuery = dataElementGroupsQuery;
 const itemsByDimensionQuery = {
-  resource: `dimensions`,
+  resource: "dimensions",
   id: ({
     id
-  }) => `${id}/items`,
+  }) => "".concat(id, "/items"),
   params: ({
     searchTerm,
     page,
@@ -173,12 +173,12 @@ const itemsByDimensionQuery = {
     const filters = [];
 
     if (searchTerm) {
-      filters.push(`${nameProp}:ilike:${searchTerm}`);
+      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
     }
 
     return {
-      fields: `id,${nameProp}~rename(name)`,
-      order: `${nameProp}:asc`,
+      fields: "id,".concat(nameProp, "~rename(name)"),
+      order: "".concat(nameProp, ":asc"),
       filter: filters,
       paging: true,
       page
@@ -198,16 +198,16 @@ const dataElementOperandsQuery = {
     const filters = [];
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
-      filters.push(`dataElement.dataElementGroups.id:eq:${filter.group}`);
+      filters.push("dataElement.dataElementGroups.id:eq:".concat(filter.group));
     }
 
     if (searchTerm) {
-      filters.push(`${nameProp}:ilike:${searchTerm}`);
+      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
     }
 
     return {
-      fields: `${idField},${nameProp}~rename(name),dimensionItemType`,
-      order: `${nameProp}:asc`,
+      fields: "".concat(idField, ",").concat(nameProp, "~rename(name),dimensionItemType"),
+      order: "".concat(nameProp, ":asc"),
       filter: filters,
       paging: true,
       page
@@ -226,16 +226,16 @@ const dataSetsQuery = {
     const filters = [];
 
     if (searchTerm) {
-      filters.push(`${nameProp}:ilike:${searchTerm}`);
+      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
     }
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
-      filters.push(`id:eq:${filter.group}`);
+      filters.push("id:eq:".concat(filter.group));
     }
 
     const query = {
-      fields: `dimensionItem~rename(id),${nameProp}~rename(name),dimensionItemType`,
-      order: `${nameProp}:asc`,
+      fields: "dimensionItem~rename(id),".concat(nameProp, "~rename(name),dimensionItemType"),
+      order: "".concat(nameProp, ":asc"),
       filter: filters,
       paging: false
     };
@@ -254,8 +254,8 @@ const programsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: `id,${nameProp}~rename(name)`,
-    order: `${nameProp}:asc`,
+    fields: "id,".concat(nameProp, "~rename(name)"),
+    order: "".concat(nameProp, ":asc"),
     paging: false
   })
 }; // Fetch functions

package/build/cjs/api/organisationUnits.js

@@ -12,7 +12,7 @@ const orgUnitLevelsQuery = {
   params: ({
     displayNameProp = 'displayName'
   }) => ({
-    fields: `id,level,${displayNameProp}~rename(displayName),name`,
+    fields: "id,level,".concat(displayNameProp, "~rename(displayName),name"),
     paging: false
   })
 };
@@ -21,7 +21,7 @@ const orgUnitGroupsQuery = {
   params: ({
     displayNameProp = 'displayName'
   }) => ({
-    fields: `id,${displayNameProp}~rename(displayName),name`,
+    fields: "id,".concat(displayNameProp, "~rename(displayName),name"),
     paging: false
   })
 };
@@ -38,7 +38,7 @@ const orgUnitsQuery = {
   params: ({
     displayNameProp
   }) => ({
-    fields: `id,path,${displayNameProp}~rename(displayName),children::isNotEmpty`,
+    fields: "id,path,".concat(displayNameProp, "~rename(displayName),children::isNotEmpty"),
     level: 1,
     userDataViewFallback: true,
     paging: false