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

Author: shreeyash07

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

@@ -393,6 +393,9 @@ function LocalUnitsForm(props: Props) {
         || isRegionAdmin(countryResponse?.region)
         || hasValidatePermission;
 
+    const hasDeletePermission = isCountryAdmin(countryResponse?.id)
+        || hasValidatePermission;
+
     const handleFormSubmit = useCallback(
         () => {
             const result = validate();
@@ -540,7 +543,7 @@ function LocalUnitsForm(props: Props) {
                 <Portal container={actionsContainerRef.current}>
                     {isDefined(localUnitDetailsResponse) && (
                         <>
-                            {hasUpdatePermission && (
+                            {hasDeletePermission && (
                                 <Button
                                     name={undefined}
                                     onClick={setShowDeleteLocalUnitModalTrue}

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

@@ -70,21 +70,25 @@ function LocalUnitsTableActions(props: Props) {
 
     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 hasAddEditLocalUnitPermission = isCountryAdmin(countryDetails?.id)
-            || isRegionAdmin(countryDetails?.region);
-
     const hasValidatePermission = isAuthenticated
         && !isExternallyManaged
         && (isSuperUser
             || isLocalUnitGlobalValidatorByType(localUnitType)
             || isLocalUnitCountryValidatorByType(countryDetails?.id, localUnitType)
             || isLocalUnitRegionValidatorByType(countryDetails?.region, localUnitType));
 
+    const hasAddEditLocalUnitPermission = !isLocked && (
+        (hasValidatePermission || countryAdmin || regionAdmin)
+    && !isBulkUploadLocalUnit);
+
     const [readOnlyLocalUnitModal, setReadOnlyLocalUnitModal] = useState(false);
 
     const [
@@ -164,7 +168,7 @@ function LocalUnitsTableActions(props: Props) {
                         >
                             {strings.localUnitActionsView}
                         </DropdownMenuItem>
-                        {((hasValidatePermission || hasAddEditLocalUnitPermission)
+                        {((hasValidatePermission || countryAdmin)
                             && !isBulkUploadLocalUnit) && (
                             <DropdownMenuItem
                                 type="button"
@@ -174,9 +178,7 @@ function LocalUnitsTableActions(props: Props) {
                                 {strings.localUnitActionsDelete}
                             </DropdownMenuItem>
                         )}
-                        {!isLocked && ((
-                            hasValidatePermission || hasAddEditLocalUnitPermission
-                        ) && !isBulkUploadLocalUnit) && (
+                        {hasAddEditLocalUnitPermission && (
                             <DropdownMenuItem
                                 type="button"
                                 name={localUnitId}