Merge branch 'develop' into fix/breadcrumbs

globalfund · Mar 8, 2023 · ca2f9ed · ca2f9ed
2 parents 1be82e3 + 5636bb0
commit ca2f9ed
Show file tree

Hide file tree

Showing 28 changed files with 33,228 additions and 6,567 deletions.
diff --git a/public/sitemap.xml b/public/sitemap.xml
diff --git a/src/app/components/Mobile/ViewsControl/index.tsx b/src/app/components/Mobile/ViewsControl/index.tsx
@@ -91,6 +91,7 @@ export function MobileViewControl(props: MobileViewControlProps) {
   }>(
     getControlItems(
       params.vizType,
+      params.subType,
       history.location.pathname,
       params.code,
       params.period
@@ -121,6 +122,7 @@ export function MobileViewControl(props: MobileViewControlProps) {
       setControlItems(
         getControlItems(
           params.vizType,
+          params.subType,
           history.location.pathname,
           params.code,
           params.period

diff --git a/src/app/components/PageHeader/components/tabs/data.ts b/src/app/components/PageHeader/components/tabs/data.ts
@@ -24,7 +24,7 @@ export const countryDetailTabs: TabProps[] = [
     tabs: [
       {
         name: "Eligibility",
-        url: "/location/<code>/eligibility",
+        url: "/location/<code>/eligibility/table",
       },
       {
         name: "Allocation",
@@ -58,17 +58,12 @@ export const countryDetailTabs: TabProps[] = [
     ],
   },
   {
-    name: "More",
-    tabs: [
-      {
-        name: "Results",
-        url: "/location/<code>/results",
-      },
-      {
-        name: "Documents",
-        url: "/location/<code>/documents",
-      },
-    ],
+    name: "Results",
+    url: "/location/<code>/results",
+  },
+  {
+    name: "Documents",
+    url: "/location/<code>/documents",
   },
 ];
 
@@ -99,21 +94,16 @@ export const grantDetailTabs: TabProps[] = [
     ],
   },
   {
-    name: "More",
-    tabs: [
-      {
-        name: "Performance Rating",
-        url: "/grant/<code>/<period>/performance-rating",
-      },
-      {
-        name: "Targets and Results",
-        url: "/grant/<code>/<period>/targets-results",
-      },
-      {
-        name: "Documents",
-        url: "/grant/<code>/<period>/documents",
-      },
-    ],
+    name: "Performance Rating",
+    url: "/grant/<code>/<period>/performance-rating",
+  },
+  {
+    name: "Targets and Results",
+    url: "/grant/<code>/<period>/targets-results",
+  },
+  {
+    name: "Documents",
+    url: "/grant/<code>/<period>/documents",
   },
 ];
 

diff --git a/src/app/components/Table/Expandable/Toolbar.tsx b/src/app/components/Table/Expandable/Toolbar.tsx
@@ -251,8 +251,10 @@ export function TableToolbar(props: TableToolbarProps) {
           <FormGroup>
             {props.columns.map((c, index) => (
               <FormControlLabel
+                key={c.name}
                 control={
                   <Checkbox
+                    key={c.name}
                     value={index}
                     color="primary"
                     checked={c.checked}

diff --git a/src/app/components/Table/Simple/data.ts b/src/app/components/Table/Simple/data.ts
@@ -12,7 +12,9 @@ export interface SimpleTableProps {
   title: string;
   search: string;
   sortBy: string;
+  forceExpand?: boolean;
   rows: SimpleTableRow[];
+  formatNumbers?: boolean;
   columns: SimpleTableColumn[];
   onSearchChange: (value: string) => void;
   onSortByChange: (value: string) => void;

diff --git a/src/app/components/Table/Simple/index.tsx b/src/app/components/Table/Simple/index.tsx
@@ -14,6 +14,7 @@ import ArrowDownward from "@material-ui/icons/ArrowDownward";
 import { TriangleXSIcon } from "app/assets/icons/TriangleXS";
 import TableContainer from "@material-ui/core/TableContainer";
 import { tablecell } from "app/components/Table/Simple/styles";
+import { formatFinancialValue } from "app/utils/formatFinancialValue";
 import { TableToolbar } from "app/components/Table/Expandable/Toolbar";
 import { TableToolbarCols } from "app/components/Table/Expandable/data";
 import {
@@ -36,9 +37,11 @@ function Row(props: {
   columns: SimpleTableColumn[];
   paddingLeft?: number;
   visibleColumnsIndexes: number[];
+  formatNumbers?: boolean;
+  forceExpand?: boolean;
 }) {
   const classes = useRowStyles();
-  const [open, setOpen] = React.useState(false);
+  const [open, setOpen] = React.useState(Boolean(props.forceExpand));
 
   const firstColumnWidth = props.columns.length > 3 ? "30%" : "";
   const firstColumnPadding = props.paddingLeft ? props.paddingLeft : 40;
@@ -80,58 +83,65 @@ function Row(props: {
         {filter(
           props.columns,
           (_c, index) => props.visibleColumnsIndexes.indexOf(index) > -1
-        ).map((column: SimpleTableColumn, index: number) => (
-          <TableCell
-            key={column.key}
-            css={`
-              ${tablecell}
-              width: calc(${columnWidthCalc});
-              ${index === 0
-                ? `padding-left: ${firstColumnPadding}px;width: ${firstColumnWidth}`
-                : ""}
-            `}
-          >
-            <div
+        ).map((column: SimpleTableColumn, index: number) => {
+          const value = get(props.row, column.key, "");
+          let formattedValue =
+            props.formatNumbers && !Number.isNaN(value)
+              ? formatFinancialValue(value, true)
+              : value;
+          return (
+            <TableCell
+              key={column.key}
               css={`
-                width: 100%;
-                display: flex;
-                align-items: center;
-                flex-direction: row;
-                justify-content: space-between;
+                ${tablecell}
+                width: calc(${columnWidthCalc});
+                ${index === 0
+                  ? `padding-left: ${firstColumnPadding}px;width: ${firstColumnWidth}`
+                  : ""}
               `}
             >
               <div
                 css={`
-                  gap: 12px;
                   width: 100%;
                   display: flex;
                   align-items: center;
                   flex-direction: row;
-                  font-weight: ${index === 0 ? "bold" : "normal"};
-                  font-family: "GothamNarrow-${index === 0 ? "Bold" : "Book"}",
-                    "Helvetica Neue", sans-serif;
+                  justify-content: space-between;
+                `}
+              >
+                <div
+                  css={`
+                    gap: 12px;
+                    width: 100%;
+                    display: flex;
+                    align-items: center;
+                    flex-direction: row;
+                    font-weight: ${index === 0 ? "bold" : "normal"};
+                    font-family: "GothamNarrow-${index === 0 ? "Bold" : "Book"}",
+                      "Helvetica Neue", sans-serif;
 
-                  > * {
-                    @supports (-webkit-touch-callout: none) and
-                      (not (translate: none)) {
-                      &:not(:last-child) {
-                        margin-right: 12px;
+                    > * {
+                      @supports (-webkit-touch-callout: none) and
+                        (not (translate: none)) {
+                        &:not(:last-child) {
+                          margin-right: 12px;
+                        }
                       }
                     }
-                  }
 
-                  > svg {
-                    transition: transform 0.1s ease-in-out;
-                    transform: rotate(${open ? "0deg" : "-180deg"});
-                  }
-                `}
-              >
-                {index === 0 && props.row.children && <TriangleXSIcon />}
-                {get(props.row, column.key, "")}
+                    > svg {
+                      transition: transform 0.1s ease-in-out;
+                      transform: rotate(${open ? "0deg" : "-180deg"});
+                    }
+                  `}
+                >
+                  {index === 0 && props.row.children && <TriangleXSIcon />}
+                  {formattedValue}
+                </div>
               </div>
-            </div>
-          </TableCell>
-        ))}
+            </TableCell>
+          );
+        })}
       </TableRow>
       <TableRow
         css={`
@@ -155,6 +165,8 @@ function Row(props: {
                       key={child.name}
                       paddingLeft={40}
                       columns={props.columns}
+                      forceExpand={props.forceExpand}
+                      formatNumbers={props.formatNumbers}
                       visibleColumnsIndexes={props.visibleColumnsIndexes}
                     />
                   ))}
@@ -270,6 +282,8 @@ export function SimpleTable(props: SimpleTableProps) {
                 key={row.name}
                 row={row}
                 columns={props.columns}
+                forceExpand={props.forceExpand}
+                formatNumbers={props.formatNumbers}
                 visibleColumnsIndexes={visibleColumnsIndexes}
               />
             ))}