Revert deploy

components/charts/components/pie-chart-legend/component.jsx

@@ -3,19 +3,10 @@ import PropTypes from 'prop-types';
 import { formatNumber } from 'utils/format';
 import cx from 'classnames';
 
-import groupBy from 'lodash/groupBy';
-
 class PieChartLegend extends PureComponent {
   render() {
-    const {
-      data,
-      chartSettings = {},
-      config,
-      className,
-      simple,
-      onMap,
-    } = this.props;
-    const { size, legend, groupedLegends } = chartSettings;
+    const { data, chartSettings = {}, config, className, simple } = this.props;
+    const { size, legend } = chartSettings;
 
     const sizeClass = (() => {
       if (size) return size;
@@ -33,61 +24,6 @@ class PieChartLegend extends PureComponent {
         })}`?.length > 9
     );
 
-    if (groupedLegends) {
-      const groupedItems = groupBy(data, 'category');
-
-      return (
-        <div
-          className={cx(
-            {
-              'c-pie-chart-legend': true,
-              'c-pie-chart-legend-grouped': groupedLegends,
-              'top-margin-20': groupedLegends && onMap,
-            },
-            className
-          )}
-        >
-          {Object.entries(groupedItems).map(([category, categoryItems]) => (
-            <div className="legend-group">
-              <h2 className="legend-group-title">{category}</h2>
-              <ul className={cx('legend-group-list', simple, sizeClass)}>
-                {categoryItems.map((item, index) => {
-                  const value = `${formatNumber({
-                    num: item[config.key],
-                    unit: item.unit ? item.unit : config.unit,
-                    spaceUnit: item.unit !== '%' && config.unit !== 'countsK',
-                  })}`;
-
-                  return (
-                    <li className="legend-item" key={index.toString()}>
-                      <div className="legend-title">
-                        <span style={{ backgroundColor: item.color }}>{}</span>
-                        <p>
-                          {item.label}
-                          {sizeClass === 'x-small' && `- ${value}`}
-                        </p>
-                      </div>
-                      {sizeClass !== 'x-small' && (
-                        <div
-                          className={cx({
-                            'legend-value': true,
-                            'legend-value--small': shouldDisplaySmallerValues,
-                          })}
-                          style={{ color: item.color }}
-                        >
-                          {value}
-                        </div>
-                      )}
-                    </li>
-                  );
-                })}
-              </ul>
-            </div>
-          ))}
-        </div>
-      );
-    }
-
     return (
       <div
         className={cx('c-pie-chart-legend', className)}
@@ -133,14 +69,12 @@ class PieChartLegend extends PureComponent {
 }
 
 PieChartLegend.propTypes = {
-  onMap: PropTypes.bool,
   data: PropTypes.array,
   config: PropTypes.object,
   chartSettings: PropTypes.shape({
     size: PropTypes.oneOf(['small', 'x-small']),
     legend: PropTypes.shape({ style: PropTypes.object }),
     chart: PropTypes.shape({ style: PropTypes.object }),
-    groupedLegends: PropTypes.bool,
   }),
   simple: PropTypes.bool,
   className: PropTypes.string,

components/charts/components/pie-chart-legend/styles.scss

@@ -4,30 +4,8 @@
   display: inline-block;
   width: 100%;
 
-  &-grouped {
-    flex-direction: column;
-  }
-
-  .legend-group {
-    display: flex;
-    flex-direction: column;
-
-    .legend-group-title {
-      margin-bottom: 0.9375rem;
-      font-weight: 500;
-      font-size: 0.875rem;
-    }
-
-    .legend-group-list {
-      display: flex;
-      justify-content: space-between;
-      flex-wrap: wrap;
-      margin-bottom: 1.25rem;
-    }
-  }
-
   .legend-title {
-    font-size: 0.75rem;
+    font-size: rem(12px);
     line-height: 1;
     color: $slate;
     position: relative;
@@ -36,19 +14,19 @@
 
     span {
       display: inline-block;
-      width: 0.75rem;
-      min-width: 0.75rem;
-      min-height: 0.75rem;
-      height: 0.75rem;
-      margin-right: 0.4375rem;
+      width: rem(12px);
+      min-width: rem(12px);
+      min-height: rem(12px);
+      height: rem(12px);
+      margin-right: rem(7px);
       border-radius: 100%;
       align-self: flex-start;
-      margin-top: 0.0625rem;
+      margin-top: 1px;
     }
 
     p {
       color: $slate;
-      font-size: 0.75rem;
+      font-size: rem(12px);
       line-height: 1.4;
     }
   }
@@ -94,7 +72,3 @@
     }
   }
 }
-
-.top-margin-20 {
-  margin-top: 1.25rem;
-}

components/widget/components/widget-pie-chart-legend/component.jsx

@@ -2,8 +2,6 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { formatNumber } from 'utils/format';
 
-import cx from 'classnames';
-
 import PieChart from 'components/charts/pie-chart';
 import PieChartLegend from 'components/charts/components/pie-chart-legend';
 import Button from 'components/ui/button';
@@ -23,9 +21,6 @@ class WidgetPieChart extends PureComponent {
     } = this.props;
     const { pathname } = location;
     const { chartHeight } = settings;
-    const { groupedLegends } = chartSettings;
-
-    const onMap = pathname.indexOf('map') !== -1;
 
     const showSettingsBtn =
       settingsBtnConfig &&
@@ -52,12 +47,7 @@ class WidgetPieChart extends PureComponent {
             {settingsBtnConfig.text}
           </Button>
         )}
-        <div
-          className={cx({
-            'pie-and-legend': true,
-            'pie-and-legend-grouped': groupedLegends && onMap,
-          })}
-        >
+        <div className="pie-and-legend">
           <PieChartLegend
             className="cover-legend"
             data={legendData || data}
@@ -67,7 +57,6 @@ class WidgetPieChart extends PureComponent {
               key: 'value',
               ...settings,
             }}
-            onMap={onMap}
             simple={simple}
             chartSettings={chartSettings}
           />

components/widget/components/widget-pie-chart-legend/styles.scss

@@ -6,10 +6,6 @@
     flex-direction: row;
     justify-content: space-between;
     gap: 4%;
-
-    &-grouped {
-      flex-direction: column-reverse;
-    }
   }
 
   .cover-legend {

components/widgets/forest-change/_tree-loss-drivers/index.js

@@ -20,6 +20,25 @@ export default {
   },
   types: ['global', 'country'],
   admins: ['global', 'adm0'],
+  alerts: {
+    default: [
+      {
+        id: 'tree-loss-drivers-alert-1',
+        text: `The methods behind this data have changed over time. Be cautious comparing old and new, data especially before/after 2015. [Read more here](https://www.globalforestwatch.org/blog/data-and-research/tree-cover-loss-satellite-data-trend-analysis/).`,
+        icon: 'warning',
+        visible: ['global', 'country', 'geostore', 'aoi', 'wdpa', 'use'],
+      },
+    ],
+    indonesia: [
+      {
+        id: 'tree-loss-drivers-indonesia-alert-1',
+        text: `Indonesia’s rates of deforestation have slowed significantly in recent years (2016-2021), largely due to reductions in commodity-driven expansion. Much of the primary forest loss from commodity-driven deforestation in Indonesia according to the GFW data actually took place in areas legally classified as secondary forests, not primary forests. Please note that ground verification is recommended before any hard conclusions are drawn about the type of forest affected, or cause of loss, in specific patches of loss on the GFW map.`,
+        icon: 'warning',
+        visible: ['global', 'country', 'geostore', 'aoi', 'wdpa', 'use'],
+        areaWhitelist: ['IDN'],
+      },
+    ],
+  },
   categories: ['summary', 'forest-change'],
   subcategories: ['forest-loss'],
   large: true,
