Merge pull request #746 from IFRCGo/fix/minor-issues

Fix minor issues in various pages
IFRCGo · Mar 6, 2024 · 3ac6dd0 · 3ac6dd0
2 parents b84a70c + e375a12
commit 3ac6dd0
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 10 deletions.
diff --git a/app/src/components/domain/AppealsTable/index.tsx b/app/src/components/domain/AppealsTable/index.tsx
@@ -173,7 +173,6 @@ function AppealsTable(props: Props) {
             createProgressColumn<AppealListItem, string>(
                 'amount_funded',
                 strings.appealsTableFundedAmount,
-                // FIXME: use progress function
                 (item) => (
                     getPercentage(
                         item.amount_funded,

diff --git a/app/src/views/CountryOngoingActivitiesThreeWProjects/i18n.json b/app/src/views/CountryOngoingActivitiesThreeWProjects/i18n.json
@@ -8,8 +8,8 @@
         "failedToCreateExport": "Failed to generate export.",
         "totalProjectsTitle": "Total Projects",
         "ongoingProjectBudgetTitle": "Total Budget (CHF) for Ongoing Projects",
-        "threeWOngoingProjectsTitle": "All Projects",
-        "viewAllOngoingProjects": "View All Ongoing Projects",
+        "threeWOngoingProjectsTitle": "Ongoing Projects",
+        "viewAllProjects": "View all Projects in this Country",
         "threeWInCountryMapSidebarTitle": "Projects by Province",
         "provinceProjects": "{provinceName} ({numProjects} Projects)",
         "otherProjects": "Others ({numProjects} Projects)",

diff --git a/app/src/views/CountryOngoingActivitiesThreeWProjects/index.tsx b/app/src/views/CountryOngoingActivitiesThreeWProjects/index.tsx
@@ -479,7 +479,7 @@ export function Component() {
                             urlSearch={`country=${countryResponse?.id}`}
                             withLinkIcon
                         >
-                            {strings.viewAllOngoingProjects}
+                            {strings.viewAllProjects}
                         </Link>
                     </>
                 )}

diff --git a/app/src/views/GlobalThreeW/Map/index.tsx b/app/src/views/GlobalThreeW/Map/index.tsx
@@ -379,7 +379,7 @@ function GlobalThreeWMap(props: Props) {
                     onCloseButtonClick={handlePointClose}
                     heading={(
                         <Link
-                            to="countriesThreeWLayout"
+                            to="countryOngoingActivitiesThreeWProjects"
                             urlParams={{
                                 countryId: clickedPointProperties
                                     .countryId,

diff --git a/app/src/views/RegionThreeW/MovementActivitiesMap/index.tsx b/app/src/views/RegionThreeW/MovementActivitiesMap/index.tsx
@@ -257,7 +257,7 @@ function MovementActivitiesMap(props: Props) {
                             headingLevel={5}
                             heading={(
                                 <Link
-                                    to="countriesLayout"
+                                    to="countryOngoingActivitiesThreeWProjects"
                                     urlParams={{ countryId: clickedPointProperties.countryId }}
                                     withUnderline
                                 >

diff --git a/app/src/views/RegionThreeW/index.tsx b/app/src/views/RegionThreeW/index.tsx
@@ -193,7 +193,7 @@ export function Component() {
         title: (
             <div className={styles.countrySectorTitle}>
                 <Link
-                    to="countryThreeWIndex"
+                    to="countryOngoingActivitiesThreeWProjects"
                     urlParams={{ countryId: country.id }}
                 >
                     {country.name}

diff --git a/app/src/views/ThreeWProjectDetail/index.tsx b/app/src/views/ThreeWProjectDetail/index.tsx
@@ -159,7 +159,7 @@ export function Component() {
                             value={(
                                 <Link
                                     withUnderline
-                                    to="countriesThreeWLayout"
+                                    to="countryOngoingActivitiesThreeWProjects"
                                     urlParams={{
                                         countryId: projectResponse?.project_country_detail.id,
                                     }}

diff --git a/packages/ui/src/components/Table/ColumnShortcuts/index.ts b/packages/ui/src/components/Table/ColumnShortcuts/index.ts
@@ -84,7 +84,7 @@ export function createBooleanColumn<D, K>(
 export function createProgressColumn<D, K>(
     id: string,
     title: string,
-    accessor: (item: D) => number,
+    accessor: (item: D) => number | undefined,
     options?: Options<D, K, ProgressBarProps, HeaderCellProps>,
 ) {
     const item: Column<D, K, ProgressBarProps, HeaderCellProps> & {

diff --git a/packages/ui/src/utils/common.ts b/packages/ui/src/utils/common.ts
@@ -81,12 +81,41 @@ export function roundSafe(value: number | undefined | null): number | undefined
     return Math.round(value);
 }
 
+export function getPercentage(
+    value: null | undefined,
+    total: null | undefined,
+    isBounded?: boolean,
+): undefined
+export function getPercentage(
+    value: number,
+    total: null | undefined,
+    isBounded?: boolean,
+): undefined
+export function getPercentage(
+    value: null | undefined,
+    total: number,
+    isBounded?: boolean,
+): undefined
+export function getPercentage(
+    value: number,
+    total: number,
+    isBounded?: boolean,
+): number
+export function getPercentage(
+    value: number | null | undefined,
+    total: number | null | undefined,
+    isBounded?: boolean,
+): number | undefined
 export function getPercentage(
     value: number | null | undefined,
     total: number | null | undefined,
     isBounded = true,
 ) {
-    if (isNotDefined(value) || isNotDefined(total) || total === 0) {
+    if (isNotDefined(value) || isNotDefined(total)) {
+        return undefined;
+    }
+
+    if (total === 0) {
         return 0;
     }