Fix #1886 Impreovements to the new upload and replace UI (#1887)

GeoNode · Oct 17, 2024 · 3267519 · 3267519
1 parent a591c2c
commit 3267519
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 24 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "geonode_mapstore_client/client/MapStore2"]
 	path = geonode_mapstore_client/client/MapStore2
 	url = https://github.com/geosolutions-it/MapStore2.git
-	branch = 2024.02.xx
+	branch = master
diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2
diff --git a/geonode_mapstore_client/client/js/api/geonode/v2/constants.js b/geonode_mapstore_client/client/js/api/geonode/v2/constants.js
@@ -28,7 +28,7 @@ let endpoints = {
     'groups': '/api/v2/groups',
     'executionrequest': '/api/v2/executionrequest',
     'facets': '/api/v2/facets',
-    'upload': '/uploads/upload'
+    'uploads': '/api/v2/uploads'
 };
 
 export const RESOURCES = 'resources';
@@ -41,7 +41,7 @@ export const RESOURCE_TYPES = 'resource_types';
 export const GROUPS = 'groups';
 export const EXECUTION_REQUEST = 'executionrequest';
 export const FACETS = 'facets';
-export const UPLOADS_UPLOAD = 'upload';
+export const UPLOADS = 'uploads';
 
 export const setEndpoints = (data) => {
     endpoints = { ...endpoints, ...data };

diff --git a/geonode_mapstore_client/client/js/plugins/Operation/index.jsx b/geonode_mapstore_client/client/js/plugins/Operation/index.jsx
@@ -60,7 +60,7 @@ import Message from '@mapstore/framework/components/I18N/Message';
  *      "source": "upload",
  *      "api": {
  *          "upload": {
- *              "url": "{context.getEndpointUrl('upload')}",
+ *              "url": "{context.getEndpointUrl('uploads', '/upload')}",
  *              "maxParallelUploads": 1,
  *              "enableRemoteUploads": false,
  *              "supportedFiles": "{context.getSupportedFilesByResourceType('dataset', { source: ['upload'] })}",

diff --git a/geonode_mapstore_client/client/js/routes/UploadDataset.jsx b/geonode_mapstore_client/client/js/routes/UploadDataset.jsx
@@ -23,7 +23,7 @@ import {
 } from '@js/utils/UploadUtils';
 import {
     getEndpointUrl,
-    UPLOADS_UPLOAD,
+    UPLOADS,
     EXECUTION_REQUEST
 } from '@js/api/geonode/v2/constants';
 
@@ -33,7 +33,7 @@ function UploadDataset({
 
     const api = {
         upload: {
-            url: getEndpointUrl(UPLOADS_UPLOAD),
+            url: getEndpointUrl(UPLOADS, '/upload'),
             body: {
                 file: {
                     'base_file': getUploadMainFile,

diff --git a/geonode_mapstore_client/client/themes/geonode/less/_operation.less b/geonode_mapstore_client/client/themes/geonode/less/_operation.less
@@ -26,7 +26,9 @@
             border-bottom-color: #555555;
         }
         .table > tbody > tr > td {
-            border-top-color: #555555
+            border-top-color: #555555;
+            background-color: transparent;
+            border-top-width: 1px;
         }
         .table > tbody > tr.danger > td {
             background-color: rgba(187, 73, 64, 0.2);

diff --git a/geonode_mapstore_client/client/themes/geonode/less/_upload.less b/geonode_mapstore_client/client/themes/geonode/less/_upload.less
@@ -62,6 +62,12 @@
             }
         }
     }
+    .gn-upload-processing {
+        .table > tbody > tr > td {
+            .background-color-var(@theme-vars[main-bg]);
+            .border-top-color-var(@theme-vars[main-variant-bg]);
+        }
+    }
 }
 
 // **************
@@ -289,6 +295,7 @@
         font-weight: normal;
         vertical-align: middle;
         word-break: break-word;
+        border-top-width: 0.25rem;
     }
 }
 

diff --git a/geonode_mapstore_client/static/mapstore/configs/localConfig.json b/geonode_mapstore_client/static/mapstore/configs/localConfig.json
@@ -1230,7 +1230,7 @@
                     "source": "resource_file_upload",
                     "api": {
                         "upload": {
-                            "url": "{context.getEndpointUrl('upload')}",
+                            "url": "{context.getEndpointUrl('uploads', '/upload')}",
                             "maxParallelUploads": 1,
                             "body": {
                                 "file": {
@@ -1270,7 +1270,7 @@
                     "source": "resource_file_upload",
                     "api": {
                         "upload": {
-                            "url": "{context.getEndpointUrl('upload')}",
+                            "url": "{context.getEndpointUrl('uploads', '/upload')}",
                             "maxParallelUploads": 1,
                             "body": {
                                 "file": {
@@ -1311,7 +1311,7 @@
                     "pageReload": true,
                     "api": {
                         "upload": {
-                            "url": "{context.getEndpointUrl('upload')}",
+                            "url": "{context.getEndpointUrl('uploads', '/upload')}",
                             "maxParallelUploads": 1,
                             "body": {
                                 "file": {

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.de-DE.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.de-DE.json
@@ -431,7 +431,7 @@
             "uploadDatasetMetadata": "Datensatzmetadaten hochladen",
             "uploadName": "Name",
             "uploadCreated": "Erstellt",
-            "replaceDataset": "Ersetzen",
+            "replaceDataset": "Datensatz Ersetzen",
             "replaceDatasetTitle": "Datensatz ersetzen"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.en-US.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.en-US.json
@@ -431,7 +431,7 @@
             "uploadDatasetMetadata": "Upload dataset metadata",
             "uploadName": "Name",
             "uploadCreated": "Created",
-            "replaceDataset": "Replace",
+            "replaceDataset": "Replace Dataset",
             "replaceDatasetTitle": "Replace dataset"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.es-ES.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.es-ES.json
@@ -430,7 +430,7 @@
             "uploadDatasetMetadata": "Metadatos del conjunto de datos de carga",
             "uploadName": "Nombre",
             "uploadCreated": "Creado",
-            "replaceDataset": "Reemplazar",
+            "replaceDataset": "Reemplazar Conjunto De Datos",
             "replaceDatasetTitle": "Reemplazar conjunto de datos"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.fi-FI.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.fi-FI.json
@@ -400,7 +400,7 @@
             "uploadDatasetMetadata": "Upload dataset metadata",
             "uploadName": "Name",
             "uploadCreated": "Created",
-            "replaceDataset": "Replace",
+            "replaceDataset": "Replace Dataset",
             "replaceDatasetTitle": "Replace dataset"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.fr-FR.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.fr-FR.json
@@ -431,7 +431,7 @@
             "uploadDatasetMetadata": "Télécharger les métadonnées du jeu de données",
             "uploadName": "Nom",
             "uploadCreated": "Créé",
-            "replaceDataset": "Remplacer",
+            "replaceDataset": "Remplacer L'Ensemble De Données",
             "replaceDatasetTitle": "Remplacer l'ensemble de données"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.hr-HR.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.hr-HR.json
@@ -400,7 +400,7 @@
             "uploadDatasetMetadata": "Upload dataset metadata",
             "uploadName": "Name",
             "uploadCreated": "Created",
-            "replaceDataset": "Replace",
+            "replaceDataset": "Replace Dataset",
             "replaceDatasetTitle": "Replace dataset"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.it-IT.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.it-IT.json
@@ -433,7 +433,7 @@
             "uploadDatasetMetadata": "Carica i metadati del dataset",
             "uploadName": "Nome",
             "uploadCreated": "Data creazione",
-            "replaceDataset": "Sostituisci",
+            "replaceDataset": "Sostituisci Dataset",
             "replaceDatasetTitle": "Sostituisci dataset"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.nl-NL.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.nl-NL.json
@@ -400,7 +400,7 @@
             "uploadDatasetMetadata": "Upload dataset metadata",
             "uploadName": "Name",
             "uploadCreated": "Created",
-            "replaceDataset": "Replace",
+            "replaceDataset": "Replace Dataset",
             "replaceDatasetTitle": "Replace dataset"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.pt-PT.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.pt-PT.json
@@ -400,7 +400,7 @@
             "uploadDatasetMetadata": "Upload dataset metadata",
             "uploadName": "Name",
             "uploadCreated": "Created",
-            "replaceDataset": "Replace",
+            "replaceDataset": "Replace Dataset",
             "replaceDatasetTitle": "Replace dataset"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.sk-SK.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.sk-SK.json
@@ -400,7 +400,7 @@
             "uploadDatasetMetadata": "Upload dataset metadata",
             "uploadName": "Name",
             "uploadCreated": "Created",
-            "replaceDataset": "Replace",
+            "replaceDataset": "Replace Dataset",
             "replaceDatasetTitle": "Replace dataset"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.sv-SE.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.sv-SE.json
@@ -401,7 +401,7 @@
             "uploadDatasetMetadata": "Upload dataset metadata",
             "uploadName": "Name",
             "uploadCreated": "Created",
-            "replaceDataset": "Replace",
+            "replaceDataset": "Replace Dataset",
             "replaceDatasetTitle": "Replace dataset"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.vi-VN.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.vi-VN.json
@@ -400,7 +400,7 @@
             "uploadDatasetMetadata": "Upload dataset metadata",
             "uploadName": "Name",
             "uploadCreated": "Created",
-            "replaceDataset": "Replace",
+            "replaceDataset": "Replace Dataset",
             "replaceDatasetTitle": "Replace dataset"
         }
     }

diff --git a/geonode_mapstore_client/static/mapstore/gn-translations/data.zh-ZH.json b/geonode_mapstore_client/static/mapstore/gn-translations/data.zh-ZH.json
@@ -400,7 +400,7 @@
             "uploadDatasetMetadata": "Upload dataset metadata",
             "uploadName": "Name",
             "uploadCreated": "Created",
-            "replaceDataset": "Replace",
+            "replaceDataset": "Replace Dataset",
             "replaceDatasetTitle": "Replace dataset"
         }
     }