Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1730: Fix - Incorrect positioning of panels #1731

Merged
merged 2 commits into from
Apr 29, 2024
Merged

#1730: Fix - Incorrect positioning of panels #1731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba51591
#1730: Fix - Incorrect positioning of panels
dsuren1 Apr 19, 2024
f1f07cd
Unit test
dsuren1 Apr 19, 2024
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
44 changes: 43 additions & 1 deletion geonode_mapstore_client/client/js/epics/__tests__/gnresource-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import axios from '@mapstore/framework/libs/ajax';
import { testEpic } from '@mapstore/framework/epics/__tests__/epicTestUtils';
import {
gnViewerSetNewResourceThumbnail,
closeInfoPanelOnMapClick
closeInfoPanelOnMapClick,
closeDatasetCatalogPanel
} from '@js/epics/gnresource';
import {
setResourceThumbnail,
Expand All @@ -24,6 +25,7 @@ import { SET_CONTROL_PROPERTY } from '@mapstore/framework/actions/controls';
import {
SHOW_NOTIFICATION
} from '@mapstore/framework/actions/notifications';
import { newMapInfoRequest } from '@mapstore/framework/actions/mapInfo';

let mockAxios;

Expand Down Expand Up @@ -132,4 +134,44 @@ describe('gnresource epics', () => {
);

});
it('close dataset panels on map info panel open', (done) => {
const NUM_ACTIONS = 1;
const testState = {
context: {
currentContext: {
plugins: {
desktop: [
{name: "Identify"}
]
}
}
},
mapInfo: {
requests: ["something"]
},
controls: {
datasetsCatalog: {
enabled: true
}
}
};

testEpic(closeDatasetCatalogPanel,
NUM_ACTIONS,
newMapInfoRequest(),
(actions) => {
try {
expect(actions.length).toBe(1);
expect(actions[0].type).toBe(SET_CONTROL_PROPERTY);
expect(actions[0].control).toBe("datasetsCatalog");
expect(actions[0].value).toBe(false);
} catch (e) {
done(e);
}
done();
},
testState
);

});
});
12 changes: 10 additions & 2 deletions geonode_mapstore_client/client/js/epics/datasetscatalog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import { SET_CONTROL_PROPERTY } from '@mapstore/framework/actions/controls';
import { updateMapLayout, UPDATE_MAP_LAYOUT } from '@mapstore/framework/actions/maplayout';
import { mapLayoutSelector } from '@mapstore/framework/selectors/maplayout';
import { mapLayoutSelector, boundingSidebarRectSelector } from '@mapstore/framework/selectors/maplayout';
import { getConfigProp } from "@mapstore/framework/utils/ConfigUtils";
import { LayoutSections } from "@js/utils/LayoutUtils";

