[FLAG-997] GADM country list

components/map-menu/components/sections/search/selectors.js

@@ -1,6 +1,6 @@
 import { createSelector, createStructuredSelector } from 'reselect';
 import { deburrUpper } from 'utils/strings';
-import { getGadm36Id } from 'utils/gadm';
+import { getGadmId } from 'utils/gadm';
 import sortBy from 'lodash/sortBy';
 import { translateText, selectActiveLang } from 'utils/lang';
 
@@ -49,7 +49,7 @@ const getLocations = createSelector(
   (locations, location) => {
     if (!locations) return null;
     const { adm0, adm1, adm2 } = location;
-    const gadmId = getGadm36Id(adm0, adm1, adm2);
+    const gadmId = getGadmId(adm0, adm1, adm2);
 
     return locations
       .map((l) => ({

components/map/components/popup/components/boundary-sentence/selectors.js

@@ -6,16 +6,16 @@ const getInteractionData = (state, { data }) => data;
 
 /**
  * Returns an object with the selected location name, its area and a sentence do be displayed.
- * @param {method} createSelector - return a memoized outut selector.
+ * @param {method} createSelector - return a memoized output selector.
  * @see https://reselect.js.org/introduction/getting-started/#output-selector for implementation details
  * @param {selector} getInteractionData - data from the area clicked by user
  * @return {object} sentence, location name and area.
  */
 export const getSentence = createSelector(
   [getInteractionData],
   ({ data } = {}) => {
-    const { adm_level, gid_0, name_1, country } = data;
-    let name = adm_level > 0 ? data[`name_${adm_level}`] : country;
+    const { adm_level, gid_0, name_1, name_0, country } = data;
+    let name = adm_level > 0 ? data[`name_${adm_level}`] : country || name_0;
 
     if (!gid_0) {
       name = data[Object.keys(data).find((k) => k.includes('name'))];
@@ -30,12 +30,15 @@ export const getSentence = createSelector(
       locationNames = [
         locationNameTranslated,
         translateText(name_1),
-        translateText(country),
+        translateText(country || name_0),
       ];
     }
 
-    if (Number(adm_level) === '1') {
-      locationNames = [locationNameTranslated, translateText(country)];
+    if (Number(adm_level) === 1) {
+      locationNames = [
+        locationNameTranslated,
+        translateText(country || name_0),
+      ];
     }
 
     const locationName = locationNames.join(', ');

components/widgets/climate/soil-organic/selectors.js

@@ -22,7 +22,7 @@ export const getSortedData = createSelector(
   [getData, getSettings, getAdm1, getAdm2],
   (data, settings, adm1, adm2) => {
     if (isEmpty(data)) return null;
-    // console.log('soil-organic', { data, settings })
+
     let regionKey = 'iso';
     if (adm1) regionKey = 'adm1';
     if (adm2) regionKey = 'adm2';
@@ -121,10 +121,10 @@ export const parseSentence = createSelector(
         settings.unit === 'totalBiomass'
           ? formatNumber({ num: percent, unit: '%' })
           : formatNumber({
-            num: avgBiomDensity,
-            unit: 'tC/ha',
-            spaceUnit: true,
-          });
+              num: avgBiomDensity,
+              unit: 'tC/ha',
+              spaceUnit: true,
+            });
 
       const labels = {
         globalDensity: 'soil organic carbon density',
@@ -134,9 +134,10 @@ export const parseSentence = createSelector(
       // Properties defined for labels and sentences are named in a way that relates with the display
       // but the units are somewhat fixed, due to their dependency on the whitelists for settings dropdowns.
       // We map them here.
-      const sentenceLabelProperty = settings.unit === 'totalBiomass' ? 'globalBiomass' : 'globalDensity';
+      const sentenceLabelProperty =
+        settings.unit === 'totalBiomass' ? 'globalBiomass' : 'globalDensity';
       const sentence = sentences[sentenceLabelProperty];
-      const label = labels[sentenceLabelProperty]
+      const label = labels[sentenceLabelProperty];
 
       return {
         sentence,
@@ -145,7 +146,7 @@ export const parseSentence = createSelector(
           value,
         },
       };
-    };
+    }
 
     // Standard processing for adm1 and adm2 areas, same sentence, same formatting.
     const location_id = location && location.value;

pages/about.js

@@ -28,7 +28,7 @@ export const getStaticProps = async () => {
     props: {
       impactProjects,
       sgfProjects,
-      countries: countries?.data?.rows,
+      countries: countries?.data,
       notifications: notifications || [],
     },
     revalidate: 10,

pages/dashboards/[[...location]].js

@@ -7,13 +7,12 @@ import uniqBy from 'lodash/uniqBy';
 
 import useRouter from 'utils/router';
 import { decodeQueryParams } from 'utils/url';
-import { parseGadm36Id } from 'utils/gadm';
+import { parseGadmId } from 'utils/gadm';
 import { parseStringWithVars } from 'utils/strings';
 
 import { getLocationData } from 'services/location';
 import { getPublishedNotifications } from 'services/notifications';
 import {
-  // getCountriesProvider,
   getRegionsProvider,
   getSubRegionsProvider,
   getCategorisedCountries,
@@ -183,9 +182,9 @@ export const getServerSideProps = async ({ params, query, req }) => {
       const countryLinks = await getCountryLinksSerialized();
       countryData = {
         ...countryData,
-        regions: uniqBy(regions.data.rows).map((row) => ({
-          id: parseGadm36Id(row.id).adm1,
-          value: parseGadm36Id(row.id).adm1,
+        regions: uniqBy(regions.data).map((row) => ({
+          id: parseGadmId(row.id).adm1,
+          value: parseGadmId(row.id).adm1,
           label: row.name,
           name: row.name,
         })),
@@ -194,12 +193,12 @@ export const getServerSideProps = async ({ params, query, req }) => {
     }
 
     if (adm1) {
-      const subRegions = await getSubRegionsProvider(adm0, adm1);
+      const subRegions = await getSubRegionsProvider({ adm0, adm1 });
       countryData = {
         ...countryData,
-        subRegions: uniqBy(subRegions.data.rows).map((row) => ({
-          id: parseGadm36Id(row.id).adm2,
-          value: parseGadm36Id(row.id).adm2,
+        subRegions: uniqBy(subRegions.data).map((row) => ({
+          id: parseGadmId(row.id).adm2,
+          value: parseGadmId(row.id).adm2,
           label: row.name,
           name: row.name,
         })),

pages/embed/sentence/[[...location]].js

@@ -2,11 +2,10 @@ import { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import uniqBy from 'lodash/uniqBy';
 
-import { parseGadm36Id } from 'utils/gadm';
+import { parseGadmId } from 'utils/gadm';
 
 import { getLocationData } from 'services/location';
 import {
-  // getCountriesProvider,
   getRegionsProvider,
   getSubRegionsProvider,
   getCategorisedCountries,
@@ -91,9 +90,9 @@ export const getServerSideProps = async ({ params }) => {
       const countryLinks = await getCountryLinksSerialized();
       countryData = {
         ...countryData,
-        regions: uniqBy(regions.data.rows).map((row) => ({
-          id: parseGadm36Id(row.id).adm1,
-          value: parseGadm36Id(row.id).adm1,
+        regions: uniqBy(regions.data).map((row) => ({
+          id: parseGadmId(row.id).adm1,
+          value: parseGadmId(row.id).adm1,
           label: row.name,
           name: row.name,
         })),
@@ -102,12 +101,12 @@ export const getServerSideProps = async ({ params }) => {
     }
 
     if (adm1) {
-      const subRegions = await getSubRegionsProvider(adm0, adm1);
+      const subRegions = await getSubRegionsProvider({ adm0, adm1 });
       countryData = {
         ...countryData,
-        subRegions: uniqBy(subRegions.data.rows).map((row) => ({
-          id: parseGadm36Id(row.id).adm2,
-          value: parseGadm36Id(row.id).adm2,
+        subRegions: uniqBy(subRegions.data).map((row) => ({
+          id: parseGadmId(row.id).adm2,
+          value: parseGadmId(row.id).adm2,
           label: row.name,
           name: row.name,
         })),
@@ -151,21 +150,6 @@ export const getServerSideProps = async ({ params }) => {
     };
   }
 };
-//
-// export const getStaticPaths = async () => {
-//   const countryData = await getCountriesProvider();
-//   const { rows: countries } = countryData?.data || {};
-//   const countryPaths = countries.map((c) => ({
-//     params: {
-//       location: ['country', c.iso],
-//     },
-//   }));
-//
-//   return {
-//     paths: ['/embed/sentence/', ...countryPaths] || [],
-//     fallback: true,
-//   };
-// };
 
 const getSentenceClientSide = async (
   locationNames = null,

pages/grants-and-fellowships/[section].js

@@ -58,7 +58,7 @@ export const getServerSideProps = async ({ query }) => {
         title: 'Projects | Grants & Fellowships | Global Forest Watch',
         section: query?.section,
         projects: parsedProjects || [],
-        allCountries: allCountries?.data?.rows || [],
+        allCountries: allCountries?.data || [],
         projectCountries: uniqCountries || [],
         country: query?.country || '',
         projectsTexts: pageTexts?.[0]?.acf,

providers/country-data-provider/actions.js

@@ -1,5 +1,5 @@
 import { createAction, createThunkAction } from 'redux/actions';
-import { parseGadm36Id } from 'utils/gadm';
+import { parseGadmId } from 'utils/gadm';
 import uniqBy from 'lodash/uniqBy';
 
 import {
@@ -47,10 +47,10 @@ export const getRegions = createThunkAction(
     getRegionsProvider(country)
       .then((response) => {
         const parsedResponse = [];
-        uniqBy(response.data.rows).forEach((row) => {
+        uniqBy(response.data).forEach((region) => {
           parsedResponse.push({
-            id: parseGadm36Id(row.id).adm1,
-            name: row.name,
+            id: parseGadmId(region.id).adm1,
+            name: region.name,
           });
         });
         dispatch(setRegions(parsedResponse, 'id'));
@@ -67,14 +67,13 @@ export const getSubRegions = createThunkAction(
   ({ adm0, adm1, token }) =>
     (dispatch) => {
       dispatch(setSubRegionsLoading(true));
-      getSubRegionsProvider(adm0, adm1, token)
+      getSubRegionsProvider({ adm0, adm1, token })
         .then((subRegions) => {
-          const { rows } = subRegions.data;
           const parsedResponse = [];
-          uniqBy(rows).forEach((row) => {
+          uniqBy(subRegions?.data).forEach((subRegion) => {
             parsedResponse.push({
-              id: parseGadm36Id(row.id).adm2,
-              name: row.name,
+              id: parseGadmId(subRegion.id).adm2,
+              name: subRegion.name,
             });
           });
           dispatch(setSubRegions(uniqBy(parsedResponse, 'id')));