Fix codes

unicef-drp · Sep 26, 2024 · d2c8205 · d2c8205
1 parent e4a4a49
commit d2c8205
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/deployment/.template.env b/deployment/.template.env
@@ -45,17 +45,17 @@ DEFAULT_FROM_EMAIL=
 
 # --------------------------------
 # ---------- APP DOMAIN ----------
-# This is needed for tenants
+# Required for tenant configurations
 APP_DOMAIN=localhost
 
 # -------------------------------
 # ---------- PLUGINS ------------
-# Add or remove the app that you want the app
-# Put it in comma separator
+# Specify the plugins to enable or disable
+# Use a comma-separated list
 
-# Plugins app on GeoSight
+# GeoSight plugins:
 # - tenants
 # - cloud_native_gis
 # - reference_dataset
-PLUGINS=tenants,cloud_native_gis,reference_dataset
+PLUGINS=
 # -----------------------------
diff --git a/django_project/frontend/src/pages/Admin/ContextLayer/StyleConfig/AggregationStyleConfig.js b/django_project/frontend/src/pages/Admin/ContextLayer/StyleConfig/AggregationStyleConfig.js
@@ -27,6 +27,7 @@ import { ThemeButton } from "../../../../components/Elements/Button";
 import { updateDataWithMapbox } from "../../../../utils/CloudNativeGIS";
 import MapboxStyleInformation
  from "../../../../components/Buttons/MapboxStyleInformation";
+import { Variables } from "../../../../utils/Variables";
 
 
 export default function AggregationStyleConfig({ data, setData, setError }) {
@@ -36,7 +37,7 @@ export default function AggregationStyleConfig({ data, setData, setError }) {
  if (data.styles !== inputStyle) {
  setInputStyle(data.styles)
  }
- if (data.cloud_native_gis_layer_id) {
+ if (!data.mapbox_style) {
  (
  async () => {
  const newData = await updateDataWithMapbox(data)
@@ -93,7 +94,7 @@ export default function AggregationStyleConfig({ data, setData, setError }) {
  <br/>
  <br/>
  {
- data.mapbox_style ?
+ data.mapbox_style && data.layer_type === Variables.TERMS.CLOUD_NATIVE_GIS ?
  <ThemeButton
  variant="primary"
  onClick={() => {

diff --git a/django_project/frontend/src/pages/Dashboard/MapLibre/Layers/ReferenceLayer/Popup.jsx b/django_project/frontend/src/pages/Dashboard/MapLibre/Layers/ReferenceLayer/Popup.jsx
@@ -332,7 +332,7 @@ export function getContext(
  const url = urls.drilldown.replace('concept_uuid', concept_uuid)
  const params = {
  rtconfigs: JSON.stringify(indicatorLayersConfig),
- reference_layer_uuid: referenceLayerData?.data?.uuid | referenceLayerData?.data?.identifier
+ reference_layer_uuid: referenceLayerData?.data?.uuid ? referenceLayerData?.data?.uuid : referenceLayerData?.data?.identifier
  }
  const session = new Session('FetchingPopupContext')
  fetchingData(

diff --git a/django_project/initialize.py b/django_project/initialize.py
@@ -58,7 +58,6 @@
 
 print("-----------------------------------------------------")
 print("2. Running the migrations")
-call_command('makemigrations')
 call_command('migrate', '--noinput')
 
 #########################################################