Editor / Associated resources panel improvements (geonetwork#7669)

* Editor / Associated metadata improvements * Editor / Associated metadata improvements / Add ISO19110 and Dublin core support * Editor / Associated metadata improvements - Support conditions to process associate resources configurations. - Fix link to metadata selection. - Fix source datasets configuration * Editor / Associated metadata improvements / Fix evaluation of conditions to process associate resources configurations * Editor / Associated metadata improvements / Map relation types between UI and updates to load the relations in the associated resources container directive * Editor / Associated metadata improvements / Configurations with predefined fields: - Fix display of the asssociated resources. - Readonly association and initiative types fields in the link to siblings dialog. - Code cleanup. * Editor / Associated metadata improvements / Support multiple remote URL mode * Editor / Associated metadata improvements / Support multiple remote urls * Editor / Associated metadata improvements / DOI panel updates * Editor / Associated resource / Read label and search params from configuration. * Editor / Associated resource / Update labels as siblings are more and more used now. * Editor / Associated resource / Update labels * Editor / Associated resource / Avoid JS error and replace all query placeholders in case of more complex queries eg. titles.title:{query} OR person-id:{query} OR doi:{query}. * Associated resource / Search / Allows unselect. * Associated resource / Add support for link to md or link to service. * Associated resource / allow to deselect DOI resources and add link to view the DOI resource * Associated resource / fix scope reference of metadata selection * Associated resource / Improve link to sibling styling for metadata results and doi searches * Associated resource / Improve link to sibling icons styling * Associated resource / Improve link to sibling icons styling - remove duplicated icon * Editor / Associated metadata improvements - add rel=noopener noreferrer' to external links in doi search panel * Editor / Associated resources / Group by type. --------- Co-authored-by: Francois Prunayre <[email protected]>
SPW-DIG · Mar 18, 2024 · 3fa0d8a · 3fa0d8a
1 parent 72b524c
commit 3fa0d8a
Show file tree

Hide file tree

Showing 22 changed files with 1,266 additions and 218 deletions.
diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/config/associated-panel/default.json b/schemas/dublin-core/src/main/plugin/dublin-core/config/associated-panel/default.json
@@ -12,6 +12,20 @@
       "fields": {
         "url": {}
       }
+    }],
+    "associatedResourcesTypes": [{
+      "type": "parent",
+      "label": "linkToParent",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "params": {
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": true}
+        }
+      }
     }]
   }
 }
diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/config-editor.xml b/schemas/dublin-core/src/main/plugin/dublin-core/layout/config-editor.xml
@@ -67,8 +67,7 @@
                                           editActions: ['addOnlinesrc']
                                         }]"/>
 
-        <directive data-gn-onlinesrc-list=""
-                   data-types="parent"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
       </sidePanel>
       <tab id="default" default="true" mode="flat">
         <section xpath="/simpledc"/>
@@ -94,8 +93,7 @@
                                           editActions: ['addOnlinesrc']
                                         }]"/>
 
-        <directive data-gn-onlinesrc-list=""
-                   data-types="parent"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
       </sidePanel>
       <tab id="advanced" default="true">
         <section xpath="/simpledc"/>
@@ -118,8 +116,8 @@
                                           editActions: ['addOnlinesrc']
                                         }]"/>
 
-        <directive data-gn-onlinesrc-list=""
-                   data-types="parent"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
+
       </sidePanel>
       <tab id="xml" default="true"/>
     </view>

diff --git a/schemas/iso19110/src/main/plugin/iso19110/config/associated-panel/default.json b/schemas/iso19110/src/main/plugin/iso19110/config/associated-panel/default.json
@@ -1,3 +1,8 @@
 {
-  "config": {}
+  "config": {
+    "associatedResourcesTypes": [ {
+      "type": "hasfeaturecats",
+      "allowToAddRelation": false
+    }]
+  }
 }
diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/config-editor.xml b/schemas/iso19110/src/main/plugin/iso19110/layout/config-editor.xml
@@ -68,8 +68,7 @@
     <view name="default" default="true">
       <sidePanel>
         <directive data-gn-need-help="creating-metadata"/>
-        <directive data-gn-onlinesrc-list=""
-                   data-types="hasfeaturecats"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
         <directive data-gn-validation-report=""/>
         <directive data-gn-suggestion-list=""/>
       </sidePanel>

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/config/associated-panel/default.json b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/config/associated-panel/default.json
@@ -991,6 +991,81 @@
           }
         }
       }
-    ]
+    ],
+    "associatedResourcesTypes": [{
+      "type": "siblings",
+      "label": "linkToSibling",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "params": {
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": true}
+        }
+      }
+    }, {
+      "type": "service",
+      "label": "linkToService",
+      "condition": "!gnCurrentEdit.isService",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "label": "searchAservice",
+            "params": {
+              "resourceType": ["service"],
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": false}
+        }
+      }
+    }, {
+      "type": "dataset",
+      "label": "linkToDataset",
+      "condition": "gnCurrentEdit.isService",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "params": {
+              "resourceType": ["dataset"],
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": false}
+        }
+      }
+    }, {
+      "type": "source",
+      "label": "linkToSource",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "label": "linkToSource",
+            "params": {
+              "resourceType": ["dataset"],
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": false}
+        }
+      }
+    }, {
+      "type": "fcats",
+      "label": "linkToFeatureCatalog",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "label": "linkToFeatureCatalog",
+            "params": {
+              "resourceType": ["featureCatalog"],
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": false}
+        }
+      }
+    }]
   }
 }
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
@@ -651,8 +651,7 @@
                                            }]"
         />
 
