Disable link for regions in rapid response personnel table

IFRCGo · Jan 16, 2024 · 1666240 · 1666240
1 parent 3e8ad2d
commit 1666240
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/src/views/AllDeployedPersonnel/index.tsx b/src/views/AllDeployedPersonnel/index.tsx
@@ -30,6 +30,7 @@ import Table from '#components/Table';
 import DateInput from '#components/DateInput';
 import useFilterState from '#hooks/useFilterState';
 
+import { isDefined } from '@togglecorp/fujs';
 import i18n from './i18n.json';
 
 type PersonnelTableItem = NonNullable<GoApiResponse<'/api/v2/personnel/'>['results']>[number];
@@ -131,10 +132,17 @@ export function Component() {
                     item.country_from?.society_name
                     || item.country_from?.name
                 ),
-                (item) => ({
-                    to: 'countriesLayout',
-                    urlParams: { countryId: item.country_from?.id },
-                }),
+                (item) => {
+                    if (isDefined(item.country_from?.record_type === 3)) {
+                        return {
+                            to: undefined,
+                        };
+                    }
+                    return {
+                        to: 'countriesLayout',
+                        urlParams: { countryId: item.country_from?.id },
+                    };
+                },
                 { sortable: true },
             ),
             createLinkColumn<PersonnelTableItem, number>(

diff --git a/...rge/RapidResponsePerosnnelTable/i18n.json → ...rge/RapidResponsePersonnelTable/i18n.json b/...rge/RapidResponsePerosnnelTable/i18n.json → ...rge/RapidResponsePersonnelTable/i18n.json
diff --git a/...rge/RapidResponsePerosnnelTable/index.tsx → ...rge/RapidResponsePersonnelTable/index.tsx b/...rge/RapidResponsePerosnnelTable/index.tsx → ...rge/RapidResponsePersonnelTable/index.tsx
@@ -141,13 +141,15 @@ export default function RapidResponsePersonnelTable(props: Props) {
                 strings.personnelTableDeployedParty,
                 (item) => item.country_from?.society_name,
                 (item) => {
-                    if (item.country_from?.id) {
+                    if (isDefined(item.country_from?.record_type === 3)) {
                         return {
-                            to: 'countriesLayout',
-                            urlParams: { countryId: item.country_from?.id },
+                            to: undefined,
                         };
                     }
-                    return strings.emergencySurgePartyNotFound;
+                    return {
+                        to: 'countriesLayout',
+                        urlParams: { countryId: item.country_from?.id },
+                    };
                 },
                 { sortable: true },
             ),
@@ -183,7 +185,6 @@ export default function RapidResponsePersonnelTable(props: Props) {
             strings.personnelTableDeployedParty,
             strings.personnelTableDeployedTo,
             strings.personnelTableName,
-            strings.emergencySurgePartyNotFound,
             getTypeName,
             dateRange,
         ],

diff --git a/...dResponsePerosnnelTable/styles.module.css → ...dResponsePersonnelTable/styles.module.css b/...dResponsePerosnnelTable/styles.module.css → ...dResponsePersonnelTable/styles.module.css
diff --git a/src/views/EmergencySurge/index.tsx b/src/views/EmergencySurge/index.tsx
@@ -9,7 +9,7 @@ import {
 import KeyFigure from '#components/KeyFigure';
 import useTranslation from '#hooks/useTranslation';
 import SurgeTable from './SurgeTable';
-import RapidResponsePersonnelTable from './RapidResponsePerosnnelTable';
+import RapidResponsePersonnelTable from './RapidResponsePersonnelTable';
 import DeployedErusTable from './DeployedErusTable';
 
 import i18n from './i18n.json';