wip: sending correct params

Author: wri7tno

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

@@ -9,7 +9,7 @@ import {
 } from 'data/layers';
 
 import { getTreeCoverLossByDriverType } from 'services/analysis-cached';
-
+import { fetchDataMart } from 'services/datamart';
 import getWidgetProps from './selectors';
 
 export default {
@@ -92,12 +92,73 @@ export default {
       groupedLegends: true,
     };
   },
-  getData: (params) =>
+  /**
+   *
+   * @param {Object} params
+   * @param {String} params.adm0
+   * @param {String} params.adm1
+   * @param {String} params.adm2
+   * @param {boolean} params.analysis true if widget is rendered in map, otherwise false
+   * @param {boolean} params.dashboard true if widget is rendered in dashboard, false otherwise
+   * @param {Object} params.geostore
+   * @param {string} params.geostore.id gesotore id
+   * @param {string} params.threshold threshold value
+   * @param {string} params.type country, global
+   * @returns
+   */
+  getData: async (params) => {
+    const {
+      adm0,
+      adm1,
+      adm2,
+      analysis,
+      // eslint-disable-next-line no-unused-vars
+      dashboard,
+      geostore,
+      threshold,
+      type,
+    } = params;
+
+    const dataset = 'tree_cover_loss_by_driver';
+    // const HARDCODED_GESOTORE = 'c3833748f6815d31bad47d47f147c0f0';
+
+    let mappedType =  '';
+
+    if (analysis) {
+      mappedType = 'geostore';
+    } else {
+      if (type === 'global') {
+        mappedType = 'global';
+      }
+
+      if (adm0 !== undefined && adm0 !== null) {
+        mappedType = 'admin';
+      }
+    }
+
+    // TODO: depending on type, send either geostore or adm0, adm1 etc
+    const response = await fetchDataMart({
+      dataset,
+      geostoreId: geostore?.id,
+      type: mappedType,
+      adm0,
+      adm1,
+      adm2,
+      threshold,
+      isDownload: false,
+    });
+
+    console.log('response: ', response);
+
+    return response.data?.tree_cover_loss_by_driver;
+  },
+  /*
     getTreeCoverLossByDriverType(params).then((response) => {
       const { data } = (response && response.data) || {};
 
       return data;
     }),
+    */
   getDataURL: (params) => [
     getTreeCoverLossByDriverType({ ...params, download: true }),
   ],

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

@@ -1,4 +1,3 @@
-import { all, spread } from 'axios';
 import { getYearsRangeFromMinMax } from 'components/widgets/utils/data';
 
 import {
@@ -12,9 +11,9 @@ import {
 } from 'data/layers';
 
 import treeLoss from 'components/widgets/forest-change/tree-loss';
-import { getExtent, getLoss } from 'services/analysis-cached';
+import { getLoss } from 'services/analysis-cached';
 
-import { fetchDataMart } from 'services/datamart';
+// import { fetchDataMart } from 'services/datamart';
 import getWidgetProps from './selectors';
 
 
@@ -124,6 +123,7 @@ export default {
     checkStatus: true,
   },
   getData: async (params) => {
+    /*
     const {
       adm0,
       adm1,
@@ -134,8 +134,14 @@ export default {
       threshold,
       type, // country, global etc
     } = params;
+
     const dataset = 'tree_cover_loss_by_driver';
 
+    const { startYear, endYear, range } = getYearsRangeFromMinMax(
+      MIN_YEAR,
+      MAX_YEAR
+    );
+
     // TODO: depending on type, send either geostore or adm0, adm1 etc
     const response = await fetchDataMart({
       dataset,
@@ -150,42 +156,36 @@ export default {
     });
 
     return response;
+    */
 
-    /*
-    return all([
-      getLoss({ ...params, landCategory: 'tsc', lossTsc: true }),
-      getExtent({ ...params }),
-    ]).then(
-      spread((loss, extent) => {
-        let data = {};
-        if (loss && loss.data && extent && extent.data) {
-          data = {
-            loss: loss.data.data.filter(
-              (d) => d.tsc_tree_cover_loss_drivers__driver !== 'Unknown'
-            ),
-            extent: (loss.data.data && extent.data.data[0].value) || 0,
-          };
-        }
+    const response = await getLoss({ ...params, landCategory: 'tsc', lossTsc: true });
 
-        const { startYear, endYear, range } = getYearsRangeFromMinMax(
-          MIN_YEAR,
-          MAX_YEAR
-        );
+    let data = {};
 
-        return {
-          ...data,
-          settings: {
-            startYear,
-            endYear,
-            yearsRange: range,
-          },
-          options: {
-            years: range,
-          },
-        };
-      })
+    if (response && response.data) {
+      data = {
+        loss: response.data.data.filter(
+          (d) => d.tsc_tree_cover_loss_drivers__driver !== 'Unknown'
+        ),
+      };
+    }
+
+    const { startYear, endYear, range } = getYearsRangeFromMinMax(
+      MIN_YEAR,
+      MAX_YEAR
     );
-    */
+
+    return {
+      ...data,
+      settings: {
+        startYear,
+        endYear,
+        yearsRange: range,
+      },
+      options: {
+        years: range,
+      },
+    };
   },
   getDataURL: (params) => [
     getLoss({
@@ -194,7 +194,6 @@ export default {
       lossTsc: true,
       download: true,
     }),
-    getExtent({ ...params, download: true }),
   ],
   getWidgetProps,
 };

components/widgets/manifest.js

@@ -10,7 +10,7 @@ import treeCoverGainOutsidePlantations from 'components/widgets/forest-change/tr
 import treeGainLocated from 'components/widgets/forest-change/tree-gain-located';
 import treeLossLocated from 'components/widgets/forest-change/tree-loss-located';
 import treeLossPlantations from 'components/widgets/forest-change/tree-loss-plantations';
-import treeLossTsc from 'components/widgets/forest-change/tree-loss-drivers';
+import treeLossTsc from 'components/widgets/forest-change/_tree-loss-drivers';
 import treeCoverGainSimple from 'components/widgets/forest-change/tree-cover-gain-simple';
 import glads from 'components/widgets/forest-change/glads';
 // import gladRanked from 'components/widgets/forest-change/glad-ranked';