From 7c52b2d7156fd6fc684b9ccf43bb3050fccea1df Mon Sep 17 00:00:00 2001 From: HichamELBSI Date: Wed, 8 Jul 2020 17:43:44 +0200 Subject: [PATCH] Move front EE folder Signed-off-by: HichamELBSI --- .eslintrc.js | 2 +- jest.config.front.js | 4 +-- packages/strapi-admin/admin/ee/LICENSE | 21 --------------- .../admin/ee/containers/TestEE/index.js | 11 -------- .../admin/src/containers/Admin/index.js | 3 --- .../Roles/ConditionsSelect/MenuList/index.js | 8 +++--- .../ComponentAttributeRow.js | 22 ++++++++-------- .../ContentTypesAttributes/AttributeRow.js | 22 ++++++++-------- .../ContentTypes/ContentTypesRow/index.js | 26 +++++++++---------- .../ContentTypes/PermissionsHeader/index.js | 8 +++--- .../PermissionRow/SubCategory/index.js | 14 +++++----- .../components/Roles/RoleForm/NameInput.js | 2 +- .../admin}/components/Roles/RoleForm/index.js | 6 ++--- .../Roles/RoleForm/utils/getNameInputValue.js | 0 .../containers/Roles/CreatePage/index.js | 19 +++++++------- .../Roles/CreatePage/utils/schema.js | 0 .../Roles/EditPage/utils/getInitialValues.js | 0 .../containers/Roles/EditPage/utils/schema.js | 0 .../Roles/ListPage/BaselineAlignment.js | 0 .../Roles/ListPage/CustomCheckbox.js | 0 .../containers/Roles/ListPage/RoleRow.js | 2 +- .../admin}/containers/Roles/ListPage/index.js | 10 +++---- .../containers/Roles/ListPage/reducer.js | 0 .../Roles/ListPage/tests/reducer.test.js | 0 .../Roles/ProtectedListPage/index.js | 2 +- packages/strapi-admin/webpack.config.js | 6 ++--- 26 files changed, 77 insertions(+), 111 deletions(-) delete mode 100644 packages/strapi-admin/admin/ee/LICENSE delete mode 100644 packages/strapi-admin/admin/ee/containers/TestEE/index.js rename packages/strapi-admin/{admin/ee => ee/admin}/components/Roles/ConditionsSelect/MenuList/index.js (92%) rename packages/strapi-admin/{admin/ee => ee/admin}/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/ComponentAttributeRow.js (84%) rename packages/strapi-admin/{admin/ee => ee/admin}/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes/AttributeRow.js (85%) rename packages/strapi-admin/{admin/ee => ee/admin}/components/Roles/Permissions/ContentTypes/ContentTypesRow/index.js (85%) rename packages/strapi-admin/{admin/ee => ee/admin}/components/Roles/Permissions/ContentTypes/PermissionsHeader/index.js (86%) rename packages/strapi-admin/{admin/ee => ee/admin}/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/index.js (84%) rename packages/strapi-admin/{admin/ee => ee/admin}/components/Roles/RoleForm/NameInput.js (66%) rename packages/strapi-admin/{admin/ee => ee/admin}/components/Roles/RoleForm/index.js (89%) rename packages/strapi-admin/{admin/ee => ee/admin}/components/Roles/RoleForm/utils/getNameInputValue.js (100%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/CreatePage/index.js (89%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/CreatePage/utils/schema.js (100%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/EditPage/utils/getInitialValues.js (100%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/EditPage/utils/schema.js (100%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/ListPage/BaselineAlignment.js (100%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/ListPage/CustomCheckbox.js (100%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/ListPage/RoleRow.js (96%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/ListPage/index.js (94%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/ListPage/reducer.js (100%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/ListPage/tests/reducer.test.js (100%) rename packages/strapi-admin/{admin/ee => ee/admin}/containers/Roles/ProtectedListPage/index.js (82%) diff --git a/.eslintrc.js b/.eslintrc.js index 9a3f0b5350..ccb94a1afb 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,6 +1,6 @@ const frontPaths = [ 'packages/**/admin/src/**/**/*.js', - 'packages/**/admin/ee/**/**/*.js', + 'packages/**/ee/admin/**/**/*.js', 'packages/strapi-helper-plugin/**/*.js', 'packages/**/test/front/**/*.js', 'test/config/front/**/*.js', diff --git a/jest.config.front.js b/jest.config.front.js index 8d1822c7ee..382c5b2cbe 100644 --- a/jest.config.front.js +++ b/jest.config.front.js @@ -12,8 +12,8 @@ const moduleNameMapper = { if (IS_EE) { const rootDirEE = [ - '/packages/strapi-admin/admin/ee$1', - '/packages/strapi-plugin-*/admin/ee$1', + '/packages/strapi-admin/ee/admin$1', + '/packages/strapi-plugin-*/ee/admin$1', ]; Object.assign(moduleNameMapper, { diff --git a/packages/strapi-admin/admin/ee/LICENSE b/packages/strapi-admin/admin/ee/LICENSE deleted file mode 100644 index 32ca89d70d..0000000000 --- a/packages/strapi-admin/admin/ee/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -This Strapi Enterprise Edition (EE) supplemental license (this “EE Supplemental License”) governs the use of this software and documentation (collectively, the “EE Software”) by you and any entity you represent (collectively, “You”). If You have separately entered into the Strapi, Inc. Enterprise Agreement (the “Enterprise Agreement”), then this EE Supplemental License hereby incorporates by reference the Enterprise Agreement and modifies the Enterprise Agreement solely to the extent set forth herein. If You have separately entered into the Strapi, Inc. Subscription Agreement (the “Subscription Agreement”), then this EE Supplemental License hereby incorporates by reference the Agreement and modifies the Subscription Agreement solely to the extent set forth herein. If You have not entered into either the Enterprise Agreement or the Subscription Agreement, then You may use the EE Software solely as set forth in Section 2 below. - -In the event of a direct conflict between the terms of this EE Supplemental License and the terms of the Enterprise Agreement or the Subscription Agreement, as applicable, the terms of this EE Supplemental License will control. Except to the extent modified by this EE Supplemental License, the Enterprise Agreement or the Subscription Agreement, as applicable, remain in full force and effect in accordance with its terms. - -By using the EE Software, You hereby agree to the below terms and conditions. - -1. Notwithstanding any terms to the contrary in the Enterprise Agreement or Subscription Agreement, You may copy, modify and publish patches to the EE Software in a production environment (such copies, “Production Copies,” such modifications, “Production Modifications” and such patches, “Production Patches”) if and only if (a) You have agreed to, and are in full compliance with, the Enterprise Agreement or Subscription Agreement, as applicable, and (b) You have a valid license to the EE Software for the correct number of projects. You agree that Strapi and/or its licensors (as applicable) will own all right, title and interest in and to all such Production Copies, Production Modifications and Production Patches. You may display and/or distribute such Production Copies, Production Modifications and Production Patches if and only if (i) You have a valid license to the EE Software for the correct number of projects and (ii) You are in compliance with the Enterprise Agreement or Subscription Agreement, as applicable. You hereby assign to Strapi all right, title and interest in and to all Production Copies, Production Modifications and Production Patches, including all intellectual property rights embodied in or related to the foregoing. - -2. Notwithstanding the foregoing, You may copy and modify the EE Software solely for development and testing purposes (such copies, “Development Copies” and such modifications, “Development Modifications”) with or without a license to the EE Software if your use is in compliance with this Section 2. You agree that Strapi and/or its licensors (as applicable) will own all right, title and interest in and to all Development Copies and Development Modifications and You hereby assign to Strapi all right, title and interest in and to all Development Copies and Development Modifications, including all intellectual property rights embodied in or related to the foregoing. If You do not have a license to the EE Software, then You further agree as follows: - -Other than as expressly set forth in this Section 2, You may not (a) copy or modify the EE Software, (b) create derivative works of the EE Software, (c) remove or modify any notice of any patent, copyright, trademark, or other proprietary rights that appear on or in the EE Software, (d) reverse engineer, decompile, translate, disassemble, or discover the source code of all or any portion of the EE Software, (e) publicly display all or any part of the EE Software, (f) distribute, disclose, market, lease, publish, merge, resell, assign, loan, sublicense, rent, or transfer the EE Software to any third party, (g) use the EE Software for any dial-up, remote access, interactive, or other on-line or hosted service, or to provide a service bureau, time share, or other services to third parties, (h) merge the EE Software into another product, (i) disclose the results of any EE Software performance benchmarks or test results to any third party without Strapi’s prior written consent, (j) use any trademarks, logos, service marks, trade names of Strapi, or any portion thereof, without Strapi’s prior written consent, (k) use the EE Software, or any portion thereof, in a manner that does not comply with applicable law, regulations, or governmental orders, or (l) use or store the EE Software on equipment not owned or controlled by Customer. - -THE EE SOFTWARE IS PROVIDED ON AN “AS IS” BASIS WITHOUT ANY REPRESENTATIONS, WARRANTIES, COVENANTS, OR CONDITIONS OF ANY KIND (EXPRESS OR IMPLIED, STATUTORY OR OTHERWISE), INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, TITLE, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. FURTHER, STRAPI DOES NOT REPRESENT OR WARRANT THAT (A) THE ACCESS TO OR USE OF THE EE SOFTWARE WILL BE SECURE, TIMELY, UNINTERRUPTED, ERROR-FREE, OR OPERATE IN COMBINATION WITH ANY OTHER HARDWARE, SOFTWARE, SYSTEM, OR DATA, (B) THE EE SOFTWARE WILL MEET YOUR REQUIREMENTS OR EXPECTATIONS, OR OTHERWISE PRODUCE ANY PARTICULAR RESULTS, (C) ERRORS OR DEFECTS WILL BE CORRECTED, PATCHES OR WORKAROUNDS WILL BE PROVIDED, OR STRAPI WILL DETECT ANY BUG IN THE EE SOFTWARE, (D) THE SOFTWARE IS FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS, OR (E) THIRD-PARTY DISRUPTIONS OR SECURITY BREACHES OF THE EE SOFTWARE WILL BE PREVENTED. - -STRAPI WILL NOT BE LIABLE FOR ANY LOSS OF PROFITS OR ANY INDIRECT, SPECIAL, INCIDENTAL, RELIANCE, OR CONSEQUENTIAL DAMAGES OF ANY KIND, REGARDLESS OF THE FORM OF ACTION, WHETHER IN CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY, OR OTHERWISE, EVEN IF INFORMED OF THE POSSIBILITY OF SUCH DAMAGES IN ADVANCE. - -STRAPI’S ENTIRE LIABILITY TO YOU FOR USE OF THE EE SOFTWARE WILL NOT EXCEED $100. - -3. You are not granted any other rights beyond what is expressly stated herein and in the Enterprise Agreement or Subscription Agreement, as applicable. - -4. This EE Supplemental License does not apply to Strapi software that is distributed as part of the Strapi Community Edition (CE) (the “CE Software”). \ No newline at end of file diff --git a/packages/strapi-admin/admin/ee/containers/TestEE/index.js b/packages/strapi-admin/admin/ee/containers/TestEE/index.js deleted file mode 100644 index f55d481c79..0000000000 --- a/packages/strapi-admin/admin/ee/containers/TestEE/index.js +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; - -const Test = () => { - return ( -
-

Admin EE version

-
- ); -}; - -export default Test; diff --git a/packages/strapi-admin/admin/src/containers/Admin/index.js b/packages/strapi-admin/admin/src/containers/Admin/index.js index 90f2f62570..7b43256085 100644 --- a/packages/strapi-admin/admin/src/containers/Admin/index.js +++ b/packages/strapi-admin/admin/src/containers/Admin/index.js @@ -23,7 +23,6 @@ import { CheckPagePermissions, request, } from 'strapi-helper-plugin'; -import TestEE from 'ee_else_ce/containers/TestEE'; import { SETTINGS_BASE_URL, SHOW_TUTORIALS } from '../../config'; import adminPermissions from '../../permissions'; @@ -229,8 +228,6 @@ export class Admin extends React.Component { this.renderRoute(props, HomePage)} exact /> - {/* TODO remove this Route it is just made for the test */} - diff --git a/packages/strapi-admin/admin/ee/components/Roles/ConditionsSelect/MenuList/index.js b/packages/strapi-admin/ee/admin/components/Roles/ConditionsSelect/MenuList/index.js similarity index 92% rename from packages/strapi-admin/admin/ee/components/Roles/ConditionsSelect/MenuList/index.js rename to packages/strapi-admin/ee/admin/components/Roles/ConditionsSelect/MenuList/index.js index b24f4fa58b..86f4690db3 100644 --- a/packages/strapi-admin/admin/ee/components/Roles/ConditionsSelect/MenuList/index.js +++ b/packages/strapi-admin/ee/admin/components/Roles/ConditionsSelect/MenuList/index.js @@ -7,10 +7,10 @@ import { Checkbox, Flex } from '@buffetjs/core'; import { Label } from '@buffetjs/styles'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import SubUl from '../../../../../src/components/Roles/ConditionsSelect/MenuList/SubUl'; -import Ul from '../../../../../src/components/Roles/ConditionsSelect/MenuList/Ul'; -import UpperFirst from '../../../../../src/components/Roles/ConditionsSelect/MenuList/UpperFirst'; -import { usePermissionsContext } from '../../../../../src/hooks'; +import SubUl from '../../../../../../admin/src/components/Roles/ConditionsSelect/MenuList/SubUl'; +import Ul from '../../../../../../admin/src/components/Roles/ConditionsSelect/MenuList/Ul'; +import UpperFirst from '../../../../../../admin/src/components/Roles/ConditionsSelect/MenuList/UpperFirst'; +import { usePermissionsContext } from '../../../../../../admin/src/hooks'; /* eslint-disable jsx-a11y/no-static-element-interactions */ diff --git a/packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/ComponentAttributeRow.js b/packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/ComponentAttributeRow.js similarity index 84% rename from packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/ComponentAttributeRow.js rename to packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/ComponentAttributeRow.js index a6364a6aa1..f17aeb0be9 100644 --- a/packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/ComponentAttributeRow.js +++ b/packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/ComponentAttributeRow.js @@ -4,23 +4,23 @@ import { get } from 'lodash'; import { Flex, Text } from '@buffetjs/core'; import styled from 'styled-components'; -import { usePermissionsContext } from '../../../../../../../src/hooks'; -import { getAttributesToDisplay } from '../../../../../../../src/utils'; +import { usePermissionsContext } from '../../../../../../../../admin/src/hooks'; +import { getAttributesToDisplay } from '../../../../../../../../admin/src/utils'; import { contentManagerPermissionPrefix, ATTRIBUTES_PERMISSIONS_ACTIONS, getAttributesByModel, getAttributePermissionsSizeByContentTypeAction, getNumberOfRecursivePermissionsByAction, -} from '../../../../../../../src/components/Roles/Permissions/utils'; -import CollapseLabel from '../../../../../../../src/components/Roles/Permissions/ContentTypes/CollapseLabel'; -import PermissionCheckbox from '../../../../../../../src/components/Roles/Permissions/ContentTypes/PermissionCheckbox'; -import PermissionWrapper from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/PermissionWrapper'; -import Chevron from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/Chevron'; -import Required from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/Required'; -import Curve from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/Curve'; -import ComponentsAttributes from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes'; -import RowStyle from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/RowStyle'; +} from '../../../../../../../../admin/src/components/Roles/Permissions/utils'; +import CollapseLabel from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/CollapseLabel'; +import PermissionCheckbox from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/PermissionCheckbox'; +import PermissionWrapper from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/PermissionWrapper'; +import Chevron from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/Chevron'; +import Required from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/Required'; +import Curve from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/Curve'; +import ComponentsAttributes from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes'; +import RowStyle from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes/RowStyle'; // Those styles will be used only in this file. const LeftBorderTimeline = styled.div` diff --git a/packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes/AttributeRow.js b/packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes/AttributeRow.js similarity index 85% rename from packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes/AttributeRow.js rename to packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes/AttributeRow.js index fa698842ea..8665d67bb7 100644 --- a/packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes/AttributeRow.js +++ b/packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes/AttributeRow.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import { get } from 'lodash'; import { Flex, Text, Checkbox, Padded } from '@buffetjs/core'; -import { usePermissionsContext } from '../../../../../../../src/hooks'; -import { getAttributesToDisplay } from '../../../../../../../src/utils'; +import { usePermissionsContext } from '../../../../../../../../admin/src/hooks'; +import { getAttributesToDisplay } from '../../../../../../../../admin/src/utils'; import { contentManagerPermissionPrefix, getNumberOfRecursivePermissionsByAction, @@ -12,15 +12,15 @@ import { getAttributesByModel, getRecursivePermissions, ATTRIBUTES_PERMISSIONS_ACTIONS, -} from '../../../../../../../src/components/Roles/Permissions/utils'; -import PermissionCheckbox from '../../../../../../../src/components/Roles/Permissions/ContentTypes/PermissionCheckbox'; -import PermissionName from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/PermissionName'; -import CollapseLabel from '../../../../../../../src/components/Roles/Permissions/ContentTypes/CollapseLabel'; -import ComponentsAttributes from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes'; -import Chevron from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/Chevron'; -import PermissionWrapper from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/PermissionWrapper'; -import AttributeRowWrapper from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes/AttributeRowWrapper'; -import Required from '../../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/Required'; +} from '../../../../../../../../admin/src/components/Roles/Permissions/utils'; +import PermissionCheckbox from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/PermissionCheckbox'; +import PermissionName from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/PermissionName'; +import CollapseLabel from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/CollapseLabel'; +import ComponentsAttributes from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ComponentsAttributes'; +import Chevron from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/Chevron'; +import PermissionWrapper from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/PermissionWrapper'; +import AttributeRowWrapper from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes/AttributeRowWrapper'; +import Required from '../../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/Required'; const AttributeRow = ({ attribute, contentType }) => { const { diff --git a/packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/ContentTypesRow/index.js b/packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/ContentTypesRow/index.js similarity index 85% rename from packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/ContentTypesRow/index.js rename to packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/ContentTypesRow/index.js index 357d774d35..0913fef3b7 100644 --- a/packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/ContentTypesRow/index.js +++ b/packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/ContentTypesRow/index.js @@ -4,25 +4,25 @@ import { get } from 'lodash'; import { Checkbox, Flex, Text, Padded } from '@buffetjs/core'; // TODO : This is why we need the babel module resolver plugin. -import { getAttributesToDisplay } from '../../../../../../src/utils'; -import { usePermissionsContext } from '../../../../../../src/hooks'; +import { getAttributesToDisplay } from '../../../../../../../admin/src/utils'; +import { usePermissionsContext } from '../../../../../../../admin/src/hooks'; import { ATTRIBUTES_PERMISSIONS_ACTIONS, isAttributeAction, getAttributePermissionsSizeByContentTypeAction, getAllAttributesActionsSize, getAttributesByModel, -} from '../../../../../../src/components/Roles/Permissions/utils'; -import Chevron from '../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/Chevron'; -import PermissionCheckbox from '../../../../../../src/components/Roles/Permissions/ContentTypes/PermissionCheckbox'; -import PermissionName from '../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/PermissionName'; -import StyledRow from '../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/StyledRow'; -import ContentTypesAttributes from '../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes'; -import PermissionWrapper from '../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/PermissionWrapper'; -import CollapseLabel from '../../../../../../src/components/Roles/Permissions/ContentTypes/CollapseLabel'; -import ConditionsButton from '../../../../../../src/components/Roles/ConditionsButton'; -import RowWrapper from '../../../../../../src/components/Roles/Permissions/ContentTypes/ContentTypesRow/RowWrapper'; -import ConditionsModal from '../../../../../../src/components/Roles/ConditionsModal'; +} from '../../../../../../../admin/src/components/Roles/Permissions/utils'; +import Chevron from '../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/Chevron'; +import PermissionCheckbox from '../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/PermissionCheckbox'; +import PermissionName from '../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/PermissionName'; +import StyledRow from '../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/StyledRow'; +import ContentTypesAttributes from '../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/ContentTypesAttributes'; +import PermissionWrapper from '../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/PermissionWrapper'; +import CollapseLabel from '../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/CollapseLabel'; +import ConditionsButton from '../../../../../../../admin/src/components/Roles/ConditionsButton'; +import RowWrapper from '../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/ContentTypesRow/RowWrapper'; +import ConditionsModal from '../../../../../../../admin/src/components/Roles/ConditionsModal'; const ContentTypeRow = ({ index, contentType, permissionsLayout }) => { const [modal, setModal] = useState({ isOpen: false, isMounted: false }); diff --git a/packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/PermissionsHeader/index.js b/packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/PermissionsHeader/index.js similarity index 86% rename from packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/PermissionsHeader/index.js rename to packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/PermissionsHeader/index.js index 452e399e33..57325c0dfe 100644 --- a/packages/strapi-admin/admin/ee/components/Roles/Permissions/ContentTypes/PermissionsHeader/index.js +++ b/packages/strapi-admin/ee/admin/components/Roles/Permissions/ContentTypes/PermissionsHeader/index.js @@ -3,13 +3,13 @@ import PropTypes from 'prop-types'; import { Flex } from '@buffetjs/core'; import { useIntl } from 'react-intl'; -import { usePermissionsContext } from '../../../../../../src/hooks'; -import PermissionCheckbox from '../../../../../../src/components/Roles/Permissions/ContentTypes/PermissionCheckbox'; +import { usePermissionsContext } from '../../../../../../../admin/src/hooks'; +import PermissionCheckbox from '../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/PermissionCheckbox'; import { getContentTypesActionsSize, isAttributeAction, -} from '../../../../../../src/components/Roles/Permissions/utils'; -import Wrapper from '../../../../../../src/components/Roles/Permissions/ContentTypes/PermissionsHeader/Wrapper'; +} from '../../../../../../../admin/src/components/Roles/Permissions/utils'; +import Wrapper from '../../../../../../../admin/src/components/Roles/Permissions/ContentTypes/PermissionsHeader/Wrapper'; const PermissionsHeader = ({ allAttributes, contentTypes }) => { const { formatMessage } = useIntl(); diff --git a/packages/strapi-admin/admin/ee/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/index.js b/packages/strapi-admin/ee/admin/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/index.js similarity index 84% rename from packages/strapi-admin/admin/ee/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/index.js rename to packages/strapi-admin/ee/admin/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/index.js index 7589fd091a..0f9d0aaa83 100644 --- a/packages/strapi-admin/admin/ee/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/index.js +++ b/packages/strapi-admin/ee/admin/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/index.js @@ -4,13 +4,13 @@ import styled from 'styled-components'; import PropTypes from 'prop-types'; import { Flex, Padded, Text, Checkbox } from '@buffetjs/core'; -import { usePermissionsContext } from '../../../../../../../src/hooks'; -import CheckboxWrapper from '../../../../../../../src/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/CheckboxWrapper'; -import BaselineAlignment from '../../../../../../../src/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/BaselineAlignment'; -import SubCategoryWrapper from '../../../../../../../src/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/SubCategoryWrapper'; -import ConditionsButtonWrapper from '../../../../../../../src/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/ConditionsButtonWrapper'; -import ConditionsModal from '../../../../../../../src/components/Roles/ConditionsModal'; -import ConditionsButton from '../../../../../../../src/components/Roles/ConditionsButton'; +import { usePermissionsContext } from '../../../../../../../../admin/src/hooks'; +import CheckboxWrapper from '../../../../../../../../admin/src/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/CheckboxWrapper'; +import BaselineAlignment from '../../../../../../../../admin/src/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/BaselineAlignment'; +import SubCategoryWrapper from '../../../../../../../../admin/src/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/SubCategoryWrapper'; +import ConditionsButtonWrapper from '../../../../../../../../admin/src/components/Roles/Permissions/PluginsAndSettingsPermissions/PermissionRow/SubCategory/ConditionsButtonWrapper'; +import ConditionsModal from '../../../../../../../../admin/src/components/Roles/ConditionsModal'; +import ConditionsButton from '../../../../../../../../admin/src/components/Roles/ConditionsButton'; const Border = styled.div` flex: 1; diff --git a/packages/strapi-admin/admin/ee/components/Roles/RoleForm/NameInput.js b/packages/strapi-admin/ee/admin/components/Roles/RoleForm/NameInput.js similarity index 66% rename from packages/strapi-admin/admin/ee/components/Roles/RoleForm/NameInput.js rename to packages/strapi-admin/ee/admin/components/Roles/RoleForm/NameInput.js index 635332e7e2..595a55c97d 100644 --- a/packages/strapi-admin/admin/ee/components/Roles/RoleForm/NameInput.js +++ b/packages/strapi-admin/ee/admin/components/Roles/RoleForm/NameInput.js @@ -1,5 +1,5 @@ import React from 'react'; -import SizedInput from '../../../../src/components/SizedInput'; +import SizedInput from '../../../../../admin/src/components/SizedInput'; const NameInput = inputProps => ; diff --git a/packages/strapi-admin/admin/ee/components/Roles/RoleForm/index.js b/packages/strapi-admin/ee/admin/components/Roles/RoleForm/index.js similarity index 89% rename from packages/strapi-admin/admin/ee/components/Roles/RoleForm/index.js rename to packages/strapi-admin/ee/admin/components/Roles/RoleForm/index.js index 0e8d2e4a2a..ab9b4063a6 100644 --- a/packages/strapi-admin/admin/ee/components/Roles/RoleForm/index.js +++ b/packages/strapi-admin/ee/admin/components/Roles/RoleForm/index.js @@ -2,9 +2,9 @@ import React from 'react'; import { PropTypes } from 'prop-types'; import { useIntl } from 'react-intl'; -import SizedInput from '../../../../src/components/SizedInput'; -import { ButtonWithNumber } from '../../../../src/components/Roles'; -import FormCard from '../../../../src/components/FormBloc'; +import SizedInput from '../../../../../admin/src/components/SizedInput'; +import { ButtonWithNumber } from '../../../../../admin/src/components/Roles'; +import FormCard from '../../../../../admin/src/components/FormBloc'; const RoleForm = ({ values, errors, onChange, onBlur, isLoading }) => { const { formatMessage } = useIntl(); diff --git a/packages/strapi-admin/admin/ee/components/Roles/RoleForm/utils/getNameInputValue.js b/packages/strapi-admin/ee/admin/components/Roles/RoleForm/utils/getNameInputValue.js similarity index 100% rename from packages/strapi-admin/admin/ee/components/Roles/RoleForm/utils/getNameInputValue.js rename to packages/strapi-admin/ee/admin/components/Roles/RoleForm/utils/getNameInputValue.js diff --git a/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js b/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/index.js similarity index 89% rename from packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js rename to packages/strapi-admin/ee/admin/containers/Roles/CreatePage/index.js index 397ea067cd..c0f4f19db5 100644 --- a/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js +++ b/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/index.js @@ -7,15 +7,15 @@ import { get, isEmpty } from 'lodash'; import { useIntl } from 'react-intl'; import { CheckPagePermissions, request, useGlobalContext } from 'strapi-helper-plugin'; import { useHistory, useRouteMatch } from 'react-router-dom'; -import adminPermissions from '../../../../src/permissions'; -import { useFetchPermissionsLayout, useFetchRole } from '../../../../src/hooks'; -import BaselineAlignement from '../../../../src/components/BaselineAlignement'; -import PageTitle from '../../../../src/components/SettingsPageTitle'; -import ContainerFluid from '../../../../src/components/ContainerFluid'; -import FormCard from '../../../../src/components/FormBloc'; -import { ButtonWithNumber, Permissions } from '../../../../src/components/Roles'; -import SizedInput from '../../../../src/components/SizedInput'; -import { formatPermissionsToApi } from '../../../../src/utils'; +import adminPermissions from '../../../../../admin/src/permissions'; +import { useFetchPermissionsLayout, useFetchRole } from '../../../../../admin/src/hooks'; +import BaselineAlignement from '../../../../../admin/src/components/BaselineAlignement'; +import PageTitle from '../../../../../admin/src/components/SettingsPageTitle'; +import ContainerFluid from '../../../../../admin/src/components/ContainerFluid'; +import FormCard from '../../../../../admin/src/components/FormBloc'; +import { ButtonWithNumber, Permissions } from '../../../../../admin/src/components/Roles'; +import SizedInput from '../../../../../admin/src/components/SizedInput'; +import { formatPermissionsToApi } from '../../../../../admin/src/utils'; import schema from './utils/schema'; @@ -168,6 +168,7 @@ const CreatePage = () => { permissionsLayout={permissionsLayout} ref={permissionsRef} rolePermissions={rolePermissions} + role={role} /> )} diff --git a/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/utils/schema.js b/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/utils/schema.js similarity index 100% rename from packages/strapi-admin/admin/ee/containers/Roles/CreatePage/utils/schema.js rename to packages/strapi-admin/ee/admin/containers/Roles/CreatePage/utils/schema.js diff --git a/packages/strapi-admin/admin/ee/containers/Roles/EditPage/utils/getInitialValues.js b/packages/strapi-admin/ee/admin/containers/Roles/EditPage/utils/getInitialValues.js similarity index 100% rename from packages/strapi-admin/admin/ee/containers/Roles/EditPage/utils/getInitialValues.js rename to packages/strapi-admin/ee/admin/containers/Roles/EditPage/utils/getInitialValues.js diff --git a/packages/strapi-admin/admin/ee/containers/Roles/EditPage/utils/schema.js b/packages/strapi-admin/ee/admin/containers/Roles/EditPage/utils/schema.js similarity index 100% rename from packages/strapi-admin/admin/ee/containers/Roles/EditPage/utils/schema.js rename to packages/strapi-admin/ee/admin/containers/Roles/EditPage/utils/schema.js diff --git a/packages/strapi-admin/admin/ee/containers/Roles/ListPage/BaselineAlignment.js b/packages/strapi-admin/ee/admin/containers/Roles/ListPage/BaselineAlignment.js similarity index 100% rename from packages/strapi-admin/admin/ee/containers/Roles/ListPage/BaselineAlignment.js rename to packages/strapi-admin/ee/admin/containers/Roles/ListPage/BaselineAlignment.js diff --git a/packages/strapi-admin/admin/ee/containers/Roles/ListPage/CustomCheckbox.js b/packages/strapi-admin/ee/admin/containers/Roles/ListPage/CustomCheckbox.js similarity index 100% rename from packages/strapi-admin/admin/ee/containers/Roles/ListPage/CustomCheckbox.js rename to packages/strapi-admin/ee/admin/containers/Roles/ListPage/CustomCheckbox.js diff --git a/packages/strapi-admin/admin/ee/containers/Roles/ListPage/RoleRow.js b/packages/strapi-admin/ee/admin/containers/Roles/ListPage/RoleRow.js similarity index 96% rename from packages/strapi-admin/admin/ee/containers/Roles/ListPage/RoleRow.js rename to packages/strapi-admin/ee/admin/containers/Roles/ListPage/RoleRow.js index 32e1cbd499..d69f92e590 100644 --- a/packages/strapi-admin/admin/ee/containers/Roles/ListPage/RoleRow.js +++ b/packages/strapi-admin/ee/admin/containers/Roles/ListPage/RoleRow.js @@ -4,7 +4,7 @@ import { useGlobalContext } from 'strapi-helper-plugin'; import { useHistory } from 'react-router-dom'; import { Pencil, Duplicate } from '@buffetjs/icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { RoleRow as RoleRowBase } from '../../../../src/components/Roles'; +import { RoleRow as RoleRowBase } from '../../../../../admin/src/components/Roles'; import Checkbox from './CustomCheckbox'; const RoleRow = ({ diff --git a/packages/strapi-admin/admin/ee/containers/Roles/ListPage/index.js b/packages/strapi-admin/ee/admin/containers/Roles/ListPage/index.js similarity index 94% rename from packages/strapi-admin/admin/ee/containers/Roles/ListPage/index.js rename to packages/strapi-admin/ee/admin/containers/Roles/ListPage/index.js index 15860d4dbe..6b87d7a3fb 100644 --- a/packages/strapi-admin/admin/ee/containers/Roles/ListPage/index.js +++ b/packages/strapi-admin/ee/admin/containers/Roles/ListPage/index.js @@ -14,11 +14,11 @@ import { LoadingIndicatorPage, } from 'strapi-helper-plugin'; import { useIntl } from 'react-intl'; -import adminPermissions from '../../../../src/permissions'; -import PageTitle from '../../../../src/components/SettingsPageTitle'; -import useSettingsHeaderSearchContext from '../../../../src/hooks/useSettingsHeaderSearchContext'; -import { EmptyRole, RoleListWrapper } from '../../../../src/components/Roles'; -import { useRolesList } from '../../../../src/hooks'; +import adminPermissions from '../../../../../admin/src/permissions'; +import PageTitle from '../../../../../admin/src/components/SettingsPageTitle'; +import useSettingsHeaderSearchContext from '../../../../../admin/src/hooks/useSettingsHeaderSearchContext'; +import { EmptyRole, RoleListWrapper } from '../../../../../admin/src/components/Roles'; +import { useRolesList } from '../../../../../admin/src/hooks'; import RoleRow from './RoleRow'; import BaselineAlignment from './BaselineAlignment'; import reducer, { initialState } from './reducer'; diff --git a/packages/strapi-admin/admin/ee/containers/Roles/ListPage/reducer.js b/packages/strapi-admin/ee/admin/containers/Roles/ListPage/reducer.js similarity index 100% rename from packages/strapi-admin/admin/ee/containers/Roles/ListPage/reducer.js rename to packages/strapi-admin/ee/admin/containers/Roles/ListPage/reducer.js diff --git a/packages/strapi-admin/admin/ee/containers/Roles/ListPage/tests/reducer.test.js b/packages/strapi-admin/ee/admin/containers/Roles/ListPage/tests/reducer.test.js similarity index 100% rename from packages/strapi-admin/admin/ee/containers/Roles/ListPage/tests/reducer.test.js rename to packages/strapi-admin/ee/admin/containers/Roles/ListPage/tests/reducer.test.js diff --git a/packages/strapi-admin/admin/ee/containers/Roles/ProtectedListPage/index.js b/packages/strapi-admin/ee/admin/containers/Roles/ProtectedListPage/index.js similarity index 82% rename from packages/strapi-admin/admin/ee/containers/Roles/ProtectedListPage/index.js rename to packages/strapi-admin/ee/admin/containers/Roles/ProtectedListPage/index.js index ec84abdb67..cb41716085 100644 --- a/packages/strapi-admin/admin/ee/containers/Roles/ProtectedListPage/index.js +++ b/packages/strapi-admin/ee/admin/containers/Roles/ProtectedListPage/index.js @@ -1,6 +1,6 @@ import React from 'react'; import { CheckPagePermissions } from 'strapi-helper-plugin'; -import adminPermissions from '../../../../src/permissions'; +import adminPermissions from '../../../../../admin/src/permissions'; import ListPage from '../ListPage'; const ProtectedListPage = () => ( diff --git a/packages/strapi-admin/webpack.config.js b/packages/strapi-admin/webpack.config.js index 74102d0272..5c8a6ef113 100644 --- a/packages/strapi-admin/webpack.config.js +++ b/packages/strapi-admin/webpack.config.js @@ -188,15 +188,15 @@ module.exports = ({ }), new webpack.NormalModuleReplacementPlugin(/ee_else_ce(\.*)/, function(resource) { // We might need to improve this if we want to make it work with components - const containerPathName = resource.context.split('/containers/'); - const componentPathName = resource.context.split('/components/'); + const containerPathName = resource.context.split(`${path.sep}containers${path.sep}`); + const componentPathName = resource.context.split(`${path.sep}components${path.sep}`); const wantedPath = containerPathName.length === 1 ? componentPathName[0] : containerPathName[0]; if (useEE) { resource.request = resource.request.replace( /ee_else_ce/, - path.join(wantedPath, '..', 'ee') + path.join(wantedPath, '../..', 'ee/admin') ); } else { resource.request = resource.request.replace(/ee_else_ce/, path.join(wantedPath));