diff --git a/.gitmodules b/.gitmodules index 6a8c7e327b..00da0a732e 100644 --- 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 index 49ba8e8e81..1a9a01e761 160000 --- a/geonode_mapstore_client/client/MapStore2 +++ b/geonode_mapstore_client/client/MapStore2 @@ -1 +1 @@ -Subproject commit 49ba8e8e81694c0e23f18bccf97aa3ca79beddab +Subproject commit 1a9a01e761f0c41782ca742166fc5680aef62ea7 diff --git a/geonode_mapstore_client/client/js/api/geonode/v2/constants.js b/geonode_mapstore_client/client/js/api/geonode/v2/constants.js index ffc87bb990..98f81286aa 100644 --- 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 index 63810cd00c..ec3d0284e9 100644 --- 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 index 15920d5e5b..e0fca34cf8 100644 --- 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 index 5556b7c0d1..bedb70597e 100644 --- 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 index 30203ebbb4..e22ae1d82d 100644 --- 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 index dd0e9605e9..376fc386f6 100644 --- 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 index bb9688e932..f7372db707 100644 --- 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 index a6aae88d6a..01002bc4ed 100644 --- 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 index e3332d6f6e..e5cf541d76 100644 --- 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 index c059361d62..d49a7d6b8a 100644 --- 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 index a68a12b403..7663992622 100644 --- 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 index f22642addd..c91bd0382e 100644 --- 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 index 1a54be8974..5b2484bd75 100644 --- 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 index 7cc6bc9333..2dddbec8d3 100644 --- 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 index 9643687996..e8137695ac 100644 --- 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 index c9228919b2..6161d6bbf5 100644 --- 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 index a387ec3e53..6dff966ebd 100644 --- 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 index c686743e72..da732bf1c5 100644 --- 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 index 39a7c1c1af..3126e457cb 100644 --- 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" } }