@@ -81,21 +100,27 @@ export default {
     return {
       ...((dashboard || embed) && {
         size: 'small',
+        legend: {
+          style: {
+            display: 'flex',
+            justifyContent: 'center',
+            paddingLeft: '8%',
+          },
+        },
         chart: {
           style: {
             display: 'flex',
             height: 'auto',
             alignItems: 'center',
+            paddingRight: '14%',
           },
         },
       }),
-      groupedLegends: true,
     };
   },
   getData: (params) =>
     getTreeCoverLossByDriverType(params).then((response) => {
       const { data } = (response && response.data) || {};
-
       return data;
     }),
   getDataURL: (params) => [

components/widgets/forest-change/_tree-loss-drivers/selectors.js

@@ -9,26 +9,12 @@ const getColors = (state) => state.colors;
 const getSettings = (state) => state.settings;
 const getTitle = (state) => state.title;
 const getSentences = (state) => state.sentences;
+const getCaution = (state) => state.caution;
 const getLocationLabel = (state) => state.locationLabel;
+const getAdm0 = (state) => state.adm0;
 const getSortedCategories = () =>
   tscLossCategories.sort((a, b) => (a.position > b.position ? 1 : -1));
 
-const groupedLegends = {
-  'commodity driven deforestation': 'Drivers of temporary deforestation',
-  forestry: 'Drivers of temporary deforestation',
-  'forest management': 'Drivers of temporary  deforestation',
-  'shifting cultivation': 'Drivers of temporary deforestation',
-  'shifting agriculture': 'Drivers of temporary deforestation',
-  wildfire: 'Drivers of temporary deforestation',
-  'other natural disasters': 'Drivers of temporary  deforestation',
-  'hard commodities': 'Drivers of permanent deforestation',
-  'Drivers of permanent deforestation agriculture':
-    'Drivers of permanent deforestation',
-  'settlements and infrastructure': 'Drivers of permanent deforestation',
-  urbanization: 'Drivers of permanent deforestation',
-  unknown: 'Drivers of permanent deforestation',
-};
-
 export const getPermanentCategories = createSelector(
   [getSortedCategories],
   (sortedCategories) =>
@@ -61,7 +47,6 @@ export const parseData = createSelector(
       return {
         label: driver_type,
         value: loss_area_ha,
-        category: groupedLegends[driver_type.toLowerCase()],
         color: categoryColors[driver_type],
         percentage: (loss_area_ha * 100) / totalLoss,
       };
@@ -127,8 +112,14 @@ export const parseSentence = createSelector(
   }
 );
 
+export const parseCaution = createSelector(
+  [getCaution, getAdm0],
+  (caution, adm0) => (adm0 === 'IDN' ? caution.indonesia : caution.default)
+);
+
 export default createStructuredSelector({
   data: parseData,
   title: parseTitle,
   sentence: parseSentence,
+  caution: parseCaution,
 });