Merge pull request #2024 from IFRCGo/feature/issue-2018-appeal-type-filter

AppealType filter to 2 values, langing page Appeals table

Author: frozenhelium

.changeset/tame-deer-mix.md

@@ -0,0 +1,6 @@
+---
+"go-web-app": patch
+---
+
+AppealType filter to 2 values, landing page Appeals table
+Update goUserAnalytics URL on /resources page

app/src/components/domain/AppealsTable/index.tsx

@@ -38,6 +38,11 @@ import type {
 } from '#utils/restRequest';
 import { useRequest } from '#utils/restRequest';
 
+import {
+    APPEAL_TYPE_DREF,
+    APPEAL_TYPE_EMERGENCY,
+} from '../ActiveOperationMap/utils';
+
 import i18n from './i18n.json';
 import styles from './styles.module.css';
 
@@ -106,7 +111,7 @@ function AppealsTable(props: Props) {
     });
 
     const strings = useTranslation(i18n);
-    const { api_appeal_type: appealTypeOptions } = useGlobalEnums();
+    const { api_appeal_type: appealTypeOptionsRaw } = useGlobalEnums();
 
     const handleClearFiltersButtonClick = useCallback(() => {
         setFilter({});
@@ -269,6 +274,13 @@ function AppealsTable(props: Props) {
         query,
     });
 
+    const appealTypeOptions = useMemo(() => (
+        appealTypeOptionsRaw?.filter(
+            (appealTypeOption) => appealTypeOption.key === APPEAL_TYPE_DREF
+                || appealTypeOption.key === APPEAL_TYPE_EMERGENCY,
+        )
+    ), [appealTypeOptionsRaw]);
+
     return (
         <Container
             className={_cs(styles.appealsTable, className)}

app/src/views/CountryNsOverviewActivities/NationalSocietyDevelopmentInitiatives/InitiativeCard/index.tsx

@@ -25,7 +25,6 @@ function InitiativeCard(props: Props) {
     } = props;
 
     const strings = useTranslation(i18n);
-    const categories = initiative.categories?.join(', ');
 
     return (
         <Container
@@ -44,7 +43,7 @@ function InitiativeCard(props: Props) {
             footerContent={(
                 <TextOutput
                     label={strings.initiativeCategoriesTitle}
-                    value={categories}
+                    value={initiative.categories}
                     valueType="text"
                     strongValue
                     withoutLabelColon

app/src/views/Resources/index.tsx

@@ -92,7 +92,7 @@ export function Component() {
                         {strings.goBlog}
                     </Link>
                     <Link
-                        href="https://app.powerbi.com/view?r=eyJrIjoiY2RlOTRkOGQtMDU5Yy00OWIwLWE2NmYtNTQ5NTQ3YjEwY2ZmIiwidCI6ImEyYjUzYmU1LTczNGUtNGU2Yy1hYjBkLWQxODRmNjBmZDkxNyIsImMiOjh9&pageName=ReportSectione263ecb5066f3105a8fa"
+                        href="https://app.powerbi.com/view?r=eyJrIjoiMmE2OTg5ZDgtYzMyNC00NjQ1LWJkZWUtMDI1ZDc5M2Q5ZDFlIiwidCI6ImEyYjUzYmU1LTczNGUtNGU2Yy1hYjBkLWQxODRmNjBmZDkxNyIsImMiOjh9"
                         external
                         withLinkIcon
                     >