-        <directive data-gn-onlinesrc-list=""
-                   data-types="sibling|associated|source|dataset|service|fcats"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
 
         <directive gn-geo-publisher=""
                    data-ng-if="gnCurrentEdit.geoPublisherConfig"
@@ -759,8 +758,7 @@
                                            }]"
         />
 
-        <directive data-gn-onlinesrc-list=""
-                   data-types="sibling|associated|source|dataset|service|fcats"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
 
         <directive gn-geo-publisher=""
                    data-ng-if="gnCurrentEdit.geoPublisherConfig"
@@ -896,8 +894,7 @@
                                            }]"
         />
 
-        <directive data-gn-onlinesrc-list=""
-                   data-types="sibling|associated|source|dataset|service|fcats"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
 
         <directive gn-geo-publisher=""
                    data-ng-if="gnCurrentEdit.geoPublisherConfig"

diff --git a/schemas/iso19139/src/main/plugin/iso19139/config/associated-panel/default.json b/schemas/iso19139/src/main/plugin/iso19139/config/associated-panel/default.json
@@ -52,6 +52,97 @@
     "multilingualFields": ["name", "desc"],
     "wmsResources": {
       "addLayerNamesMode": "resourcename"
+    },
+    "associatedResourcesTypes": [{
+      "type": "parent",
+      "label": "linkToParent",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "label": "linkToParent",
+            "params": {
+              "resourceType": ["series"],
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": false}
+        }
+      }
+    }, {
+        "type": "service",
+        "label": "linkToService",
+        "condition": "!gnCurrentEdit.isService",
+        "config": {
+          "sources": {
+            "metadataStore": {
+              "label": "searchAservice",
+              "params": {
+                "resourceType": ["service"],
+                "isTemplate": "n"
+              }
+            },
+            "remoteurl": {"multiple": false}
+          }
+        }
+    }, {
+      "type": "dataset",
+      "label": "linkToDataset",
+      "condition": "gnCurrentEdit.isService",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "params": {
+              "resourceType": ["dataset"],
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": false}
+        }
+      }
+    }, {
+      "type": "source",
+      "label": "linkToSource",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "label": "linkToSource",
+            "params": {
+              "resourceType": ["dataset"],
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": false}
+        }
+      }
+    }, {
+      "type": "fcats",
+      "label": "linkToFeatureCatalog",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "label": "linkToFeatureCatalog",
+            "params": {
+              "resourceType": ["featureCatalog"],
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": false}
+        }
+      }
+    }, {
+      "type": "siblings",
+      "label": "linkToSibling",
+      "config": {
+        "sources": {
+          "metadataStore": {
+            "params": {
+              "isTemplate": "n"
+            }
+          },
+          "remoteurl": {"multiple": true}
+        }
+      }
     }
+    ]
   }
 }
diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml b/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml
@@ -541,8 +541,7 @@
                                             editActions: ['addOnlinesrc']}]"
         />
 
-        <directive data-gn-onlinesrc-list=""
-                   data-types="parent|dataset|service|source|sibling|associated|fcats"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
 
         <directive gn-geo-publisher=""
                    data-ng-if="gnCurrentEdit.geoPublisherConfig"
@@ -3201,6 +3200,11 @@
     <view name="default" default="true"
           class="gn-label-above-input gn-indent-bluescale">
       <sidePanel>
+        <!-- Simple overview manager + online source manger for other types
+        Limit the max number of overviews with data-number-of-overviews="3" attribute.
+        In the full view, editor can access and manage the file store and
+        thumbnail name and description not supported by the overview manager.
+        -->
         <directive data-gn-need-help="creating-metadata"/>
 
         <directive data-gn-validation-report=""/>
@@ -3225,8 +3229,7 @@
                                             editActions: []}]"
         />
 
-        <directive data-gn-onlinesrc-list=""
-                   data-types="parent|dataset|service|source|sibling|associated|fcats"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
 
         <directive gn-geo-publisher=""
                    data-ng-if="gnCurrentEdit.geoPublisherConfig"
@@ -3361,8 +3364,7 @@
                                             editActions: ['addOnlinesrc']}]"
         />
 
-        <directive data-gn-onlinesrc-list=""
-                   data-types="parent|dataset|service|source|sibling|associated|fcats"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
 
         <directive gn-geo-publisher=""
                    data-ng-if="gnCurrentEdit.geoPublisherConfig"
@@ -3462,8 +3464,7 @@
                                             editActions: ['addOnlinesrc']}]"
         />
 
-        <directive data-gn-onlinesrc-list=""
-                   data-types="parent|dataset|service|source|sibling|associated|fcats"/>
+        <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
 
         <directive gn-geo-publisher=""
                    data-ng-if="gnCurrentEdit.geoPublisherConfig"