Merge pull request #4719 from wri/chore/hide-european-countries-FLAG-934

[FLAG-934] Conditionally hide 2 widgets for European countries
wri · Nov 6, 2023 · ddbc300 · ddbc300
2 parents 99ce83c + bd30abc
commit ddbc300
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 19 deletions.
diff --git a/components/widgets/forest-change/tree-cover-gain-outside-plantations/index.js b/components/widgets/forest-change/tree-cover-gain-outside-plantations/index.js
@@ -12,6 +12,8 @@ import {
   TREE_PLANTATIONS,
 } from 'data/layers';
 
+import { EuropeFAOCountries } from 'utils/fao-countries';
+
 import getWidgetProps from './selectors';
 
 export default {
@@ -76,6 +78,9 @@ export default {
     regionWithIndicator:
       'In {location} between 2000 and 2020, {gainPercent} of tree cover gain within {indicator} occurred outside of plantations.',
   },
+  blacklists: {
+    adm0: EuropeFAOCountries,
+  },
   settings: {
     threshold: 0,
   },

diff --git a/components/widgets/forest-change/tree-loss-plantations/index.js b/components/widgets/forest-change/tree-loss-plantations/index.js
@@ -14,6 +14,8 @@ import {
   TREE_PLANTATIONS,
 } from 'data/layers';
 
+import { EuropeFAOCountries } from 'utils/fao-countries';
+
 import getWidgetProps from './selectors';
 
 const MIN_YEAR = 2013;
@@ -73,6 +75,9 @@ export default {
     indicators: ['plantations'],
     checkStatus: true,
   },
+  blacklists: {
+    adm0: EuropeFAOCountries,
+  },
   settings: {
     threshold: 30,
     startYear: MIN_YEAR,

diff --git a/components/widgets/selectors.js b/components/widgets/selectors.js
@@ -262,8 +262,8 @@ export const filterWidgetsByLocation = createSelector(
       const {
         types,
         admins,
-        whitelists,
-        blacklists,
+        whitelists: allowedList,
+        blacklists: deniedList,
         source,
         datasets,
         visible,
@@ -293,37 +293,40 @@ export const filterWidgetsByLocation = createSelector(
         admins &&
         admins.includes(adminLevel);
 
-      const adminWhitelist =
-        type === 'country' && whitelists && whitelists.adm0;
+      const adminAllowedList =
+        type === 'country' && allowedList && allowedList.adm0;
 
-      const adminBlacklist =
-        type === 'country' && blacklists && blacklists[adminLevel];
-      const notInBlacklist =
-        !adminBlacklist || !adminBlacklist.includes(adminLevel);
+      const matchesAllowedList =
+        !adminAllowedList || adminAllowedList.includes(location.adm0);
+
+      const adminDeniedList =
+        type === 'country' && deniedList && deniedList.adm0;
+
+      const notInDeniedList =
+        !adminDeniedList || !adminDeniedList?.includes(location.adm0);
 
       const isFAOCountry =
         source !== 'fao' || (fao && fao.find((f) => f.value === location.adm0));
-      const matchesAdminWhitelist =
-        !adminWhitelist || adminWhitelist.includes(location.adm0);
+
       const polynameIntersection =
-        whitelists &&
-        whitelists.indicators &&
+        allowedList &&
+        allowedList.indicators &&
         intersection(
           polynameWhitelist?.[
             w.whitelistType || w?.settings?.dataset || 'annual'
           ],
-          whitelists.indicators
+          allowedList.indicators
         );
       const matchesPolynameWhitelist =
         type === 'global' ||
-        !whitelists ||
-        !whitelists.indicators ||
+        !allowedList ||
+        !allowedList.indicators ||
         (polynameIntersection && polynameIntersection.length);
       const isWidgetDataPending =
         // for geostore shapes sometimes the data is not ready (no cached tables)
-        !whitelists ||
+        !allowedList ||
         (status && status !== 'pending') ||
-        !whitelists.checkStatus;
+        !allowedList.checkStatus;
 
       const isWidgetVisible =
         (!showAnalysis && !visible) ||
@@ -341,11 +344,11 @@ export const filterWidgetsByLocation = createSelector(
 
       return (
         hasLocation &&
-        matchesAdminWhitelist &&
+        matchesAllowedList &&
         matchesPolynameWhitelist &&
         isFAOCountry &&
         isWidgetVisible &&
-        notInBlacklist &&
+        notInDeniedList &&
         isWidgetDataPending &&
         published
       );

diff --git a/utils/fao-countries.js b/utils/fao-countries.js
@@ -0,0 +1,54 @@
+export const EuropeFAOCountries = [
+  'ALB',
+  'AND',
+  'AUT',
+  'BLR',
+  'BEL',
+  'BIH',
+  'BGR',
+  'HRV',
+  'CZE',
+  'DNK',
+  'EST',
+  'FRO',
+  'FIN',
+  'FRA',
+  'DEU',
+  'GIB',
+  'GRC',
+  'GGY',
+  'VAT',
+  'HUN',
+  'ISL',
+  'IRL',
+  'IMN',
+  'ITA',
+  'JEY',
+  'LVA',
+  'LIE',
+  'LTU',
+  'LUX',
+  'MLT',
+  'MCO',
+  'MNE',
+  'NLD',
+  'MKD',
+  'NOR',
+  'POL',
+  'PRT',
+  'MDA',
+  'ROU',
+  'RUS',
+  'SMR',
+  'SRB',
+  'SVK',
+  'SVN',
+  'ESP',
+  'SJM',
+  'SWE',
+  'CHE',
+  'UKR',
+  'GBR',
+];
+
+export default EuropeFAOCountries;