Fix color bugs for overriden predefined (#321)

unicef-drp · Nov 19, 2024 · 054d627 · 054d627
1 parent 158730d
commit 054d627
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/django_project/_commit_hash.txt b/django_project/_commit_hash.txt
@@ -1 +1 @@
-24aac4bc3175037479ab01decf2b01e9f0e5e42e
+158730d76e51290ce01ac8d3c45d299d961bbae2
diff --git a/django_project/_version.txt b/django_project/_version.txt
@@ -1 +1 @@
-2.0.0
+2.0.1
diff --git a/..._project/frontend/src/pages/Admin/Dashboard/Form/IndicatorLayers/IndicatorStyle/index.jsx b/..._project/frontend/src/pages/Admin/Dashboard/Form/IndicatorLayers/IndicatorStyle/index.jsx
@@ -211,7 +211,7 @@ export const IndicatorStyle = forwardRef(
                             updateData()
                           }}
                           valuesUrl={`/api/indicator/${indicator.id}/values/flat/`}
-                          defaultStyleRules={indicator?.style ? indicator?.style : []}
+                          defaultStyleRules={dataLayer.style ? dataLayer.style : indicator?.style ? indicator?.style : []}
                           selectableInput={batch !== null}
                         /> : null
                     }

diff --git a/django_project/frontend/src/utils/referenceLayer.jsx b/django_project/frontend/src/utils/referenceLayer.jsx
@@ -91,6 +91,8 @@ export function returnValueByGeometry(
       allData = allData.filter(row => filteredGeometries.includes(row.concept_uuid))
     }
     allData = UpdateStyleData(allData, config)
+  } else if (layer.override_style) {
+    allData = UpdateStyleData(allData, layer)
   }
 
   const byGeometry = {}