Remove personal detail for focal unit point from local units table

frozenhelium · samshara · commit 073fa1e07558 · 2024-06-13T13:53:23.000+05:45
- Add a constant for default invalid text in GO UI
- Use the default invalid text constant
diff --git a/.changeset/great-rivers-wave.md b/.changeset/great-rivers-wave.md
@@ -0,0 +1,5 @@
+---
+"go-web-app": patch
+---
+
+Remove personal detail for focal point in local units table
diff --git a/.changeset/sixty-bobcats-impress.md b/.changeset/sixty-bobcats-impress.md
@@ -0,0 +1,5 @@
+---
+"@ifrc-go/ui": patch
+---
+
+Add a constant for default invalid text
diff --git a/app/src/components/domain/AppealsOverYearsChart/PointDetails/index.tsx b/app/src/components/domain/AppealsOverYearsChart/PointDetails/index.tsx
@@ -84,7 +84,7 @@ function PointDetails(props: Props) {
                         />
                         <TextOutput
                             label={strings.timelineChartPeopleTargetedLabel}
-                            value={Number(data.dref?.beneficiaries) ?? '-'}
+                            value={Number(data.dref?.beneficiaries)}
                             valueType="number"
                             strongValue
                         />
diff --git a/app/src/utils/common.ts b/app/src/utils/common.ts
@@ -1,3 +1,4 @@
+import { DEFAULT_INVALID_TEXT } from '@ifrc-go/ui/utils';
 import {
     compareNumber,
     isNotDefined,
@@ -77,15 +78,18 @@ export function downloadFile(
     URL.revokeObjectURL(url);
 }
 
-export function chooseName(
-    primaryName: string | null | undefined,
-    secondaryName: string | null | undefined,
+export function getFirstTruthyString(
+    primaryStr: string | null | undefined,
+    secondaryStr: string | null | undefined,
+    invalidText = DEFAULT_INVALID_TEXT,
 ) {
-    if (isTruthyString(primaryName)) {
-        return primaryName;
+    if (isTruthyString(primaryStr)) {
+        return primaryStr;
     }
-    if (isTruthyString(secondaryName)) {
-        return secondaryName;
+
+    if (isTruthyString(secondaryStr)) {
+        return secondaryStr;
     }
-    return '--';
+
+    return invalidText;
 }
diff --git a/app/src/views/AccountMyFormsPer/index.tsx b/app/src/views/AccountMyFormsPer/index.tsx
@@ -20,6 +20,7 @@ import {
     createExpansionIndicatorColumn,
     createNumberColumn,
     createStringColumn,
+    DEFAULT_INVALID_TEXT,
     numericIdSelector,
 } from '@ifrc-go/ui/utils';
 import {
@@ -137,7 +138,7 @@ export function Component() {
             createStringColumn<PerProcessStatusItem, number>(
                 'phase',
                 strings.tablePerPhaseTitle,
-                (item) => (isDefined(item.phase) ? `${item.phase} - ${item.phase_display}` : '-'),
+                (item) => (isDefined(item.phase) ? `${item.phase} - ${item.phase_display}` : DEFAULT_INVALID_TEXT),
                 { sortable: true },
             ),
             createElementColumn<PerProcessStatusItem, number, PerTableActionsProps>(
diff --git a/app/src/views/CountryNsOverviewActivities/Map/index.tsx b/app/src/views/CountryNsOverviewActivities/Map/index.tsx
@@ -9,7 +9,10 @@ import {
     Message,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
-import { resolveToString } from '@ifrc-go/ui/utils';
+import {
+    DEFAULT_INVALID_TEXT,
+    resolveToString,
+} from '@ifrc-go/ui/utils';
 import {
     _cs,
     isDefined,
@@ -348,7 +351,7 @@ function CountryThreeWNationalSocietyProjectsMap(props: Props) {
                         className={styles.mapContainer}
                         title={resolveToString(
                             strings.countryNSMapTitle,
-                            { countryName: countryResponse?.society_name ?? '-' },
+                            { countryName: countryResponse?.society_name ?? DEFAULT_INVALID_TEXT },
                         )}
                         footer={(
                             <div className={styles.legend}>
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsMap/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsMap/index.tsx
@@ -42,7 +42,7 @@ import MapContainerWithDisclaimer from '#components/MapContainerWithDisclaimer';
 import MapPopup from '#components/MapPopup';
 import useAuth from '#hooks/domain/useAuth';
 import useFilterState from '#hooks/useFilterState';
-import { chooseName } from '#utils/common';
+import { getFirstTruthyString } from '#utils/common';
 import {
     COLOR_DARK_GREY,
     COLOR_PRIMARY_BLUE,
@@ -349,12 +349,12 @@ function LocalUnitsMap(props: Props) {
         && countryResponse.emails.length > 0;
     const hasContactDetails = hasAddress || hasEmails;
 
-    const localUnitName = useMemo(() => chooseName(
+    const localUnitName = useMemo(() => getFirstTruthyString(
         localUnitDetail?.local_branch_name,
         localUnitDetail?.english_branch_name,
     ), [localUnitDetail?.local_branch_name, localUnitDetail?.english_branch_name]);
 
-    const localUnitAddress = useMemo(() => chooseName(
+    const localUnitAddress = useMemo(() => getFirstTruthyString(
         localUnitDetail?.address_loc,
         localUnitDetail?.address_en,
     ), [localUnitDetail?.address_loc, localUnitDetail?.address_en]);
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx
@@ -18,7 +18,7 @@ import {
 } from '@togglecorp/fujs';
 
 import useFilterState from '#hooks/useFilterState';
-import { chooseName } from '#utils/common';
+import { getFirstTruthyString } from '#utils/common';
 import { type CountryOutletContext } from '#utils/outletContext';
 import {
     type GoApiResponse,
@@ -85,12 +85,12 @@ function LocalUnitsTable() {
             createStringColumn<LocalUnitsTableListItem, number>(
                 'branch_name',
                 strings.localUnitsTableName,
-                (item) => chooseName(item.local_branch_name, item.english_branch_name),
+                (item) => getFirstTruthyString(item.local_branch_name, item.english_branch_name),
             ),
             createStringColumn<LocalUnitsTableListItem, number>(
                 'address',
                 strings.localUnitsTableAddress,
-                (item) => chooseName(item.address_loc, item.address_en),
+                (item) => getFirstTruthyString(item.address_loc, item.address_en),
             ),
             createStringColumn<LocalUnitsTableListItem, number>(
                 'type',
@@ -101,17 +101,17 @@ function LocalUnitsTable() {
             createStringColumn<LocalUnitsTableListItem, number>(
                 'focal',
                 strings.localUnitsTableFocal,
-                (item) => chooseName(item.focal_person_loc, item.focal_person_en),
+                (item) => getFirstTruthyString(item.focal_person_loc, item.focal_person_en),
             ),
             createStringColumn<LocalUnitsTableListItem, number>(
                 'phone',
                 strings.localUnitsTablePhoneNumber,
-                (item) => chooseName(item.phone, item?.health_details?.focal_point_phone_number),
+                (item) => item.phone,
             ),
             createStringColumn<LocalUnitsTableListItem, number>(
                 'email',
                 strings.localUnitsTableEmail,
-                (item) => chooseName(item.email, item?.health_details?.focal_point_email),
+                (item) => item.email,
             ),
             createBooleanColumn<LocalUnitsTableListItem, number>(
                 'validated',
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/index.tsx
@@ -2,7 +2,10 @@ import { useState } from 'react';
 import { useOutletContext } from 'react-router-dom';
 import { Container } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
-import { resolveToString } from '@ifrc-go/ui/utils';
+import {
+    DEFAULT_INVALID_TEXT,
+    resolveToString,
+} from '@ifrc-go/ui/utils';
 import {
     compareNumber,
     isDefined,
@@ -124,7 +127,7 @@ export function Component() {
                         >
                             {resolveToString(
                                 strings.countryOnIFRC,
-                                { countryName: countryResponse?.name ?? '-' },
+                                { countryName: countryResponse?.name ?? DEFAULT_INVALID_TEXT },
                             )}
                         </Link>
                     )}
@@ -137,7 +140,7 @@ export function Component() {
                         >
                             {resolveToString(
                                 strings.countryOnReliefWeb,
-                                { countryName: countryResponse?.name ?? '-' },
+                                { countryName: countryResponse?.name ?? DEFAULT_INVALID_TEXT },
                             )}
                         </Link>
                     )}
@@ -150,7 +153,7 @@ export function Component() {
                         >
                             {resolveToString(
                                 strings.countryRCHomepage,
-                                { countryName: countryResponse?.name ?? '-' },
+                                { countryName: countryResponse?.name ?? DEFAULT_INVALID_TEXT },
                             )}
                         </Link>
                     )}
@@ -163,7 +166,7 @@ export function Component() {
                         >
                             {resolveToString(
                                 strings.countryDisasterLaw,
-                                { countryName: countryResponse?.name ?? '-' },
+                                { countryName: countryResponse?.name ?? DEFAULT_INVALID_TEXT },
                             )}
                         </Link>
                     )}
diff --git a/app/src/views/CountryOngoingActivitiesThreeWProjects/Map/index.tsx b/app/src/views/CountryOngoingActivitiesThreeWProjects/Map/index.tsx
@@ -11,6 +11,7 @@ import {
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
+    DEFAULT_INVALID_TEXT,
     denormalizeList,
     resolveToString,
 } from '@ifrc-go/ui/utils';
@@ -346,7 +347,7 @@ function CountryThreeWMap(props: Props) {
                         className={styles.mapContainer}
                         title={resolveToString(
                             strings.threeWMapTitle,
-                            { countryName: countryResponse?.name ?? '-' },
+                            { countryName: countryResponse?.name ?? DEFAULT_INVALID_TEXT },
                         )}
                         footer={operationTypeOptions && operationTypeOptions.length > 0 && (
                             <div className={styles.legend}>
diff --git a/app/src/views/CountryPreparedness/RatingByAreaChart/index.tsx b/app/src/views/CountryPreparedness/RatingByAreaChart/index.tsx
@@ -2,6 +2,7 @@ import {
     ChartAxes,
     ChartContainer,
 } from '@ifrc-go/ui';
+import { DEFAULT_INVALID_TEXT } from '@ifrc-go/ui/utils';
 import { listToMap } from '@togglecorp/fujs';
 
 import useNumericChartData from '#hooks/useNumericChartData';
@@ -39,7 +40,7 @@ function RatingByAreaChart(props: Props) {
 
     const formAreaMap = listToMap(
         formAreaOptions,
-        (option) => option.area_num ?? '-',
+        (option) => option.area_num ?? DEFAULT_INVALID_TEXT,
         (option) => option.title,
     );
 
@@ -86,7 +87,8 @@ function RatingByAreaChart(props: Props) {
                                 x={point.x - barWidth / 2}
                                 y={point.y}
                             >
-                                {Number(point.originalData.value.toFixed(2)) ?? '-'}
+                                {Number(point.originalData.value.toFixed(2))
+                                    ?? DEFAULT_INVALID_TEXT}
                             </text>
                         )}
                         <rect
diff --git a/app/src/views/CountryProfileRiskWatch/RiskTable/index.tsx b/app/src/views/CountryProfileRiskWatch/RiskTable/index.tsx
@@ -7,6 +7,7 @@ import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
     createNumberColumn,
     createStringColumn,
+    DEFAULT_INVALID_TEXT,
     minSafe,
     resolveToComponent,
 } from '@ifrc-go/ui/utils';
@@ -98,7 +99,7 @@ function RiskTable(props: Props) {
     const riskScoreToLabel = useCallback(
         (score: number | undefined | null, hazardType: HazardTypeOption['hazard_type']) => {
             if (isNotDefined(score) || score < 0) {
-                return '-';
+                return DEFAULT_INVALID_TEXT;
             }
 
             const riskCategory = riskScoreToCategory(score, hazardType);
diff --git a/app/src/views/RegionProfile/index.tsx b/app/src/views/RegionProfile/index.tsx
@@ -6,7 +6,10 @@ import {
     KeyFigure,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
-import { resolveToString } from '@ifrc-go/ui/utils';
+import {
+    DEFAULT_INVALID_TEXT,
+    resolveToString,
+} from '@ifrc-go/ui/utils';
 import { isValidEmail } from '@togglecorp/fujs';
 
 import Link from '#components/Link';
@@ -32,7 +35,7 @@ export function Component() {
                     label={
                         resolveToString(
                             strings.regionalProfileNationalSocietyTitle,
-                            { regionName: regionResponse?.region_name ?? '-' },
+                            { regionName: regionResponse?.region_name ?? DEFAULT_INVALID_TEXT },
                         )
                     }
                 />
diff --git a/app/src/views/Search/useColumns/index.tsx b/app/src/views/Search/useColumns/index.tsx
@@ -10,6 +10,7 @@ import {
     createNumberColumn,
     createProgressColumn,
     createStringColumn,
+    DEFAULT_INVALID_TEXT,
     getDuration,
     getPercentage,
 } from '@ifrc-go/ui/utils';
@@ -56,7 +57,7 @@ function useColumns(searchResponse: SearchResponse | undefined) {
         createStringColumn<EmergencyResult, number>(
             'appeal_type',
             strings.searchEmergencyTableAppealType,
-            (emergency) => emergency.appeal_type ?? '-',
+            (emergency) => emergency.appeal_type ?? DEFAULT_INVALID_TEXT,
         ),
         createStringColumn<EmergencyResult, number>(
             'disaster_type',
@@ -237,7 +238,7 @@ function useColumns(searchResponse: SearchResponse | undefined) {
             strings.searchSurgeAlertTableDuration,
             (surgeAlert) => {
                 if (isNotDefined(surgeAlert.alert_date)) {
-                    return '-';
+                    return DEFAULT_INVALID_TEXT;
                 }
 
                 const alertDate = new Date(surgeAlert.alert_date);
diff --git a/app/src/views/SurgeOverview/SurgeAlertsTable/index.tsx b/app/src/views/SurgeOverview/SurgeAlertsTable/index.tsx
@@ -9,6 +9,7 @@ import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
     createDateColumn,
     createStringColumn,
+    DEFAULT_INVALID_TEXT,
     formatDate,
     getDuration,
 } from '@ifrc-go/ui/utils';
@@ -99,7 +100,7 @@ function SurgeAlertsTable() {
             strings.surgeAlertsTableDuration,
             (surgeAlert) => {
                 if (isNotDefined(surgeAlert.start) || isNotDefined(surgeAlert.end)) {
-                    return '-';
+                    return DEFAULT_INVALID_TEXT;
                 }
 
                 const startDate = new Date(surgeAlert.start);
diff --git a/app/src/views/ThreeWActivityForm/ActivitiesBySectorInput/ActivityInput/index.tsx b/app/src/views/ThreeWActivityForm/ActivitiesBySectorInput/ActivityInput/index.tsx
@@ -15,6 +15,7 @@ import {
     TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
+import { DEFAULT_INVALID_TEXT } from '@ifrc-go/ui/utils';
 import {
     isDefined,
     isNotDefined,
@@ -244,7 +245,7 @@ function ActivityInput(props: Props) {
         >
             <NonFieldError error={error} />
             <InputSection
-                description={actionDetails?.description || '-'}
+                description={actionDetails?.description || DEFAULT_INVALID_TEXT}
                 withoutPadding
             >
                 <div className={styles.inputSectionContent}>
diff --git a/packages/ui/src/components/NumberOutput/index.tsx b/packages/ui/src/components/NumberOutput/index.tsx
@@ -10,6 +10,7 @@ import {
 
 import LanguageContext from '#contexts/language';
 import { formatNumber } from '#utils/common';
+import { DEFAULT_INVALID_TEXT } from '#utils/constants';
 
 import styles from './styles.module.css';
 
@@ -49,7 +50,7 @@ export interface Props {
 function NumberOutput(props: Props) {
     const {
         className,
-        invalidText = '-',
+        invalidText = DEFAULT_INVALID_TEXT,
         separatorHidden,
         compact,
         currency,
diff --git a/packages/ui/src/components/TextOutput/index.tsx b/packages/ui/src/components/TextOutput/index.tsx
@@ -3,6 +3,7 @@ import { _cs } from '@togglecorp/fujs';
 import BooleanOutput, { Props as BooleanOutputProps } from '#components/BooleanOutput';
 import DateOutput, { Props as DateOutputProps } from '#components/DateOutput';
 import NumberOutput, { Props as NumberOutputProps } from '#components/NumberOutput';
+import { DEFAULT_INVALID_TEXT } from '#utils/constants';
 
 import styles from './styles.module.css';
 
@@ -60,7 +61,7 @@ function TextOutput(props: Props) {
         strongValue,
         strongDescription,
         withoutLabelColon,
-        invalidText = '-',
+        invalidText = DEFAULT_INVALID_TEXT,
         ...otherProps
     } = props;
 
diff --git a/packages/ui/src/components/printable/TextOutput/index.tsx b/packages/ui/src/components/printable/TextOutput/index.tsx
diff --git a/packages/ui/src/utils/constants.ts b/packages/ui/src/utils/constants.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"go-web-app": patch
 +---
++
 +Remove personal detail for focal point in local units table