Update Share URL return UUID URL (#2102)

Author: dsuren1

geonode_mapstore_client/client/js/plugins/ResourceDetails/components/DetailsToolbar.jsx

@@ -16,6 +16,7 @@ import tooltip from '@mapstore/framework/components/misc/enhancers/tooltip';
 import ResourceStatus from '@mapstore/framework/plugins/ResourcesCatalog/components/ResourceStatus';
 import useIsMounted from '@mapstore/framework/hooks/useIsMounted';
 import FlexBox from '@mapstore/framework/components/layout/FlexBox';
+import { formatResourceLinkUrl } from '@js/utils/ResourceUtils';
 
 const ButtonWithTooltip = tooltip(Button);
 const CopyToClipboard = tooltip(CopyToClipboardCmp);
@@ -54,13 +55,6 @@ function DetailsToolbarButton({
     );
 }
 
-function formatResourceLinkUrl(resource) {
-    if (resource?.uuid) {
-        return window.location.href.replace(/#.+$/, `uuid/${resource.uuid}`);
-    }
-    return window.location.href;
-}
-
 function DetailsToolbar({
     resource,
     items = [],

geonode_mapstore_client/client/js/plugins/Share.jsx

@@ -26,7 +26,7 @@ import {
     getViewedResourceType
 } from '@js/selectors/resource';
 import {
-    cleanUrl,
+    formatResourceLinkUrl,
     getDownloadUrlInfo,
     getResourceTypesInfo
 } from '@js/utils/ResourceUtils';
@@ -42,18 +42,15 @@ function Share({
     onClose,
     resourceType,
     embedUrl,
-    downloadUrl
+    downloadUrl,
+    pageUrl
 }) {
-    const pageUrl = cleanUrl(window.location.href);
-
     return (
         <OverlayContainer
             enabled={enabled}
             className="gn-overlay-wrapper"
         >
-            <section
-                className="gn-share-panel"
-            >
+            <section className="gn-share-panel">
                 <div className="gn-share-panel-head">
                     <h2><Message msgId="gnviewer.shareThisResource" /></h2>
                     <Button className="square-button" onClick={() => onClose()}>
@@ -91,7 +88,8 @@ const SharePlugin = connect(
         enabled,
         embedUrl: getEmbedUrl(resource),
         resourceType: type,
-        downloadUrl: getDownloadUrlInfo(resource)?.url
+        downloadUrl: getDownloadUrlInfo(resource)?.url,
+        pageUrl: formatResourceLinkUrl(resource)
     })),
     {
         onClose: setControlProperty.bind(null, 'rightOverlay', 'enabled', false)

geonode_mapstore_client/client/js/utils/ResourceUtils.js

@@ -779,6 +779,14 @@ export const getDownloadUrlInfo = (resource) => {
     return hrefUrl;
 };
 
+export const formatResourceLinkUrl = (resource) => {
+    let href = window.location.href;
+    if (resource?.uuid) {
+        href = href.replace(/#.+$/, `uuid/${resource.uuid}`);
+    }
+    return cleanUrl(href);
+};
+
 export const getCataloguePath = (path = '') => {
     const catalogPagePath = getGeoNodeLocalConfig('geoNodeSettings.catalogPagePath');
     if (!isEmpty(catalogPagePath)) {