Reuse country to region mapping in surge personnel table

Author: frozenhelium

src/views/AllDeployedPersonnel/index.tsx

@@ -28,10 +28,10 @@ import {
     useRequest,
 } from '#utils/restRequest';
 import { resolveToComponent } from '#utils/translation';
+import { COUNTRY_RECORD_TYPE_REGION } from '#utils/constants';
+import { countryIdToRegionIdMap } from '#utils/domain/country';
 
 import i18n from './i18n.json';
-import { COUNTRY_RECORD_TYPE_COUNTRY, COUNTRY_RECORD_TYPE_REGION } from '#utils/constants';
-import { countryIdToRegionIdMap } from '#utils/domain/country';
 
 type PersonnelTableItem = NonNullable<GoApiResponse<'/api/v2/personnel/'>['results']>[number];
 function keySelector(personnel: PersonnelTableItem) {

src/views/DrefApplicationForm/schema.ts

@@ -316,13 +316,13 @@ const schema: DrefFormSchema = {
                         lessons_learned: {},
                         event_scope: {},
                         people_in_need: { validations: [positiveIntegerCondition] },
-                        event_text: { validations: [max500CharCondition] },
                     };
                 }
 
                 if (val?.type_of_dref === TYPE_IMMINENT) {
                     conditionalFields = {
                         ...conditionalFields,
+                        event_text: { validations: [max500CharCondition] },
                         anticipatory_actions: {},
                         supporting_document: {},
                     };

src/views/EmergencySurge/RapidResponsePersonnelTable/index.tsx

@@ -28,6 +28,8 @@ import {
     maxSafe,
     minSafe,
 } from '#utils/common';
+import { COUNTRY_RECORD_TYPE_REGION } from '#utils/constants';
+import { countryIdToRegionIdMap } from '#utils/domain/country';
 
 import i18n from './i18n.json';
 import styles from './styles.module.css';
@@ -142,14 +144,26 @@ export default function RapidResponsePersonnelTable(props: Props) {
                 strings.personnelTableDeployedParty,
                 (item) => item.country_from?.society_name,
                 (item) => {
-                    if (isDefined(item.country_from?.record_type === 3)) {
+                    if (isNotDefined(item.country_from)) {
+                        return { to: undefined };
+                    }
+
+                    const countryId = item.country_from.id;
+
+                    if (item.country_from.record_type === COUNTRY_RECORD_TYPE_REGION) {
+                        const regionId = isDefined(countryId)
+                            ? countryIdToRegionIdMap[countryId]
+                            : undefined;
+
                         return {
-                            to: undefined,
+                            to: 'regionsLayout',
+                            urlParams: { regionId },
                         };
                     }
+
                     return {
                         to: 'countriesLayout',
-                        urlParams: { countryId: item.country_from?.id },
+                        urlParams: { countryId },
                     };
                 },
                 { sortable: true },