Skip to content

Commit e69ac23

Browse files
authored
#7653: Share panel advanced settings fix (#7662) (#7673)
(cherry picked from commit dae5b2c)
1 parent 8c01810 commit e69ac23

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

web/client/components/share/SharePanel.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
Tooltip
2626
} from 'react-bootstrap';
2727
import Message from '../../components/I18N/Message';
28-
import { join, isNil, isEqual, inRange } from 'lodash';
28+
import { join, isNil, isEqual, inRange, isEmpty } from 'lodash';
2929
import { removeQueryFromUrl, getSharedGeostoryUrl, CENTERANDZOOM, BBOX, MARKERANDZOOM, SHARE_TABS } from '../../utils/ShareUtils';
3030
import { getLonLatFromPoint } from '../../utils/CoordinatesUtils';
3131
import { getMessageById } from '../../utils/LocaleUtils';
@@ -234,7 +234,7 @@ class SharePanel extends React.Component {
234234
onClose={this.props.onClose}>
235235
<div role="body" className="share-panels">
236236
{tabs}
237-
{this.props.advancedSettings
237+
{!isEmpty(this.props.advancedSettings)
238238
&& currentTab !== SHARE_TABS[this.props?.advancedSettings?.hideInTab]
239239
&& this.renderAdvancedSettings()
240240
}

web/client/components/share/__tests__/SharePanel-test.jsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,19 @@ describe("The SharePanel component", () => {
8181
expect(document.querySelectorAll('h4')[1].innerHTML).toBe("<span>share.directLinkTitle</span>");
8282

8383
});
84+
it('test hide advancedSettings when no settings configured', () => {
85+
const advancedSettings = {};
86+
let panel = ReactDOM.render(<SharePanel showAPI={false} advancedSettings={advancedSettings} getCount={() => 2} shareUrl="www.geo-solutions.it" isVisible />, document.getElementById("container"));
87+
expect(panel.state.eventKey).toBe(1);
88+
expect(document.querySelectorAll('h4')[1].innerHTML).toBe("<span>share.directLinkTitle</span>");
89+
90+
let advancedSettingsPanel = document.querySelector('.mapstore-switch-panel');
91+
expect(advancedSettingsPanel).toBeFalsy();
92+
93+
ReactDOM.render(<SharePanel showAPI={false} advancedSettings={false} getCount={() => 2} shareUrl="www.geo-solutions.it" isVisible />, document.getElementById("container"));
94+
advancedSettingsPanel = document.querySelector('.mapstore-switch-panel');
95+
expect(advancedSettingsPanel).toBeFalsy();
96+
});
8497
it('test hide advancedSettings in specific tab', () => {
8598
const advancedSettings = {
8699
homeButton: true,

0 commit comments

Comments
 (0)