gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: various fixes and tweaks (#701)

Browse Source
This commit is contained in:
Daniel Lautzenheiser
2023-04-14 13:52:11 -04:00
committed by GitHub
parent 422b7798da
commit 364612e9ae
22 changed files with 101 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/src/widgets/list/ListControl.tsx
View File

@ -293,7 +293,7 @@ const ListControl: FC<WidgetControlProps<ValueOrNestedValue[], ListField>> = ({
[onChange, internalValue, keys],
);
const hasChildErrors = useHasChildErrors(path, fieldsErrors, i18n);
const hasChildErrors = useHasChildErrors(path, fieldsErrors, i18n, false);
if (valueType === null) {
return null;

2
packages/core/src/widgets/list/components/ListItem.tsx
View File

@ -165,7 +165,7 @@ const ListItem: FC<ListItemProps> = ({
}
}, [entry, field, index, value, valueType]);
const hasChildErrors = useHasChildErrors(path, fieldsErrors, i18n);
const hasChildErrors = useHasChildErrors(path, fieldsErrors, i18n, false);
const finalValue = useMemo(() => {
if (field.fields && field.fields.length === 1) {

2
packages/core/src/widgets/object/ObjectControl.tsx
View File

@ -31,7 +31,7 @@ const ObjectControl: FC<WidgetControlProps<ObjectValue, ObjectField>> = ({
const fields = useMemo(() => field.fields, [field.fields]);
const hasChildErrors = useHasChildErrors(path, fieldsErrors, i18n);
const hasChildErrors = useHasChildErrors(path, fieldsErrors, i18n, false);
const renderedField = useMemo(() => {
return (

9
packages/core/src/widgets/relation/RelationControl.tsx
View File

@ -179,11 +179,15 @@ const RelationControl: FC<WidgetControlProps<string | string[], RelationField>>
);
const [options, setOptions] = useState<HitOption[]>([]);
const [entries, setEntries] = useState<Entry[]>([]);
const loading = useMemo(() => options.length === 0, [options.length]);
const [entries, setEntries] = useState<Entry[] | null>(null);
const loading = useMemo(() => !entries, [entries]);
const filterOptions = useCallback(
(inputValue: string) => {
if (!entries) {
return;
}
const searchFields = field.search_fields;
const limit = field.options_length || DEFAULT_OPTIONS_LIMIT;
const expandedEntries = expandSearchEntries(entries, searchFields);
@ -334,6 +338,7 @@ const RelationControl: FC<WidgetControlProps<string | string[], RelationField>>
key="loading-indicator"
className="absolute inset-y-0 right-4 flex items-center pr-2"
data-testid="relation-loading-indicator"
size="small"
/>
) : null}
</>

15
packages/core/src/widgets/relation/__tests__/RelationControl.spec.ts
View File

@ -306,6 +306,21 @@ describe(RelationControl.name, () => {
expect(queryByTestId('relation-loading-indicator')).not.toBeInTheDocument();
});
it('should stop showing loading indicator if no entries found', async () => {
mockListAllEntries.mockReturnValue([]);
const { getByTestId, queryByTestId } = renderControl({ value: 'Post 1' });
const input = getByTestId('autocomplete-input');
expect(input).toHaveValue('');
getByTestId('relation-loading-indicator');
await waitFor(() =>
expect(queryByTestId('relation-loading-indicator')).not.toBeInTheDocument(),
);
});
it('should not try to load entiries if search collection does not exist', () => {
const field: RelationField = {
label: 'Relation',