Skip to content

#2166: Fix - Time series information retrieved for read-only resources #2171

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

Merged
merged 5 commits into from
Oct 10, 2025
Merged

#2166: Fix - Time series information retrieved for read-only resources #2171

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2251a3d
#2166: Fix - Time series information retrieved for read-only resources
dsuren1 Sep 26, 2025
5de04b9
Merge commit '89fc69cd1f20ce048a5e0e19baa8a06bfca466a7' into #2166_ti…
dsuren1 Oct 9, 2025
e2d4bfd
Avoid timeseries call when lacking permission
dsuren1 Oct 9, 2025
cf23863
update dimensions in payload based on has_time
dsuren1 Oct 10, 2025
6dfb3a7
perform update calls sequentially
dsuren1 Oct 10, 2025
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
15 changes: 12 additions & 3 deletions 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 @@ -740,11 +740,20 @@ export const gnSelectResourceEpic = (action$, store) =>
.then((compactPermissions) => compactPermissions)
.catch(() => null)
: Promise.resolve(null)
]))
.switchMap(([resource, compactPermissions]) => {
])
.then((response) => {
const [resource] = response ?? [];
if (resource?.has_time) {
return getDatasetTimeSettingsByPk(pk)
.then((timeseries) => response.concat(timeseries));
}
return response;
}))
.switchMap((response) => {
const [resource, compactPermissions, timeseries] = response ?? [];
return Observable.of(
setResourceType(resourceType),
setResource(getResourceWithDetail(resource)),
setResource(getResourceWithDetail({...resource, timeseries})),
...(compactPermissions ? [setResourceCompactPermissions(compactPermissions)] : [])
);
})
Expand Down
5 changes: 3 additions & 2 deletions geonode_mapstore_client/client/js/plugins/ResourceDetails/components/DetailsTimeSeries.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@ import HTML from '@mapstore/framework/components/I18N/HTML';
import { getMessageById } from '@mapstore/framework/utils/LocaleUtils';
import InfoPopover from '@mapstore/framework/components/widgets/widget/InfoPopover';

import { TIME_SERIES_PROPERTIES, TIME_ATTRIBUTE_TYPES, TIME_PRECISION_STEPS } from '@js/utils/ResourceUtils';
import { TIME_SERIES_PROPERTIES, TIME_ATTRIBUTE_TYPES, TIME_PRECISION_STEPS, resourceHasPermission } from '@js/utils/ResourceUtils';
import FlexBox from '@mapstore/framework/components/layout/FlexBox';
import Text from '@mapstore/framework/components/layout/Text';

const TimeSeriesSettings = ({ resource, onChange }, context) => {
const timeAttributes = (resource?.attribute_set ?? [])
.filter((attribute) => TIME_ATTRIBUTE_TYPES.includes(attribute.attribute_type))
.map((attribute)=> ({value: attribute.pk, label: attribute.attribute}));
const canChangeResourcebase = resourceHasPermission(resource, 'change_resourcebase');

const [timeseries, setTimeSeries] = useState(resource.timeseries);
const [error, setError] = useState();

if (isEmpty(timeAttributes)) return null;
if (!canChangeResourcebase || isEmpty(timeAttributes)) return null;

const onChangeTimeSettings = (key, value) => {
const _timeseries = {
Expand Down
7 changes: 6 additions & 1 deletion geonode_mapstore_client/client/js/selectors/resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ export const getSelectedLayerDataset = (state) => {
return state?.gnresource?.selectedLayerDataset;
};

export const isResourceDetail = (state) => {
return get(state, 'gnresource.data["@ms-detail"]', false);
};

export const getCompactPermissions = (state) => {
const compactPermissions = state?.gnresource?.compactPermissions || {};
return compactPermissions;
Expand Down Expand Up @@ -338,7 +342,8 @@ export const getResourceDirtyState = (state) => {
if (resourceType === ResourceTypes.DATASET) {
metadataKeys = metadataKeys.concat('timeseries');
}
const { data: initialData = {}, ...resource } = pick(state?.gnresource?.initialResource || {}, metadataKeys);
let { data: initialData = {}, ...resource } = pick(state?.gnresource?.initialResource || {}, metadataKeys);
if (isResourceDetail(state)) initialData = {}; // detail page allows only metadata editing. Data is not editable.
const { compactPermissions, geoLimits } = getPermissionsPayload(state);
const currentData = JSON.parse(JSON.stringify(getDataPayload(state) || {})); // JSON stringify is needed to remove undefined values
// omitting data on thumbnail
Expand Down