Allow create project from data browser just with a view (unicef-drp#262)

geomatico · Apr 5, 2024 · a69fd51 · a69fd51
1 parent 7423cca
commit a69fd51
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/django_project/frontend/src/app/form.scss b/django_project/frontend/src/app/form.scss
@@ -109,6 +109,13 @@
 
     &.ClickedReadOnly {
       cursor: pointer;
+      background-color: white;
+      color: unset;
+      border: 1px solid rgba(0, 0, 0, 0.23) !important;
+
+      &:hover {
+        border: 1px solid rgba(0, 0, 0, 0.87) !important;
+      }
     }
   }
 

diff --git a/django_project/frontend/src/pages/Admin/Dataset/index.jsx b/django_project/frontend/src/pages/Admin/Dataset/index.jsx
@@ -60,7 +60,7 @@ export default function DatasetAdmin() {
   // Other attributes
   const defaultFilters = urlParams()
   const [filters, setFilters] = useState({
-    groupAdminLevel: defaultFilters.groupAdminLevel === 'true',
+    groupAdminLevel: defaultFilters.groupAdminLevel ? defaultFilters.groupAdminLevel === 'true' : true,
     indicators: defaultFilters.indicators ? splitParams(defaultFilters.indicators) : [],
     datasets: defaultFilters.datasets ? splitParams(defaultFilters.datasets, false) : [],
     levels: defaultFilters.levels ? splitParams(defaultFilters.levels) : [],
@@ -225,9 +225,13 @@ export default function DatasetAdmin() {
           <div className='Separator'/>
           <ThemeButton
             variant='primary'
-            disabled={!(filters.datasets.length === 1 && filters.indicators.length >= 1)}
+            disabled={!(filters.datasets.length === 1)}
             onClick={() => {
-              window.location.href = `/admin/project/create?dataset=${filters.datasets[0]}&indicators=${filters.indicators.join(',')}`;
+              let url = `/admin/project/create?dataset=${filters.datasets[0]}`
+              if (filters.indicators.length) {
+                url += `&indicators=${filters.indicators.join(',')}`
+              }
+              window.location.href = url;
             }}
           >
             <AddIcon/> Add to New Project

diff --git a/django_project/frontend/src/pages/Admin/Importer/Form/Extensions/QueryForm/Filter.js b/django_project/frontend/src/pages/Admin/Importer/Form/Extensions/QueryForm/Filter.js
@@ -86,6 +86,7 @@ export default function Filter(
     <input
       disabled={!fields || onLoading}
       type="text"
+      className='ClickedReadOnly'
       placeholder={onLoading ? "Loading" : "SQL Filter"}
       readOnly={true}
       value={data}

diff --git a/django_project/geosight/data/api/dashboard.py b/django_project/geosight/data/api/dashboard.py
@@ -150,11 +150,13 @@ def get(self, request, slug):
             dashboard_indicators = []
             dashboard_indicator_layers = []
             indicator_layers_structure_children = []
-            if dataset and indicators:
+            if dataset:
                 view, _ = ReferenceLayerView.objects.get_or_create(
                     identifier=dataset
                 )
                 dashboard.reference_layer = view
+
+            if indicators:
                 for idx, indicator in enumerate(
                         Indicator.objects.filter(id__in=indicators.split(','))
                 ):

diff --git a/django_project/version/version.txt b/django_project/version/version.txt
@@ -1 +1 @@
-1.40.2
+1.40.3