Merge pull request #4697 from beyondessential/release-2023-27

Release 2023-27
beyondessential · Jul 4, 2023 · 3929fd9 · 3929fd9
2 parents 5a6ac93 + b383ddd
commit 3929fd9
Show file tree

Hide file tree

Showing 535 changed files with 4,089 additions and 3,514 deletions.
diff --git a/packages/admin-panel-server/src/viz-builder/index.ts b/packages/admin-panel-server/src/viz-builder/index.ts
@@ -7,4 +7,4 @@ export * from './dashboardVisualisation';
 export * from './mapOverlayVisualisation';
 export * from './types';
 export * from './validators';
-export * from './constants';
+export * from './constants';
diff --git a/packages/admin-panel-server/src/viz-builder/mapOverlayVisualisation/index.ts b/packages/admin-panel-server/src/viz-builder/mapOverlayVisualisation/index.ts
@@ -6,4 +6,4 @@
 export { MapOverlayVisualisationExtractor } from './MapOverlayVisualisationExtractor';
 export { combineMapOverlayVisualisation } from './combineMapOverlayVisualisation';
 export * from './validators';
-export * from './types';
+export * from './types';
diff --git a/packages/admin-panel-server/src/viz-builder/mapOverlayVisualisation/types.ts b/packages/admin-panel-server/src/viz-builder/mapOverlayVisualisation/types.ts
@@ -82,4 +82,4 @@ export type MapOverlayVisualisationResource = { mapOverlay: MapOverlay; report:
 // };
 //
 export type MapOverlayVizResource = MapOverlayVisualisationResource;
-//| LegacyMapOverlayVisualisationResource;
+// | LegacyMapOverlayVisualisationResource;
diff --git a/packages/admin-panel/src/pages/resources/DhisInstancesPage.js b/packages/admin-panel/src/pages/resources/DhisInstancesPage.js
@@ -0,0 +1,76 @@
+/**
+ * Tupaia
+ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import { ResourcePage } from './ResourcePage';
+
+const FIELDS = [
+  {
+    Header: 'Code',
+    source: 'code',
+  },
+  {
+    Header: 'Readonly',
+    source: 'readonly',
+    type: 'boolean',
+    editConfig: {
+      type: 'boolean',
+    },
+  },
+  {
+    Header: 'Config',
+    source: 'config',
+    type: 'jsonTooltip',
+    editConfig: {
+      type: 'jsonEditor',
+      default: '{}',
+    },
+  },
+];
+
+const COLUMNS = [
+  ...FIELDS,
+  {
+    Header: 'Edit',
+    type: 'edit',
+    source: 'id',
+    actionConfig: {
+      editEndpoint: 'dhisInstances',
+      fields: FIELDS,
+    },
+  },
+  {
+    Header: 'Delete',
+    source: 'id',
+    type: 'delete',
+    actionConfig: {
+      endpoint: `dhisInstances`,
+    },
+  },
+];
+
+const CREATE_CONFIG = {
+  title: 'New Dhis Instance',
+  actionConfig: {
+    editEndpoint: 'dhisInstances',
+    fields: FIELDS,
+  },
+};
+
+export const DhisInstancesPage = ({ getHeaderEl, ...props }) => (
+  <ResourcePage
+    title="DHIS Instances"
+    endpoint="dhisInstances"
+    columns={COLUMNS}
+    createConfig={CREATE_CONFIG}
+    getHeaderEl={getHeaderEl}
+    {...props}
+  />
+);
+
+DhisInstancesPage.propTypes = {
+  getHeaderEl: PropTypes.func.isRequired,
+};
diff --git a/packages/admin-panel/src/pages/resources/SupersetInstancesPage.js b/packages/admin-panel/src/pages/resources/SupersetInstancesPage.js
@@ -0,0 +1,68 @@
+/**
+ * Tupaia MediTrak
+ * Copyright (c) 2017 Beyond Essential Systems Pty Ltd
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import { ResourcePage } from './ResourcePage';
+
+const FIELDS = [
+  {
+    Header: 'Code',
+    source: 'code',
+  },
+  {
+    Header: 'Config',
+    source: 'config',
+    type: 'jsonTooltip',
+    editConfig: {
+      type: 'jsonEditor',
+      default: '{}',
+    },
+  },
+];
+
+const COLUMNS = [
+  ...FIELDS,
+  {
+    Header: 'Edit',
+    type: 'edit',
+    source: 'id',
+    actionConfig: {
+      editEndpoint: 'supersetInstances',
+      fields: FIELDS,
+    },
+  },
+  {
+    Header: 'Delete',
+    source: 'id',
+    type: 'delete',
+    actionConfig: {
+      endpoint: `supersetInstances`,
+    },
+  },
+];
+
+const CREATE_CONFIG = {
+  title: 'New Superset Instance',
+  actionConfig: {
+    editEndpoint: 'supersetInstances',
+    fields: FIELDS,
+  },
+};
+
+export const SupersetInstancesPage = ({ getHeaderEl, ...props }) => (
+  <ResourcePage
+    title="mSupply Superset Instances"
+    endpoint="supersetInstances"
+    columns={COLUMNS}
+    createConfig={CREATE_CONFIG}
+    getHeaderEl={getHeaderEl}
+    {...props}
+  />
+);
+
+SupersetInstancesPage.propTypes = {
+  getHeaderEl: PropTypes.func.isRequired,
+};
diff --git a/packages/admin-panel/src/pages/resources/index.js b/packages/admin-panel/src/pages/resources/index.js
@@ -37,3 +37,6 @@ export { ExternalDatabaseConnectionsPage } from './ExternalDatabaseConnectionsPa
 export { EntityHierarchyPage } from './EntityHierarchyPage';
 export { PermissionGroupsViewerPage } from './PermissionGroupsViewerPage';
 export { CustomLandingPagesPage } from './CustomLandingPagesPage';
+export { DataElementDataServicesPage } from './DataElementDataServicesPage';
+export { DhisInstancesPage } from './DhisInstancesPage';
+export { SupersetInstancesPage } from './SupersetInstancesPage';
diff --git a/packages/admin-panel/src/routes.js b/packages/admin-panel/src/routes.js
@@ -37,8 +37,10 @@ import {
   DataTablesPage,
   ExternalDatabaseConnectionsPage,
   EntityHierarchyPage,
+  DataElementDataServicesPage,
+  DhisInstancesPage,
+  SupersetInstancesPage,
 } from './pages/resources';
-import { DataElementDataServicesPage } from './pages/resources/DataElementDataServicesPage';
 
 export const ROUTES = [
   {
@@ -241,6 +243,16 @@ export const ROUTES = [
         to: '',
         component: ExternalDatabaseConnectionsPage,
       },
+      {
+        label: 'DHIS Instances',
+        to: '/dhis-instances',
+        component: DhisInstancesPage,
+      },
+      {
+        label: 'mSupply Superset Instances',
+        to: '/superset-instances',
+        component: SupersetInstancesPage,
+      },
     ],
   },
 ];
diff --git a/packages/aggregator/src/analytics/aggregateAnalytics/adjustOptionsToAggregationList.js b/packages/aggregator/src/analytics/aggregateAnalytics/adjustOptionsToAggregationList.js
@@ -72,16 +72,21 @@ const getAdjustedOrganisationUnitsAndAggregations = async (
         return [aggregation, dataSourceEntities];
       }
 
-      const { aggregationEntityType, dataSourceEntityType, dataSourceEntityFilter } =
-        aggregation.config;
-      const [dataSourceEntities, relationships] =
-        await entityProvider.getDataSourceEntitiesAndRelationships(
-          hierarchy,
-          organisationUnitCodes,
-          aggregationEntityType,
-          dataSourceEntityType,
-          dataSourceEntityFilter,
-        );
+      const {
+        aggregationEntityType,
+        dataSourceEntityType,
+        dataSourceEntityFilter,
+      } = aggregation.config;
+      const [
+        dataSourceEntities,
+        relationships,
+      ] = await entityProvider.getDataSourceEntitiesAndRelationships(
+        hierarchy,
+        organisationUnitCodes,
+        aggregationEntityType,
+        dataSourceEntityType,
+        dataSourceEntityFilter,
+      );
 
       return [
         {

diff --git a/packages/central-server/src/apiV2/GETCountries.js b/packages/central-server/src/apiV2/GETCountries.js
@@ -24,7 +24,9 @@ export class GETCountries extends GETHandler {
   async findSingleRecord(countryId, options) {
     const countryPermissionChecker = accessPolicy =>
       assertCountryPermissions(accessPolicy, this.models, countryId);
-    await this.assertPermissions(assertAnyPermissions([assertBESAdminAccess, countryPermissionChecker]));
+    await this.assertPermissions(
+      assertAnyPermissions([assertBESAdminAccess, countryPermissionChecker]),
+    );
 
     return super.findSingleRecord(countryId, options);
   }

diff --git a/packages/central-server/src/apiV2/import/importEntities/getEntityMetadata.js b/packages/central-server/src/apiV2/import/importEntities/getEntityMetadata.js
@@ -1,4 +1,3 @@
-
 /**
  * Tupaia
  * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd

diff --git a/packages/central-server/src/apiV2/index.js b/packages/central-server/src/apiV2/index.js
@@ -236,6 +236,7 @@ apiV2.get('/facilities/:recordId?', useRouteHandler(GETClinics));
 apiV2.get('/geographicalAreas/:recordId?', useRouteHandler(GETGeographicalAreas));
 apiV2.get('/reports/:recordId?', useRouteHandler(GETReports));
 apiV2.get('/dhisInstances/:recordId?', useRouteHandler(TupaiaAdminGETHandler));
+apiV2.get('/supersetInstances/:recordId?', useRouteHandler(TupaiaAdminGETHandler));
 apiV2.get('/dataServiceSyncGroups/:recordId?', useRouteHandler(GETSyncGroups));
 apiV2.get('/dataServiceSyncGroups/:recordId/logs', useRouteHandler(GETSyncGroupLogs));
 apiV2.get('/dataServiceSyncGroups/:recordId/logs/count', useRouteHandler(GETSyncGroupLogsCount));
@@ -288,6 +289,8 @@ apiV2.post('/dataServiceSyncGroups/:recordId/sync', useRouteHandler(ManuallySync
 apiV2.post('/dataElementDataServices', useRouteHandler(BESAdminCreateHandler));
 apiV2.post('/externalDatabaseConnections', useRouteHandler(BESAdminCreateHandler));
 apiV2.post('/landingPages', useRouteHandler(CreateLandingPage));
+apiV2.post('/dhisInstances', useRouteHandler(BESAdminCreateHandler));
+apiV2.post('/supersetInstances', useRouteHandler(BESAdminCreateHandler));
 
 /**
  * PUT routes
@@ -326,6 +329,8 @@ apiV2.put('/dataElementDataServices/:recordId', useRouteHandler(BESAdminEditHand
 apiV2.put('/externalDatabaseConnections/:recordId', useRouteHandler(BESAdminEditHandler));
 apiV2.put('/entityHierarchy/:recordId', useRouteHandler(BESAdminEditHandler));
 apiV2.put('/landingPages/:recordId', useRouteHandler(EditLandingPage));
+apiV2.put('/dhisInstances/:recordId', useRouteHandler(BESAdminEditHandler));
+apiV2.put('/supersetInstances/:recordId', useRouteHandler(BESAdminEditHandler));
 
 /**
  * DELETE routes
@@ -360,6 +365,8 @@ apiV2.delete('/dataServiceSyncGroups/:recordId', useRouteHandler(DeleteSyncGroup
 apiV2.delete('/dataElementDataServices/:recordId', useRouteHandler(BESAdminDeleteHandler));
 apiV2.delete('/externalDatabaseConnections/:recordId', useRouteHandler(BESAdminDeleteHandler));
 apiV2.delete('/landingPages/:recordId', useRouteHandler(BESAdminDeleteHandler));
+apiV2.delete('/dhisInstances/:recordId', useRouteHandler(BESAdminDeleteHandler));
+apiV2.delete('/supersetInstances/:recordId', useRouteHandler(BESAdminDeleteHandler));
 
 apiV2.use(handleError); // error handler must come last
 

diff --git a/packages/central-server/src/apiV2/meditrakApp/countChanges/countChanges.js b/packages/central-server/src/apiV2/meditrakApp/countChanges/countChanges.js
@@ -6,7 +6,7 @@
 import { respond, DatabaseError, UnauthenticatedError } from '@tupaia/utils';
 import { LegacyCountChangesHandler } from './LegacyCountChangesHandler';
 import { allowNoPermissions } from '../../../permissions';
-import { buildMeditrakSyncQuery } from "../meditrakSync";
+import { buildMeditrakSyncQuery } from '../meditrakSync';
 
 const handleNonLegacyRequest = async (req, res) => {
   const { models } = req;

diff --git a/packages/central-server/src/apiV2/meditrakApp/index.js b/packages/central-server/src/apiV2/meditrakApp/index.js
@@ -8,4 +8,4 @@ export { getChanges } from './getChanges';
 export { getSocialFeed } from './getSocialFeed';
 export { getUserRewards } from './getUserRewards';
 export { postChanges } from './postChanges';
-export * from './countChanges';
+export * from './countChanges';
diff --git a/packages/central-server/src/apiV2/meditrakApp/meditrakSync/index.js b/packages/central-server/src/apiV2/meditrakApp/meditrakSync/index.js
@@ -8,4 +8,4 @@ export { buildPermissionsBasedMeditrakSyncQuery } from './permissionsBasedMeditr
 export {
   supportsPermissionsBasedSync,
   PERMISSIONS_BASED_SYNC_MIN_APP_VERSION,
-} from './supportsPermissionsBasedSync';
+} from './supportsPermissionsBasedSync';
diff --git a/packages/central-server/src/apiV2/meditrakApp/utilities/index.js b/packages/central-server/src/apiV2/meditrakApp/utilities/index.js
@@ -7,4 +7,4 @@ export { addSurveyImage } from './addSurveyImage';
 export { addSurveyFile } from './addSurveyFile';
 export { updateOrCreateSurveyResponse } from './updateOrCreateSurveyResponse';
 export { fetchRequestingMeditrakDevice } from './fetchRequestingMeditrakDevice';
-export { getColumnsForMeditrakApp } from './getColumnsForMeditrakApp';
+export { getColumnsForMeditrakApp } from './getColumnsForMeditrakApp';
diff --git a/packages/central-server/src/apiV2/utilities/constructNewRecordValidationRules.js b/packages/central-server/src/apiV2/utilities/constructNewRecordValidationRules.js
@@ -334,6 +334,17 @@ export const constructForSingle = (models, recordType) => {
           },
         ],
       };
+    case TYPES.DHIS_INSTANCE:
+      return {
+        code: [isAString],
+        readonly: [hasContent, isBoolean],
+        config: [hasContent],
+      };
+    case TYPES.SUPERSET_INSTANCE:
+      return {
+        code: [isAString],
+        config: [hasContent],
+      };
     default:
       throw new ValidationError(`${recordType} is not a valid POST endpoint`);
   }

diff --git a/packages/central-server/src/kobo/startSyncWithKoBo.js b/packages/central-server/src/kobo/startSyncWithKoBo.js
@@ -123,15 +123,16 @@ export async function syncWithKoBo(models, dataBroker, syncGroupCode) {
     await validateSyncGroup(models, dataServiceSyncGroup);
 
     // Pull data from KoBo
-    const koboData = await dataBroker.pull(
-      {
-        code: syncGroupCode,
-        type: dataBroker.getDataSourceTypes().SYNC_GROUP,
-      },
-      {
-        startSubmissionTime: dataServiceSyncGroup.sync_cursor,
-      },
-    );
+    const koboData =
+      (await dataBroker.pull(
+        {
+          code: syncGroupCode,
+          type: dataBroker.getDataSourceTypes().SYNC_GROUP,
+        },
+        {
+          startSubmissionTime: dataServiceSyncGroup.sync_cursor,
+        },
+      )) || [];
 
     await models.wrapInTransaction(async transactingModels => {
       // Create new survey_responses in Tupaia

diff --git a/packages/central-server/src/tests/testUtilities/mapOverlays/index.js b/packages/central-server/src/tests/testUtilities/mapOverlays/index.js
@@ -3,4 +3,4 @@
  * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
  */
 
-export { setupMapOverlayTestData } from './setupMapOverlayTestData';
+export { setupMapOverlayTestData } from './setupMapOverlayTestData';
diff --git a/packages/data-broker/src/__tests__/services/dhis/DhisService.fixtures.ts b/packages/data-broker/src/__tests__/services/dhis/DhisService.fixtures.ts
@@ -12,7 +12,7 @@ export const DATA_ELEMENTS = dataElements({
   POP01: { code: 'POP01', dataElementCode: 'POP01', service_type: 'dhis' },
   POP02: { code: 'POP02', dataElementCode: 'POP02', service_type: 'dhis' },
   DIF01: { code: 'DIF01', dataElementCode: 'DIF01_DHIS', service_type: 'dhis' },
-  NON_DHIS_1: { code: 'NON_DHIS_1', service_type: 'superset' }
+  NON_DHIS_1: { code: 'NON_DHIS_1', service_type: 'superset' },
 });
 
 export const DATA_GROUPS = dataGroups({

diff --git a/packages/data-broker/src/__tests__/services/dhis/DhisService.test.ts b/packages/data-broker/src/__tests__/services/dhis/DhisService.test.ts
@@ -257,7 +257,9 @@ describe('DhisService', () => {
       };
 
       it('uses AnalyticsPuller for dataElements', async () => {
-        await dhisService.pull([DATA_ELEMENTS.POP01], 'dataElement', { dataServiceMapping: DEFAULT_DATA_SERVICE_MAPPING });
+        await dhisService.pull([DATA_ELEMENTS.POP01], 'dataElement', {
+          dataServiceMapping: DEFAULT_DATA_SERVICE_MAPPING,
+        });
         expect(mockPullAnalytics).toHaveBeenCalledOnceWith([dhisApi], [DATA_ELEMENTS.POP01], {
           dataServiceMapping: DEFAULT_DATA_SERVICE_MAPPING,
         });
@@ -297,9 +299,7 @@ describe('DhisService', () => {
       const getApisForDataSourcesSpy = jest.spyOn(GetDhisApi, 'getApisForDataSources');
 
       it('looks up the api from the given data source', async () => {
-        const dataSources = [
-          DATA_ELEMENTS.POP01,
-        ];
+        const dataSources = [DATA_ELEMENTS.POP01];
         const options = {
           organisationUnitCodes: ['TO'],
           dataServiceMapping: DEFAULT_DATA_SERVICE_MAPPING,