Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the normalization logic in seasonal risk #1592

Merged
merged 3 commits into from
Dec 24, 2024

Conversation

frozenhelium
Copy link
Member

@frozenhelium frozenhelium commented Dec 19, 2024

  • Add option to include Lack of Coping capacity for Risk score
  • Remove option to include Lack of Coping capacity for People exposed and People at Risk of Displacement
  • Use current month as default value in country seasonal risk month selector

Addresses:

Copy link

changeset-bot bot commented Dec 19, 2024

⚠️ No Changeset found

Latest commit: 5f3ac55

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

- Add option to include Lack of Coping capacity for Risk score
- Remove option to include Lack of Coping capacity for People exposed
  and People at Risk of Displacement
- Add a minimum value of 1 for total populatioh/RiskBarChart/CombinedChart/index.tsx
@@ -34,7 +34,7 @@ import {
     getWfRiskDataItem,
     hazardTypeToColorMap,
     monthNumberToNameMap,
-    RiskMetricOption,
+    type RiskMetricOption,
     riskScoreToCategory,
 } from '#utils/domain/risk';
 import { type RiskApiResponse } from '#utils/restRequest';
diff --git c/app/src/views/CountryProfileRiskWatch/RiskBarChart/WildfireChart/index.tsx i/app/src/views/CountryProfileRiskWatch/RiskBarChart/WildfireChart/index.tsx
index 56c85be67..7162ee627 100644
--- c/app/src/views/CountryProfileRiskWatch/RiskBarChart/WildfireChart/index.tsx
+++ i/app/src/views/CountryProfileRiskWatch/RiskBarChart/WildfireChart/index.tsx
@@ -25,7 +25,7 @@ import {
     mapToList,
 } from '@togglecorp/fujs';

