Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/MapStore2
Submodule MapStore2 updated 174 files
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ function ResourceDetailsPanel({
{
"type": "share",
"id": "share",
"labelId": "gnviewer.share",
"labelId": "gnviewer.security",
"disableIf": "{not canAccessPermissions(state('gnResourceData'))}",
"items": [true]
},
Expand Down Expand Up @@ -427,7 +427,7 @@ export default createPlugin('ResourceDetails', {
priority: 1,
doNotHide: true
}, {
name: 'ShareActionButton',
name: 'PermissionButton',
Component: connect(
createSelector(
isNewResource,
Expand All @@ -450,7 +450,7 @@ export default createPlugin('ResourceDetails', {
onSelectTab('share');
}}
>
<Message msgId="share.title"/>
<Message msgId="gnviewer.security"/>
</Button>
: null;
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ function DetailsToolbarButton({
function DetailsToolbar({
resource,
items = [],
showViewerButton = false
showViewerButton = false,
onToggleShare = () => {}
}) {

const {
Expand All @@ -66,7 +67,6 @@ function DetailsToolbar({
} = resource?.['@extras'] || {};

const [copiedUrl, setCopiedUrl] = useState({
resource: false,
datasetowsurl: false
});

Expand All @@ -80,6 +80,14 @@ function DetailsToolbar({
}, 700);
};

function handleShare(event) {
event.stopPropagation();
onToggleShare({
shareUrl: formatResourceLinkUrl(resource),
categoryName: (resource?.category?.name || '').toLowerCase()
});
}

return (
<FlexBox style={{ alignItems: 'flex-start' }}>
<FlexBox gap="xs" centerChildrenVertically>
Expand All @@ -90,21 +98,14 @@ function DetailsToolbar({
resource={resource}
component={DetailsToolbarButton}
/>))}
<CopyToClipboard
<ButtonWithTooltip
tooltipPosition="top"
tooltipId={
copiedUrl.resource
? 'gnhome.copiedResourceUrl'
: 'gnhome.copyResourceUrl'
}
text={formatResourceLinkUrl(resource)}
tooltipId="share.title"
variant="default"
onClick={handleShare}
>
<Button
variant="default"
onClick={()=> handleCopyPermalink('resource')}>
<Glyphicon glyph="share-alt" />
</Button>
</CopyToClipboard>
<Glyphicon glyph="share-alt" />
</ButtonWithTooltip>
{resource?.dataset_ows_url && <CopyToClipboard
tooltipPosition="top"
tooltipId={
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
/*
* Copyright 2026, GeoSolutions Sas.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

import expect from 'expect';
import React from 'react';
import ReactDOM from 'react-dom';
import { Simulate } from 'react-dom/test-utils';

import DetailsToolbar from '../DetailsToolbar';

describe('DetailsToolbar component', () => {
beforeEach((done) => {
document.body.innerHTML = '<div id="container"></div>';
setTimeout(done);
});

afterEach((done) => {
ReactDOM.unmountComponentAtNode(document.getElementById('container'));
document.body.innerHTML = '';
setTimeout(done);
});

it('should render DetailsToolbar with default props and share button', () => {
ReactDOM.render(
<DetailsToolbar />,
document.getElementById('container')
);

const shareGlyph = document.querySelector('.glyphicon-share-alt');
expect(shareGlyph).toBeTruthy();
});

it('should trigger onToggleShare when clicking the share button', () => {
let sharePayload = null;

const resource = {
pk: 123,
uuid: 'test-uuid-123',
category: { name: 'Vector' }
};

ReactDOM.render(
<DetailsToolbar
resource={resource}
onToggleShare={(payload) => {
sharePayload = payload;
}}
/>,
document.getElementById('container')
);

const shareGlyph = document.querySelector('.glyphicon-share-alt');
expect(shareGlyph).toBeTruthy();

const shareButton = shareGlyph.closest('button');
expect(shareButton).toBeTruthy();

Simulate.click(shareButton);

expect(sharePayload).toBeTruthy();
expect(sharePayload.shareUrl).toContain('/catalogue/uuid/test-uuid-123');
expect(sharePayload.categoryName).toBe('vector');
});

it('should handle resource without category when clicking share button', () => {
let sharePayload = null;

const resource = {
pk: 456,
uuid: 'test-uuid-456'
};

ReactDOM.render(
<DetailsToolbar
resource={resource}
onToggleShare={(payload) => {
sharePayload = payload;
}}
/>,
document.getElementById('container')
);

const shareGlyph = document.querySelector('.glyphicon-share-alt');
const shareButton = shareGlyph.closest('button');
Simulate.click(shareButton);

expect(sharePayload).toBeTruthy();
expect(sharePayload.shareUrl).toContain('/catalogue/uuid/test-uuid-456');
expect(sharePayload.categoryName).toBe('');
});

it('should render custom toolbar items', () => {
const CustomItem = ({ resource }) => (
<div className="custom-toolbar-item">{resource?.title}</div>
);

const resource = { title: 'Test Resource' };
const items = [
{ name: 'customItem', Component: CustomItem }
];

ReactDOM.render(
<DetailsToolbar
resource={resource}
items={items}
/>,
document.getElementById('container')
);

const customElem = document.querySelector('.custom-toolbar-item');
expect(customElem).toBeTruthy();
expect(customElem.textContent).toBe('Test Resource');
});

it('should render copy dataset ows url button when dataset_ows_url is provided', () => {
const resource = {
dataset_ows_url: 'https://example.com/geoserver/ows'
};

ReactDOM.render(
<DetailsToolbar
resource={resource}
/>,
document.getElementById('container')
);

const globeGlyph = document.querySelector('.glyphicon-globe');
expect(globeGlyph).toBeTruthy();

const copyButton = globeGlyph.closest('button');
expect(copyButton).toBeTruthy();
Simulate.click(copyButton);
});

it('should render viewer button when showViewerButton is true and viewerUrl exists', () => {
const resource = {
'@extras': {
info: {
viewerUrl: '/catalogue/#/map/1',
typeName: 'Map'
}
}
};

ReactDOM.render(
<DetailsToolbar
resource={resource}
showViewerButton
/>,
document.getElementById('container')
);

const linkButton = document.querySelector('a.btn-primary');
expect(linkButton).toBeTruthy();
expect(linkButton.getAttribute('href')).toBe('/catalogue/#/map/1');
});

it('should render metadata detail button when showViewerButton is true and only metadataDetailUrl exists', () => {
const resource = {
'@extras': {
info: {
metadataDetailUrl: '/catalogue/#/dataset/1/metadata'
}
}
};

ReactDOM.render(
<DetailsToolbar
resource={resource}
showViewerButton
/>,
document.getElementById('container')
);

const linkButton = document.querySelector('a.btn-primary');
expect(linkButton).toBeTruthy();
expect(linkButton.getAttribute('href')).toBe('/catalogue/#/dataset/1/metadata');
});

it('should not render viewer button when showViewerButton is false', () => {
const resource = {
'@extras': {
info: {
viewerUrl: '/catalogue/#/map/1',
typeName: 'Map'
}
}
};

ReactDOM.render(
<DetailsToolbar
resource={resource}
showViewerButton={false}
/>,
document.getElementById('container')
);

const linkButton = document.querySelector('a.btn-primary');
expect(linkButton).toBeFalsy();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import { getMonitoredStateSelector, getRouterLocation, getDetailPanelTab } from
import withScrollableTabs from '@js/components/enhancers/withScrollableTabs';
import { getMessageById } from '@mapstore/framework/utils/LocaleUtils';
import { setDetailPanelTab } from '@mapstore/framework/plugins/ResourcesCatalog/actions/resources';
import { toggleControl, setControlProperty } from '@mapstore/framework/actions/controls';
const DetailsInfo = withScrollableTabs(DetailsInfoComp);

const transformValue = (obj, messages) => {
Expand Down Expand Up @@ -97,7 +98,8 @@ function DetailsPanel({
panelRef,
showViewerButton,
selectedTab,
onSelectTab
onSelectTab,
onToggleShare
}, context) {

const resource = parseCatalogResource(resourceProp);
Expand All @@ -124,6 +126,7 @@ function DetailsPanel({
resource={resource}
items={toolbarItems}
showViewerButton={showViewerButton}
onToggleShare={onToggleShare}
/>}
onClose={onClose}
thumbnailComponent={ConnectedDetailsThumbnail}
Expand Down Expand Up @@ -188,9 +191,13 @@ const ConnectedDetailsPanel = connect(
location: getRouterLocation,
selectedTab: getDetailPanelTab
}),
{
onSelectTab: setDetailPanelTab
}
(dispatch) => ({
onSelectTab: (...args) => dispatch(setDetailPanelTab(...args)),
onToggleShare: (...args) => {
dispatch(toggleControl('share', null));
dispatch(setControlProperty('share', 'resource', ...args));
}
})
)(DetailsPanel);

export default ConnectedDetailsPanel;
Loading
Loading