Fix reference dataset on selecting admin (#318)

meomancer · web-flow · commit 6c2073b3f544 · 2024-11-07T13:35:13.000+07:00
* Show plugins status on preference admin

* Fix the reference layer handler when changing

* Fix detail on management form

* Bump commit version
diff --git a/django_project/_commit_hash.txt b/django_project/_commit_hash.txt
@@ -1 +1 @@
-5ee1fe9d8fedb0c3355534241a80cf36d91fc887
+0b044429cb4fda6ef2939f5e8ea987f83ae429fc
diff --git a/django_project/core/admin.py b/django_project/core/admin.py
@@ -64,6 +64,10 @@ class SitePreferencesAdmin(admin.ModelAdmin):
         }),
         ('Plugins', {
             'fields': (
+                'cloud_native_gis_enabled',
+                'machine_info_fetcher_enabled',
+                'reference_dataset_enabled',
+                'tenants_enabled',
                 'machine_info_fetcher_config',
             )
         }),
@@ -137,7 +141,13 @@ class SitePreferencesAdmin(admin.ModelAdmin):
         })
     )
     inlines = (SitePreferencesImageInline,)
-    readonly_fields = ('sentry_dsn', 'sentry_environment')
+    readonly_fields = (
+        'sentry_dsn', 'sentry_environment',
+        'cloud_native_gis_enabled',
+        'machine_info_fetcher_enabled',
+        'reference_dataset_enabled',
+        'tenants_enabled'
+    )
 
 
 admin.site.register(SitePreferences, SitePreferencesAdmin)
diff --git a/django_project/core/models/preferences.py b/django_project/core/models/preferences.py
@@ -375,6 +375,29 @@ def sentry_environment(self):
         """Return admin emails."""
         return settings.SENTRY_ENVIRONMENT
 
+    # -------------------------------------
+    # FOR PLUGINS
+    # -------------------------------------
+    @property
+    def cloud_native_gis_enabled(self):
+        """Return if CLOUD_NATIVE_GIS_ENABLED is enabled."""
+        return settings.CLOUD_NATIVE_GIS_ENABLED
+
+    @property
+    def machine_info_fetcher_enabled(self):
+        """Return if MACHINE_INFO_FETCHER_ENABLED is enabled."""
+        return settings.MACHINE_INFO_FETCHER_ENABLED
+
+    @property
+    def reference_dataset_enabled(self):
+        """Return if REFERENCE_DATASET_ENABLED is enabled."""
+        return settings.REFERENCE_DATASET_ENABLED
+
+    @property
+    def tenants_enabled(self):
+        """Return if TENANTS_ENABLED is enabled."""
+        return settings.TENANTS_ENABLED
+
 
 class SitePreferencesImage(models.Model):
     """Preference images settings specifically for website."""
diff --git a/django_project/frontend/src/pages/Admin/Components/Input/ReferenceLayerGeometrySelector.jsx b/django_project/frontend/src/pages/Admin/Components/Input/ReferenceLayerGeometrySelector.jsx
@@ -14,12 +14,9 @@
  */
 
 import React, { useEffect, useState } from 'react';
-import {
-  axiosGet,
-  fetchFeatureList,
-  GeorepoUrls
-} from "../../../../utils/georepo";
+import { axiosGet, fetchFeatureList } from "../../../../utils/georepo";
 import { Select } from "../../../../components/Input";