-import { paths } from '#generated/riskTypes';
+import { type paths } from '#generated/riskTypes';
 import useTemporalChartData from '#hooks/useTemporalChartData';
 import {
     COLOR_PRIMARY_BLUE,
diff --git c/app/src/views/DrefApplicationExport/index.tsx i/app/src/views/DrefApplicationExport/index.tsx
index fa1a0efb0..964d5c137 100644
--- c/app/src/views/DrefApplicationExport/index.tsx
+++ i/app/src/views/DrefApplicationExport/index.tsx
@@ -29,7 +29,7 @@ import {
     DISASTER_CATEGORY_ORANGE,
     DISASTER_CATEGORY_RED,
     DISASTER_CATEGORY_YELLOW,
-    DisasterCategory,
+    type DisasterCategory,
     DREF_TYPE_ASSESSMENT,
     DREF_TYPE_IMMINENT,
     ONSET_SLOW,
diff --git c/app/src/views/DrefApplicationForm/DrefImportButton/DrefImportModal/index.tsx i/app/src/views/DrefApplicationForm/DrefImportButton/DrefImportModal/index.tsx
index 686014ef0..88e505a49 100644
--- c/app/src/views/DrefApplicationForm/DrefImportButton/DrefImportModal/index.tsx
+++ i/app/src/views/DrefApplicationForm/DrefImportButton/DrefImportModal/index.tsx
@@ -15,8 +15,8 @@ import {
     isObject,
 } from '@togglecorp/fujs';
 import xlsx, {
-    CellValue,
-    Row,
+    type CellValue,
+    type Row,
 } from 'exceljs';

 import useAlert from '#hooks/useAlert';
@@ -30,7 +30,7 @@ import {
 } from '#utils/domain/dref';
 import { getValueFromImportTemplate } from '#utils/importTemplate';
 import useImportTemplateSchema from '#views/AccountMyFormsDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema';
-import { PartialDref } from '#views/DrefApplicationForm/schema';
+import { type PartialDref } from '#views/DrefApplicationForm/schema';

 import i18n from './i18n.json';
 import styles from './styles.module.css';
diff --git c/app/src/views/DrefApplicationForm/DrefImportButton/index.tsx i/app/src/views/DrefApplicationForm/DrefImportButton/index.tsx
index 9cf87c3e4..be0a8a834 100644
--- c/app/src/views/DrefApplicationForm/DrefImportButton/index.tsx
+++ i/app/src/views/DrefApplicationForm/DrefImportButton/index.tsx
@@ -4,7 +4,7 @@ import {
     useTranslation,
 } from '@ifrc-go/ui/hooks';

-import { PartialDref } from '../schema';
+import { type PartialDref } from '../schema';
 import DrefImportModal from './DrefImportModal';

 import i18n from './i18n.json';
diff --git c/app/src/views/DrefApplicationForm/Operation/InterventionInput/IndicatorInput/index.tsx i/app/src/views/DrefApplicationForm/Operation/InterventionInput/IndicatorInput/index.tsx
index b3091f74e..06d40069e 100644
--- c/app/src/views/DrefApplicationForm/Operation/InterventionInput/IndicatorInput/index.tsx
+++ i/app/src/views/DrefApplicationForm/Operation/InterventionInput/IndicatorInput/index.tsx
@@ -14,7 +14,7 @@ import {

 import NonFieldError from '#components/NonFieldError';

-import { PartialDref } from '../../../schema';
+import { type PartialDref } from '../../../schema';

 import i18n from './i18n.json';
 import styles from './styles.module.css';
diff --git c/app/src/views/DrefFinalReportExport/index.tsx i/app/src/views/DrefFinalReportExport/index.tsx
index 6a86cf8da..1a45deaf3 100644
--- c/app/src/views/DrefFinalReportExport/index.tsx
+++ i/app/src/views/DrefFinalReportExport/index.tsx
@@ -32,7 +32,7 @@ import {
     DISASTER_CATEGORY_ORANGE,
     DISASTER_CATEGORY_RED,
     DISASTER_CATEGORY_YELLOW,
-    DisasterCategory,
+    type DisasterCategory,
     DREF_TYPE_ASSESSMENT,
     DREF_TYPE_IMMINENT,
     ONSET_SLOW,
diff --git c/app/src/views/DrefFinalReportForm/Operation/InterventionInput/IndicatorInput/index.tsx i/app/src/views/DrefFinalReportForm/Operation/InterventionInput/IndicatorInput/index.tsx
index b4b27f861..58fb3bf81 100644
--- c/app/src/views/DrefFinalReportForm/Operation/InterventionInput/IndicatorInput/index.tsx
+++ i/app/src/views/DrefFinalReportForm/Operation/InterventionInput/IndicatorInput/index.tsx
@@ -14,7 +14,7 @@ import {

 import NonFieldError from '#components/NonFieldError';

-import { PartialFinalReport } from '../../../schema';
+import { type PartialFinalReport } from '../../../schema';

 import i18n from './i18n.json';
 import styles from './styles.module.css';
diff --git c/app/src/views/DrefOperationalUpdateExport/index.tsx i/app/src/views/DrefOperationalUpdateExport/index.tsx
index e794590b1..4ecbc8e1c 100644
--- c/app/src/views/DrefOperationalUpdateExport/index.tsx
+++ i/app/src/views/DrefOperationalUpdateExport/index.tsx
@@ -35,7 +35,7 @@ import {
     DISASTER_CATEGORY_ORANGE,
     DISASTER_CATEGORY_RED,
     DISASTER_CATEGORY_YELLOW,
-    DisasterCategory,
+    type DisasterCategory,
     DREF_TYPE_ASSESSMENT,
     DREF_TYPE_IMMINENT,
     ONSET_SLOW,
diff --git c/app/src/views/DrefOperationalUpdateForm/Operation/InterventionInput/IndicatorInput/index.tsx i/app/src/views/DrefOperationalUpdateForm/Operation/InterventionInput/IndicatorInput/index.tsx
index d3c611b71..4c5c0c6dc 100644
--- c/app/src/views/DrefOperationalUpdateForm/Operation/InterventionInput/IndicatorInput/index.tsx
+++ i/app/src/views/DrefOperationalUpdateForm/Operation/InterventionInput/IndicatorInput/index.tsx
@@ -14,7 +14,7 @@ import {

 import NonFieldError from '#components/NonFieldError';

-import { PartialOpsUpdate } from '../../../schema';
+import { type PartialOpsUpdate } from '../../../schema';

 import i18n from './i18n.json';
 import styles from './styles.module.css';
diff --git c/app/src/views/Emergencies/FlashUpdatesTable/index.tsx i/app/src/views/Emergencies/FlashUpdatesTable/index.tsx
index 867b0a276..2a6dee958 100644
--- c/app/src/views/Emergencies/FlashUpdatesTable/index.tsx
+++ i/app/src/views/Emergencies/FlashUpdatesTable/index.tsx
@@ -23,7 +23,7 @@ import {
 import type { GoApiResponse } from '#utils/restRequest';
 import { useRequest } from '#utils/restRequest';

-import FlashUpdatesTableAction, { Props as FlashUpdatesTableActions } from './FlashUpdatesTableActions';
+import FlashUpdatesTableAction, { type Props as FlashUpdatesTableActions } from './FlashUpdatesTableActions';

 import i18n from './i18n.json';
 import styles from './styles.module.css';
diff --git c/app/src/views/Emergencies/Map/index.tsx i/app/src/views/Emergencies/Map/index.tsx
index fcef907d7..ebef7e243 100644
--- c/app/src/views/Emergencies/Map/index.tsx
+++ i/app/src/views/Emergencies/Map/index.tsx
@@ -50,7 +50,7 @@ import {
     RESPONSE_LEVEL_MIXED_RESPONSE,
     RESPONSE_LEVEL_WITH_IFRC_RESPONSE,
     RESPONSE_LEVEL_WITHOUT_IFRC_RESPONSE,
-    ScaleOption,
+    type ScaleOption,
 } from './utils';

 import i18n from './i18n.json';
diff --git c/app/src/views/EmergencyActivities/Filters/index.tsx i/app/src/views/EmergencyActivities/Filters/index.tsx
index 7dc126e1b..b7d952391 100644
--- c/app/src/views/EmergencyActivities/Filters/index.tsx
+++ i/app/src/views/EmergencyActivities/Filters/index.tsx
@@ -14,7 +14,7 @@ import {
     isNotDefined,
 } from '@togglecorp/fujs';
 import {
-    EntriesAsList,
+    type EntriesAsList,
     type SetValueArg,
 } from '@togglecorp/toggle-form';

diff --git c/app/src/views/EmergencyDetails/FieldReportStats/index.tsx i/app/src/views/EmergencyDetails/FieldReportStats/index.tsx
index 202a7a38b..e13b6448b 100644
--- c/app/src/views/EmergencyDetails/FieldReportStats/index.tsx
+++ i/app/src/views/EmergencyDetails/FieldReportStats/index.tsx
@@ -10,7 +10,7 @@ import Link from '#components/Link';
 import {
     DISASTER_TYPE_EPIDEMIC,
     FIELD_REPORT_STATUS_EARLY_WARNING,
-    ReportType,
+    type ReportType,
 } from '#utils/constants';
 import { type GoApiResponse } from '#utils/restRequest';

diff --git c/app/src/views/EmergencyReportAndDocument/index.tsx i/app/src/views/EmergencyReportAndDocument/index.tsx
index b33188bf3..744fa2c98 100644
--- c/app/src/views/EmergencyReportAndDocument/index.tsx
+++ i/app/src/views/EmergencyReportAndDocument/index.tsx
@@ -26,7 +26,7 @@ import {
     unique,
 } from '@togglecorp/fujs';

-import Link, { Props as LinkProps } from '#components/Link';
+import Link, { type Props as LinkProps } from '#components/Link';
 import { adminUrl } from '#config';
 import useRegion, { type Region } from '#hooks/domain/useRegion';
 import useFilterState from '#hooks/useFilterState';
diff --git c/app/src/views/FlashUpdateDetails/FlashUpdateShareModal/index.tsx i/app/src/views/FlashUpdateDetails/FlashUpdateShareModal/index.tsx
index ef002e8df..0a3cf64ee 100644
--- c/app/src/views/FlashUpdateDetails/FlashUpdateShareModal/index.tsx
+++ i/app/src/views/FlashUpdateDetails/FlashUpdateShareModal/index.tsx
@@ -15,7 +15,7 @@ import { isDefined } from '@togglecorp/fujs';
 import useAlert from '#hooks/useAlert';
 import useInputState from '#hooks/useInputState';
 import {
-    GoApiBody,
+    type GoApiBody,
     useLazyRequest,
     useRequest,
 } from '#utils/restRequest';
diff --git c/app/src/views/FlashUpdateForm/ActionsTab/ActionInput/index.tsx i/app/src/views/FlashUpdateForm/ActionsTab/ActionInput/index.tsx
index 6ff572b5c..f9d90fd7d 100644
--- c/app/src/views/FlashUpdateForm/ActionsTab/ActionInput/index.tsx
+++ i/app/src/views/FlashUpdateForm/ActionsTab/ActionInput/index.tsx
@@ -4,10 +4,10 @@ import {
 } from '@ifrc-go/ui';
 import { randomString } from '@togglecorp/fujs';
 import {
-    ArrayError,
+    type ArrayError,
     getErrorObject,
     getErrorString,
-    SetValueArg,
+    type SetValueArg,
     useFormObject,
 } from '@togglecorp/toggle-form';

diff --git c/app/src/views/FlashUpdateForm/ContextTab/CountryProvinceInput/index.tsx i/app/src/views/FlashUpdateForm/ContextTab/CountryProvinceInput/index.tsx
index 08bd6d5c5..70652a1f6 100644
--- c/app/src/views/FlashUpdateForm/ContextTab/CountryProvinceInput/index.tsx
+++ i/app/src/views/FlashUpdateForm/ContextTab/CountryProvinceInput/index.tsx
@@ -17,7 +17,7 @@ import CountrySelectInput from '#components/domain/CountrySelectInput';
 import DistrictSearchMultiSelectInput, { type DistrictItem } from '#components/domain/DistrictSearchMultiSelectInput';
 import NonFieldError from '#components/NonFieldError';

-import { PartialCountryDistrict } from '../../schema';
+import { type PartialCountryDistrict } from '../../schema';

 import i18n from './i18n.json';
 import styles from './styles.module.css';
diff --git c/app/src/views/FlashUpdateForm/ContextTab/ReferenceInput/index.tsx i/app/src/views/FlashUpdateForm/ContextTab/ReferenceInput/index.tsx
index ede19f26c..4ac152858 100644
--- c/app/src/views/FlashUpdateForm/ContextTab/ReferenceInput/index.tsx
+++ i/app/src/views/FlashUpdateForm/ContextTab/ReferenceInput/index.tsx
@@ -17,7 +17,7 @@ import {
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
 import NonFieldError from '#components/NonFieldError';

-import { PartialReferenceType } from '../../schema';
+import { type PartialReferenceType } from '../../schema';

 import i18n from './i18n.json';
 import styles from './styles.module.css';
diff --git c/app/src/views/FlashUpdateForm/FocalPointsTab/index.tsx i/app/src/views/FlashUpdateForm/FocalPointsTab/index.tsx
index e134d8fd5..6a1696c5e 100644
--- c/app/src/views/FlashUpdateForm/FocalPointsTab/index.tsx
+++ i/app/src/views/FlashUpdateForm/FocalPointsTab/index.tsx
@@ -5,12 +5,12 @@ import {
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
-    EntriesAsList,
-    Error,
+    type EntriesAsList,
+    type Error,
     getErrorObject,
 } from '@togglecorp/toggle-form';

-import { FormType } from '../schema';
+import { type FormType } from '../schema';

 import i18n from './i18n.json';

diff --git c/app/src/views/FlashUpdateForm/schema.ts i/app/src/views/FlashUpdateForm/schema.ts
index 0b38daa26..4bf7e7751 100644
--- c/app/src/views/FlashUpdateForm/schema.ts
+++ i/app/src/views/FlashUpdateForm/schema.ts
@@ -4,7 +4,7 @@ import { isDefined } from '@togglecorp/fujs';
 import {
     type ArraySchema,
     emailCondition,
-    ObjectSchema,
+    type ObjectSchema,
     type PartialForm,
     type PurgeNull,
     requiredStringCondition,
diff --git c/app/src/views/OperationalLearning/Filters/index.tsx i/app/src/views/OperationalLearning/Filters/index.tsx
index 0bcc4d674..6dbc3ab98 100644
--- c/app/src/views/OperationalLearning/Filters/index.tsx
+++ i/app/src/views/OperationalLearning/Filters/index.tsx
@@ -13,12 +13,12 @@ import {
     stringTitleSelector,
     stringValueSelector,
 } from '@ifrc-go/ui/utils';
-import { EntriesAsList } from '@togglecorp/toggle-form';
+import { type EntriesAsList } from '@togglecorp/toggle-form';

 import CountryMultiSelectInput, { type CountryOption } from '#components/domain/CountryMultiSelectInput';
 import RegionSelectInput, { type RegionOption } from '#components/domain/RegionSelectInput';
 import { type components } from '#generated/types';
-import { DisasterType } from '#hooks/domain/useDisasterType';
+import { type DisasterType } from '#hooks/domain/useDisasterType';
 import { type PerComponent } from '#hooks/domain/usePerComponent';
 import { type SecondarySector } from '#hooks/domain/useSecondarySector';
 import { getFormattedComponentName } from '#utils/domain/per';
diff --git c/app/src/views/OperationalLearning/index.tsx i/app/src/views/OperationalLearning/index.tsx
index 664fd2346..85b605192 100644
--- c/app/src/views/OperationalLearning/index.tsx
+++ i/app/src/views/OperationalLearning/index.tsx
@@ -35,7 +35,7 @@ import {
     isTruthyString,
     sum,
 } from '@togglecorp/fujs';
-import { EntriesAsList } from '@togglecorp/toggle-form';
+import { type EntriesAsList } from '@togglecorp/toggle-form';
 import { saveAs } from 'file-saver';
 import Papa from 'papaparse';

@@ -45,7 +45,7 @@ import Link from '#components/Link';
 import Page from '#components/Page';
 import { type components } from '#generated/types';
 import useCountry from '#hooks/domain/useCountry';
-import useDisasterTypes, { DisasterType } from '#hooks/domain/useDisasterType';
+import useDisasterTypes, { type DisasterType } from '#hooks/domain/useDisasterType';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import usePerComponent from '#hooks/domain/usePerComponent';
 import useSecondarySector from '#hooks/domain/useSecondarySector';
@@ -55,7 +55,7 @@ import useRecursiveCsvExport from '#hooks/useRecursiveCsvRequest';
 import { getFormattedComponentName } from '#utils/domain/per';
 import {
     type GoApiResponse,
-    GoApiUrlQuery,
+    type GoApiUrlQuery,
     useRequest,
 } from '#utils/restRequest';

diff --git c/app/src/views/PerAssessmentForm/AreaInput/ComponentInput/QuestionInput/index.tsx i/app/src/views/PerAssessmentForm/AreaInput/ComponentInput/QuestionInput/index.tsx
index 9e0de65a9..1093a37bd 100644
--- c/app/src/views/PerAssessmentForm/AreaInput/ComponentInput/QuestionInput/index.tsx
+++ i/app/src/views/PerAssessmentForm/AreaInput/ComponentInput/QuestionInput/index.tsx
@@ -7,9 +7,9 @@ import {
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { isDefined } from '@togglecorp/fujs';
 import {
-    Error,
+    type Error,
     getErrorObject,
-    SetValueArg,
+    type SetValueArg,
     useFormObject,
 } from '@togglecorp/toggle-form';

diff --git c/app/src/views/PerAssessmentForm/AreaInput/ComponentInput/index.tsx i/app/src/views/PerAssessmentForm/AreaInput/ComponentInput/index.tsx
index 314db0693..381ded7c4 100644
--- c/app/src/views/PerAssessmentForm/AreaInput/ComponentInput/index.tsx
+++ i/app/src/views/PerAssessmentForm/AreaInput/ComponentInput/index.tsx
@@ -22,9 +22,9 @@ import {
     mapToList,
 } from '@togglecorp/fujs';
 import {
-    Error,
+    type Error,
     getErrorObject,
-    SetValueArg,
+    type SetValueArg,
     useFormArray,
     useFormObject,
 } from '@togglecorp/toggle-form';
@@ -32,7 +32,7 @@ import {
 import NonFieldError from '#components/NonFieldError';
 import {
     type GoApiResponse,
-    ListResponseItem,
+    type ListResponseItem,
 } from '#utils/restRequest';

 import { type PartialAssessment } from '../../schema';
diff --git c/app/src/views/PerAssessmentForm/AreaInput/index.tsx i/app/src/views/PerAssessmentForm/AreaInput/index.tsx
index 9ae5da766..679af3d83 100644
--- c/app/src/views/PerAssessmentForm/AreaInput/index.tsx
+++ i/app/src/views/PerAssessmentForm/AreaInput/index.tsx
@@ -5,7 +5,7 @@ import {
     listToMap,
 } from '@togglecorp/fujs';
 import {
-    Error,
+    type Error,
     getErrorObject,
     type SetValueArg,
     useFormArray,
@@ -15,7 +15,7 @@ import {
 import NonFieldError from '#components/NonFieldError';
 import {
     type GoApiResponse,
-    ListResponseItem,
+    type ListResponseItem,
 } from '#utils/restRequest';

 import { type PartialAssessment } from '../schema';
diff --git c/app/src/views/PerAssessmentForm/index.tsx i/app/src/views/PerAssessmentForm/index.tsx
index fbb49a6d1..79694dea5 100644
--- c/app/src/views/PerAssessmentForm/index.tsx
+++ i/app/src/views/PerAssessmentForm/index.tsx
@@ -59,7 +59,7 @@ import {
 import AreaInput from './AreaInput';
 import {
     assessmentSchema,
-    PartialAssessment,
+    type PartialAssessment,
 } from './schema';

 import i18n from './i18n.json';
diff --git c/app/src/views/PerAssessmentForm/schema.ts i/app/src/views/PerAssessmentForm/schema.ts
index 64ec0ec4c..e6d426291 100644
--- c/app/src/views/PerAssessmentForm/schema.ts
+++ i/app/src/views/PerAssessmentForm/schema.ts
@@ -1,8 +1,8 @@
 import { type DeepReplace } from '@ifrc-go/ui/utils';
 import {
-    ObjectSchema,
-    PartialForm,
-    PurgeNull,
+    type ObjectSchema,
+    type PartialForm,
+    type PurgeNull,
 } from '@togglecorp/toggle-form';

 import { type GoApiResponse } from '#utils/restRequest';
diff --git c/app/src/views/PerOverviewForm/index.tsx i/app/src/views/PerOverviewForm/index.tsx
index d07034055..07d5bd268 100644
--- c/app/src/views/PerOverviewForm/index.tsx
+++ i/app/src/views/PerOverviewForm/index.tsx
@@ -61,8 +61,8 @@ import { transformObjectError } from '#utils/restRequest/error';

 import {
     overviewSchema,
-    PartialOverviewFormFields,
-    PerOverviewRequestBody,
+    type PartialOverviewFormFields,
+    type PerOverviewRequestBody,
 } from './schema';

 import i18n from './i18n.json';
diff --git c/app/src/views/PerOverviewForm/schema.ts i/app/src/views/PerOverviewForm/schema.ts
index 8820e70f0..988f02ceb 100644
--- c/app/src/views/PerOverviewForm/schema.ts
+++ i/app/src/views/PerOverviewForm/schema.ts
@@ -6,8 +6,8 @@ import {
 import {
     addCondition,
     emailCondition,
-    ObjectSchema,
-    PartialForm,
+    type ObjectSchema,
+    type PartialForm,
     undefinedValue,
 } from '@togglecorp/toggle-form';

diff --git c/app/src/views/PerPrioritizationForm/ComponentInput/index.tsx i/app/src/views/PerPrioritizationForm/ComponentInput/index.tsx
index c029cc98b..ed3c5b445 100644
--- c/app/src/views/PerPrioritizationForm/ComponentInput/index.tsx
+++ i/app/src/views/PerPrioritizationForm/ComponentInput/index.tsx
@@ -20,9 +20,9 @@ import {
     mapToList,
 } from '@togglecorp/fujs';
 import {
-    Error,
+    type Error,
     getErrorObject,
-    SetValueArg,
+    type SetValueArg,
     useFormObject,
 } from '@togglecorp/toggle-form';

diff --git c/app/src/views/PerPrioritizationForm/schema.ts i/app/src/views/PerPrioritizationForm/schema.ts
index 603018dc3..9533dd604 100644
--- c/app/src/views/PerPrioritizationForm/schema.ts
+++ i/app/src/views/PerPrioritizationForm/schema.ts
@@ -1,6 +1,6 @@
 import {
-    ObjectSchema,
-    PartialForm,
+    type ObjectSchema,
+    type PartialForm,
 } from '@togglecorp/toggle-form';

 import { type GoApiBody } from '#utils/restRequest';
diff --git c/app/src/views/PerWorkPlanForm/AdditionalActionInput/index.tsx i/app/src/views/PerWorkPlanForm/AdditionalActionInput/index.tsx
index 27f9306d2..e825e4611 100644
--- c/app/src/views/PerWorkPlanForm/AdditionalActionInput/index.tsx
+++ i/app/src/views/PerWorkPlanForm/AdditionalActionInput/index.tsx
@@ -17,9 +17,9 @@ import {
 } from '@ifrc-go/ui/utils';
 import { randomString } from '@togglecorp/fujs';
 import {
-    Error,
+    type Error,
     getErrorObject,
-    SetValueArg,
+    type SetValueArg,
     useFormObject,
 } from '@togglecorp/toggle-form';

@@ -29,7 +29,7 @@ import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import { NATIONAL_SOCIETY } from '#utils/constants';
 import { type GoApiResponse } from '#utils/restRequest';

-import { PartialWorkPlan } from '../schema';
+import { type PartialWorkPlan } from '../schema';

 import i18n from './i18n.json';
 import styles from './styles.module.css';
diff --git c/app/src/views/PerWorkPlanForm/index.tsx i/app/src/views/PerWorkPlanForm/index.tsx
index 5e648e6c7..013da7879 100644
--- c/app/src/views/PerWorkPlanForm/index.tsx
+++ i/app/src/views/PerWorkPlanForm/index.tsx
@@ -48,8 +48,8 @@ import {
 import AdditionalActionInput from './AdditionalActionInput';
 import PrioritizedActionInput from './PrioritizedActionInput';
 import {
-    PartialWorkPlan,
-    WorkPlanBody,
+    type PartialWorkPlan,
+    type WorkPlanBody,
     workplanSchema,
 } from './schema';

diff --git c/app/src/views/PerWorkPlanForm/schema.ts i/app/src/views/PerWorkPlanForm/schema.ts
index c2ff316f8..4b519be30 100644
--- c/app/src/views/PerWorkPlanForm/schema.ts
+++ i/app/src/views/PerWorkPlanForm/schema.ts
@@ -1,8 +1,8 @@
 import {
     addCondition,
     nullValue,
-    ObjectSchema,
-    PartialForm,
+    type ObjectSchema,
+    type PartialForm,
     requiredStringCondition,
 } from '@togglecorp/toggle-form';

diff --git c/app/src/views/RecoverAccountConfirm/index.tsx i/app/src/views/RecoverAccountConfirm/index.tsx
index d6f81c20b..f11867fce 100644
--- c/app/src/views/RecoverAccountConfirm/index.tsx
+++ i/app/src/views/RecoverAccountConfirm/index.tsx
@@ -21,7 +21,7 @@ import Page from '#components/Page';
 import useAlert from '#hooks/useAlert';
 import useRouting from '#hooks/useRouting';
 import {
-    GoApiBody,
+    type GoApiBody,
     useLazyRequest,
 } from '#utils/restRequest';
 import { transformObjectError } from '#utils/restRequest/error';
diff --git c/app/src/views/RegionAdditionalInfo/index.tsx i/app/src/views/RegionAdditionalInfo/index.tsx
index 7cc638984..f47aa6ae8 100644
--- c/app/src/views/RegionAdditionalInfo/index.tsx
+++ i/app/src/views/RegionAdditionalInfo/index.tsx
@@ -3,7 +3,7 @@ import { useOutletContext } from 'react-router-dom';
 import {
     Container,
     HtmlOutput,
-    HtmlOutputProps,
+    type HtmlOutputProps,
     KeyFigure,
     List,
     Message,
diff --git c/app/src/views/RegionRiskWatch/index.tsx i/app/src/views/RegionRiskWatch/index.tsx
index dc5da9340..65c08469a 100644
--- c/app/src/views/RegionRiskWatch/index.tsx
+++ i/app/src/views/RegionRiskWatch/index.tsx
@@ -9,7 +9,7 @@ import { isFalsyString } from '@togglecorp/fujs';

 import NavigationTab from '#components/NavigationTab';
 import WikiLink from '#components/WikiLink';
-import { RegionOutletContext } from '#utils/outletContext';
+import { type RegionOutletContext } from '#utils/outletContext';

 import i18n from './i18n.json';
 import styles from './styles.module.css';
diff --git c/app/src/views/RegionRiskWatchImminent/index.tsx i/app/src/views/RegionRiskWatchImminent/index.tsx
index e7be1697d..8d3c1baef 100644
--- c/app/src/views/RegionRiskWatchImminent/index.tsx
+++ i/app/src/views/RegionRiskWatchImminent/index.tsx
@@ -3,7 +3,7 @@ import { useOutletContext } from 'react-router-dom';
 import getBbox from '@turf/bbox';

 import RiskImminentEvents from '#components/domain/RiskImminentEvents';
-import { RegionOutletContext } from '#utils/outletContext';
+import { type RegionOutletContext } from '#utils/outletContext';

 import styles from './styles.module.css';

diff --git c/app/src/views/RegionThreeW/Filters/index.tsx i/app/src/views/RegionThreeW/Filters/index.tsx
index fdd2eb5d1..6dade1d15 100644
--- c/app/src/views/RegionThreeW/Filters/index.tsx
+++ i/app/src/views/RegionThreeW/Filters/index.tsx
@@ -5,7 +5,7 @@ import {
     stringLabelSelector,
     stringValueSelector,
 } from '@ifrc-go/ui/utils';
-import { EntriesAsList } from '@togglecorp/toggle-form';
+import { type EntriesAsList } from '@togglecorp/toggle-form';

 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import {
diff --git c/app/src/views/RegionThreeW/MovementActivitiesMap/index.tsx i/app/src/views/RegionThreeW/MovementActivitiesMap/index.tsx
index e4181cca6..0d318e1e7 100644
--- c/app/src/views/RegionThreeW/MovementActivitiesMap/index.tsx
+++ i/app/src/views/RegionThreeW/MovementActivitiesMap/index.tsx
@@ -7,7 +7,7 @@ import { useOutletContext } from 'react-router-dom';
 import {
     RawList,
     TextOutput,
-    TextOutputProps,
+    type TextOutputProps,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { numericIdSelector } from '@ifrc-go/ui/utils';
@@ -27,7 +27,7 @@ import BaseMap from '#components/domain/BaseMap';
 import Link from '#components/Link';
 import MapContainerWithDisclaimer from '#components/MapContainerWithDisclaimer';
 import MapPopup from '#components/MapPopup';
-import useCountryRaw, { Country } from '#hooks/domain/useCountryRaw';
+import useCountryRaw, { type Country } from '#hooks/domain/useCountryRaw';
 import {
     COLOR_RED,
     DEFAULT_MAP_PADDING,
diff --git c/app/src/views/RegionThreeW/index.tsx i/app/src/views/RegionThreeW/index.tsx
index aae821fe8..39b166ace 100644
--- c/app/src/views/RegionThreeW/index.tsx
+++ i/app/src/views/RegionThreeW/index.tsx
@@ -7,7 +7,7 @@ import {
     BlockLoading,
     Container,
     ExpandableContainer,
-    ExpandableContainerProps,
+    type ExpandableContainerProps,
     KeyFigure,
     List,
     PieChart,
diff --git c/app/src/views/Register/index.tsx i/app/src/views/Register/index.tsx
index 425336576..cf0b67153 100644
--- c/app/src/views/Register/index.tsx
+++ i/app/src/views/Register/index.tsx
@@ -33,7 +33,7 @@ import NonFieldError from '#components/NonFieldError';
 import Page from '#components/Page';
 import WikiLink from '#components/WikiLink';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
-import useNationalSociety, { NationalSociety } from '#hooks/domain/useNationalSociety';
+import useNationalSociety, { type NationalSociety } from '#hooks/domain/useNationalSociety';
 import useAlert from '#hooks/useAlert';
 import useRouting from '#hooks/useRouting';
 import {
diff --git c/app/src/views/SurgeCatalogueBasecamp/index.tsx i/app/src/views/SurgeCatalogueBasecamp/index.tsx
index ca733ff1d..85f7c4315 100644
--- c/app/src/views/SurgeCatalogueBasecamp/index.tsx
+++ i/app/src/views/SurgeCatalogueBasecamp/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueCash/index.tsx i/app/src/views/SurgeCatalogueCash/index.tsx
index a1e438e75..6a707292d 100644
--- c/app/src/views/SurgeCatalogueCash/index.tsx
+++ i/app/src/views/SurgeCatalogueCash/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueCommunication/index.tsx i/app/src/views/SurgeCatalogueCommunication/index.tsx
index 05478f5a0..94e04c76f 100644
--- c/app/src/views/SurgeCatalogueCommunication/index.tsx
+++ i/app/src/views/SurgeCatalogueCommunication/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueCommunityEngagement/index.tsx i/app/src/views/SurgeCatalogueCommunityEngagement/index.tsx
index 49835800a..418096c47 100644
--- c/app/src/views/SurgeCatalogueCommunityEngagement/index.tsx
+++ i/app/src/views/SurgeCatalogueCommunityEngagement/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueEmergencyNeedsAssessment/index.tsx i/app/src/views/SurgeCatalogueEmergencyNeedsAssessment/index.tsx
index f0f762fe8..66a87fa7b 100644
--- c/app/src/views/SurgeCatalogueEmergencyNeedsAssessment/index.tsx
+++ i/app/src/views/SurgeCatalogueEmergencyNeedsAssessment/index.tsx
@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueHealth/index.tsx i/app/src/views/SurgeCatalogueHealth/index.tsx
index 11008de40..e93954191 100644
--- c/app/src/views/SurgeCatalogueHealth/index.tsx
+++ i/app/src/views/SurgeCatalogueHealth/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueInformationManagement/index.tsx i/app/src/views/SurgeCatalogueInformationManagement/index.tsx
index 58887231a..b5e49cb8b 100644
--- c/app/src/views/SurgeCatalogueInformationManagement/index.tsx
+++ i/app/src/views/SurgeCatalogueInformationManagement/index.tsx
@@ -2,7 +2,7 @@ import { Image } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';

 import pyramidImage from '#assets/images/surge-im-pyramid.png';
-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueInformationTechnology/index.tsx i/app/src/views/SurgeCatalogueInformationTechnology/index.tsx
index 17828a55e..7e4c947f0 100644
--- c/app/src/views/SurgeCatalogueInformationTechnology/index.tsx
+++ i/app/src/views/SurgeCatalogueInformationTechnology/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueLivelihood/index.tsx i/app/src/views/SurgeCatalogueLivelihood/index.tsx
index 785f2ae95..48a69984f 100644
--- c/app/src/views/SurgeCatalogueLivelihood/index.tsx
+++ i/app/src/views/SurgeCatalogueLivelihood/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueLogistics/index.tsx i/app/src/views/SurgeCatalogueLogistics/index.tsx
index f4f5c8f83..984803b3c 100644
--- c/app/src/views/SurgeCatalogueLogistics/index.tsx
+++ i/app/src/views/SurgeCatalogueLogistics/index.tsx
@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueOperationsManagement/index.tsx i/app/src/views/SurgeCatalogueOperationsManagement/index.tsx
index e36bf9606..352175ece 100644
--- c/app/src/views/SurgeCatalogueOperationsManagement/index.tsx
+++ i/app/src/views/SurgeCatalogueOperationsManagement/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueOtherStrategicPartnershipsResourceMobilisation/index.tsx i/app/src/views/SurgeCatalogueOtherStrategicPartnershipsResourceMobilisation/index.tsx
index f4650e4d8..875f7bc88 100644
--- c/app/src/views/SurgeCatalogueOtherStrategicPartnershipsResourceMobilisation/index.tsx
+++ i/app/src/views/SurgeCatalogueOtherStrategicPartnershipsResourceMobilisation/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';
 import SurgeContentContainer from '#components/domain/SurgeContentContainer';
diff --git c/app/src/views/SurgeCataloguePgi/index.tsx i/app/src/views/SurgeCataloguePgi/index.tsx
index 4f543b682..ecb9f3769 100644
--- c/app/src/views/SurgeCataloguePgi/index.tsx
+++ i/app/src/views/SurgeCataloguePgi/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueShelter/index.tsx i/app/src/views/SurgeCatalogueShelter/index.tsx
index 8eb6fdccc..06058a2bb 100644
--- c/app/src/views/SurgeCatalogueShelter/index.tsx
+++ i/app/src/views/SurgeCatalogueShelter/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeCatalogueWash/index.tsx i/app/src/views/SurgeCatalogueWash/index.tsx
index 2248f1b70..b02c3111c 100644
--- c/app/src/views/SurgeCatalogueWash/index.tsx
+++ i/app/src/views/SurgeCatalogueWash/index.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from '@ifrc-go/ui/hooks';

-import CatalogueInfoCard, { LinkData } from '#components/CatalogueInfoCard';
+import CatalogueInfoCard, { type LinkData } from '#components/CatalogueInfoCard';
 import SurgeCardContainer from '#components/domain/SurgeCardContainer';
 import SurgeCatalogueContainer from '#components/domain/SurgeCatalogueContainer';

diff --git c/app/src/views/SurgeOperationalToolbox/index.tsx i/app/src/views/SurgeOperationalToolbox/index.tsx
index b2c0e9084..1b88407d8 100644
--- c/app/src/views/SurgeOperationalToolbox/index.tsx
+++ i/app/src/views/SurgeOperationalToolbox/index.tsx
@@ -1,4 +1,4 @@
-import { MouseEventHandler } from 'react';
+import { type MouseEventHandler } from 'react';
 import {
     Container,
     ExpandableContainer,
diff --git c/app/src/views/SurgeOverview/SurgeMap/index.tsx i/app/src/views/SurgeOverview/SurgeMap/index.tsx
index e44e4fc17..37c321dc8 100644
--- c/app/src/views/SurgeOverview/SurgeMap/index.tsx
+++ i/app/src/views/SurgeOverview/SurgeMap/index.tsx
@@ -40,7 +40,7 @@ import {
     optionLabelSelector,
     outerCircleLayerOptionsForEru,
     outerCircleLayerOptionsForPersonnel,
-    ScaleOption,
+    type ScaleOption,
 } from './utils';

 import i18n from './i18n.json';
diff --git c/app/src/views/ThreeWProjectForm/schema.ts i/app/src/views/ThreeWProjectForm/schema.ts
index 6bbd51b5d..b4eaa89bc 100644
--- c/app/src/views/ThreeWProjectForm/schema.ts
+++ i/app/src/views/ThreeWProjectForm/schema.ts
@@ -1,11 +1,11 @@
 import { type DeepReplace } from '@ifrc-go/ui/utils';
 import {
     addCondition,
-    ArraySchema,
+    type ArraySchema,
     emailCondition,
     nullValue,
-    ObjectSchema,
-    PartialForm,
+    type ObjectSchema,
+    type PartialForm,
     requiredStringCondition,
     undefinedValue,
 } from '@togglecorp/toggle-form';
@tnagorra tnagorra merged commit 9e8b87e into develop Dec 24, 2024
10 checks passed
tnagorra added a commit that referenced this pull request Dec 24, 2024
Fix the normalization logic in seasonal risk
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants