From ef3e693dfcb68215df649ee9588d425bce95f68e Mon Sep 17 00:00:00 2001 From: soupette Date: Tue, 14 Dec 2021 10:08:58 +0100 Subject: [PATCH] Fixes #11845 Signed-off-by: soupette --- .../components/ComponentInitializer/index.js | 13 +-- .../AccordionGroupCustom/index.js | 4 +- .../components/SelectWrapper/index.js | 96 +++---------------- .../utils/formatLayouts.js | 4 +- .../utils/tests/formatLayouts.test.js | 26 ++--- 5 files changed, 29 insertions(+), 114 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/ComponentInitializer/index.js b/packages/core/admin/admin/src/content-manager/components/ComponentInitializer/index.js index a52c923764..355fcef5e1 100644 --- a/packages/core/admin/admin/src/content-manager/components/ComponentInitializer/index.js +++ b/packages/core/admin/admin/src/content-manager/components/ComponentInitializer/index.js @@ -57,13 +57,10 @@ const ComponentInitializer = ({ error, isReadOnly, onClick }) => { {error?.id && ( - {formatMessage( - { - id: error.id, - defaultMessage: error.defaultMessage, - }, - error.values - )} + {formatMessage({ + id: error.id, + defaultMessage: error.id, + })} )} @@ -78,8 +75,6 @@ ComponentInitializer.defaultProps = { ComponentInitializer.propTypes = { error: PropTypes.shape({ id: PropTypes.string.isRequired, - defaultMessage: PropTypes.string.isRequired, - values: PropTypes.object, }), isReadOnly: PropTypes.bool, onClick: PropTypes.func.isRequired, diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/AccordionGroupCustom/index.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/AccordionGroupCustom/index.js index 0c29e1e02a..3e41ab38af 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/AccordionGroupCustom/index.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/AccordionGroupCustom/index.js @@ -92,7 +92,7 @@ const AccordionGroupCustom = ({ children, footer, label, labelAction, error }) = {error && ( - {formatMessage({ id: error.id, defaultMessage: error.defaultMessage }, error.values)} + {formatMessage({ id: error.id, defaultMessage: error.id })} )} @@ -111,8 +111,6 @@ AccordionGroupCustom.propTypes = { children: PropTypes.node.isRequired, error: PropTypes.shape({ id: PropTypes.string.isRequired, - defaultMessage: PropTypes.string.isRequired, - values: PropTypes.object, }), footer: PropTypes.node, label: PropTypes.string, diff --git a/packages/core/admin/admin/src/content-manager/components/SelectWrapper/index.js b/packages/core/admin/admin/src/content-manager/components/SelectWrapper/index.js index e6730ea212..ac6618cce0 100644 --- a/packages/core/admin/admin/src/content-manager/components/SelectWrapper/index.js +++ b/packages/core/admin/admin/src/content-manager/components/SelectWrapper/index.js @@ -29,9 +29,9 @@ import { connect, select } from './utils'; import getSelectStyles from './utils/getSelectStyles'; const initialPaginationState = { - _contains: '', - _limit: 20, - _start: 0, + contains: '', + limit: 20, + start: 0, }; const buildParams = (query, paramsToKeep) => { @@ -141,10 +141,10 @@ function SelectWrapper({ setIsLoading(true); - const params = { _limit: state._limit, ...defaultParams }; + const params = { limit: state.limit, ...defaultParams, start: state.start }; - if (state._contains) { - params[containsKey] = state._contains; + if (state.contains) { + params[`filters[${containsKey}][$contains]`] = state.contains; } try { @@ -183,10 +183,9 @@ function SelectWrapper({ isFieldAllowed, isMorph, mainField.name, - setIsLoading, - setOptions, - state._contains, - state._limit, + state.contains, + state.limit, + state.start, ] ); @@ -204,11 +203,11 @@ function SelectWrapper({ const handleInputChange = (inputValue, { action }) => { if (action === 'input-change') { setState(prevState => { - if (prevState._contains === inputValue) { + if (prevState.contains === inputValue) { return prevState; } - return { ...prevState, _contains: inputValue, _start: 0 }; + return { ...prevState, contains: inputValue, start: 0 }; }); } @@ -216,7 +215,10 @@ function SelectWrapper({ }; const handleMenuScrollToBottom = () => { - setState(prevState => ({ ...prevState, _limit: prevState._limit + 20 })); + setState(prevState => ({ + ...prevState, + start: prevState.start + 20, + })); }; const handleMenuClose = () => { @@ -304,7 +306,6 @@ function SelectWrapper({ move={moveRelation} name={name} options={filteredOptions} - // options={temp} onChange={handleChange} onInputChange={handleInputChange} onMenuClose={handleMenuClose} @@ -320,73 +321,6 @@ function SelectWrapper({ /> ); - - // return ( - // - // - // - // - // - // - // {label} - // {!isSingle && ` (${associationsLength})`} - // - // - // {labelIconformatted && ( - //
- // - // {labelIconformatted.icon} - // - //
- // )} - // - // {isSingle && link} - // - // {!isEmpty(description) && ( - // - // - // - // {description} - // - // - // )} - // - // - - // - // ) : ( - // placeholder - // ) - // } - // searchToPersist={searchToPersist} - // styles={styles} - // targetModel={targetModel} - // value={value} - // /> - // - //
- // - // ); } SelectWrapper.defaultProps = { diff --git a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/formatLayouts.js b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/formatLayouts.js index 549c09a16a..a55ddaa496 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/formatLayouts.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/formatLayouts.js @@ -185,7 +185,7 @@ const generateRelationQueryInfos = (contentTypeConfiguration, fieldName, models) const queryInfos = { endPoint, - containsKey: `${mainField}_contains`, + containsKey: `${mainField}`, defaultParams: {}, shouldDisplayRelationLink, }; @@ -210,7 +210,7 @@ const generateRelationQueryInfosForComponents = ( const queryInfos = { endPoint, - containsKey: `${mainField}_contains`, + containsKey: `${mainField}`, defaultParams: { _component: contentTypeConfiguration.uid, }, diff --git a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js index a6d914c5e2..5e765b5438 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js @@ -58,7 +58,7 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { }, queryInfos: { endPoint: '/content-manager/relations/api::address.address/categories', - containsKey: 'name_contains', + containsKey: 'name', defaultParams: {}, shouldDisplayRelationLink: true, }, @@ -124,10 +124,7 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { uid: 'compo', layouts: { edit: [ - [ - { name: 'full_name', size: 6 }, - { name: 'city', size: 6 }, - ], + [{ name: 'full_name', size: 6 }, { name: 'city', size: 6 }], [{ name: 'compo', size: 12 }], ], }, @@ -169,10 +166,7 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { editRelations: [], edit: [ [{ name: 'dz', size: 12 }], - [ - { name: 'full_name', size: 6 }, - { name: 'city', size: 6 }, - ], + [{ name: 'full_name', size: 6 }, { name: 'city', size: 6 }], [{ name: 'compo', size: 12 }], ], }, @@ -370,10 +364,7 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { layouts: { edit: [ [{ name: 'dz', size: 12 }], - [ - { name: 'full_name', size: 6 }, - { name: 'city', size: 6 }, - ], + [{ name: 'full_name', size: 6 }, { name: 'city', size: 6 }], [{ name: 'compo', size: 12 }], ], }, @@ -552,7 +543,7 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { it('should return an object with the correct keys', () => { expect(generateRelationQueryInfos(addressSchema, 'categories', simpleModels)).toEqual({ endPoint: '/content-manager/relations/api::address.address/categories', - containsKey: 'name_contains', + containsKey: 'name', defaultParams: {}, shouldDisplayRelationLink: true, }); @@ -570,7 +561,7 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { ) ).toEqual({ endPoint: '/content-manager/relations/api::address.address/categories', - containsKey: 'name_contains', + containsKey: 'name', defaultParams: { _component: 'api::address.address', }, @@ -581,10 +572,7 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { describe('getDisplayedModels', () => { it('should return an array containing only the displayable models', () => { - const models = [ - { uid: 'test', isDisplayed: false }, - { uid: 'testtest', isDisplayed: true }, - ]; + const models = [{ uid: 'test', isDisplayed: false }, { uid: 'testtest', isDisplayed: true }]; expect(getDisplayedModels([])).toHaveLength(0); expect(getDisplayedModels(models)).toHaveLength(1);