From d06af0d8fc2030764925ff4cb290ea77fe9e64d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20de=20Juvigny?= Date: Mon, 17 Apr 2023 12:02:08 +0200 Subject: [PATCH] Rename to isResizable --- .../pages/EditSettingsView/components/ModalForm.js | 2 +- .../pages/EditSettingsView/tests/reducer.test.js | 6 +++--- .../core/content-manager/server/services/field-sizes.js | 6 +++--- .../server/services/utils/configuration/layouts.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js index cd34da865c..cb38264f29 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js @@ -152,7 +152,7 @@ const ModalForm = ({ onMetaChange, onSizeChange }) => { return ( <> {metaFields} - {fieldSizeInfo.resizable && sizeField} + {fieldSizeInfo.isResizable && sizeField} {hasTimePicker && timeStepField} ); diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/reducer.test.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/reducer.test.js index 3d7c26abd2..439e430511 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/reducer.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/reducer.test.js @@ -1,9 +1,9 @@ import reducer from '../reducer'; const fieldSizes = { - richtext: { default: 12, resizable: false }, - string: { default: 6, resizable: true }, - boolean: { default: 4, resizable: true }, + richtext: { default: 12, isResizable: false }, + string: { default: 6, isResizable: true }, + boolean: { default: 4, isResizable: true }, }; describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { diff --git a/packages/core/content-manager/server/services/field-sizes.js b/packages/core/content-manager/server/services/field-sizes.js index 767335bd96..bdbeffe83f 100644 --- a/packages/core/content-manager/server/services/field-sizes.js +++ b/packages/core/content-manager/server/services/field-sizes.js @@ -2,17 +2,17 @@ const needsFullSize = { default: 12, - resizable: false, + isResizable: false, }; const smallSize = { default: 4, - resizable: true, + isResizable: true, }; const defaultSize = { default: 6, - resizable: true, + isResizable: true, }; const fieldSizes = { diff --git a/packages/core/content-manager/server/services/utils/configuration/layouts.js b/packages/core/content-manager/server/services/utils/configuration/layouts.js index 6cb3262217..18dd5f5c6e 100644 --- a/packages/core/content-manager/server/services/utils/configuration/layouts.js +++ b/packages/core/content-manager/server/services/utils/configuration/layouts.js @@ -12,7 +12,7 @@ const isAllowedFieldSize = (type, size) => { const fieldSize = getFieldSize(type); // Check if field was locked to another size - if (!fieldSize.resizable && size !== fieldSize.default) { + if (!fieldSize.isResizable && size !== fieldSize.default) { return false; }