From 005f91bdcca3b9f31e8e9a1ea6cc3bc89a344add Mon Sep 17 00:00:00 2001 From: Gustav Hansen Date: Tue, 13 Jun 2023 06:49:02 +0200 Subject: [PATCH] Chore: Replace role layout ee_else_ce imports with useEnterprise --- .../Users/ListPage/ModalForm/constants.js | 2 ++ .../pages/Users/ListPage/ModalForm/index.js | 21 ++++++++++++---- .../ModalForm/utils/roleSettingsForm.js | 3 --- .../Users/ListPage/ModalForm/constants.js | 23 ++++++++++++++++++ .../ModalForm/utils/roleSettingsForm.js | 24 ------------------- 5 files changed, 41 insertions(+), 32 deletions(-) delete mode 100644 packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js delete mode 100644 packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/constants.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/constants.js index a2fb9fb1ff..663733fc06 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/constants.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/constants.js @@ -4,3 +4,5 @@ export const FORM_INITIAL_VALUES = { email: '', roles: [], }; + +export const ROLE_LAYOUT = []; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js index d388cf4184..806b5d18bd 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js @@ -25,10 +25,9 @@ import { } from '@strapi/helper-plugin'; import { useMutation } from 'react-query'; -import roleSettingsForm from 'ee_else_ce/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm'; import MagicLink from 'ee_else_ce/pages/SettingsPage/pages/Users/components/MagicLink'; -import { FORM_INITIAL_VALUES } from './constants'; +import { FORM_INITIAL_VALUES, ROLE_LAYOUT } from './constants'; import SelectRoles from '../../components/SelectRoles'; import layout from './utils/layout'; import schema from './utils/schema'; @@ -43,7 +42,19 @@ const ModalForm = ({ onSuccess, onToggle }) => { const toggleNotification = useNotification(); const { lockApp, unlockApp } = useOverlayBlocker(); const { post } = useFetchClient(); - const formDataModel = useEnterprise( + const roleRowLayout = useEnterprise( + ROLE_LAYOUT, + async () => + ( + await import( + '../../../../../../../../ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/constants' + ) + ).ROLE_LAYOUT, + { + defaultValue: [], + } + ); + const initialValues = useEnterprise( FORM_INITIAL_VALUES, async () => ( @@ -138,7 +149,7 @@ const ModalForm = ({ onSuccess, onToggle }) => { { value={values.roles} /> - {roleSettingsForm.map((row) => { + {roleRowLayout.map((row) => { return row.map((input) => { return ( diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js deleted file mode 100644 index 2cc3a5ea91..0000000000 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js +++ /dev/null @@ -1,3 +0,0 @@ -const form = []; - -export default form; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/constants.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/constants.js index d461bfde73..b1a17eaf82 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/constants.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/constants.js @@ -5,3 +5,26 @@ export const FORM_INITIAL_VALUES = { } : {}), }; + +export const ROLE_LAYOUT = [ + ...(window.strapi.features.isEnabled(window.strapi.features.SSO) + ? [ + { + intlLabel: { + id: 'Settings.permissions.users.form.sso', + defaultMessage: 'Connect with SSO', + }, + hint: { + id: 'Settings.permissions.users.form.sso.description', + defaultMessage: 'When enabled (ON), users can login via SSO', + }, + name: 'useSSORegistration', + type: 'bool', + size: { + col: 6, + xs: 12, + }, + }, + ] + : []), +]; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js deleted file mode 100644 index 1a707c2547..0000000000 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js +++ /dev/null @@ -1,24 +0,0 @@ -const form = window.strapi.features.isEnabled(window.strapi.features.SSO) - ? [ - [ - { - intlLabel: { - id: 'Settings.permissions.users.form.sso', - defaultMessage: 'Connect with SSO', - }, - hint: { - id: 'Settings.permissions.users.form.sso.description', - defaultMessage: 'When enabled (ON), users can login via SSO', - }, - name: 'useSSORegistration', - type: 'bool', - size: { - col: 6, - xs: 12, - }, - }, - ], - ] - : []; - -export default form;