Update file names in local unit import modal

app/src/hooks/domain/usePermissions.ts

@@ -20,7 +20,7 @@ function usePermissions() {
                 && isDefined(countryId)
                 && !!userMe?.is_admin_for_countries?.includes(countryId)
             );
-            const isRegionAdmin = (regionId: number | undefined) => (
+            const isRegionAdmin = (regionId: number | null | undefined) => (
                 !isGuestUser
                 && isDefined(regionId)
                 && !!userMe?.is_admin_for_regions?.includes(regionId)

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/ConfigureLocalUnitsModal/index.tsx

@@ -99,9 +99,9 @@ function ConfigureLocalUnitsModal(props: Props) {
     const isNewManageLocalUnit = useMemo(() => {
         if (isDefined(manageLocalUnitsValues)
             && isDefined(manageLocalUnitsValues.id)) {
-            return true;
+            return false;
         }
-        return false;
+        return true;
     }, [manageLocalUnitsValues]);
 
     const {

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/i18n.json

@@ -2,16 +2,16 @@
     "namespace": "localUnitImportModal",
     "strings": {
         "modalHeading": "Import Local Units for {countryName}",
-        "modalDescription": "Please select a local unit type and upload the CSV file",
+        "modalDescription": "Please select a local unit type and upload the xlsx file",
         "modalImportPendingDescription": "Your file is currently being processed. You can close this modal and check the result from the upload history",
         "closeButtonLabel": "Close",
         "localUnitTypeInputLabel": "Local unit type",
-        "uploadFileSectionTitle": "Upload CSV file",
-        "uploadFileSectionDescription": "Please make sure to select a supported file format (csv) with size less than 10MB",
+        "uploadFileSectionTitle": "Upload xlsx file",
+        "uploadFileSectionDescription": "Please make sure to select a supported file format (xlsx) with size less than 10MB",
         "selectFileButtonLabel": "Select a file",
         "cancelUploadButtonLabel": "Cancel",
         "startUploadButtonLabel": "Upload",
-        "contentStructureDescription": "The contents in the CSV should follow the structure provided in {templateLink}.",
+        "contentStructureDescription": "The contents in the xlsx should follow the structure provided in {templateLink}.",
         "templateLinkLabel": "this template",
         "noPermissionBothDescription": "You don't have permission and this unit is not externally managed.",
         "noPermissionErrorDescription": "You do not have the permission to upload local unit data",

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/index.tsx

@@ -258,7 +258,7 @@ function LocalUnitBulkUploadModal(props: Props) {
                     {isNotDefined(bulkUploadFile) && (
                         <RawFileInput
                             name="file"
-                            accept=".csv"
+                            accept=".xlsx"
                             onChange={setBulkUploadFile}
                             variant="secondary"
                             disabled={

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitView/i18n.json

@@ -55,6 +55,7 @@
         "localUnitViewDentist": "Dentist",
         "localUnitViewNursingAid": "Nursing aid",
         "localUnitViewMidwife": "Midwife",
+        "localUnitViewPharmacists": "Pharmacists",
         "localUnitViewOtherProfiles": "Other profiles",
         "localUnitViewRemovedOtherProfiles": "Removed Other profiles",
         "localUnitViewOtherMedicalHeal": "Other medical heal",

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitView/index.tsx

@@ -892,6 +892,18 @@ function LocalUnitView(props: Props) {
                             value={newValue?.health?.midwife}
                         />
                     </DiffWrapper>
+                    <DiffWrapper
+                        hideOnPristine
+                        value={newValue?.health?.pharmacists}
+                        previousValue={oldValue?.health?.pharmacists}
+                        diffViewEnabled
+                    >
+                        <TextOutput
+                            strongValue
+                            label={strings.localUnitViewMidwife}
+                            value={newValue?.health?.pharmacists}
+                        />
+                    </DiffWrapper>
                     {isDefined(changedOtherProfiles) && changedOtherProfiles.length > 0 && (
                         <>
                             <span>

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/i18n.json

@@ -67,6 +67,7 @@
         "dentist": "Dentist",
         "nursingAid": "Nursing aid",
         "midwife": "Midwife",
+        "pharmacists": "Pharmacists",
         "otherMedicalHeal": "Other medical heal",
         "commentsNS": "Comments by the NS",
         "addOtherProfilesButtonLabel": "Add Other Profiles",

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/schema.ts

@@ -162,6 +162,7 @@ const schema: LocalUnitsFormSchema = {
                                         ],
                                     },
                                     focal_point_position: {
+                                        required: true,
                                         validations: [lengthSmallerThanCondition(50)],
                                     },
                                     focal_point_phone_number: {
@@ -213,7 +214,6 @@ const schema: LocalUnitsFormSchema = {
                                         validations: [
                                             positiveIntegerCondition,
                                         ],
-                                        required: true,
                                     },
                                     general_practitioner: {
                                         validations: [
@@ -250,6 +250,11 @@ const schema: LocalUnitsFormSchema = {
                                             positiveIntegerCondition,
                                         ],
                                     },
+                                    pharmacists: {
+                                        validations: [
+                                            positiveIntegerCondition,
+                                        ],
+                                    },
                                     other_medical_heal: {},
                                     other_profiles: {
                                         keySelector: (item) => item.client_id,

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx

@@ -64,6 +64,8 @@ function LocalUnitsTableActions(props: Props) {
         isLocalUnitRegionValidatorByType,
         isSuperUser,
         isGuestUser,
+        isCountryAdmin,
+        isRegionAdmin,
     } = usePermissions();
 
     const isLocked = status !== VALIDATED;
@@ -73,14 +75,11 @@ function LocalUnitsTableActions(props: Props) {
             && isDefined(manageResponse)
             && !!manageResponse[localUnitType]?.enabled);
 
-    const hasPermission = isAuthenticated
-        && !isExternallyManaged
-        && (isSuperUser
-            || isLocalUnitGlobalValidatorByType(localUnitType)
-            || isLocalUnitCountryValidatorByType(countryDetails?.id, localUnitType)
-            || isLocalUnitRegionValidatorByType(countryDetails?.region, localUnitType));
+    const hasAddEditLocalUnitPermission = isCountryAdmin(countryDetails?.id)
+            || isRegionAdmin(countryDetails?.region);
 
     const hasValidatePermission = isAuthenticated
+        && !isExternallyManaged
         && (isSuperUser
             || isLocalUnitGlobalValidatorByType(localUnitType)
             || isLocalUnitCountryValidatorByType(countryDetails?.id, localUnitType)
@@ -165,7 +164,8 @@ function LocalUnitsTableActions(props: Props) {
                         >
                             {strings.localUnitActionsView}
                         </DropdownMenuItem>
-                        {(hasPermission && !isBulkUploadLocalUnit) && (
+                        {((hasValidatePermission || hasAddEditLocalUnitPermission)
+                            && !isBulkUploadLocalUnit) && (
                             <DropdownMenuItem
                                 type="button"
                                 name={undefined}
@@ -174,7 +174,9 @@ function LocalUnitsTableActions(props: Props) {
                                 {strings.localUnitActionsDelete}
                             </DropdownMenuItem>
                         )}
-                        {!isLocked && (hasPermission && !isBulkUploadLocalUnit) && (
+                        {!isLocked && ((
+                            hasValidatePermission || hasAddEditLocalUnitPermission
+                        ) && !isBulkUploadLocalUnit) && (
                             <DropdownMenuItem
                                 type="button"
                                 name={localUnitId}
@@ -190,7 +192,7 @@ function LocalUnitsTableActions(props: Props) {
                     <LocalUnitValidateButton
                         onClick={handleValidateLocalUnitClick}
                         status={status}
-                        hasValidatePermission={hasPermission}
+                        hasValidatePermission={hasValidatePermission}
                     />
                 )}
             </TableActions>

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx

@@ -58,6 +58,7 @@ function LocalUnitsTable(props: Props) {
     const {
         isSuperUser,
         isCountryAdmin,
+        isRegionAdmin,
         isLocalUnitGlobalValidator,
         isLocalUnitRegionValidator,
         isLocalUnitCountryValidator,
@@ -71,6 +72,7 @@ function LocalUnitsTable(props: Props) {
         || isLocalUnitRegionValidator(countryResponse?.region ?? undefined);
 
     const hasAddEditLocalUnitPermission = isCountryAdmin(countryResponse?.id)
+        || isRegionAdmin(countryResponse?.region)
         || hasPermission;
 
     const {

translationMigrations/000054-1761919700888.json

@@ -0,0 +1,106 @@
+{
+    "parent": "000053-1761568674475.json",
+    "actions": [
+        {
+            "action": "add",
+            "key": "addOtherProfilesButtonLabel",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Add Other Profiles"
+        },
+        {
+            "action": "add",
+            "key": "localUnitViewPharmacists",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Pharmacists"
+        },
+        {
+            "action": "add",
+            "key": "localUnitViewRemovedOtherProfiles",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Removed Other profiles"
+        },
+        {
+            "action": "add",
+            "key": "otherProfileNumberOutputLabel",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Number"
+        },
+        {
+            "action": "add",
+            "key": "otherProfileOutputLabel",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Other Profiles"
+        },
+        {
+            "action": "add",
+            "key": "otherProfilePositionOutputLabel",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Position"
+        },
+        {
+            "action": "add",
+            "key": "otherProfilesNumberLabel",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Number"
+        },
+        {
+            "action": "add",
+            "key": "otherProfilesPositionLabel",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Position"
+        },
+        {
+            "action": "add",
+            "key": "otherProfilesRemoveLabel",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Remove"
+        },
+        {
+            "action": "add",
+            "key": "otherTrainingFacilities",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Other training facilities"
+        },
+        {
+            "action": "add",
+            "key": "pharmacists",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Pharmacists"
+        },
+        {
+            "action": "add",
+            "key": "qualifiersTitle",
+            "namespace": "countryNsOverviewContextAndStructure",
+            "value": "Qualifiers"
+        },
+        {
+            "action": "remove",
+            "key": "otherProfiles",
+            "namespace": "countryNsOverviewContextAndStructure"
+        },
+        {
+            "action": "update",
+            "key": "contentStructureDescription",
+            "namespace": "localUnitImportModal",
+            "newValue": "The contents in the xlsx should follow the structure provided in {templateLink}."
+        },
+        {
+            "action": "update",
+            "key": "modalDescription",
+            "namespace": "localUnitImportModal",
+            "newValue": "Please select a local unit type and upload the xlsx file"
+        },
+        {
+            "action": "update",
+            "key": "uploadFileSectionDescription",
+            "namespace": "localUnitImportModal",
+            "newValue": "Please make sure to select a supported file format (xlsx) with size less than 10MB"
+        },
+        {
+            "action": "update",
+            "key": "uploadFileSectionTitle",
+            "namespace": "localUnitImportModal",
+            "newValue": "Upload xlsx file"
+        }
+    ]
+}