fix(local-unit): update add and edit permission for local unit form

Author: shreeyash07

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

@@ -155,6 +155,7 @@ function LocalUnitsForm(props: Props) {
     const {
         isSuperUser,
         isCountryAdmin,
+        isRegionAdmin,
         isLocalUnitGlobalValidatorByType,
         isLocalUnitRegionValidatorByType,
         isLocalUnitCountryValidatorByType,
@@ -388,7 +389,9 @@ function LocalUnitsForm(props: Props) {
         || isLocalUnitRegionValidatorByType(countryResponse?.region, value.type)
     );
 
-    const hasUpdatePermission = isCountryAdmin(countryResponse?.id) || hasValidatePermission;
+    const hasUpdatePermission = isCountryAdmin(countryResponse?.id)
+        || isRegionAdmin(countryResponse?.region)
+        || hasValidatePermission;
 
     const handleFormSubmit = useCallback(
         () => {

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 {