1444 location admin fix

packages/fhir-helpers/src/constants/codeSystems.ts

@@ -4,8 +4,7 @@ export const eusmServicePointCodeSystemUri =
 export const snomedCodeSystemUri = 'http://snomed.info/sct';
 export const hl7PhysicalTypeCodeSystemUri =
   'http://terminology.hl7.org/CodeSystem/location-physical-type';
-export const administrativeLevelSystemUri =
-  'https://smartregister.org/CodeSystem/administrative-level';
+export const administrativeLevelSystemUri = 'https://smartregister.org/codes/administrative-level';
 
 const baseValuSetURI = 'http://smartregister.org/ValueSet';
 export const unicefSectionValueSetURI = `${baseValuSetURI}/eusm-unicef-sections`;

packages/fhir-helpers/src/utils/tests/utils.test.ts

@@ -40,7 +40,7 @@ test('getCharacteristicWithCoding works correctly', () => {
 test('getAdministrativeLevelTypeCoding works correctly', () => {
   const level = 1;
   expect(getAdministrativeLevelTypeCoding(level)).toEqual({
-    system: 'https://smartregister.org/CodeSystem/administrative-level',
+    system: 'https://smartregister.org/codes/administrative-level',
     code: `${level}`,
     display: `Level ${level}`,
   });

packages/fhir-location-management/src/components/LocationForm/CustomTreeSelect/index.tsx

@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react';
 import { TreeNode } from '../../../helpers/types';
-import { serializeTree } from '../../../helpers/utils';
 import { TreeSelect } from 'antd';
 import { TreeSelectProps } from 'antd/lib/tree-select/';
 import { LabelValueType, DataNode } from 'rc-tree-select/lib/interface';
@@ -30,7 +29,7 @@ export const CustomTreeSelect = (props: CustomTreeSelectProps) => {
       fullDataCallback?.(tree);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [serializeTree(tree), fullDataCallback, value]);
+  }, [fullDataCallback, value]);
 
   const userDefinedRoots = tree.children ?? [];
   const selectOptions = treeToOptions(userDefinedRoots, disabledTreeNodesCallback);

packages/fhir-location-management/src/components/LocationForm/tests/fixtures.ts

@@ -113,7 +113,7 @@ export const parentNode1 = {
         {
           coding: [
             {
-              system: 'https://smartregister.org/CodeSystem/administrative-level',
+              system: 'https://smartregister.org/codes/administrative-level',
               code: '1',
               display: 'Level 1',
             },
@@ -137,7 +137,7 @@ export const parentNode2 = {
         {
           coding: [
             {
-              system: 'https://smartregister.org/CodeSystem/administrative-level',
+              system: 'https://smartregister.org/codes/administrative-level',
               code: '2',
               display: 'Level 2',
             },

packages/fhir-location-management/src/components/LocationForm/tests/utils.test.ts

@@ -8,27 +8,27 @@ test('generateLocationUnit works correctly', () => {
   expect(getResourceType()).toEqual({
     code: '0',
     display: 'Level 0',
-    system: 'https://smartregister.org/CodeSystem/administrative-level',
+    system: 'https://smartregister.org/codes/administrative-level',
   });
 
   // Has parent id and parentNode
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   expect(getResourceType(parentNode1 as any, parentId)).toEqual({
-    system: 'https://smartregister.org/CodeSystem/administrative-level',
+    system: 'https://smartregister.org/codes/administrative-level',
     code: '2',
     display: 'Level 2',
   });
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   expect(getResourceType(parentNode1 as any, parentId)).toEqual({
-    system: 'https://smartregister.org/CodeSystem/administrative-level',
+    system: 'https://smartregister.org/codes/administrative-level',
     code: '2',
     display: 'Level 2',
   });
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   expect(getResourceType(parentNode2 as any, parentId)).toEqual({
-    system: 'https://smartregister.org/CodeSystem/administrative-level',
+    system: 'https://smartregister.org/codes/administrative-level',
     code: '3',
     display: 'Level 3',
   });

packages/fhir-location-management/src/components/RootLocationWizard/tests/fixtures.ts

@@ -19,7 +19,7 @@ export const rootlocationFixture = {
     {
       coding: [
         {
-          system: 'https://smartregister.org/CodeSystem/administrative-level',
+          system: 'https://smartregister.org/codes/administrative-level',
           code: '0',
           display: 'Level 0',
         },

packages/fhir-location-management/src/components/RootLocationWizard/tests/index.test.tsx

@@ -42,7 +42,7 @@ test('check generated root fhir location payload', () => {
           {
             code: '0',
             display: 'Level 0',
-            system: 'https://smartregister.org/CodeSystem/administrative-level',
+            system: 'https://smartregister.org/codes/administrative-level',
           },
         ],
       },

packages/fhir-location-management/src/components/ViewDetails/DetailsTabs/tests/detailsTabs.test.tsx

@@ -259,7 +259,7 @@ test('works correctly - physical location', async () => {
 
   // check records shown in table
   tableData = [...inventoryTab.querySelectorAll('table tbody tr')].map((tr) => tr.textContent);
-  waitFor(() => {
+  await waitFor(() => {
     expect(tableData).toEqual(['No data']);
   });
 

packages/fhir-location-management/src/components/ViewDetails/DetailsTabs/tests/fixtures.ts

@@ -83,7 +83,7 @@ export const centralProviceChildLocations = {
           {
             coding: [
               {
-                system: 'https://smartregister.org/CodeSystem/administrative-level',
+                system: 'https://smartregister.org/codes/administrative-level',
                 code: '1',
                 display: 'Level 1',
               },

packages/fhir-location-management/src/components/ViewDetails/tests/fixtures.ts

@@ -228,7 +228,7 @@ export const centralProvinceInclude = {
           {
             coding: [
               {
-                system: 'https://smartregister.org/CodeSystem/administrative-level',
+                system: 'https://smartregister.org/codes/administrative-level',
                 code: '1',
                 display: 'Level 1',
               },

packages/keycloak-user-management/src/components/CreateEditUserGroup/tests/__snapshots__/index.test.tsx.snap

@@ -1,5 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`components/CreateEditUserGroup initializes form field with data if page is refreshed: full user group form 1`] = `"Edit User Group | AdminNameRealm Roles2 itemsAvailable RolesEDIT_KEYCLOAK_USERSVIEW_KEYCLOAK_USERS6 itemsAssigned RolesOPENMRSALL_EVENTSPLANS_FOR_USERrealm-adminoffline_accessuma_authorizationSaveCancel"`;
-
 exports[`components/CreateEditUserGroup renders correctly: full user group form 1`] = `"Edit User Group | AdminNameRealm Roles2 itemsAvailable RolesEDIT_KEYCLOAK_USERSVIEW_KEYCLOAK_USERS6 itemsAssigned RolesOPENMRSALL_EVENTSPLANS_FOR_USERrealm-adminoffline_accessuma_authorizationSaveCancel"`;