Merge pull request #2642 from ZakarFin/fix-metadata

Fix service metadata before saving the layer
oskariorg · May 21, 2024 · 3d10060 · 3d10060
2 parents 4c09c86 + 18c13ca
commit 3d10060
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/bundles/admin/admin-layereditor/view/AdminLayerForm/AdditionalTabPane/MetadataId.jsx b/bundles/admin/admin-layereditor/view/AdminLayerForm/AdditionalTabPane/MetadataId.jsx
@@ -21,7 +21,7 @@ export const MetadataId = ({ layer, controller }) => {
                 <StyledFormField>
                     <Message messageKey='metadata.overridden'/>
                     {renderButton &&
-                        <MetadataButton onClick={() => controller.showLayerMetadata(layer.id)}/>
+                        <MetadataButton onClick={() => controller.showLayerMetadata(layer.isNew ? layer.metadataid : layer.id)}/>
                     }
                     <TextInput
                         value={layer.metadataid}

diff --git a/bundles/admin/admin-layereditor/view/AdminLayerForm/AdditionalTabPane/ServiceMetadata.jsx b/bundles/admin/admin-layereditor/view/AdminLayerForm/AdditionalTabPane/ServiceMetadata.jsx
@@ -26,7 +26,7 @@ export const ServiceMetadata = ({ capabilities, controller, hasHandler, layerId
         <Tooltip title={metadataUuid}>
             <Message messageKey='metadata.service' />
             {hasHandler &&
-                <MetadataButton onClick={() => controller.showLayerMetadata(layerId)}/>
+                <MetadataButton onClick={() => controller.showLayerMetadata(layerId || metadataUuid)}/>
             }
         </Tooltip>
     );
@@ -36,5 +36,5 @@ ServiceMetadata.propTypes = {
     hasHandler: PropTypes.bool.isRequired,
     capabilities: PropTypes.object.isRequired,
     controller: PropTypes.instanceOf(Controller).isRequired,
-    layerId: PropTypes.number.isRequired
+    layerId: PropTypes.number
 };
diff --git a/bundles/admin/admin-layereditor/view/AdminLayerForm/AdminLayerFormHandler.js b/bundles/admin/admin-layereditor/view/AdminLayerForm/AdminLayerFormHandler.js
@@ -1178,8 +1178,15 @@ class UIHandler extends StateHandler {
     }
 
     showLayerMetadata (layerId) {
+        // this works even when the layer hasn't been saved yet
+        let payload = { uuid: layerId };
+        if (typeof layerId === 'number') {
+            // this works only when layer has been saved
+            // (and supports the attributes override for metadata service url)
+            payload = { layerId };
+        }
         Oskari.getSandbox().postRequestByName('catalogue.ShowMetadataRequest', [
-            { layerId: layerId }
+            payload
         ]);
     }