chore: minor review changes

globalfund · Mar 7, 2023 · ab4d6a4 · ab4d6a4
1 parent 5cbcde4
commit ab4d6a4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 34 deletions.
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/ToolBoxPanel/utils/getControlItems.ts b/src/app/components/ToolBoxPanel/utils/getControlItems.ts
@@ -114,6 +114,11 @@ const views = {
       value: "Map",
       link: "/viz/allocations/map",
     },
+    {
+      label: "Table",
+      value: "Table",
+      link: "/viz/allocations/table",
+    },
   ],
   grants: [
     {
@@ -181,14 +186,14 @@ const aggregates = {
   //   },
   // ],
   eligibility: [
-    {
-      label: "Components",
-      value: "componentName",
-    },
     {
       label: "Locations",
       value: "geographicAreaName",
     },
+    {
+      label: "Components",
+      value: "componentName",
+    },
   ],
 };
 

diff --git a/src/app/hooks/useDatasetMenuItems.tsx b/src/app/hooks/useDatasetMenuItems.tsx
@@ -136,7 +136,7 @@ export function useDatasetMenuItems(): React.ReactChild[] {
       </Link>
     </Expandable>,
     <Expandable label="Access to Funding">
-      <Link to={`/viz/eligibility${location.search}`}>Eligibility</Link>
+      <Link to={`/viz/eligibility/table${location.search}`}>Eligibility</Link>
       <Link to={`/viz/allocations${location.search}`}>Allocations</Link>
     </Expandable>,
     <Expandable label="Grant Implementation">

diff --git a/src/app/modules/datasets-module/data.tsx b/src/app/modules/datasets-module/data.tsx
@@ -46,7 +46,7 @@ export const datasets: DatasetItemModel[] = [
   },
   {
     name: "Eligibility",
-    link: "/viz/eligibility",
+    link: "/viz/eligibility/table",
     group: "Access to Funding",
     preview: <EligibilityDotsPreview />,
   },

diff --git a/src/app/modules/landing-module/components/dataset-grid/index.tsx b/src/app/modules/landing-module/components/dataset-grid/index.tsx
@@ -226,7 +226,7 @@ export function LandingDatasetGrid() {
       <Grid item xs={12} sm={6} md={6} lg={3}>
         <GridItem
           title={aeText}
-          link="/viz/eligibility"
+          link="/viz/eligibility/table"
           description={aeDescription}
           iconLinks={[
             {
@@ -254,6 +254,10 @@ export function LandingDatasetGrid() {
               icon: <MapIcon />,
               link: "/viz/allocations/map",
             },
+            {
+              icon: <TableIcon />,
+              link: "viz/allocations/table",
+            },
           ]}
         />
       </Grid>