feat: update cms usage to cockpit hq

globalfund · Dec 7, 2023 · c52452e · c52452e
1 parent c81b61b
commit c52452e
Show file tree

Hide file tree

Showing 34 changed files with 47 additions and 41 deletions.
diff --git a/src/app/modules/country-detail-module/index.tsx b/src/app/modules/country-detail-module/index.tsx
@@ -83,13 +83,13 @@ export default function CountryDetail() {
     (store) => store.EligibilityCountry.clear
   );
   const countrySummaryCMSAction = useStoreActions(
-    (actions) => actions.cms.countrySummary.post
+    (actions) => actions.cms.countrySummary.fetch
   );
   const clearCountrySummaryCMS = useStoreActions(
     (store) => store.cms.countrySummary.clear
   );
   const notesDisclaimersCMSAction = useStoreActions(
-    (actions) => actions.cms.notesAndDisclaimers.post
+    (actions) => actions.cms.notesAndDisclaimers.fetch
   );
   const appliedFilters = useStoreState((state) => state.AppliedFiltersState);
 

diff --git a/src/app/modules/country-detail-module/sub-modules/overview/index.tsx b/src/app/modules/country-detail-module/sub-modules/overview/index.tsx
@@ -51,10 +51,10 @@ export function LocationDetailOverviewModule(props: Props) {
     })
   );
   const countrySummaryCMSData = useStoreState((state) =>
-    get(state.cms.countrySummary, "data.entries[0].summary", null)
+    get(state.cms.countrySummary, "data.summary", null)
   );
-  const notesDisclaimersCMSData = useStoreState((state) =>
-    get(state.cms.notesAndDisclaimers, "data.entries[0].content", null)
+  const notesDisclaimersCMSData = useStoreState((state) => 
+    get(state.cms.notesAndDisclaimers, "data.content", null)
   );
 
   let investmentLgValue: GridSize = 12;

diff --git a/src/app/state/api/action-reducers/cms/componentsAppBar.ts b/src/app/state/api/action-reducers/cms/componentsAppBar.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsAppBar: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsAppBar?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsAppBar`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsChartsBudgets.ts b/src/app/state/api/action-reducers/cms/componentsChartsBudgets.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsChartsBudgets: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsChartsBudgets?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsChartsBudgets`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsChartsCommon.ts b/src/app/state/api/action-reducers/cms/componentsChartsCommon.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsChartsCommon: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsChartsCommon?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsChartsCommon`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsChartsEligibility.ts b/src/app/state/api/action-reducers/cms/componentsChartsEligibility.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsChartsEligibility: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsChartsEligibility?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsChartsEligibility`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsChartsGeomap.ts b/src/app/state/api/action-reducers/cms/componentsChartsGeomap.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsChartsGeomap: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsChartsGeomap?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsChartsGeomap`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsChartsGrants.ts b/src/app/state/api/action-reducers/cms/componentsChartsGrants.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsChartsGrants: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsChartsGrants?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsChartsGrants`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsChartsInvestments.ts b/src/app/state/api/action-reducers/cms/componentsChartsInvestments.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsChartsInvestments: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsChartsInvestments?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsChartsInvestments`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsChartsNetwork.ts b/src/app/state/api/action-reducers/cms/componentsChartsNetwork.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsChartsNetwork: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsChartsNetwork?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsChartsNetwork`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsChartsPerformanceRating.ts b/src/app/state/api/action-reducers/cms/componentsChartsPerformanceRating.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsChartsPerformanceRating: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsChartsPerformanceRating?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsChartsPerformanceRating`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsChartsPledges.ts b/src/app/state/api/action-reducers/cms/componentsChartsPledges.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsChartsPledges: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsChartsPledges?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsChartsPledges`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsCookieDialog.ts b/src/app/state/api/action-reducers/cms/componentsCookieDialog.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsCookieDialog: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsCookieDialog?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsCookieDialog`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsDatasetCarousel.ts b/src/app/state/api/action-reducers/cms/componentsDatasetCarousel.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsDatasetCarousel: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsDatasetCarousel?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsDatasetCarousel`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsDialogBox.ts b/src/app/state/api/action-reducers/cms/componentsDialogBox.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsDialogBox: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsDialogBox?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsDialogBox`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsInformationPanel.ts b/src/app/state/api/action-reducers/cms/componentsInformationPanel.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsInformationPanel: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsInformationPanel?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsInformationPanel`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsMobile.ts b/src/app/state/api/action-reducers/cms/componentsMobile.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsMobile: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsMobile?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsMobile`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsPageHeader.ts b/src/app/state/api/action-reducers/cms/componentsPageHeader.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsPageHeader: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsPageHeader?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsPageHeader`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsPerformanceFrameworkComponents.ts b/src/app/state/api/action-reducers/cms/componentsPerformanceFrameworkComponents.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsPerformanceFrameworkComponents: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsPerformanceFrameworkComponents?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsPerformanceFrameworkComponents`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsSearch.ts b/src/app/state/api/action-reducers/cms/componentsSearch.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsSearch: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsSearch?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsSearch`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsSidebar.ts b/src/app/state/api/action-reducers/cms/componentsSidebar.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsSidebar: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsSidebar?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsSidebar`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsSlideInPanel.ts b/src/app/state/api/action-reducers/cms/componentsSlideInPanel.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsSlideInPanel: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsSlideInPanel?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsSlideInPanel`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/componentsTable.ts b/src/app/state/api/action-reducers/cms/componentsTable.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const componentsTable: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/componentsTable?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/componentsTable`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/countrySummary.ts b/src/app/state/api/action-reducers/cms/countrySummary.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const countrySummary: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/collections/get/countrySummary?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/countrySummary`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/modulesAbout.ts b/src/app/state/api/action-reducers/cms/modulesAbout.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const modulesAbout: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/modulesAbout?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/modulesAbout`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/modulesCommon.ts b/src/app/state/api/action-reducers/cms/modulesCommon.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const modulesCommon: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/modulesCommon?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/modulesCommon`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/modulesCountryDetail.ts b/src/app/state/api/action-reducers/cms/modulesCountryDetail.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const modulesCountryDetail: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/modulesCountryDetail?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/modulesCountryDetail`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/modulesDatasets.ts b/src/app/state/api/action-reducers/cms/modulesDatasets.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const modulesDatasets: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/modulesDatasets?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/modulesDatasets`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/modulesFundingRequests.ts b/src/app/state/api/action-reducers/cms/modulesFundingRequests.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const modulesFundingRequests: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/modulesFundingRequests?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/modulesFundingRequests`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/modulesGrantDetail.ts b/src/app/state/api/action-reducers/cms/modulesGrantDetail.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const modulesGrantDetail: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/modulesGrantDetail?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/modulesGrantDetail`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/modulesGrants.ts b/src/app/state/api/action-reducers/cms/modulesGrants.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const modulesGrants: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/modulesGrants?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/modulesGrants`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/modulesLanding.ts b/src/app/state/api/action-reducers/cms/modulesLanding.ts
@@ -3,7 +3,7 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const modulesLanding: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/singletons/get/modulesLanding?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/modulesLanding`
   ),
 };
 

