From 264d77ec11e803010372a7eb6c3a6229a9243e7b Mon Sep 17 00:00:00 2001
From: Francois Prunayre <fx.prunayre@gmail.com>
Date: Thu, 1 Feb 2024 09:32:06 +0100
Subject: [PATCH 1/3] Metadata editor / Improve layer configuration init.

Related to https://github.com/geonetwork/core-geonetwork/pull/7646.
---
 .../components/edit/onlinesrc/OnlineSrcDirective.js  |  8 +-------
 .../edit/onlinesrc/partials/addOnlinesrc.html        | 12 ++----------
 .../components/metadatamanager/EditorService.js      |  9 ++++++++-
 .../main/resources/catalog/locales/en-editor.json    |  1 -
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
index a2bb60fb980..ec8b4098706 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
@@ -678,13 +678,7 @@
                 //   });
                 // }
                 // Add each WMS layer to the map
-                if (scope.gnCurrentEdit.layerConfig == undefined) {
-                  scope.layers = scope.gnCurrentEdit.layerConfig;
-                } else {
-                  scope.layers = Array.isArray(scope.gnCurrentEdit.layerConfig)
-                    ? scope.gnCurrentEdit.layerConfig
-                    : [scope.gnCurrentEdit.layerConfig];
-                }
+                scope.layers = scope.gnCurrentEdit.layerConfig;
                 angular.forEach(scope.gnCurrentEdit.layerConfig, function (layer) {
                   scope.map.addLayer(
                     new ol.layer.Tile({
diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
index 405682e079b..f8ed6466aed 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
@@ -531,7 +531,7 @@ <h5>
       <div
         id="gn-addonlinesrc-thumbnail-panel"
         class="panel panel-default"
-        data-ng-show="params.linkType.sources.thumbnailMaker"
+        data-ng-show="params.linkType.sources.thumbnailMaker && layers.length > 0"
       >
         <div class="panel-heading" data-translate="">createAThumbnail</div>
         <div class="panel-body">
@@ -539,15 +539,7 @@ <h5>
             id="gn-addonlinesrc-thumbnail-map"
             class="form-group gn-thumbnail-maker-panel"
           >
-            <div
-              id="gn-addonlinesrc-thumbnail-warning"
-              class="alert alert-warning"
-              data-ng-show="layers == undefined"
-              data-translate=""
-            >
-              noLayersForThumbnail
-            </div>
-            <div data-ng-hide="layers == undefined">
+            <div>
               <textarea
                 id="gn-addonlinesrc-thumbnail-json"
                 class="form-control hidden"
diff --git a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
index 0fa3201f7d2..cc5c869d48b 100644
--- a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
+++ b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
@@ -376,6 +376,13 @@
               .val();
           };
 
+          // The list of layers in a record is defined in XSL template get-online-source-config
+          // and is depending on each schema. If emtpy an empty array is set.
+          var getLayerConfiguration = function () {
+            var configuration = angular.fromJson(getInputValue("layerConfig")) || [];
+            return Array.isArray(configuration) ? configuration : [configuration];
+          };
+
           var extent = [],
             value = getInputValue("extent");
           try {
@@ -414,7 +421,7 @@
             extent: extent,
             dataFormats: dataFormats,
             isMinor: getInputValue("minor") === "true",
-            layerConfig: angular.fromJson(getInputValue("layerConfig")),
+            layerConfig: getLayerConfiguration(),
             saving: false
           });
 
diff --git a/web-ui/src/main/resources/catalog/locales/en-editor.json b/web-ui/src/main/resources/catalog/locales/en-editor.json
index ebe4bb18463..6f150ad5b98 100644
--- a/web-ui/src/main/resources/catalog/locales/en-editor.json
+++ b/web-ui/src/main/resources/catalog/locales/en-editor.json
@@ -185,7 +185,6 @@
     "generateThumbnail": "Generate thumbnail",
     "generateThumbnail-help": "Thumbnail will be created and saved in the filestore. Use the filestore to add the thumbnail in the metadata record.",
     "createAThumbnail": "Generate thumbnail using the view service",
-    "noLayersForThumbnail": "No layer defined in record to generate thumbnail from",
     "noTemplatesAvailable": "Warning! There is no templates available in the catalog. You should add or <a href='admin.console#/metadata'>import</a> some.",
     "none": "None",
     "notFoundInThesaurus": "<strong>Warning! Keywords {{invalid}} not found in thesaurus.</strong> Others {{found}} were found in the thesaurus. 2 reasons: <ul><li>keywords in this record are in a language that is not in the current user interface language</li><li>keywords does not exists in the thesaurus</li></ul><strong>Those keywords will not be modified by this editing session</strong> unless you remove this thesaurus section.",

From e2b351e15f806691d85b8f2683d699636be86e27 Mon Sep 17 00:00:00 2001
From: Francois Prunayre <fx.prunayre@gmail.com>
Date: Thu, 1 Feb 2024 10:32:18 +0100
Subject: [PATCH 2/3] Metadata editor / Improve layer configuration init.

---
 .../catalog/components/edit/onlinesrc/OnlineSrcDirective.js   | 1 -
 .../components/edit/onlinesrc/partials/addOnlinesrc.html      | 4 ++--
 .../catalog/components/metadatamanager/EditorService.js       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
index ec8b4098706..ebc9d14e214 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
@@ -678,7 +678,6 @@
                 //   });
                 // }
                 // Add each WMS layer to the map
-                scope.layers = scope.gnCurrentEdit.layerConfig;
                 angular.forEach(scope.gnCurrentEdit.layerConfig, function (layer) {
                   scope.map.addLayer(
                     new ol.layer.Tile({
diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
index f8ed6466aed..ea9e17b1c25 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
@@ -527,11 +527,11 @@ <h5>
           </form>
         </div>
       </div>
-
+{{layers}}==
       <div
         id="gn-addonlinesrc-thumbnail-panel"
         class="panel panel-default"
-        data-ng-show="params.linkType.sources.thumbnailMaker && layers.length > 0"
+        data-ng-show="params.linkType.sources.thumbnailMaker && gnCurrentEdit.layerConfig.length > 0"
       >
         <div class="panel-heading" data-translate="">createAThumbnail</div>
         <div class="panel-body">
diff --git a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
index cc5c869d48b..4ff822de1b4 100644
--- a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
+++ b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
@@ -380,7 +380,7 @@
           // and is depending on each schema. If emtpy an empty array is set.
           var getLayerConfiguration = function () {
             var configuration = angular.fromJson(getInputValue("layerConfig")) || [];
-            return Array.isArray(configuration) ? configuration : [configuration];
+            return Array.isArray(configuration) ? configuration : [configuration.resource];
           };
 
           var extent = [],

From abca91966d1f972008e499e77ecc7af8c4a67d9b Mon Sep 17 00:00:00 2001
From: Francois Prunayre <fx.prunayre@gmail.com>
Date: Thu, 1 Feb 2024 10:36:48 +0100
Subject: [PATCH 3/3] Metadata editor / Remove log.

---
 .../components/edit/onlinesrc/partials/addOnlinesrc.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
index ea9e17b1c25..9c312642f9b 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
@@ -527,7 +527,7 @@ <h5>
           </form>
         </div>
       </div>
-{{layers}}==
+
       <div
         id="gn-addonlinesrc-thumbnail-panel"
         class="panel panel-default"