feat: perf optimization, hospital data processed in less than a second

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-01-01T15:15:58.433Z\n"
-"PO-Revision-Date: 2024-01-01T15:15:58.433Z\n"
+"POT-Creation-Date: 2024-01-05T16:06:58.231Z\n"
+"PO-Revision-Date: 2024-01-05T16:06:58.231Z\n"
 
 msgid "WHO privacy policy"
 msgstr ""
@@ -82,6 +82,11 @@ msgstr ""
 msgid "HOSP"
 msgstr ""
 
+msgid ""
+"This survey has other surveys associated with it.\n"
+" Please delete all associated surveys, before you can delete this one."
+msgstr ""
+
 msgid "Survey deleted!"
 msgstr ""
 
@@ -121,6 +126,9 @@ msgstr ""
 msgid "Hospital Code"
 msgstr ""
 
+msgid "Loading..."
+msgstr ""
+
 msgid "Yes"
 msgstr ""
 

src/data/repositories/UserD2Repository.ts

@@ -126,14 +126,9 @@ export class UserD2Repository implements UserRepository {
                 },
                 fields: {
                     id: true,
-                    name: true,
                     shortName: true,
-                    code: true,
                     path: true,
                     level: true,
-                    parent: {
-                        id: true,
-                    },
                 },
                 paging: false,
             })
@@ -142,10 +137,9 @@ export class UserD2Repository implements UserRepository {
                 res.objects.map(ou => {
                     if (!ou.path.includes(NA_OU_ID))
                         return {
-                            name: ou.name,
                             id: ou.id,
                             shortName: ou.shortName,
-                            code: ou.code,
+
                             path: ou.path,
                         };
                 })
@@ -162,6 +156,7 @@ export class UserD2Repository implements UserRepository {
             const userDataViewOrgUnits = allLevelOUs.filter(levelOU =>
                 dataViewOrganisationUnits.some(userOU => levelOU.path.includes(userOU.id))
             );
+
             return Future.success({ userOrgUnits, userDataViewOrgUnits });
         });
     };
@@ -170,34 +165,26 @@ export class UserD2Repository implements UserRepository {
         organisationUnits: OrgUnit[],
         dataViewOrganisationUnits: OrgUnit[]
     ): OrgUnitAccess[] => {
-        let orgUnitsAccess = organisationUnits.map(ou => ({
+        const orgUnitsAccess: OrgUnitAccess[] = organisationUnits.map(ou => ({
             orgUnitId: ou.id,
-            orgUnitName: ou.name,
             orgUnitShortName: ou.shortName,
-            orgUnitCode: ou.code,
             orgUnitPath: ou.path,
-            readAccess: dataViewOrganisationUnits.some(dvou => dvou.id === ou.id),
+            readAccess: dataViewOrganisationUnits.includes(ou),
             captureAccess: true,
         }));
 
         //Setting view access for org units that are present in dataViewOrganisationUnits and not organisationUnits
-        const readOnlyAccessOrgUnits = dataViewOrganisationUnits
-            .filter(dvou => orgUnitsAccess.every(oua => oua.orgUnitId !== dvou.id))
+        const readOnlyAccessOrgUnits: OrgUnitAccess[] = dataViewOrganisationUnits
+            .filter(dvou => !organisationUnits.includes(dvou))
             .map(raou => ({
                 orgUnitId: raou.id,
-                orgUnitName: raou.name,
                 orgUnitShortName: raou.shortName,
-                orgUnitCode: raou.code,
                 orgUnitPath: raou.path,
                 readAccess: true,
                 captureAccess: false, //orgUnits in dataViewOrganisationUnits dont have capture access
             }));
-
-        orgUnitsAccess = [...orgUnitsAccess, ...readOnlyAccessOrgUnits].sort((a, b) =>
-            a.orgUnitShortName.localeCompare(b.orgUnitShortName)
-        );
-
-        return orgUnitsAccess;
+        const newOrgUnitsAccess: OrgUnitAccess[] = [...orgUnitsAccess, ...readOnlyAccessOrgUnits];
+        return newOrgUnitsAccess;
     };
 
     saveLocale(isUiLocale: boolean, locale: string): FutureData<void> {

src/domain/entities/OrgUnit.ts

@@ -1,7 +1,5 @@
 export interface OrgUnit {
-    name: string;
     id: string;
     shortName: string;
-    code: string;
     path: string;
 }

src/domain/entities/User.ts

@@ -3,9 +3,7 @@ import { Id, NamedRef } from "./Ref";
 
 export interface OrgUnitAccess {
     orgUnitId: Id;
-    orgUnitName: string;
     orgUnitShortName: string;
-    orgUnitCode: string;
     orgUnitPath: string;
     readAccess: boolean;
     captureAccess: boolean;

src/domain/usecases/GetUserAccessibleOUByLevel.ts

@@ -10,6 +10,9 @@ export class GetUserAccessibleOUByLevel {
         organisationUnits: NamedRef[],
         dataViewOrganisationUnits: NamedRef[]
     ): FutureData<OrgUnitAccess[]> {
+
+
+
         return this.usersRepository.getCurrentOUByLevel(
             organisationUnits,
             dataViewOrganisationUnits

src/webapp/components/user-profile/UserProfileContent.tsx

@@ -155,7 +155,7 @@ export const UserProfileContent: React.FC<UserProfileContentProps> = ({ userInfo
                                         <StyledChip
                                             size="small"
                                             key={orgUnits.orgUnitId}
-                                            label={orgUnits.orgUnitName}
+                                            label={orgUnits.orgUnitShortName}
                                             color="primary"
                                         />
                                     )