diff --git a/src/app/state/api/action-reducers/cms/notesAndDisclaimers.ts b/src/app/state/api/action-reducers/cms/notesAndDisclaimers.ts
@@ -3,8 +3,13 @@ import { CMSApiCallModel } from "app/state/api/interfaces";
 
 const notesAndDisclaimers: CMSApiCallModel = {
   ...APIModel(
-    `${process.env.REACT_APP_CMS_API}/collections/get/notesAndDisclaimers?token=${process.env.REACT_APP_CMS_TOKEN}`
+    `${process.env.REACT_APP_CMS_API}/content/item/notesAndDisclaimers`
   ),
 };
 
 export default notesAndDisclaimers;
+
+/**
+https://cms-prod.tgf.nyuki.io/api/singletons/get/componentsAppBar?token=account-fafa59d165d28d24a5de7214435942
+https://cms-prod.tgf.nyuki.io/api/collections/get/notesAndDisclaimers?token=account-fafa59d165d28d24a5de7214435942
+*/
diff --git a/src/app/state/api/index.ts b/src/app/state/api/index.ts
@@ -48,14 +48,15 @@ export const APIModel = <QueryModel, ResponseModel>(
   }),
   fetch: thunk(async (actions, query: RequestValues<QueryModel>) => {
     actions.onRequest();
+    const headers: any = {
+      "Content-Type": "application/json",
+      ...(process.env.REACT_APP_CMS_API && url.includes(process.env.REACT_APP_CMS_API) ? {"api-key": process.env.REACT_APP_CMS_TOKEN} : {}),
+    };
+    if (url.includes('content/items')) console.log('debuggy - querying url', url)
     axios
       .get(
         `${url}${query.filterString ? "?" : ""}${query.filterString ?? ""}`,
-        {
-          headers: {
-            "Content-Type": "application/json",
-          },
-        }
+        { headers }
       )
       .then(
         (resp: AxiosResponse) =>