Merge branch 'master' into testing-new-deploy

WFP-VAM · Oct 31, 2023 · 6b46531 · 6b46531
2 parents 4c9ba67 + 1f17394
commit 6b46531
Show file tree

Hide file tree

Showing 10 changed files with 1,060 additions and 392 deletions.
diff --git a/api/app/report.py b/api/app/report.py
@@ -80,7 +80,7 @@ async def mock_prism_api_stats_call(route):
         await page.wait_for_selector('div[id="full-width-tabpanel-2"]', state="visible")
 
         await page.wait_for_selector(
-            'div[class="memo-analysisButtonContainer-140"]', state="visible"
+            'div[class^="memo-analysisButtonContainer-"]', state="visible"
         )
 
         await page.wait_for_selector(CREATE_REPORT_BUTTON_SELECTOR, state="attached")

diff --git a/frontend/src/components/DataViewer/index.tsx b/frontend/src/components/DataViewer/index.tsx
@@ -62,7 +62,6 @@ function DataViewer({ classes }: DatasetProps) {
         url: params.url,
         serverLayerName: params.serverLayerName,
         datasetFields: params.datasetFields,
-        selectedDate,
       };
       dispatch(loadDataset(requestParams));
     } else {

diff --git a/frontend/src/components/MapView/LeftPanel/ChartsPanel/ChartSection/index.tsx b/frontend/src/components/MapView/LeftPanel/ChartsPanel/ChartSection/index.tsx
@@ -27,7 +27,8 @@ const ChartSection = memo(
     chartLayer,
     adminProperties,
     adminLevel,
-    date,
+    startDate,
+    endDate,
     dataForCsv,
     classes,
   }: ChartSectionProps) => {
@@ -72,13 +73,15 @@ const ChartSection = memo(
         url: params.url,
         serverLayerName: params.serverLayerName,
         datasetFields: params.datasetFields,
-        selectedDate: date,
+        startDate,
+        endDate,
       };
     }, [
       adminCode,
       adminKey,
       adminLevel,
-      date,
+      startDate,
+      endDate,
       params.boundaryProps,
       params.datasetFields,
       params.serverLayerName,
@@ -280,7 +283,8 @@ export interface ChartSectionProps extends WithStyles<typeof styles> {
   chartLayer: WMSLayerProps;
   adminProperties: GeoJsonProperties;
   adminLevel: 0 | 1 | 2;
-  date: number;
+  startDate: number;
+  endDate: number;
   dataForCsv: React.MutableRefObject<any>;
 }