feat: add organization type and learning type filter in operational learning

samshara · frozenhelium · commit ab085edb8dff · 2024-12-23T15:21:57.000+05:45
diff --git a/.changeset/slimy-eggs-peel.md b/.changeset/slimy-eggs-peel.md
@@ -0,0 +1,5 @@
+---
+"go-web-app": patch
+---
+
+Add Organization type and Learning type filter in Operational learning
diff --git a/app/src/views/OperationalLearning/Filters/i18n.json b/app/src/views/OperationalLearning/Filters/i18n.json
@@ -14,6 +14,10 @@
         "filterOpsLearningSearchLabel": "Search",
         "filterOpsLearningSearchPlaceholder": "Search",
         "appealStartDate": "Appeal Start Date",
-        "appealEndDate": "Appeal End Date"
+        "appealEndDate": "Appeal End Date",
+        "organizationTypesLabel": "Organization Type",
+        "organizationTypesLabelPlaceholder": "All Organization Types",
+        "perLearningTypesLabel": "Learning Type",
+        "perLearningTypesLabelPlaceholder": "All Learning Type"
     }
 }
diff --git a/app/src/views/OperationalLearning/Filters/index.tsx b/app/src/views/OperationalLearning/Filters/index.tsx
@@ -6,29 +6,41 @@ import {
     TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
+import {
+    numericIdSelector,
+    numericKeySelector,
+    stringLabelSelector,
+    stringTitleSelector,
+    stringValueSelector,
+} from '@ifrc-go/ui/utils';
 import { 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 PerComponent } from '#hooks/domain/usePerComponent';
 import { type SecondarySector } from '#hooks/domain/useSecondarySector';
 import { getFormattedComponentName } from '#utils/domain/per';
+import { type GoApiResponse } from '#utils/restRequest';
 
 import i18n from './i18n.json';
 
-const sectorKeySelector = (d: SecondarySector) => d.key;
-const sectorLabelSelector = (d: SecondarySector) => d.label;
-const perComponentKeySelector = (option: PerComponent) => option.id;
-const disasterTypeKeySelector = (type: DisasterType) => type.id;
-const disasterTypeLabelSelector = (type: DisasterType) => type.name ?? '?';
+type OpsLearningOrganizationType = NonNullable<GoApiResponse<'/api/v2/ops-learning/organization-type/'>['results']>[number];
+export type PerLearningType = components<'read'>['schemas']['PerLearningTypeEnum'];
+
+const disasterTypeLabelSelector = (disasterType: DisasterType) => disasterType.name ?? '?';
+
+const perLearningTypeKeySelector = (perLearningType: PerLearningType) => perLearningType.key;
 
 export type FilterValue = Partial<{
     region: RegionOption['key'],
     countries: CountryOption['id'][],
     disasterTypes: DisasterType['id'][],
     secondarySectors: SecondarySector['key'][],
     perComponents: PerComponent['id'][],
+    organizationTypes: OpsLearningOrganizationType['id'][],
+    perLearningTypes: PerLearningType['key'][],
     appealStartDateAfter: string,
     appealStartDateBefore: string,
     appealSearchText: string;
@@ -40,15 +52,22 @@ interface Props {
     disasterTypeOptions: DisasterType[] | undefined;
     secondarySectorOptions: SecondarySector[] | undefined;
     perComponentOptions: PerComponent[] | undefined;
+    organizationTypeOptions: OpsLearningOrganizationType[] | undefined,
+    organizationTypePending: boolean;
+    perLearningTypeOptions: PerLearningType[] | undefined;
     disabled?: boolean;
 }
+
 function Filters(props: Props) {
     const {
         value,
         onChange,
         disasterTypeOptions,
         secondarySectorOptions,
         perComponentOptions,
+        organizationTypeOptions,
+        organizationTypePending,
+        perLearningTypeOptions,
         disabled,
     } = props;
 
@@ -90,7 +109,7 @@ function Filters(props: Props) {
                 label={strings.filterDisasterTypeLabel}
                 placeholder={strings.filterDisasterTypePlaceholder}
                 options={disasterTypeOptions}
-                keySelector={disasterTypeKeySelector}
+                keySelector={numericIdSelector}
                 labelSelector={disasterTypeLabelSelector}
                 value={value.disasterTypes}
                 onChange={onChange}
@@ -101,8 +120,8 @@ function Filters(props: Props) {
                 label={strings.filterSectorLabel}
                 placeholder={strings.filterSectorPlaceholder}
                 options={secondarySectorOptions}
-                keySelector={sectorKeySelector}
-                labelSelector={sectorLabelSelector}
+                keySelector={numericKeySelector}
+                labelSelector={stringLabelSelector}
                 disabled={disabled}
                 value={value.secondarySectors}
                 onChange={onChange}
@@ -113,13 +132,37 @@ function Filters(props: Props) {
                 label={strings.filterComponentLabel}
                 placeholder={strings.filterComponentPlaceholder}
                 options={perComponentOptions}
-                keySelector={perComponentKeySelector}
+                keySelector={numericIdSelector}
                 labelSelector={getFormattedComponentName}
                 disabled={disabled}
                 value={value.perComponents}
                 onChange={onChange}
                 withSelectAll
             />
+            <MultiSelectInput
+                name="organizationTypes"
+                label={strings.organizationTypesLabel}
+                placeholder={strings.organizationTypesLabelPlaceholder}
+                options={organizationTypeOptions}
+                keySelector={numericIdSelector}
+                labelSelector={stringTitleSelector}
+                disabled={disabled || organizationTypePending}
+                value={value.organizationTypes}
+                onChange={onChange}
+                withSelectAll
+            />
+            <MultiSelectInput
+                name="perLearningTypes"
+                label={strings.perLearningTypesLabel}
+                placeholder={strings.perLearningTypesLabelPlaceholder}
+                options={perLearningTypeOptions}
+                keySelector={perLearningTypeKeySelector}
+                labelSelector={stringValueSelector}
+                disabled={disabled}
+                value={value.perLearningTypes}
+                onChange={onChange}
+                withSelectAll
+            />
             <DateInput
                 name="appealStartDateAfter"
                 label={strings.appealStartDate}
diff --git a/app/src/views/OperationalLearning/index.tsx b/app/src/views/OperationalLearning/index.tsx
@@ -22,9 +22,12 @@ import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
     hasSomeDefinedValue,
     numericIdSelector,
+    numericKeySelector,
     resolveToComponent,
     resolveToString,
+    stringLabelSelector,
     stringNameSelector,
+    stringTitleSelector,
     stringValueSelector,
 } from '@ifrc-go/ui/utils';
 import {
@@ -41,11 +44,11 @@ import { type RegionOption } from '#components/domain/RegionSelectInput';
 import Link from '#components/Link';
 import Page from '#components/Page';
 import { type components } from '#generated/types';
-import useCountry, { Country } from '#hooks/domain/useCountry';
+import useCountry from '#hooks/domain/useCountry';
 import useDisasterTypes, { DisasterType } from '#hooks/domain/useDisasterType';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
-import usePerComponent, { type PerComponent } from '#hooks/domain/usePerComponent';
-import useSecondarySector, { type SecondarySector } from '#hooks/domain/useSecondarySector';
+import usePerComponent from '#hooks/domain/usePerComponent';
+import useSecondarySector from '#hooks/domain/useSecondarySector';
 import useAlert from '#hooks/useAlert';
 import useFilterState from '#hooks/useFilterState';
 import useRecursiveCsvExport from '#hooks/useRecursiveCsvRequest';
@@ -56,7 +59,10 @@ import {
     useRequest,
 } from '#utils/restRequest';
 
-import Filters, { type FilterValue } from './Filters';
+import Filters, {
+    type FilterValue,
+    type PerLearningType,
+} from './Filters';
 import KeyInsights from './KeyInsights';
 import Summary, { type Props as SummaryProps } from './Summary';
 
@@ -89,12 +95,8 @@ type QueryType = Pick<
 >;
 
 const regionKeySelector = (region: RegionOption) => region.key;
-const countryKeySelector = (country: Country) => country.id;
-const sectorKeySelector = (d: SecondarySector) => d.key;
-const sectorLabelSelector = (d: SecondarySector) => d.label;
-const perComponentKeySelector = (option: PerComponent) => option.id;
-const disasterTypeKeySelector = (type: DisasterType) => type.id;
 const disasterTypeLabelSelector = (type: DisasterType) => type.name ?? '?';
+const perLearningTypeKeySelector = (perLearningType: PerLearningType) => perLearningType.key;
 
 /** @knipignore */
 // eslint-disable-next-line import/prefer-default-export
@@ -123,7 +125,10 @@ export function Component() {
 
     const alert = useAlert();
 
-    const { api_region_name: regionList } = useGlobalEnums();
+    const {
+        api_region_name: regionList,
+        per_learning_type: perLearningTypeOptions,
+    } = useGlobalEnums();
     const countryList = useCountry({ region: rawFilter.region });
     const disasterTypeOptions = useDisasterTypes();
     const secondarySectorOptions = useSecondarySector();
@@ -213,8 +218,16 @@ export function Component() {
         preserveResponse: true,
     });
 
+    const {
+        pending: opsLearningOrganizationTypePending,
+        response: opsLearningOrganizationTypes,
+    } = useRequest({
+        url: '/api/v2/ops-learning/organization-type/',
+        preserveResponse: true,
+    });
+
     const [
-        pendingExport,,
+        pendingExport, ,
         triggerExportStart,
     ] = useRecursiveCsvExport({
         disableProgress: true,
@@ -270,6 +283,10 @@ export function Component() {
                 ? filter.perComponents : undefined,
             search_extracts: isTruthyString(filter.appealSearchText)
                 ? (filter.appealSearchText) : undefined,
+            type_validated__in: hasSomeDefinedValue(filter.perLearningTypes)
+                ? filter.perLearningTypes : undefined,
+            organization_validated__in: hasSomeDefinedValue(filter.organizationTypes)
+                ? filter.organizationTypes : undefined,
         };
         setFilterPristine(true);
         setQuery(newQuery);
@@ -333,6 +350,9 @@ export function Component() {
                         disasterTypeOptions={disasterTypeOptions}
                         secondarySectorOptions={secondarySectorOptions}
                         perComponentOptions={perComponentOptions}
+                        organizationTypeOptions={opsLearningOrganizationTypes?.results}
+                        perLearningTypeOptions={perLearningTypeOptions}
+                        organizationTypePending={opsLearningOrganizationTypePending}
                     />
                 )}
                 footerContent={(
@@ -361,31 +381,47 @@ export function Component() {
                                                 value={rawFilter.countries}
                                                 options={countryList}
                                                 labelSelector={stringNameSelector}
-                                                keySelector={countryKeySelector}
+                                                keySelector={numericIdSelector}
                                             />
                                             <DismissableMultiListOutput
                                                 name="disasterTypes"
                                                 onDismiss={onFilterChange}
                                                 value={rawFilter.disasterTypes}
                                                 options={disasterTypeOptions}
                                                 labelSelector={disasterTypeLabelSelector}
-                                                keySelector={disasterTypeKeySelector}
+                                                keySelector={numericIdSelector}
                                             />
                                             <DismissableMultiListOutput
                                                 name="secondarySectors"
                                                 onDismiss={onFilterChange}
                                                 value={rawFilter.secondarySectors}
                                                 options={secondarySectorOptions}
-                                                labelSelector={sectorLabelSelector}
-                                                keySelector={sectorKeySelector}
+                                                labelSelector={stringLabelSelector}
+                                                keySelector={numericKeySelector}
                                             />
                                             <DismissableMultiListOutput
                                                 name="perComponents"
                                                 onDismiss={onFilterChange}
                                                 value={rawFilter.perComponents}
                                                 options={perComponentOptions}
                                                 labelSelector={getFormattedComponentName}
-                                                keySelector={perComponentKeySelector}
+                                                keySelector={numericIdSelector}
+                                            />
+                                            <DismissableMultiListOutput
+                                                name="organizationTypes"
+                                                onDismiss={onFilterChange}
+                                                value={rawFilter.organizationTypes}
+                                                options={opsLearningOrganizationTypes?.results}
+                                                labelSelector={stringTitleSelector}
+                                                keySelector={numericIdSelector}
+                                            />
+                                            <DismissableMultiListOutput
+                                                name="perLearningTypes"
+                                                onDismiss={onFilterChange}
+                                                value={rawFilter.perLearningTypes}
+                                                options={perLearningTypeOptions}
+                                                labelSelector={stringValueSelector}
+                                                keySelector={perLearningTypeKeySelector}
                                             />
                                             <DismissableTextOutput
                                                 name="appealStartDateAfter"

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"go-web-app": patch
 +---
++
 +Add Organization type and Learning type filter in Operational learning
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@`
`14`	`14`	`"filterOpsLearningSearchLabel": "Search",`
`15`	`15`	`"filterOpsLearningSearchPlaceholder": "Search",`
`16`	`16`	`"appealStartDate": "Appeal Start Date",`
`17`		`- "appealEndDate": "Appeal End Date"`
	`17`	`+ "appealEndDate": "Appeal End Date",`
	`18`	`+ "organizationTypesLabel": "Organization Type",`
	`19`	`+ "organizationTypesLabelPlaceholder": "All Organization Types",`
	`20`	`+ "perLearningTypesLabel": "Learning Type",`
	`21`	`+ "perLearningTypesLabelPlaceholder": "All Learning Type"`
`18`	`22`	`}`
`19`	`23`	`}`