+import { RefererenceLayerUrls } from "../../../../utils/referenceLayer";
 
 let requestTime = null
 /**
@@ -40,7 +37,8 @@ export default function ReferenceLayerGeometrySelector(
         setLevels(null)
         const currentDate = new Date().getTime();
         requestTime = currentDate;
-        axiosGet(GeorepoUrls.ViewDetail(referenceLayer)).then(response => {
+        const url = RefererenceLayerUrls.ViewDetail(referenceLayer)
+        axiosGet(url).then(response => {
           if (requestTime === currentDate) {
             const data = response.data
             const newLevels = data.dataset_levels.map(level => {
diff --git a/django_project/frontend/src/pages/Admin/Components/Input/ReferenceLayerLevelConfiguration/index.jsx b/django_project/frontend/src/pages/Admin/Components/Input/ReferenceLayerLevelConfiguration/index.jsx
@@ -29,6 +29,7 @@ import { GeorepoUrls } from "../../../../../utils/georepo";
 import { FormControlLabel, FormGroup } from "@mui/material";
 import { InternalReferenceDatasets } from "../../../../../utils/urls";
 import { Actions } from "../../../../../store/dashboard";
+import { RefererenceLayerUrls } from "../../../../../utils/referenceLayer";
 
 import './styles.scss';
 
@@ -84,10 +85,7 @@ export const ViewLevelConfiguration = forwardRef(
 
     useEffect(() => {
       if (referenceLayer.identifier && !referenceLayerData) {
-        let url = GeorepoUrls.ViewDetail(referenceLayer.identifier)
-        if (referenceLayer.is_local) {
-          url = InternalReferenceDatasets.detail(referenceLayer.identifier)
-        }
+        const url = RefererenceLayerUrls.ViewDetail(referenceLayer)
         dispatch(
           Actions.ReferenceLayerData.fetch(
             dispatch, referenceLayer.identifier, url
diff --git a/django_project/frontend/src/pages/Admin/Importer/Form/Extensions/FormulaBasedOnOtherIndicators/base.jsx b/django_project/frontend/src/pages/Admin/Importer/Form/Extensions/FormulaBasedOnOtherIndicators/base.jsx
@@ -207,7 +207,7 @@ export const FormulaBasedForm = forwardRef(
           }}
         >
           <ReferenceLayerGeometrySelector
-            referenceLayer={data.reference_layer}
+            referenceLayer={data}
             onChange={config => {
               setGeomConfig(config)
             }}
diff --git a/django_project/frontend/src/pages/Admin/Importer/LogDetail/index.jsx b/django_project/frontend/src/pages/Admin/Importer/LogDetail/index.jsx
@@ -27,8 +27,9 @@ import {
   replaceWithBr
 } from "../../../../utils/main";
 import { getScheduleText } from "../../../../utils/cron";
-import { axiosGet, GeorepoUrls } from "../../../../utils/georepo";
+import { axiosGet } from "../../../../utils/georepo";
 import { resourceActions } from "../Logs";
+import { RefererenceLayerUrls } from "../../../../utils/referenceLayer";
 
 import '../ImporterDetail/style.scss';
 import './style.scss';
@@ -82,7 +83,8 @@ export function ImporterDetailSection({ inputData }) {
 
   useEffect(() => {
     if (data.attributes?.admin_level_type === 'Specific Level') {
-      axiosGet(GeorepoUrls.ViewDetail(data.reference_layer)).then(response => response.data).then(response => {
+      const url = RefererenceLayerUrls.ViewDetail(data)
+      axiosGet(url).then(response => response.data).then(response => {
         const level = response.dataset_levels.find(level => level.level + '' === data.attributes?.admin_level_value + '')
         data.attributes.admin_level_type = level ? level.level_name : data.attributes?.admin_level_value
         setData({ ...data })
@@ -458,7 +460,7 @@ export default function ImporterLogDetail() {
                   </div>
                   <div className='DetailButtonButton'>
                     <div className='Separator'/>
-                    <a href={urls.api.dataView+'?status=Warning and Error'}>
+                    <a href={urls.api.dataView + '?status=Warning and Error'}>
                       <ThemeButton
                         variant="primary">
                         See the data
diff --git a/django_project/frontend/src/pages/Admin/Indicator/ValueManagementForm/index.jsx b/django_project/frontend/src/pages/Admin/Indicator/ValueManagementForm/index.jsx
@@ -1,17 +1,17 @@
 /**
-* GeoSight is UNICEF's geospatial web-based business intelligence platform.
-*
-* Contact : geosight-no-reply@unicef.org
-*
-* .. note:: This program is free software; you can redistribute it and/or modify
-*     it under the terms of the GNU Affero General Public License as published by
-*     the Free Software Foundation; either version 3 of the License, or
-*     (at your option) any later version.
-*
-* __author__ = 'irwan@kartoza.com'
-* __date__ = '13/06/2023'
-* __copyright__ = ('Copyright 2023, Unicef')
-*/
+ * GeoSight is UNICEF's geospatial web-based business intelligence platform.
+ *
+ * Contact : geosight-no-reply@unicef.org
+ *
+ * .. note:: This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU Affero General Public License as published by
+ *     the Free Software Foundation; either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ * __author__ = 'irwan@kartoza.com'
+ * __date__ = '13/06/2023'
+ * __copyright__ = ('Copyright 2023, Unicef')
+ */
 
 import React, { Fragment, useEffect, useRef, useState } from 'react';
 import $ from "jquery";
