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

MS submodule upgrade + upgrade of axios #1737

Merged
merged 8 commits into from
Apr 24, 2024
Merged

MS submodule upgrade + upgrade of axios #1737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b81f3f
Update mapstore submodule to branch 2024.01.xx (#1712)
allyoucanmap Apr 15, 2024
eb49593
[Backport] #1710 - Update calls with catalog_list preset (#1711) (#1716)
dsuren1 Apr 17, 2024
c885618
#1720: Improve layer setting visualisation (#1721)
dsuren1 Apr 18, 2024
90578be
#1722: Fix - LayerSettings select dropdown are covered by titles (#1723)
dsuren1 Apr 18, 2024
cca247a
#1726: Fix - Tile format select input not shown (#1727)
dsuren1 Apr 18, 2024
22ca1df
#1732: Fix - Chart widget header style (#1733)
dsuren1 Apr 22, 2024
4f80dac
Merge branch 'mapviewer-resource-built' into mapviewer-resource
dsuren1 Apr 22, 2024
1ddecd8
#1735: Fix - Map and other resources are loading indefinitely (#1736)
dsuren1 Apr 24, 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
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/MapStore2
Open in desktop
Submodule MapStore2 updated 114 files
28 changes: 14 additions & 14 deletions geonode_mapstore_client/client/js/api/geonode/v2/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export const getResources = ({
};
return axios.get(parseDevHostname(endpoints[RESOURCES]), {
params: _params,
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => {
return {
Expand Down Expand Up @@ -182,7 +182,7 @@ export const getMaps = ({
page_size: pageSize,
api_preset: API_PRESET.MAPS
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => {
return {
Expand Down Expand Up @@ -218,7 +218,7 @@ export const getDatasets = ({
page_size: pageSize,
api_preset: API_PRESET.DATASETS
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => {
return {
Expand Down Expand Up @@ -255,7 +255,7 @@ export const getDocumentsByDocType = (docType = 'image', {
page_size: pageSize,
api_preset: API_PRESET.DOCUMENTS
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => {
return {
Expand Down Expand Up @@ -337,7 +337,7 @@ export const getDatasetByPk = (pk) => {
params: {
api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.DATASET]
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => data.dataset);
};
Expand All @@ -347,7 +347,7 @@ export const getDocumentByPk = (pk) => {
params: {
api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.DOCUMENT]
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => data.document);
};
Expand All @@ -360,7 +360,7 @@ export const getDocumentsByPk = (pk) => {
page_size: pks.length,
api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.DOCUMENT]
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => data.documents);
};
Expand Down Expand Up @@ -406,7 +406,7 @@ export const getGeoApps = ({
page,
page_size: pageSize
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => {
return {
Expand Down Expand Up @@ -458,7 +458,7 @@ export const getUsers = ({
page,
page_size: pageSize
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => {
return {
Expand Down Expand Up @@ -487,7 +487,7 @@ export const getGroups = ({
page,
page_size: pageSize
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => {
return {
Expand Down Expand Up @@ -661,7 +661,7 @@ export const getMapByPk = (pk) => {
params: {
api_preset: [API_PRESET.VIEWER_COMMON, API_PRESET.MAP]
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => data?.map);
};
Expand All @@ -675,7 +675,7 @@ export const getMapsByPk = (pk) => {
page_size: pks.length,
api_preset: API_PRESET.MAPS
},
paramsSerializer
...paramsSerializer()
})
.then(({ data }) => data?.maps);
};
Expand Down Expand Up @@ -839,7 +839,7 @@ export const getFacetItemsByFacetName = ({ name: facetName, style, filterKey, fi
return axios.get(`${parseDevHostname(endpoints[FACETS])}/${facetName}`,
{ ...config,
params: updatedParams,
paramsSerializer
...paramsSerializer()
}
).then(({data}) => {
const {page: _page = 0, items: _items = [], total, page_size: size} = data?.topics ?? {};
Expand Down Expand Up @@ -890,7 +890,7 @@ export const getFacetItemsByFacetName = ({ name: facetName, style, filterKey, fi

export const getFacetsByKey = (facet, filterParams) => {
return axios
.get(parseDevHostname(endpoints[FACETS] + `/${facet}`), {params: {...filterParams}, paramsSerializer})
.get(parseDevHostname(endpoints[FACETS] + `/${facet}`), {params: {...filterParams}, ...paramsSerializer()})
.then(({ data } = {}) => ({
...data?.topics,
items: data?.topics?.items?.map(item => ({...item, facetName: facet}))
Expand Down
5 changes: 3 additions & 2 deletions geonode_mapstore_client/client/js/plugins/layersettings/WMSLayerSettings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import InfoPopover from '@mapstore/framework/components/widgets/widget/InfoPopov
import { getSupportedFormat } from '@mapstore/framework/api/WMS';
import { getConfigProp } from '@mapstore/framework/utils/ConfigUtils';
import LegendImage from '@mapstore/framework/plugins/TOC/components/Legend';
import { DEFAULT_SUPPORTED_GET_MAP_FORMAT } from '@mapstore/framework/utils/WMSUtils';
import Select from 'react-select';
import GeneralSettings from '@js/plugins/layersettings/GeneralSettings';
import VisibilitySettings from '@js/plugins/layersettings/VisibilitySettings';
Expand Down Expand Up @@ -215,8 +216,8 @@ function WMSLayerSettings({
isLoading={!!formatLoading}
options={formatLoading
? []
: (formats?.map((value) => ({ value, label: value }))
|| imageFormats)}
: (formats ?? imageFormats ?? DEFAULT_SUPPORTED_GET_MAP_FORMAT).map((_format) => _format?.value ? _format : ({ value: _format, label: _format }))
}
value={format}
onChange={({ value }) => onChange({ format: value })}/>
<Button
Expand Down
26 changes: 16 additions & 10 deletions geonode_mapstore_client/client/js/utils/APIUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,22 @@ export const getApiToken = () => {
* @param {Object} params
* @returns {Object} updated params
*/
export const paramsSerializer = (params) => {
const {include, exclude, sort, ...rest} = params ?? {}; // Update bracket params (if any)
let queryParams = '';
if (!isEmpty(include) || !isEmpty(exclude) || !isEmpty(sort)) {
queryParams = queryString.stringify({include, exclude, sort}, { arrayFormat: 'bracket'});
}
if (!isEmpty(rest)) {
queryParams = (isEmpty(queryParams) ? '' : `${queryParams}&`) + queryString.stringify(rest);
}
return queryParams;
export const paramsSerializer = () => {
return {
paramsSerializer: {
serialize: params => {
const {include, exclude, sort, ...rest} = params ?? {}; // Update bracket params (if any)
let queryParams = '';
if (!isEmpty(include) || !isEmpty(exclude) || !isEmpty(sort)) {
queryParams = queryString.stringify({include, exclude, sort}, { arrayFormat: 'bracket'});
}
if (!isEmpty(rest)) {
queryParams = (isEmpty(queryParams) ? '' : `${queryParams}&`) + queryString.stringify(rest);
}
return queryParams;
}
}
};
};

export const API_PRESET = {
Expand Down
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/themes/geonode/less/ms-theme.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ div#mapstore-globalspinner {
}
}
}
.map-widget-view {
.map-widget-view, .chart-widget-view {
.widget-icons, .widget-title {
.em(margin-bottom, 6);
}
Expand Down