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

Jump to bottom

Autocomplete enhancement with additional schema types #1910

Merged
merged 2 commits into from
Nov 22, 2024
Merged

Autocomplete enhancement with additional schema types #1910

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
ecdba75
Autocomplete enhancement with additional schema types
dsuren1 Nov 21, 2024
89b83b7
enhance autocomplete
dsuren1 Nov 21, 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
19 changes: 6 additions & 13 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 @@ -9,6 +9,7 @@
import React from 'react';
import isArray from 'lodash/isArray';
import isEmpty from 'lodash/isEmpty';
import isString from 'lodash/isString';
import PropTypes from 'prop-types';

import SelectInfiniteScroll from '@js/components/SelectInfiniteScroll/SelectInfiniteScroll';
Expand All @@ -22,31 +23,26 @@ const Autocomplete = ({
description,
helpTitleIcon,
id,
labelKey,
labelKey = "label",
name,
title,
value,
valueKey,
valueKey = "value",
...props
}) => {
const getValue = () => {
if (value && isArray(value) && valueKey && labelKey) {
if (value && isArray(value)) {
return value.map((entry) => {
return {
result: entry,
value: entry[valueKey],
label: entry[labelKey]
[valueKey]: isString(entry) ? entry : entry[valueKey],
[labelKey]: isString(entry) ? entry : entry[labelKey]
};
});
}
return value;
};

const defaultNewOptionCreator = (option) => ({
[valueKey]: option.label,
[labelKey]: option.label
});

return (
<div className={`autocomplete${className ? " " + className : ""}`}>
<div className="title-container">
Expand All @@ -59,9 +55,6 @@ const Autocomplete = ({
value={getValue()}
valueKey={valueKey}
labelKey={labelKey}
{...props.creatable && {
newOptionCreator: props.newOptionCreator ?? defaultNewOptionCreator
}}
/>
</div>
);
Expand Down
16 changes: 11 additions & 5 deletions geonode_mapstore_client/client/js/components/SelectInfiniteScroll/SelectInfiniteScroll.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ function SelectInfiniteScroll({
loadOptions,
pageSize = 20,
debounceTime = 500,
labelKey,
valueKey,
labelKey = "label",
valueKey = "value",
newOptionPromptText = "Create option",
...props
}) {
Expand All @@ -46,13 +46,17 @@ function SelectInfiniteScroll({

const updateNewOption = (newOptions, query) => {
if (props.creatable && !isEmpty(query)) {
const isValueExist = props.value?.some(v => v[labelKey] === query);
const isOptionExist = newOptions.some((o) => o[labelKey] === query);
const compareValue = (option) =>
option?.[labelKey]?.toLowerCase() === query.toLowerCase();

const isValueExist = props.value?.some(compareValue);
const isOptionExist = newOptions.some(compareValue);

// Add new option if it doesn't exist and `creatable` is enabled
if (!isValueExist && !isOptionExist) {
return [{
[labelKey]: `${newOptionPromptText} "${query}"`, value: query,
[labelKey]: `${newOptionPromptText} "${query}"`,
[valueKey]: query,
result: { [valueKey]: query, [labelKey]: query }
}].concat(newOptions);
}
Expand Down Expand Up @@ -141,6 +145,8 @@ function SelectInfiniteScroll({
{...props}
isLoading={loading}
options={options}
labelKey={labelKey}
valueKey={valueKey}
onOpen={() => setOpen(true)}
onClose={() => setOpen(false)}
filterOptions={filterOptions}
Expand Down
22 changes: 15 additions & 7 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 @@ -29,7 +29,11 @@ const SchemaField = (props) => {
uiSchema
} = props;
const autocomplete = uiSchema?.['ui:options']?.['geonode-ui:autocomplete'];
const isMultiSelect = schema?.items?.type === 'object' && !isEmpty(schema?.items?.properties);
const isSchemaItemString = schema?.items?.type === 'string';
const isSchemaItemObject = schema?.items?.type === 'object';
const isMultiSelect = schema?.type === 'array' && (isSchemaItemString ||
(isSchemaItemObject && !isEmpty(schema?.items?.properties))
);
const isSingleSelect = schema?.type === 'object' && !isEmpty(schema?.properties);

if (autocomplete && (isMultiSelect || isSingleSelect)) {
Expand Down Expand Up @@ -65,10 +69,14 @@ const SchemaField = (props) => {
if (result === undefined) {
return option;
}
return Object.fromEntries(
Object.keys(schema.items.properties)
.map((key) => [key, result[key]])
);
return isString(result)
? result
: isSchemaItemString
? result[valueKey]
: Object.fromEntries(
Object.keys(schema.items?.properties)
.map((key) => [key, result[key]])
);
});
}
onChange(_selected);
Expand All @@ -89,8 +97,8 @@ const SchemaField = (props) => {
return {
selectOption: {
result,
value: result[valueKey],
label: result[labelKey]
[valueKey]: isString(result) ? result : result[valueKey],
[labelKey]: isString(result) ? result : result[labelKey]
}
};
})
Expand Down
Loading