Validate endpoint with super user and country admin

Author: shreeyash07

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

@@ -1,4 +1,4 @@
-import react from 'react';
+import react, { useMemo } from 'react';
 import { useOutletContext } from 'react-router-dom';
 import {
     LocationIcon,
@@ -14,7 +14,6 @@ import { useTranslation } from '@ifrc-go/ui/hooks';
 import { sumSafe } from '@ifrc-go/ui/utils';
 import {
     isDefined,
-    isNotDefined,
     isTruthyString,
 } from '@togglecorp/fujs';
 import {
@@ -34,7 +33,7 @@ import BaseMap from '#components/domain/BaseMap';
 import Link, { type Props as LinkProps } from '#components/Link';
 import MapContainerWithDisclaimer from '#components/MapContainerWithDisclaimer';
 import MapPopup from '#components/MapPopup';
-import useUserMe from '#hooks/domain/useUserMe';
+import usePermissions from '#hooks/domain/usePermissions';
 import useFilterState from '#hooks/useFilterState';
 import {
     COLOR_DARK_GREY,
@@ -49,7 +48,11 @@ import {
     useRequest,
 } from '#utils/restRequest';
 
-import { VALIDATED } from '../common';
+import {
+    AUTHENTICATED,
+    PUBLIC,
+    VALIDATED,
+} from '../common';
 import Filters, { FilterValue } from '../Filters';
 
 import i18n from './i18n.json';
@@ -127,13 +130,28 @@ function LocalUnitsMap() {
         [limit, filter, countryResponse],
     );
 
-    const meResponse = useUserMe();
+    const { isCountryAdmin, isSuperUser } = usePermissions();
+
+    const requestType = useMemo(
+        () => {
+            if (isSuperUser) {
+                return 'authenticated';
+            }
+
+            if (isCountryAdmin(countryResponse?.id)) {
+                return 'authenticated';
+            }
+
+            return 'public';
+        },
+        [countryResponse, isSuperUser, isCountryAdmin],
+    );
 
     const {
         response: publicLocalUnitsResponse,
         pending: publicLocalUnitsPending,
     } = useRequest({
-        skip: isNotDefined(countryResponse?.iso3) || meResponse?.is_superuser,
+        skip: requestType !== PUBLIC,
         url: '/api/v2/public-local-units/',
         query: urlQuery,
     });
@@ -142,14 +160,13 @@ function LocalUnitsMap() {
         response: localUnitsResponse,
         pending: localUnitsPending,
     } = useRequest({
-        skip: isNotDefined(countryResponse?.iso3)
-            || isNotDefined(meResponse)
-            || !meResponse.is_superuser,
+        skip: requestType !== AUTHENTICATED,
         url: '/api/v2/local-units/',
         query: urlQuery,
     });
 
-    const localUnits = meResponse?.is_superuser ? localUnitsResponse : publicLocalUnitsResponse;
+    const localUnits = (isSuperUser || isCountryAdmin(countryResponse?.id))
+        ? localUnitsResponse : publicLocalUnitsResponse;
     const pending = publicLocalUnitsPending || localUnitsPending;
 
     const strings = useTranslation(i18n);
@@ -218,7 +235,7 @@ function LocalUnitsMap() {
         pending: publicLocalUnitDetailPending,
         error: publicLocalUnitDetailError,
     } = useRequest({
-        skip: isNotDefined(clickedPointProperties?.localUnitId) || meResponse?.is_superuser,
+        skip: requestType !== PUBLIC,
         url: '/api/v2/public-local-units/{id}/',
         pathVariables: isDefined(clickedPointProperties) ? ({
             id: clickedPointProperties.localUnitId,
@@ -230,24 +247,22 @@ function LocalUnitsMap() {
         pending: superLocalUnitDetailPending,
         error: superLocalUnitDetailError,
     } = useRequest({
-        skip: isNotDefined(clickedPointProperties?.localUnitId)
-            || isNotDefined(meResponse)
-            || !meResponse.is_superuser,
+        skip: requestType !== AUTHENTICATED,
         url: '/api/v2/local-units/{id}/',
         pathVariables: isDefined(clickedPointProperties) ? ({
             id: clickedPointProperties.localUnitId,
         }) : undefined,
     });
 
-    const localUnitDetail = meResponse?.is_superuser
+    const localUnitDetail = requestType !== AUTHENTICATED
         ? superLocalUnitDetailResponse
         : publicLocalUnitDetailResponse;
 
-    const localUnitDetailPending = meResponse?.is_superuser
+    const localUnitDetailPending = requestType !== AUTHENTICATED
         ? superLocalUnitDetailPending
         : publicLocalUnitDetailPending;
 
-    const localUnitDetailError = meResponse?.is_superuser
+    const localUnitDetailError = requestType !== AUTHENTICATED
         ? superLocalUnitDetailError
         : publicLocalUnitDetailError;
 

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

@@ -38,6 +38,7 @@ function LocalUnitsTableActions(props: Props) {
     const alert = useAlert();
 
     const hasValidatePermission = isSuperUser || isCountryAdmin(countryId);
+
     const {
         pending: validateLocalUnitPending,
         trigger: validateLocalUnit,
@@ -82,24 +83,26 @@ function LocalUnitsTableActions(props: Props) {
                     >
                         {strings.localUnitsView}
                     </DropdownMenuItem>
-                    {!(isValidated) && hasValidatePermission && (
-                        <DropdownMenuItem
-                            persist
-                            name={undefined}
-                            type="confirm-button"
-                            variant="tertiary"
-                            className={styles.button}
-                            confirmHeading={strings.validateLocalUnitHeading}
-                            confirmMessage={resolveToString(
-                                strings.validateLocalUnitMessage,
-                                { localUnitName: localUnitName ?? '' },
-                            )}
-                            onConfirm={handleLocalUnitValidate}
-                            disabled={validateLocalUnitPending}
-                        >
-                            {strings.localUnitsValidate}
-                        </DropdownMenuItem>
-                    )}
+                    <DropdownMenuItem
+                        persist
+                        name={undefined}
+                        type="confirm-button"
+                        variant="tertiary"
+                        className={styles.button}
+                        confirmHeading={strings.validateLocalUnitHeading}
+                        confirmMessage={resolveToString(
+                            strings.validateLocalUnitMessage,
+                            { localUnitName: localUnitName ?? '' },
+                        )}
+                        onConfirm={handleLocalUnitValidate}
+                        disabled={
+                            validateLocalUnitPending
+                        || !hasValidatePermission
+                        || isValidated
+                        }
+                    >
+                        {strings.localUnitsValidate}
+                    </DropdownMenuItem>
                 </>
             )}
         />

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

@@ -122,7 +122,7 @@ function LocalUnitsTable() {
                 '',
                 LocalUnitsTableActions,
                 (_, item) => ({
-                    countryId: item.id,
+                    countryId: item.country,
                     localUnitId: item.id,
                     isValidated: item.validated,
                     localUnitName: item.local_branch_name ?? item.english_branch_name,

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/common.ts

@@ -1,4 +1,7 @@
 export type Validation = 'Validated' | 'Not Validated';
+export type RequestType = 'authenticated' | 'public';
 
 export const VALIDATED = 'Validated' satisfies Validation;
 export const NOT_VALIDATED = 'Not Validated' satisfies Validation;
+export const AUTHENTICATED = 'authenticated' satisfies RequestType;
+export const PUBLIC = 'public' satisfies RequestType;