diff --git a/packages/chakra-ui-lib/src/components/Table/Table.tsx b/packages/chakra-ui-lib/src/components/Table/Table.tsx index 208a369d..52fce0da 100644 --- a/packages/chakra-ui-lib/src/components/Table/Table.tsx +++ b/packages/chakra-ui-lib/src/components/Table/Table.tsx @@ -1,5 +1,5 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; -import { sortBy } from 'lodash-es'; +import { isArray, sortBy } from 'lodash-es'; import { Table as BaseTable, Thead, @@ -63,6 +63,7 @@ export const TableImpl = implementTable( }, [data, updateSelectedItem, updateSelectedItems]); const sortedData = useMemo(() => { + if (!isArray(data)) return []; if (!sortRule) return data; const sorted = sortBy(data, sortRule.key); return sortRule.desc ? sorted.reverse() : sorted; diff --git a/packages/editor/src/components/ComponentForm/ComponentForm.tsx b/packages/editor/src/components/ComponentForm/ComponentForm.tsx index b5aca105..4c587e8f 100644 --- a/packages/editor/src/components/ComponentForm/ComponentForm.tsx +++ b/packages/editor/src/components/ComponentForm/ComponentForm.tsx @@ -153,7 +153,7 @@ export const ComponentForm: React.FC = observer(props => { - { hasFetchTrait ? : null } + { hasFetchTrait ? : null } diff --git a/packages/editor/src/components/ComponentForm/FetchTraitForm/FetchTraitForm.tsx b/packages/editor/src/components/ComponentForm/FetchTraitForm/FetchTraitForm.tsx index 63302728..e16fa4e6 100644 --- a/packages/editor/src/components/ComponentForm/FetchTraitForm/FetchTraitForm.tsx +++ b/packages/editor/src/components/ComponentForm/FetchTraitForm/FetchTraitForm.tsx @@ -41,7 +41,7 @@ export const FetchTraitForm: React.FC = props => { ?.properties as Static; const formik = useFormik({ - initialValues: fetchTrait, + initialValues: { onComplete: [], onError: [], ...fetchTrait }, onSubmit: values => { const index = component.traits.findIndex(t => t.type === 'core/v1/fetch'); eventBus.send( diff --git a/packages/editor/src/components/ComponentForm/JsonSchemaForm/ArrayField.tsx b/packages/editor/src/components/ComponentForm/JsonSchemaForm/ArrayField.tsx index c60c669c..5b5f4413 100644 --- a/packages/editor/src/components/ComponentForm/JsonSchemaForm/ArrayField.tsx +++ b/packages/editor/src/components/ComponentForm/JsonSchemaForm/ArrayField.tsx @@ -33,7 +33,7 @@ const ArrayField: React.FC = props => { <> {formData.map((v, idx) => { return ( - + = observer(({ services }) => { paddingY="2" paddingX="4" boxShadow="0 0 4px rgba(0, 0, 0, 0.1)" + background='white' >