Skip to content

Handle options and errors on field #1915

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
allyoucanmap merged 2 commits into from
Dec 10, 2024
Merged

Handle options and errors on field #1915

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
39eec3b
Handle options and errors on field
dsuren1 Dec 3, 2024
28b34b7
code refactor
dsuren1 Dec 3, 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
8 changes: 5 additions & 3 deletions geonode_mapstore_client/client/js/components/Autocomplete/Autocomplete.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const Autocomplete = ({
title,
value,
valueKey = "value",
showLabel = true,
...props
}) => {
const getValue = () => {
Expand All @@ -46,10 +47,10 @@ const Autocomplete = ({

return (
<div className={`autocomplete${className ? " " + className : ""}${!!error ? " " + "has-error" : ""}`}>
<div className="title-container">
{showLabel && <div className="title-container">
<label className="control-label" htmlFor={id}>{title || name}</label>
{helpTitleIcon && !isEmpty(description) && <IconWithTooltip className="help-title" tooltip={description} tooltipPosition={"right"} />}
</div>
</div>}
<SelectInfiniteScroll
{...props}
id={id}
Expand All @@ -72,7 +73,8 @@ Autocomplete.propTypes = {
name: PropTypes.string,
title: PropTypes.string,
value: PropTypes.any.isRequired,
valueKey: PropTypes.string
valueKey: PropTypes.string,
showLabel: PropTypes.bool
};

export default Autocomplete;
6 changes: 6 additions & 0 deletions geonode_mapstore_client/client/js/plugins/MetadataEditor/actions/metadata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const SET_METADATA_UPDATING = 'GEONODE:SET_METADATA_UPDATING';
export const SET_METADATA_UPDATE_ERROR = 'GEONODE:SET_METADATA_UPDATE_ERROR';
export const SET_METADATA_PREVIEW = 'GEONODE:SET_METADATA_PREVIEW';
export const SET_METADATA_RESOURCE = 'GEONODE:SET_METADATA_RESOURCE';
export const SET_METADATA_EXTRA_ERRORS = 'GEONODE:SET_METADATA_EXTRA_ERRORS';

export const setMetadata = (metadata) => ({
type: SET_METADATA,
Expand Down Expand Up @@ -66,3 +67,8 @@ export const setMetadataResource = (resource) => ({
type: SET_METADATA_RESOURCE,
resource
});

export const setExtraErrors = (extraErrors) => ({
type: SET_METADATA_EXTRA_ERRORS,
extraErrors
});
26 changes: 20 additions & 6 deletions geonode_mapstore_client/client/js/plugins/MetadataEditor/components/_fields/SchemaField.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ const SchemaField = (props) => {
formData,
idSchema,
name,
hideError,
errorSchema,
uiSchema
} = props;
const autocomplete = uiSchema?.['ui:options']?.['geonode-ui:autocomplete'];
const uiOptions = uiSchema?.['ui:options'];
const autocomplete = uiOptions?.['geonode-ui:autocomplete'];
const isSchemaItemString = schema?.items?.type === 'string';
const isSchemaItemObject = schema?.items?.type === 'object';
const isMultiSelect = schema?.type === 'array' && (isSchemaItemString ||
Expand All @@ -40,6 +40,17 @@ const SchemaField = (props) => {
const isSingleSelect = schema?.type === 'object' && !isEmpty(schema?.properties);

if (autocomplete && (isMultiSelect || isSingleSelect)) {
const {
classNames,
style,
description,
disabled,
help: helpText,
hideError,
label,
placeholder: autoCompletePlaceholder,
title
} = uiOptions;
const errors = (!hideError ? castArray(errorSchema) : [])
.reduce((acc, errorEntry) => {
if (errorEntry?.__errors) {
Expand All @@ -61,23 +72,26 @@ const SchemaField = (props) => {
const resultsKey = autocompleteOptions?.resultsKey || 'results';
const valueKey = autocompleteOptions?.valueKey || 'id';
const labelKey = autocompleteOptions?.labelKey || 'label';
const placeholder = autocompleteOptions?.placeholder ?? '...';
const creatable = !!autocompleteOptions?.creatable;
const placeholder = autoCompletePlaceholder ?? '...';

let autoCompleteProps = {
className: "gn-metadata-autocomplete",
className: `gn-metadata-autocomplete${classNames ? ' ' + classNames : ''}`,
clearable: !isMultiSelect,
creatable,
id: idSchema.$id,
labelKey,
multi: isMultiSelect,
name,
placeholder,
title: schema.title,
showLabel: label ?? true,
title: title ?? schema.title,
value: formData,
valueKey,
helpTitleIcon: true,
description: schema.description,
description: helpText ?? description ?? schema.description, // Help text is preferred over description and displayed as a tooltip
disabled,
style,
onChange: (selected) => {
let _selected = selected?.result ?? null;
if (isMultiSelect) {
Expand Down
2 changes: 2 additions & 0 deletions geonode_mapstore_client/client/js/plugins/MetadataEditor/containers/MetadataEditor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ function MetadataEditor({
pk,
loading,
error,
extraErrors,
metadata,
schema,
uiSchema,
Expand Down Expand Up @@ -97,6 +98,7 @@ function MetadataEditor({
validator={validator}
templates={templates}
fields={fields}
extraErrors={extraErrors}
experimental_defaultFormStateBehavior={{
arrayMinItems: {
populate: 'never',
Expand Down
7 changes: 5 additions & 2 deletions geonode_mapstore_client/client/js/plugins/MetadataEditor/containers/MetadataUpdateButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

import React from 'react';
import get from 'lodash/get';
import { updateMetadata } from '@js/api/geonode/v2/metadata';
import Message from '@mapstore/framework/components/I18N/Message';
import Button from '@js/components/Button';
Expand All @@ -20,15 +21,17 @@ function MetadataUpdateButton({
updating,
setUpdating,
setUpdateError,
setInitialMetadata
setInitialMetadata,
setExtraErrors
}) {

function handleUpdate() {
setUpdating(true);
setUpdateError(false);
updateMetadata(pk, metadata)
.then(() => {
.then((res) => {
setInitialMetadata(metadata);
setExtraErrors(get(res, 'data.extraErrors', {}));
})
.catch(() => {
setUpdateError(true);
Expand Down
10 changes: 7 additions & 3 deletions geonode_mapstore_client/client/js/plugins/MetadataEditor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import {
setMetadataError,
setMetadataUpdating,
setMetadataUpdateError,
setMetadataResource
setMetadataResource,
setExtraErrors
} from './actions/metadata';
import { parseDevHostname } from '@js/utils/APIUtils';

Expand All @@ -35,16 +36,18 @@ const connectMetadata = connect(
createSelector([
state => state?.metadata?.loading,
state => state?.metadata?.error,
state => state?.metadata?.extraErrors,
state => state?.metadata?.metadata,
state => state?.metadata?.initialMetadata,
state => state?.metadata?.schema,
state => state?.metadata?.uiSchema,
state => state?.metadata?.updating,
state => state?.metadata?.updateError,
state => state?.metadata?.resource
], (loading, error, metadata, initialMetadata, schema, uiSchema, updating, updateError, resource) => ({
], (loading, error, extraErrors, metadata, initialMetadata, schema, uiSchema, updating, updateError, resource) => ({
loading,
error,
extraErrors,
metadata,
schema,
uiSchema,
Expand All @@ -62,7 +65,8 @@ const connectMetadata = connect(
setInitialMetadata,
setUpdateError: setMetadataUpdateError,
setUpdating: setMetadataUpdating,
setResource: setMetadataResource
setResource: setMetadataResource,
setExtraErrors
}
);

Expand Down
9 changes: 8 additions & 1 deletion geonode_mapstore_client/client/js/plugins/MetadataEditor/reducers/metadata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import {
SET_METADATA_UPDATING,
SET_METADATA_UPDATE_ERROR,
SET_METADATA_PREVIEW,
SET_METADATA_RESOURCE
SET_METADATA_RESOURCE,
SET_METADATA_EXTRA_ERRORS
} from '../actions/metadata';

function metadata(state = {}, action) {
Expand Down Expand Up @@ -81,6 +82,12 @@ function metadata(state = {}, action) {
resource: action.resource
};
}
case SET_METADATA_EXTRA_ERRORS: {
return {
...state,
extraErrors: action.extraErrors
};
}
default:
return state;
}
Expand Down
Loading