Add custom functions

CodeForAfrica · May 20, 2024 · 62a2564 · 62a2564
1 parent 2109783
commit 62a2564
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/apps/charterafrica/src/lib/data/common/processPageContributors.js b/apps/charterafrica/src/lib/data/common/processPageContributors.js
@@ -1,4 +1,4 @@
-import { allLocations } from "@/charterafrica/lib/data/json/locations";
+import { allCountries } from "@/charterafrica/lib/data/json/locations";
 import {
   CONTRIBUTORS_COLLECTION,
   TOOL_COLLECTION,
@@ -173,7 +173,7 @@ async function processPageContributors(page, api, context) {
           type: "select",
           name: "location",
           label: filterLabels.location,
-          options: allLocations.map((country) => ({
+          options: allCountries.map((country) => ({
             value: country.value,
             label: country.label?.[locale || "en"],
           })),

diff --git a/apps/charterafrica/src/lib/data/common/processPageOrganisations.js b/apps/charterafrica/src/lib/data/common/processPageOrganisations.js
@@ -1,4 +1,4 @@
-import { allLocations } from "@/charterafrica/lib/data/json/locations";
+import { allCountries } from "@/charterafrica/lib/data/json/locations";
 import { ORGANIZATION_COLLECTION } from "@/charterafrica/payload/utils/collections";
 import queryString from "@/charterafrica/utils/ecosystem/queryString";
 import formatDateTime from "@/charterafrica/utils/formatDate";
@@ -146,7 +146,7 @@ async function processPageOrganisations(page, api, context) {
           type: "select",
           name: "location",
           label: filterLabels.location,
-          options: allLocations.map((country) => ({
+          options: allCountries.map((country) => ({
             value: country.value,
             label: country.label?.[locale || "en"],
           })),

diff --git a/apps/charterafrica/src/lib/data/json/locations.js b/apps/charterafrica/src/lib/data/json/locations.js
@@ -1,4 +1,4 @@
-const locations = [
+const countries = [
   {
     name: "Afghanistan",
     label: {
@@ -1959,6 +1959,9 @@ const locations = [
     value: "Zimbabwe",
     continent: "Africa",
   },
+];
+
+const regions = [
   {
     name: "Africa",
     label: {
@@ -1970,13 +1973,14 @@ const locations = [
     continent: "Africa",
   },
 ];
+const locations = [...countries, ...regions];
+const toOptions = ({ label, value }) => ({ label, value });
 
 export const locationsByContinent = (continent) => {
   return locations
     .filter((country) => continent === country.continent)
-    .map(({ continent: cntnt, name, ...c }) => c);
+    .map(toOptions);
 };
 
-export const allLocations = locations.map(
-  ({ continent: cntnt, name, ...c }) => c,
-);
+export const allCountries = countries.map(toOptions);
+export const allLocations = locations.map(toOptions);