@dhis2/analytics 20.6.4 → 21.0.0-alpha.3

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

package/build/es/api/dimensions.js

@@ -1,6 +1,6 @@
 import objectClean from 'd2-utilizr/lib/objectClean';
-import { ALL_ID // CHART_AGGREGATE_AGGREGATABLE_TYPES,
-, INDICATORS, DATA_ELEMENTS, DATA_SETS, PROGRAM_INDICATORS, EVENT_DATA_ITEMS, PROGRAM_DATA_ELEMENT, PROGRAM_ATTRIBUTE, TOTALS } from '../modules/dataTypes';
+import { ALL_ID, // CHART_AGGREGATE_AGGREGATABLE_TYPES,
+INDICATORS, DATA_ELEMENTS, DATA_SETS, PROGRAM_INDICATORS, EVENT_DATA_ITEMS, PROGRAM_DATA_ELEMENT, PROGRAM_ATTRIBUTE, TOTALS } from '../modules/dataTypes';
 import { onError } from './index'; // Query definitions
 
 export const dimensionsQuery = {
@@ -8,8 +8,8 @@ export const dimensionsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: "id,".concat(nameProp, "~rename(name),dimensionType,dataDimensionType"),
-    order: "".concat(nameProp, ":asc"),
+    fields: `id,${nameProp}~rename(name),dimensionType,dataDimensionType`,
+    order: `${nameProp}:asc`,
     paging: false
   })
 };