Expand All @@ -27,13 +27,21 @@ export const gnUpdateDatasetsCatalogMapLayout = (action$, store) =>
})
.map(({ layout }) => {
const mapLayout = getConfigProp('mapLayout') || { left: { sm: 300, md: 500, lg: 600 }, right: { md: 658 }, bottom: { sm: 30 } };
const boundingSidebarRect = boundingSidebarRectSelector(store.getState());
const left = !!store.getState()?.controls?.drawer?.enabled ? mapLayout.left.sm : null;
const action = updateMapLayout({
...mapLayoutSelector(store.getState()),
...layout,
right: mapLayout.right.md,
...(left && {left}),
boundingMapRect: {
...(layout?.boundingMapRect || {}),
right: mapLayout.right.md
right: mapLayout.right.md,
...(left && {left})
},
boundingSidebarRect: {
...boundingSidebarRect,
...layout.boundingSidebarRect
}
});
return { ...action, source: LayoutSections.PANEL }; // add an argument to avoid infinite loop.
Expand Down
22 changes: 21 additions & 1 deletion geonode_mapstore_client/client/js/epics/gnresource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ import { STYLE_OWNER_NAME } from '@mapstore/framework/utils/StyleEditorUtils';
import { styleServiceSelector } from '@mapstore/framework/selectors/styleeditor';
import { updateStyleService } from '@mapstore/framework/api/StyleEditor';
import { CLICK_ON_MAP, resizeMap } from '@mapstore/framework/actions/map';
import { purgeMapInfoResults, closeIdentify } from '@mapstore/framework/actions/mapInfo';
import { purgeMapInfoResults, closeIdentify, NEW_MAPINFO_REQUEST } from '@mapstore/framework/actions/mapInfo';
import { saveError } from '@js/actions/gnsave';
import {
error as errorNotification,
Expand All @@ -113,6 +113,7 @@ import { setContext } from '@mapstore/framework/actions/context';
import { wrapStartStop } from '@mapstore/framework/observables/epics';
import { parseDevHostname } from '@js/utils/APIUtils';
import { ProcessTypes } from '@js/utils/ResourceServiceUtils';
import { catalogClose } from '@mapstore/framework/actions/catalog';

const resourceTypes = {
[ResourceTypes.DATASET]: {
Expand Down Expand Up @@ -579,6 +580,15 @@ export const closeOpenPanels = (action$, store) => action$.ofType(SET_CONTROL_PR
if (isMapInfoOpen(state)) {
setActions.push(purgeMapInfoResults(), closeIdentify());
}
const isDatasetCatalogPanelOpen = get(state, "controls.datasetsCatalog.enabled");
const isCatalogOpen = get(state, "controls.metadataexplorer.enabled");
const isVisualStyleEditorOpen = get(state, "controls.visualStyleEditor.enabled");
if ((isDatasetCatalogPanelOpen || isVisualStyleEditorOpen) && isCatalogOpen) {
setActions.push(catalogClose());
}
if (isDatasetCatalogPanelOpen && isVisualStyleEditorOpen) {
setActions.push(setControlProperty('datasetsCatalog', 'enabled', false));
}
const control = oneOfTheOther(action.control);
if (control?.control) {
if (state.controls?.rightOverlay?.enabled === 'DetailViewer' || state.controls?.rightOverlay?.enabled === 'Share') {
Expand All @@ -593,6 +603,15 @@ export const closeOpenPanels = (action$, store) => action$.ofType(SET_CONTROL_PR
return actions.length > 0 ? Observable.of(...actions) : Observable.empty();
});

/**
* Close dataset panels on map info panel open
*/
export const closeDatasetCatalogPanel = (action$, store) => action$.ofType(NEW_MAPINFO_REQUEST)
.filter(() => isMapInfoOpen(store.getState()) && get(store.getState(), "controls.datasetsCatalog.enabled"))
.switchMap(() => {
return Observable.of(setControlProperty('datasetsCatalog', 'enabled', false));
});

export const gnManageLinkedResource = (action$, store) =>
action$.ofType(MANAGE_LINKED_RESOURCE)
.switchMap((action) => {
Expand Down Expand Up @@ -636,5 +655,6 @@ export default {
gnViewerSetNewResourceThumbnail,
closeInfoPanelOnMapClick,
closeOpenPanels,
closeDatasetCatalogPanel,
gnManageLinkedResource
};
7 changes: 6 additions & 1 deletion geonode_mapstore_client/client/js/epics/layersettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import { updateMapLayout, UPDATE_MAP_LAYOUT } from '@mapstore/framework/actions/maplayout';
import { mapLayoutSelector } from '@mapstore/framework/selectors/maplayout';
import { mapLayoutSelector, boundingSidebarRectSelector } from '@mapstore/framework/selectors/maplayout';
import { getConfigProp } from "@mapstore/framework/utils/ConfigUtils";
import { SHOW_SETTINGS } from '@mapstore/framework/actions/layers';
import { LayoutSections } from "@js/utils/LayoutUtils";
Expand All @@ -26,13 +26,18 @@ export const gnUpdateLayerSettingsMapLayout = (action$, store) =>
})
.map(({ layout }) => {
const mapLayout = getConfigProp('mapLayout') || { left: { sm: 300, md: 500, lg: 600 }, right: { md: 658 }, bottom: { sm: 30 } };
const boundingSidebarRect = boundingSidebarRectSelector(store.getState());
const action = updateMapLayout({
...mapLayoutSelector(store.getState()),
...layout,
left: mapLayout.left.sm,
boundingMapRect: {
...(layout?.boundingMapRect || {}),
left: mapLayout.left.sm
},
boundingSideBarReact: {
...boundingSidebarRect,
...layout.boundingSidebarRect
}
});
return { ...action, source: LayoutSections.PANEL }; // add an argument to avoid infinite loop.
Expand Down
7 changes: 6 additions & 1 deletion geonode_mapstore_client/client/js/epics/visualstyleeditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import tinycolor from 'tinycolor2';
import { parseStyleName } from '@js/utils/ResourceUtils';
import { getStyleProperties } from '@js/api/geonode/style';
import { updateMapLayout, UPDATE_MAP_LAYOUT } from '@mapstore/framework/actions/maplayout';
import { mapLayoutSelector } from '@mapstore/framework/selectors/maplayout';
import { mapLayoutSelector, boundingSidebarRectSelector } from '@mapstore/framework/selectors/maplayout';
import { getConfigProp } from "@mapstore/framework/utils/ConfigUtils";
import { LayoutSections } from "@js/utils/LayoutUtils";

Expand Down Expand Up @@ -177,13 +177,18 @@ export const gnUpdateVisualStyleEditorMapLayout = (action$, store) =>
})
.map(({ layout }) => {
const mapLayout = getConfigProp('mapLayout') || { left: { sm: 300, md: 500, lg: 600 }, right: { md: 658 }, bottom: { sm: 30 } };
const boundingSidebarRect = boundingSidebarRectSelector(store.getState());
const action = updateMapLayout({
...mapLayoutSelector(store.getState()),
...layout,
left: mapLayout.left.md,
boundingMapRect: {
...(layout?.boundingMapRect || {}),
left: mapLayout.left.md
},
boundingSidebarRect: {
...boundingSidebarRect,
...layout.boundingSidebarRect
}
});
return { ...action, source: LayoutSections.PANEL }; // add an argument to avoid infinite loop.
Expand Down
5 changes: 5 additions & 0 deletions geonode_mapstore_client/static/mapstore/configs/pluginsConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
},
{
"name": "DrawerMenu",
"defaultConfig": {
"menuOptions": {
"width": 350
}
},
"hidden": true
},
{
Expand Down