Pharmacist form field in local unit form

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/ConfirmationModal/index.tsx

@@ -111,8 +111,9 @@ function ConfirmationModal(props: Props) {
     const handleConfirmButtonChange = useCallback(() => {
         if (isNewManageLocalUnit) {
             addManageLocalUnit(manageLocalUnitsValues);
+        } else {
+            updateManageLocalUnit(manageLocalUnitsValues);
         }
-        updateManageLocalUnit(manageLocalUnitsValues);
     }, [isNewManageLocalUnit,
         addManageLocalUnit, manageLocalUnitsValues, updateManageLocalUnit]);
 

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

@@ -67,22 +67,13 @@ function ConfigureLocalUnitsModal(props: Props) {
 
     const handleLocalUnitSwitchChange = useCallback((value: boolean, name: number) => {
         setLocalUnitType(name);
-        if (isNotDefined(manageResponse)
-            && isDefined(countryResponse)
-        ) {
-            setManageLocalUnitsValues({
-                id: undefined,
-                country: countryResponse.id,
-                local_unit_type: name,
-                enabled: value,
-            });
-        }
-        if (isDefined(manageResponse)
-            && isDefined(manageResponse[name])
-            && isDefined(countryResponse)
-        ) {
+
+        if (isDefined(countryResponse)) {
+            const isNew = isNotDefined(manageResponse) || isNotDefined(manageResponse[name]);
+            const manageId = isNew ? undefined : manageResponse[name]?.externallyManagedId;
+
             setManageLocalUnitsValues({
-                id: manageResponse[name].externallyManagedId,
+                id: manageId,
                 country: countryResponse.id,
                 local_unit_type: name,
                 enabled: value,
@@ -97,8 +88,8 @@ function ConfigureLocalUnitsModal(props: Props) {
     ]);
 
     const isNewManageLocalUnit = useMemo(() => {
-        if (isDefined(manageLocalUnitsValues)
-            && isDefined(manageLocalUnitsValues.id)) {
+        if (isNotDefined(manageLocalUnitsValues)
+            || isNotDefined(manageLocalUnitsValues?.id)) {
             return true;
         }
         return false;

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

@@ -1,7 +1,6 @@
 {
     "namespace": "countryNsOverviewContextAndStructure",
     "strings": {
-        "otherProfileOutputLabel": "Other Profiles",
         "otherProfilePositionOutputLabel": "Position",
         "otherProfileNumberOutputLabel": "Number"
     }

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.localUnitViewPharmacists}
+                            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: {
@@ -250,6 +251,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,27 +64,30 @@ function LocalUnitsTableActions(props: Props) {
         isLocalUnitRegionValidatorByType,
         isSuperUser,
         isGuestUser,
+        isCountryAdmin,
+        isRegionAdmin,
     } = usePermissions();
 
     const isLocked = status !== VALIDATED;
 
+    const countryAdmin = isCountryAdmin(countryDetails?.id);
+    const regionAdmin = isRegionAdmin(countryDetails?.region);
+
     const isExternallyManaged = status === EXTERNALLY_MANAGED
         || (isDefined(localUnitType)
             && isDefined(manageResponse)
             && !!manageResponse[localUnitType]?.enabled);
 
-    const hasPermission = isAuthenticated
+    const hasValidatePermission = isAuthenticated
         && !isExternallyManaged
         && (isSuperUser
             || isLocalUnitGlobalValidatorByType(localUnitType)
             || isLocalUnitCountryValidatorByType(countryDetails?.id, localUnitType)
             || isLocalUnitRegionValidatorByType(countryDetails?.region, localUnitType));
 
-    const hasValidatePermission = isAuthenticated
-        && (isSuperUser
-            || isLocalUnitGlobalValidatorByType(localUnitType)
-            || isLocalUnitCountryValidatorByType(countryDetails?.id, localUnitType)
-            || isLocalUnitRegionValidatorByType(countryDetails?.region, localUnitType));
+    const hasAddEditLocalUnitPermission = !isLocked && (
+        (hasValidatePermission || countryAdmin || regionAdmin)
+    && !isBulkUploadLocalUnit);
 
     const [readOnlyLocalUnitModal, setReadOnlyLocalUnitModal] = useState(false);
 
@@ -165,7 +168,8 @@ function LocalUnitsTableActions(props: Props) {
                         >
                             {strings.localUnitActionsView}
                         </DropdownMenuItem>
-                        {(hasPermission && !isBulkUploadLocalUnit) && (
+                        {((hasValidatePermission || countryAdmin)
+                            && !isBulkUploadLocalUnit) && (
                             <DropdownMenuItem
                                 type="button"
                                 name={undefined}
@@ -174,7 +178,7 @@ function LocalUnitsTableActions(props: Props) {
                                 {strings.localUnitActionsDelete}
                             </DropdownMenuItem>
                         )}
-                        {!isLocked && (hasPermission && !isBulkUploadLocalUnit) && (
+                        {hasAddEditLocalUnitPermission && (
                             <DropdownMenuItem
                                 type="button"
                                 name={localUnitId}
@@ -190,7 +194,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 {