@@ -22,11 +22,11 @@ const recommendedDimensionsQuery = {
     const dimensions = [];
 
     if (dxIds.length) {
-      dimensions.push("dx:".concat(dxIds.join(';')));
+      dimensions.push(`dx:${dxIds.join(';')}`);
     }
 
     if (ouIds.length) {
-      dimensions.push("ou:".concat(ouIds.join(';')));
+      dimensions.push(`ou:${ouIds.join(';')}`);
     }
 
     return {
@@ -46,22 +46,22 @@ export const dataItemsQuery = {
     const filters = []; // TODO: Extract all of this logic out of the query?
 
     if ((filter === null || filter === void 0 ? void 0 : filter.dataType) === EVENT_DATA_ITEMS) {
-      filters.push("dimensionItemType:in:[".concat(PROGRAM_DATA_ELEMENT, ",").concat(PROGRAM_ATTRIBUTE, "]"));
+      filters.push(`dimensionItemType:in:[${PROGRAM_DATA_ELEMENT},${PROGRAM_ATTRIBUTE}]`);
     } else if (filter !== null && filter !== void 0 && filter.dataType && filter.dataType !== ALL_ID) {
-      filters.push("dimensionItemType:eq:".concat(filter.dataType));
+      filters.push(`dimensionItemType:eq:${filter.dataType}`);
     }
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID && [EVENT_DATA_ITEMS, PROGRAM_INDICATORS].includes(filter.dataType)) {
-      filters.push("programId:eq:".concat(filter.group));
+      filters.push(`programId:eq:${filter.group}`);
     }
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     return objectClean({
-      fields: "id,".concat(nameProp, "~rename(name),dimensionItemType"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `id,${nameProp}~rename(name),dimensionItemType`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: true,
       page
@@ -79,16 +79,16 @@ export const indicatorsQuery = {
     const filters = [];
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
-      filters.push("indicatorGroups.id:eq:".concat(filter.group));
+      filters.push(`indicatorGroups.id:eq:${filter.group}`);
     }
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     return {
-      fields: "id,".concat(nameProp, "~rename(name),dimensionItemType"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `id,${nameProp}~rename(name),dimensionItemType`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: true,
       page
@@ -100,8 +100,8 @@ export const indicatorGroupsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: "id,".concat(nameProp, "~rename(name)"),
-    order: "".concat(nameProp, ":asc"),
+    fields: `id,${nameProp}~rename(name)`,
+    order: `${nameProp}:asc`,
     paging: false
   })
 };
@@ -117,16 +117,16 @@ export const dataElementsQuery = {
     const filters = ['domainType:eq:AGGREGATE'];
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
-      filters.push("dataElementGroups.id:eq:".concat(filter.group));
+      filters.push(`dataElementGroups.id:eq:${filter.group}`);
     }
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     return {
-      fields: "".concat(idField, ",").concat(nameProp, "~rename(name),dimensionItemType"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `${idField},${nameProp}~rename(name),dimensionItemType`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: true,
       page
@@ -138,16 +138,16 @@ export const dataElementGroupsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: "id,".concat(nameProp, "~rename(name)"),
-    order: "".concat(nameProp, ":asc"),
+    fields: `id,${nameProp}~rename(name)`,
+    order: `${nameProp}:asc`,
     paging: false
   })
 };
 export const itemsByDimensionQuery = {
-  resource: "dimensions",
+  resource: `dimensions`,
   id: ({
     id
-  }) => "".concat(id, "/items"),
+  }) => `${id}/items`,
   params: ({
     searchTerm,
     page,
@@ -156,12 +156,12 @@ export const itemsByDimensionQuery = {
     const filters = [];
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     return {
-      fields: "id,".concat(nameProp, "~rename(name)"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `id,${nameProp}~rename(name)`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: true,
       page
@@ -180,16 +180,16 @@ export const dataElementOperandsQuery = {
     const filters = [];
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
-      filters.push("dataElement.dataElementGroups.id:eq:".concat(filter.group));
+      filters.push(`dataElement.dataElementGroups.id:eq:${filter.group}`);
     }
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     return {
-      fields: "".concat(idField, ",").concat(nameProp, "~rename(name),dimensionItemType"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `${idField},${nameProp}~rename(name),dimensionItemType`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: true,
       page
@@ -207,16 +207,16 @@ export const dataSetsQuery = {
     const filters = [];
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
-      filters.push("id:eq:".concat(filter.group));
+      filters.push(`id:eq:${filter.group}`);
     }
 
     const query = {
-      fields: "dimensionItem~rename(id),".concat(nameProp, "~rename(name),dimensionItemType"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `dimensionItem~rename(id),${nameProp}~rename(name),dimensionItemType`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: false
     };
@@ -234,8 +234,8 @@ export const programsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: "id,".concat(nameProp, "~rename(name)"),
-    order: "".concat(nameProp, ":asc"),
+    fields: `id,${nameProp}~rename(name)`,
+    order: `${nameProp}:asc`,
     paging: false
   })
 }; // Fetch functions

package/build/es/api/organisationUnits.js

@@ -1,49 +1,99 @@
 import { onError } from './index';
-export const apiFetchOrganisationUnitRoot = d2 => {
-  const endPoint = '/organisationUnits';
-  const fields = ['id', 'displayName', 'name'];
-  const url = "".concat(endPoint, "?paging=false&userDataViewFallback=true&fields=").concat(fields.join(','));
-  return d2.Api.getApi().get(url).then(({
-    organisationUnits
-  }) => organisationUnits[0]).catch(onError);
-};
-/**
- * Fetch organisation units
- * @returns {Promise<T | never>}
- */
-
-export const apiFetchOrganisationUnits = (d2, displayNameProperty) => {
-  const fields = ['id', 'path', "".concat(displayNameProperty, "~rename(displayName)"), 'children::isNotEmpty'];
-  return d2.models.organisationUnits.list({
-    paging: false,
+const orgUnitLevelsQuery = {
+  resource: 'organisationUnitLevels',
+  params: ({
+    displayNameProp = 'displayName'
+  }) => ({
+    fields: `id,level,${displayNameProp}~rename(displayName),name`,
+    paging: false
+  })
+};
+const orgUnitGroupsQuery = {
+  resource: 'organisationUnitGroups',
+  params: ({
+    displayNameProp = 'displayName'
+  }) => ({
+    fields: `id,${displayNameProp}~rename(displayName),name`,
+    paging: false
+  })
+};
+const orgUnitRootsQuery = {
+  resource: 'organisationUnits',
+  params: {
+    fields: 'id,displayName,name',
+    userDataViewFallback: true,
+    paging: false
+  }
+};
+const orgUnitsQuery = {
+  resource: 'organisationUnits',
+  params: ({
+    displayNameProp
+  }) => ({
+    fields: `id,path,${displayNameProp}~rename(displayName),children::isNotEmpty`,
     level: 1,
-    fields: fields.join(','),
-    userDataViewFallback: true
+    userDataViewFallback: true,
+    paging: false
+  })
+};
+const orgUnitQuery = {
+  resource: 'organisationUnits',
+  id: ({
+    id
+  }) => id,
+  params: {
+    fields: 'id,level,displayName~rename(name),path,parent[id,displayName~rename(name)],children[level]',
+    userDataViewFallback: true,
+    paging: false
+  }
+};
+export const apiFetchOrganisationUnitLevels = async dataEngine => {
+  const orgUnitLevelsData = await dataEngine.query({
+    orgUnitLevels: orgUnitLevelsQuery
+  }, {
+    onError
   });
+  return orgUnitLevelsData.orgUnitLevels.organisationUnitLevels;
 };
-/**
- * Fetch organisation unit groups
- * @returns {*}
- */
-
-export const apiFetchOrganisationUnitGroups = (d2, displayNameProperty) => {
-  const endPoint = '/organisationUnitGroups';
-  const fields = ['id', "".concat(displayNameProperty, "~rename(displayName)"), 'name'];
-  const url = "".concat(endPoint, "?paging=false&fields=").concat(fields.join(','));
-  return d2.Api.getApi().get(url).then(({
-    organisationUnitGroups
-  }) => organisationUnitGroups).catch(onError);
-};
-/**
- * Fetch organisation unit levels
- * @returns {*}
- */
+export const apiFetchOrganisationUnitGroups = async (dataEngine, displayNameProp) => {
+  const orgUnitGroupsData = await dataEngine.query({
+    orgUnitGroups: orgUnitGroupsQuery
+  }, {
+    variables: {
+      displayNameProp
+    },
+    onError
+  });
+  return orgUnitGroupsData.orgUnitGroups.organisationUnitGroups;
+};
+export const apiFetchOrganisationUnitRoots = async dataEngine => {
+  const orgUnitRootsData = await dataEngine.query({
+    orgUnitRoots: orgUnitRootsQuery
+  }, {
+    onError
+  });
+  return orgUnitRootsData.orgUnitRoots.organisationUnits;
+}; // TODO: Unused, previously used to load all org units for the tree, but that is done by the ui component internally now, remove?
 
-export const apiFetchOrganisationUnitLevels = d2 => {
-  const endPoint = '/organisationUnitLevels';
-  const fields = ['id', 'displayName', 'name', 'level'];
-  const url = "".concat(endPoint, "?paging=false&fields=").concat(fields.join(','));
-  return d2.Api.getApi().get(url).then(({
-    organisationUnitLevels
-  }) => organisationUnitLevels).catch(onError);
+export const apiFetchOrganisationUnits = async (dataEngine, displayNameProp) => {
+  const orgUnitsData = await dataEngine.query({
+    orgUnits: orgUnitsQuery
+  }, {
+    variables: {
+      displayNameProp
+    },
+    onError
+  });
+  return orgUnitsData.orgUnits.organisationUnits;
+};
+export const apiFetchOrganisationUnit = async (dataEngine, id) => {
+  const orgUnitData = await dataEngine.query({
+    orgUnit: orgUnitQuery
+  }, {
+    variables: {
+      id
+    },
+    onError
+  });
+  return orgUnitData.orgUnit;
 };

package/build/es/components/DataDimension/DataTypesSelector.js

@@ -14,7 +14,7 @@ const DataTypes = ({
   var _dataTypes$currentDat;
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "container"
+    className: `jsx-${styles.__hash}` + " " + "container"
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     label: i18n.t('Data Type'),
     dataTest: dataTest,
@@ -25,12 +25,12 @@ const DataTypes = ({
     value: ALL_ID,
     key: ALL_ID,
     label: i18n.t('All types'),
-    dataTest: "".concat(dataTest, "-option-all")
+    dataTest: `${dataTest}-option-all`
   }), Object.values(dataTypes).map(type => /*#__PURE__*/React.createElement(SingleSelectOption, {
     value: type.id,
     key: type.id,
     label: type.getName(),
-    dataTest: "".concat(dataTest, "-option-").concat(type.id)
+    dataTest: `${dataTest}-option-${type.id}`
   }))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));

package/build/es/components/DataDimension/DetailSelector.js

@@ -18,7 +18,7 @@ export const DetailSelector = ({
 }) => {
   const options = getOptions();
   return /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "detail-container"
+    className: `jsx-${styles.__hash}` + " " + "detail-container"
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     dataTest: dataTest,
     label: i18n.t('Disaggregation'),
@@ -29,7 +29,7 @@ export const DetailSelector = ({
     value: option[0],
     key: option[0],
     label: option[1],
-    dataTest: "".concat(dataTest, "-option-").concat(option[0])
+    dataTest: `${dataTest}-option-${option[0]}`
   }))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));