@@ -31,17 +31,14 @@ import {
 } from "../../../../components/Elements/Button";
 import { SelectWithList } from "../../../../components/Input/SelectWithList";
 import InputFile from './InputFile'
-import {
-  axiosGet,
-  fetchReferenceLayerList,
-  GeorepoUrls
-} from '../../../../utils/georepo'
+import { axiosGet, fetchReferenceLayerList } from '../../../../utils/georepo'
 import { jsonToXlsx } from '../../../../utils/main'
 import { GeorepoViewInputSelector } from "../../ModalSelector/InputSelector";
 import {
   Notification,
   NotificationStatus
 } from "../../../../components/Notification";
+import { RefererenceLayerUrls } from "../../../../utils/referenceLayer";
 
 import './style.scss';
 
@@ -79,7 +76,7 @@ export default function ValueManagement() {
   }
 
   const fetchData = (level, page) => {
-    axiosGet(level.url + '?page=' + page).then(response => {
+    axiosGet(level.url, { page: page }).then(response => {
       const data = response.data
       if (!level.layer) {
         level.layer = []
@@ -106,7 +103,8 @@ export default function ValueManagement() {
         return
       }
       if (!referenceLayer.data) {
-        axiosGet(GeorepoUrls.ViewDetail(reference.identifier)).then(response => {
+        const url = RefererenceLayerUrls.ViewDetail(referenceLayer)
+        axiosGet(url).then(response => {
           const data = response.data
           referenceLayer.data = data.dataset_levels.map(level => {
             level.value = level.level
diff --git a/django_project/frontend/src/pages/Admin/Indicator/ValueManagementMap/Map.jsx b/django_project/frontend/src/pages/Admin/Indicator/ValueManagementMap/Map.jsx
@@ -1,17 +1,17 @@
 /**
-* GeoSight is UNICEF's geospatial web-based business intelligence platform.
-*
-* Contact : geosight-no-reply@unicef.org
-*
-* .. note:: This program is free software; you can redistribute it and/or modify
-*     it under the terms of the GNU Affero General Public License as published by
-*     the Free Software Foundation; either version 3 of the License, or
-*     (at your option) any later version.
-*
-* __author__ = 'irwan@kartoza.com'
-* __date__ = '13/06/2023'
-* __copyright__ = ('Copyright 2023, Unicef')
-*/
+ * GeoSight is UNICEF's geospatial web-based business intelligence platform.
+ *
+ * Contact : geosight-no-reply@unicef.org
+ *
+ * .. note:: This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU Affero General Public License as published by
+ *     the Free Software Foundation; either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ * __author__ = 'irwan@kartoza.com'
+ * __date__ = '13/06/2023'
+ * __copyright__ = ('Copyright 2023, Unicef')
+ */
 
 /* ==========================================================================
    MAP CONFIG CONTAINER
@@ -22,8 +22,9 @@ import $ from 'jquery';
 import L from 'leaflet';
 
 import { SelectWithList } from "../../../../components/Input/SelectWithList";
-import { axiosGet, fetchGeojson, GeorepoUrls } from '../../../../utils/georepo'
+import { axiosGet, fetchGeojson } from '../../../../utils/georepo'
 import { GeorepoViewInputSelector } from "../../ModalSelector/InputSelector";
+import { RefererenceLayerUrls } from "../../../../utils/referenceLayer";
 
 /**
  * Map component.
@@ -240,7 +241,8 @@ export default function Map() {
         return
       }
       if (!referenceLayer.data) {
-        axiosGet(GeorepoUrls.ViewDetail(reference.identifier)).then(response => {
+        const url = RefererenceLayerUrls.ViewDetail(referenceLayer)
+        axiosGet(url).then(response => {
           const data = response.data
           referenceLayer.data = data.dataset_levels.map(level => {
             level.value = level.level
diff --git a/django_project/frontend/src/pages/Dashboard/MapLibre/Controllers/DatasetGeometryData.jsx b/django_project/frontend/src/pages/Dashboard/MapLibre/Controllers/DatasetGeometryData.jsx
@@ -22,15 +22,11 @@ import { useEffect } from "react";
 import { datasetListFromDashboardData } from "../../../../utils/geometry";
 import { dictDeepCopy } from "../../../../utils/main";
 import { Actions } from "../../../../store/dashboard";
-import {
-  axiosGet,
-  extractCode,
-  GeorepoUrls,
-  headers
-} from "../../../../utils/georepo";
+import { axiosGet, extractCode, headers } from "../../../../utils/georepo";
 import { apiReceive } from "../../../../store/reducers_api";
 import { fetchJSON } from "../../../../Requests";
 import { InternalReferenceDatasets } from "../../../../utils/urls";
+import { RefererenceLayerUrls } from "../../../../utils/referenceLayer";
 
 /**
  * Handling geometry data.
@@ -54,17 +50,15 @@ export default function DatasetGeometryData() {
 
         const referenceLayerData = dictDeepCopy(referenceLayerDataState)
         for (let i = 0; i < datasets.length; i++) {
-          const identifier = datasets[i].identifier
+          const referenceLayer = datasets[i]
+          const identifier = referenceLayer.identifier
           if (!referenceLayerData[identifier]) {
             dispatch(
               Actions.ReferenceLayerData.request(identifier)
             )
 
             // Fetch the data
-            let url = GeorepoUrls.ViewDetail(identifier)
-            if (datasets[i].is_local) {
-              url = InternalReferenceDatasets.detail(identifier)
-            }
+            const url = RefererenceLayerUrls.ViewDetail(referenceLayer)
             await axiosGet(url).then(response => {
               referenceLayerData[identifier] = apiReceive({
                 data: response.data,
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
@@ -121,6 +121,7 @@ export function ReferenceLayer(
   }
 
   const filteredGeometries = where ? filteredGeometriesState : null
+  let levels = referenceLayerData?.data?.dataset_levels
   let currentLevel = selectedAdminLevel ? selectedAdminLevel.level : levels?.level
 
   // When indicator data, current layer, second layer and compare mode changed
@@ -218,7 +219,6 @@ export function ReferenceLayer(
     if (!indicatorShow) {
       return;
     }
-    let levels = referenceLayerData?.data?.dataset_levels
     const vectorTiles = referenceLayerData?.data?.vector_tiles
     if (vectorTiles && levels && map && currentLevel !== undefined) {
       const url = GeorepoUrls.WithoutDomain(updateToken(vectorTiles))
@@ -604,8 +604,6 @@ export function ReferenceLayer(
     setIs3DInit(true)
     const geometries = checkCodes()
     let url = null
-    let levels = referenceLayerData?.data?.dataset_levels
-    let currentLevel = selectedAdminLevel ? selectedAdminLevel.level : levels?.level
     const vectorTiles = referenceLayerData?.data?.vector_tiles
     if (vectorTiles && levels && map && currentLevel !== undefined) {
       url = GeorepoUrls.WithoutDomain(updateToken(vectorTiles))
diff --git a/django_project/frontend/src/pages/Dashboard/MiddlePanel/ReferenceLayer/index.jsx b/django_project/frontend/src/pages/Dashboard/MiddlePanel/ReferenceLayer/index.jsx
@@ -96,7 +96,7 @@ export default function ReferenceLayerSection() {
         }
       }
     }
-  }, [referenceLayerData, selectedIndicatorLayer])
+  }, [referenceLayerData, selectedAdminLevel, levels])
 
   /** Change Admin Level **/
   const onChange = (newLevel) => {
diff --git a/django_project/frontend/src/utils/georepo.jsx b/django_project/frontend/src/utils/georepo.jsx
@@ -109,7 +109,10 @@ export const fetchGeojson = async function (url, useCache = true) {
   }
   const _fetchGeojson = async function (page = 1) {
     try {
-      const response = await fetchJSON(url + '?format=geojson&page=' + page, headers, useCache);
+      var newUrl = new URL(url);
+      newUrl.searchParams.append('format', "geojson");
+      newUrl.searchParams.append('page', page);
+      const response = await fetchJSON(newUrl.toString(), headers, useCache);
       if (response?.features?.length) {
         data.features = data.features.concat(response.features)
         await _fetchGeojson(page += 1)
@@ -162,8 +165,12 @@ export const fetchFeatureList = async function (url, useCache = true) {
 }
 
 /*** Axios georepo request */
-export const axiosGet = function (url) {
-  return axios.get(url, headers);
+export const axiosGet = function (url, params = null) {
+  if (params) {
+    return axios.get(url, headers, params);
+  } else {
+    return axios.get(url, headers);
+  }
 }
 
 /*** Axios georepo request json */
diff --git a/django_project/frontend/src/utils/referenceLayer.jsx b/django_project/frontend/src/utils/referenceLayer.jsx
@@ -15,13 +15,14 @@
 
 import { getRelatedTableData } from "./relatedTable";
 import { getIndicatorDataByLayer, UpdateStyleData } from "./indicatorData";
-import { extractCode } from "./georepo";
+import { extractCode, GeorepoUrls } from "./georepo";
 import {
   indicatorLayerId,
   isIndicatorLayerLikeIndicator
 } from "./indicatorLayer";
 import { dynamicStyleTypes, returnLayerStyleConfig } from "./Style";
 import { dictDeepCopy } from "./main";
+import { InternalReferenceDatasets } from "./urls";
 
 const temporary = {}
 
@@ -125,3 +126,14 @@ export function returnStyle(layer, values, noDataStyle) {
   }
   return style
 }
+
+export const RefererenceLayerUrls = {
+  ViewDetail: function (referenceLayerDetail) {
+    const identifier = referenceLayerDetail.identifier
+    if (referenceLayerDetail.is_local) {
+      return InternalReferenceDatasets.detail(identifier)
+    } else {
+      return GeorepoUrls.ViewDetail(identifier)
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-5ee1fe9d8fedb0c3355534241a80cf36d91fc887`
	`1`	`+0b044429cb4fda6ef2939f5e8ea987f83ae429fc`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ export const FormulaBasedForm = forwardRef(`
`207`	`207`	`}}`
`208`	`208`	`>`
`209`	`209`	`<ReferenceLayerGeometrySelector`
`210`		`- referenceLayer={data.reference_layer}`
	`210`	`+ referenceLayer={data}`
`211`	`211`	`onChange={config => {`
`212`	`212`	`setGeomConfig(config)`
`213`	`213`	`}}`