feat(active-operation): remove disaster Uncategorised from the label and map

- add filter for event and needs_confirmation for appeal response

Author: shreeyash07

app/src/components/domain/ActiveOperationMap/OperationMapContainer/index.tsx

@@ -42,7 +42,6 @@ import GlobalMap, { type AdminZeroFeatureProperties } from '../../GlobalMap';
 import {
     APPEAL_TYPE_MULTIPLE,
     basePointLayerOptions,
-    DISASTER_UNCATEGORISED,
     optionKeySelector,
     optionLabelSelector,
     outerCircleLayerOptionsForFinancialRequirements,
@@ -138,7 +137,7 @@ function OperationMapContainer(props: Props) {
                         ));
                         return highestSeverity[0];
                     }
-                    if (uniqueEventList.length === 0) return DISASTER_UNCATEGORISED;
+                    if (uniqueEventList.length === 0) return undefined;
                     return uniqueEventList[0];
                 });
 

app/src/components/domain/ActiveOperationMap/i18n.json

@@ -22,7 +22,6 @@
         "crisisRedEmergency": "Red Emergency",
         "crisisOrangeEmergency": "Orange Emergency",
         "crisisYellowEmergency": "Yellow Emergency",
-        "crisisUncategorisedEmergency": "Uncategorised",
         "explanationBubblePopulationLabel": "# of people targeted",
         "explanationBubbleAmountLabel": "IFRC financial requirements"
     }

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

@@ -27,7 +27,6 @@ import Link from '#components/Link';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import useFilterState from '#hooks/useFilterState';
 import {
-    COLOR_BLACK,
     DISASTER_CATEGORY_ORANGE,
     DISASTER_CATEGORY_RED,
     DISASTER_CATEGORY_YELLOW,
@@ -49,7 +48,6 @@ import {
     COLOR_ORANGE_SEVERITY,
     COLOR_RED_SEVERITY,
     COLOR_YELLOW_SEVERITY,
-    DISASTER_UNCATEGORISED,
     type ScaleOption,
 } from './utils';
 
@@ -130,6 +128,10 @@ function ActiveOperationMap(props: Props) {
                 dtype: filter.displacement,
                 district: hasSomeDefinedValue(filter.district) ? filter.district : undefined,
                 end_date__gt: now,
+                // NOTE: Filtering only those appeals that has not been confirmed
+                // and does not contain event
+                has_event: true,
+                needs_confirmation: false,
                 start_date__gte: filter.startDateAfter,
                 start_date__lte: filter.startDateBefore,
                 limit,
@@ -249,11 +251,6 @@ function ActiveOperationMap(props: Props) {
                 label: strings.crisisYellowEmergency,
                 color: COLOR_YELLOW_SEVERITY,
             },
-            {
-                value: DISASTER_UNCATEGORISED,
-                label: strings.crisisUncategorisedEmergency,
-                color: COLOR_BLACK,
-            },
         ]);
     }, [strings, activeTab]);
 

app/src/components/domain/ActiveOperationMap/utils.ts

@@ -4,24 +4,23 @@ import type {
 } from 'mapbox-gl';
 
 import {
-    COLOR_BLACK,
     COLOR_BLUE,
+    COLOR_DREF_YELLOW,
     COLOR_LIGHT_GREY,
     COLOR_ORANGE,
     COLOR_RED,
-    COLOR_YELLOW,
     DISASTER_CATEGORY_ORANGE,
     DISASTER_CATEGORY_RED,
     DISASTER_CATEGORY_YELLOW,
     type DisasterCategory,
 } from '#utils/constants';
 
 export const COLOR_EMERGENCY_APPEAL = COLOR_RED;
-export const COLOR_DREF = COLOR_YELLOW;
+export const COLOR_DREF = COLOR_DREF_YELLOW;
 export const COLOR_EAP = COLOR_BLUE;
 export const COLOR_MULTIPLE_TYPES = COLOR_ORANGE;
 
-export const COLOR_YELLOW_SEVERITY = COLOR_YELLOW;
+export const COLOR_YELLOW_SEVERITY = COLOR_DREF_YELLOW;
 export const COLOR_ORANGE_SEVERITY = COLOR_ORANGE;
 export const COLOR_RED_SEVERITY = COLOR_RED;
 
@@ -31,7 +30,6 @@ export const APPEAL_TYPE_EMERGENCY = 1;
 // const APPEAL_TYPE_INTERNATIONAL = 2; // TODO: we are not showing this?
 export const APPEAL_TYPE_EAP = 3;
 export const APPEAL_TYPE_MULTIPLE = -1;
-export const DISASTER_UNCATEGORISED = -1;
 
 export const severityOrderMapping: Record<DisasterCategory, number> = {
     [DISASTER_CATEGORY_RED]: 1,
@@ -66,8 +64,6 @@ const circleColor: CirclePaint['circle-color'] = [
         COLOR_RED_SEVERITY,
         DISASTER_CATEGORY_YELLOW,
         COLOR_YELLOW_SEVERITY,
-        DISASTER_UNCATEGORISED,
-        COLOR_BLACK,
         COLOR_LIGHT_GREY,
     ],
     COLOR_LIGHT_GREY,

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

@@ -236,6 +236,10 @@ function AppealsTable(props: Props) {
                 ordering: orderingWithFallback,
                 atype: filter.appeal,
                 dtype: filter.displacement,
+                // NOTE: Filtering those appeals that has not been confirmed and does not
+                // contain event
+                has_event: true,
+                needs_confirmation: false,
                 district: hasSomeDefinedValue(filter.district) ? filter.district : undefined,
                 end_date__gt: withPastOperations ? undefined : now,
                 start_date__gte: filter.startDateAfter,

app/src/utils/constants.ts

@@ -65,6 +65,7 @@ export const COLOR_DARK_GREY = '#a5a5a5';
 export const COLOR_BLACK = '#000000';
 // const COLOR_LIGHT_YELLOW = '#ffd470';
 export const COLOR_YELLOW = '#ff9e00';
+export const COLOR_DREF_YELLOW = '#FFF939';
 export const COLOR_BLUE = '#4c5d9b';
 export const COLOR_LIGHT_BLUE = '#c7d3e0';
 export const COLOR_ORANGE = '#ff8000';