Fix multi reference dataset not handling properly (#391)

* Fix multi reference dataset not handling properly * Bump commit hash
unicef-drp · Jan 30, 2025 · 39dcf93 · 39dcf93
1 parent 2478a7a
commit 39dcf93
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 16 deletions.
diff --git a/django_project/_commit_hash.txt b/django_project/_commit_hash.txt
@@ -1 +1 @@
-b09ba978b78bc81df4d9f257e6165868d890a701
+c1063dc7e3fe68addb2869bbb8b4c47452fefe9f
diff --git a/django_project/frontend/src/components/Map/Filter/Input/FilterInputData.tsx b/django_project/frontend/src/components/Map/Filter/Input/FilterInputData.tsx
@@ -255,7 +255,6 @@ export const FilterInputData = memo(
     const updateFilter = () => {
       // Run the calculation
       if (active) {
-        console.log(field)
         const queryWhere = returnDataToExpression(`data.${keyField}`, operator, value)
         const query = `SELECT ARRAY(concept_uuid) AS concept_uuids
                        FROM ? data

diff --git a/django_project/frontend/src/pages/Admin/Dashboard/Form/ListForm/index.jsx b/django_project/frontend/src/pages/Admin/Dashboard/Form/ListForm/index.jsx
@@ -131,7 +131,7 @@ export default function ListForm(
     } else if (dataStructure.children?.length) {
       dataStructure.children = Array.from(new Set(
           dataStructure.children.concat(
-            data.filter(row => row.group == null).map(row => row.id)
+            data.filter(row => row.group === null).map(row => row.id)
           )
         )
       )

diff --git a/django_project/frontend/src/pages/Dashboard/LeftPanel/Indicators/index.jsx b/django_project/frontend/src/pages/Dashboard/LeftPanel/Indicators/index.jsx
@@ -75,7 +75,7 @@ export default function Indicators() {
   }, [indicators, indicatorLayerMetadata]);
 
   /** Loading data **/
-  const loading = (id) => {
+  const loading = (id, referenceLayerIdentifier) => {
     const indicatorLayer = indicatorLayers.filter(layer => layer.indicators.map(indicator => indicator.id).includes(id))
     indicatorLayer.map(indicatorLayer => {
       indicatorFetchingIds.push(indicatorLayer.id);
@@ -84,7 +84,10 @@ export default function Indicators() {
     dispatch(Actions.IndicatorsData.request(id))
 
     // get metadata and update progress
-    const dataId = 'indicator-' + id
+    let dataId = 'indicator-' + id
+    if (referenceLayer.identifier !== referenceLayerIdentifier) {
+      dataId += '-' + referenceLayerIdentifier
+    }
     const metadata = indicatorLayerMetadata[dataId]
     if (metadata?.version) {
       dispatch(
@@ -215,13 +218,16 @@ export default function Indicators() {
         // TODO:
         //  Loading by datasets
         indicatorsWithDataset.map(row => {
+          const { id, datasets } = row
           const indicator = indicators.find(
-            indicator => indicator.id === row.id
+            indicator => indicator.id === id
           )
           if (indicator) {
             const { id } = indicator
-            const referenceLayerIdentifier = referenceLayer?.identifier;
-            loading(id, referenceLayerIdentifier)
+            const _datasets = Array.from(new Set(datasets))
+            _datasets.map(dataset => {
+              loading(id, dataset)
+            })
           }
 
         })

diff --git a/django_project/frontend/src/pages/Dashboard/MapLibre/Layers/ReferenceLayer/index.jsx b/django_project/frontend/src/pages/Dashboard/MapLibre/Layers/ReferenceLayer/index.jsx
@@ -84,7 +84,6 @@ export function ReferenceLayer(
   const FILL_LAYER_ID = FILL_LAYER_ID_KEY + '-' + idx
   const OUTLINE_LAYER_ID = OUTLINE_LAYER_ID_KEY + '-' + idx
 
-  const prevState = useRef()
   const {
     referenceLayer: referenceLayerProject,
     indicatorLayers,
@@ -739,7 +738,6 @@ export default function ReferenceLayers({ map, deckgl, is3DView }) {
   const {
     referenceLayers
   } = useSelector(state => state.map);
-
   return map ? <>
     <ReferenceLayer
       idx={0} map={map}

diff --git a/django_project/frontend/src/pages/Dashboard/MiddlePanel/GlobalDateSelector/index.jsx b/django_project/frontend/src/pages/Dashboard/MiddlePanel/GlobalDateSelector/index.jsx
@@ -42,6 +42,9 @@ import { SelectWithList } from "../../../../components/Input/SelectWithList";
 import PlayControl from "./PlayControl";
 import { ThemeButton } from "../../../../components/Elements/Button";
 import { Session } from "../../../../utils/Sessions";
+import {
+  referenceLayerIndicatorLayer
+} from "../../../../utils/indicatorLayer";
 
 import './style.scss';
 
@@ -169,8 +172,13 @@ export default function GlobalDateSelector() {
     indicatorLayersSelected.map(id => {
       const indicatorLayer = indicatorLayers.find(layer => layer.id === id)
       if (indicatorLayer) {
+        const identifier = referenceLayerIndicatorLayer(null, indicatorLayer)?.identifier;
         indicatorLayer?.indicators?.map(indicator => {
-          const indicatorDates = indicatorLayerMetadata['indicator-' + indicator.id]?.dates
+          let metadataId = 'indicator-' + indicator.id
+          if (identifier) {
+            metadataId += '-' + identifier
+          }
+          const indicatorDates = indicatorLayerMetadata[metadataId]?.dates
           if (typeof indicatorDates === 'string' && indicatorDates.includes('Error')) {
             errorMessage = indicatorDates
           }
@@ -335,8 +343,10 @@ export default function GlobalDateSelector() {
       async () => {
         if (indicators.length) {
           const session = new Session('GlobalDateSelector');
+
+          // This is for default identifier
           const metadataUrl = `/api/indicator/metadata?reference_layer_uuid=` + referenceLayer?.identifier
-          axiosPostWithSession('FetchMetadata', metadataUrl, indicators.map(indicator => indicator.id))
+          await axiosPostWithSession('FetchMetadata', metadataUrl, indicators.map(indicator => indicator.id))
             .then(responses => {
                 const data = {}
                 indicators.map(indicator => {
@@ -357,16 +367,67 @@ export default function GlobalDateSelector() {
                 }
               }
             ).catch(err => {
-              if (session.isValid) {
-                dispatch(Actions.IndicatorLayerMetadata.updateBatch({}))
+                if (session.isValid) {
+                  dispatch(Actions.IndicatorLayerMetadata.updateBatch({}))
+                }
               }
-            }
-          );
+            );
         }
       }
     )();
   }, [indicators, referenceLayer]);
 
+  /**
+   * Update indicator dates
+   */
+  useEffect(() => {
+    (
+      async () => {
+        if (indicatorLayers.length) {
+          const datasetWithIndicators = {};
+          [currentIndicatorLayer, currentIndicatorSecondLayer].concat(indicatorLayers).map(layer => {
+            const identifier = referenceLayerIndicatorLayer(referenceLayer, layer)?.identifier;
+            if (identifier !== referenceLayer.identifier) {
+              if (!datasetWithIndicators[identifier]) {
+                datasetWithIndicators[identifier] = []
+              }
+              datasetWithIndicators[identifier] = datasetWithIndicators[identifier].concat(
+                layer?.indicators?.map(indicator => indicator.id)
+              )
+            }
+          })
+          for (var identifier of Object.keys(datasetWithIndicators)) {
+            const indicators = datasetWithIndicators[identifier]
+            const metadataUrl = `/api/indicator/metadata?reference_layer_uuid=` + identifier
+            if (indicators?.length) {
+              await axiosPostWithSession(metadataUrl, metadataUrl, indicators)
+                .then(responses => {
+                    const data = {}
+                    indicators.map(indicator => {
+                      const response = responses[indicator]
+                      const id = 'indicator-' + indicator + '-' + identifier
+                      if (!response?.dates?.length) {
+                        data[id] = {
+                          dates: [nowUTC().toISOString()],
+                          count: 0,
+                          version: new Date().getTime() + '-' + referenceLayer?.identifier
+                        }
+                      } else {
+                        data[id] = response
+                      }
+                    })
+                    dispatch(Actions.IndicatorLayerMetadata.updateBatch(data))
+                  }
+                ).catch(err => {
+                  }
+                );
+            }
+          }
+        }
+      }
+    )();
+  }, [indicatorLayers]);
+
   /**
    * Update dates
    */
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b09ba978b78bc81df4d9f257e6165868d890a701
		c1063dc7e3fe68addb2869bbb8b4c47452fefe9f