From 33648d2a93cfbf90476b73cc8f63d67d459d6cb4 Mon Sep 17 00:00:00 2001 From: Gustav Hansen Date: Fri, 11 Aug 2023 15:17:01 +0200 Subject: [PATCH] Chore: Remove pluginId references --- .../admin/src/hooks/useFetchRole/index.js | 5 ++--- .../admin/src/hooks/usePlugins.js | 9 ++++----- .../admin/src/hooks/useRolesList/index.js | 5 ++--- .../users-permissions/admin/src/index.js | 15 +++++++-------- .../{ => components}/ProtectedCreatePage.js | 9 +++------ .../Roles/{ => components}/ProtectedEditPage.js | 9 +++------ .../Roles/{ => components}/ProtectedListPage.js | 9 +++------ .../admin/src/pages/Roles/index.js | 17 ++++++++++------- .../src/pages/Roles/{ => pages}/CreatePage.js | 9 ++++----- .../src/pages/Roles/{ => pages}/EditPage.js | 9 ++++----- .../ListPage/components/TableBody.js | 9 +++++---- .../pages/Roles/{ => pages}/ListPage/index.js | 7 +++---- .../{ => pages}/ListPage/tests/index.test.js | 0 .../Roles/{ => pages}/ListPage/utils/api.js | 0 .../Roles/{ => pages}/tests/CreatePage.test.js | 5 ++--- .../Roles/{ => pages}/tests/EditPage.test.js | 5 ++--- 16 files changed, 54 insertions(+), 68 deletions(-) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => components}/ProtectedCreatePage.js (53%) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => components}/ProtectedEditPage.js (54%) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => components}/ProtectedListPage.js (57%) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => pages}/CreatePage.js (96%) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => pages}/EditPage.js (96%) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => pages}/ListPage/components/TableBody.js (92%) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => pages}/ListPage/index.js (97%) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => pages}/ListPage/tests/index.test.js (100%) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => pages}/ListPage/utils/api.js (100%) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => pages}/tests/CreatePage.test.js (94%) rename packages/plugins/users-permissions/admin/src/pages/Roles/{ => pages}/tests/EditPage.test.js (96%) diff --git a/packages/plugins/users-permissions/admin/src/hooks/useFetchRole/index.js b/packages/plugins/users-permissions/admin/src/hooks/useFetchRole/index.js index 629e00199b..eed0765705 100644 --- a/packages/plugins/users-permissions/admin/src/hooks/useFetchRole/index.js +++ b/packages/plugins/users-permissions/admin/src/hooks/useFetchRole/index.js @@ -2,10 +2,9 @@ import { useCallback, useEffect, useReducer, useRef } from 'react'; import { useFetchClient, useNotification } from '@strapi/helper-plugin'; -import pluginId from '../../pluginId'; - import reducer, { initialState } from './reducer'; +// TODO: Refactor to use react-query const useFetchRole = (id) => { const [state, dispatch] = useReducer(reducer, initialState); const toggleNotification = useNotification(); @@ -32,7 +31,7 @@ const useFetchRole = (id) => { try { const { data: { role }, - } = await get(`/${pluginId}/roles/${roleId}`); + } = await get(`/users-permissions/roles/${roleId}`); // Prevent updating state on an unmounted component if (isMounted.current) { diff --git a/packages/plugins/users-permissions/admin/src/hooks/usePlugins.js b/packages/plugins/users-permissions/admin/src/hooks/usePlugins.js index ce1f0e8d23..0fbfa02be9 100644 --- a/packages/plugins/users-permissions/admin/src/hooks/usePlugins.js +++ b/packages/plugins/users-permissions/admin/src/hooks/usePlugins.js @@ -3,7 +3,6 @@ import { useEffect } from 'react'; import { useNotification, useFetchClient, useAPIErrorHandler } from '@strapi/helper-plugin'; import { useQueries } from 'react-query'; -import pluginId from '../pluginId'; import { cleanPermissions, getTrad } from '../utils'; export const usePlugins = () => { @@ -21,17 +20,17 @@ export const usePlugins = () => { { data: routes, isLoading: isLoadingRoutes, error: routesError, refetch: refetchRoutes }, ] = useQueries([ { - queryKey: [pluginId, 'permissions'], + queryKey: ['users-permissions', 'permissions'], async queryFn() { - const res = await get(`/${pluginId}/permissions`); + const res = await get(`/users-permissions/permissions`); return res.data.permissions; }, }, { - queryKey: [pluginId, 'routes'], + queryKey: ['users-permissions', 'routes'], async queryFn() { - const res = await get(`/${pluginId}/routes`); + const res = await get(`/users-permissions/routes`); return res.data.routes; }, diff --git a/packages/plugins/users-permissions/admin/src/hooks/useRolesList/index.js b/packages/plugins/users-permissions/admin/src/hooks/useRolesList/index.js index aae9175751..1e61370ce3 100644 --- a/packages/plugins/users-permissions/admin/src/hooks/useRolesList/index.js +++ b/packages/plugins/users-permissions/admin/src/hooks/useRolesList/index.js @@ -3,11 +3,10 @@ import { useCallback, useEffect, useReducer, useRef } from 'react'; import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import get from 'lodash/get'; -import pluginId from '../../pluginId'; - import init from './init'; import reducer, { initialState } from './reducer'; +// TODO: refactor to use react-query or useAdminRoles() const useRolesList = (shouldFetchData = true) => { const [{ roles, isLoading }, dispatch] = useReducer(reducer, initialState, () => init(initialState, shouldFetchData) @@ -25,7 +24,7 @@ const useRolesList = (shouldFetchData = true) => { const { data: { roles }, - } = await fetchClient.get(`/${pluginId}/roles`); + } = await fetchClient.get(`/users-permissions/roles`); dispatch({ type: 'GET_DATA_SUCCEEDED', diff --git a/packages/plugins/users-permissions/admin/src/index.js b/packages/plugins/users-permissions/admin/src/index.js index 951656c6d0..58dd5c556a 100644 --- a/packages/plugins/users-permissions/admin/src/index.js +++ b/packages/plugins/users-permissions/admin/src/index.js @@ -9,7 +9,6 @@ import { prefixPluginTranslations } from '@strapi/helper-plugin'; import pluginPkg from '../../package.json'; import { PERMISSIONS } from './constants'; -import pluginId from './pluginId'; import getTrad from './utils/getTrad'; const name = pluginPkg.strapi.name; @@ -19,7 +18,7 @@ export default { // Create the plugin's settings section app.createSettingSection( { - id: pluginId, + id: 'users-permissions', intlLabel: { id: getTrad('Settings.section-label'), defaultMessage: 'Users & Permissions plugin', @@ -32,7 +31,7 @@ export default { defaultMessage: 'Roles', }, id: 'roles', - to: `/settings/${pluginId}/roles`, + to: `/settings/users-permissions/roles`, async Component() { const component = await import( /* webpackChunkName: "users-roles-settings-page" */ './pages/Roles' @@ -48,7 +47,7 @@ export default { defaultMessage: 'Providers', }, id: 'providers', - to: `/settings/${pluginId}/providers`, + to: `/settings/users-permissions/providers`, async Component() { const component = await import( /* webpackChunkName: "users-providers-settings-page" */ './pages/Providers' @@ -64,7 +63,7 @@ export default { defaultMessage: 'Email templates', }, id: 'email-templates', - to: `/settings/${pluginId}/email-templates`, + to: `/settings/users-permissions/email-templates`, async Component() { const component = await import( /* webpackChunkName: "users-email-settings-page" */ './pages/EmailTemplates' @@ -80,7 +79,7 @@ export default { defaultMessage: 'Advanced Settings', }, id: 'advanced-settings', - to: `/settings/${pluginId}/advanced-settings`, + to: `/settings/users-permissions/advanced-settings`, async Component() { const component = await import( /* webpackChunkName: "users-advanced-settings-page" */ './pages/AdvancedSettings' @@ -94,7 +93,7 @@ export default { ); app.registerPlugin({ - id: pluginId, + id: 'users-permissions', name, }); }, @@ -107,7 +106,7 @@ export default { ) .then(({ default: data }) => { return { - data: prefixPluginTranslations(data, pluginId), + data: prefixPluginTranslations(data, 'users-permissions'), locale, }; }) diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedCreatePage.js b/packages/plugins/users-permissions/admin/src/pages/Roles/components/ProtectedCreatePage.js similarity index 53% rename from packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedCreatePage.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/components/ProtectedCreatePage.js index ecdf420f84..a262ff59cf 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedCreatePage.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/components/ProtectedCreatePage.js @@ -2,14 +2,11 @@ import React from 'react'; import { CheckPagePermissions } from '@strapi/helper-plugin'; -import { PERMISSIONS } from '../../constants'; +import { PERMISSIONS } from '../../../constants'; +import { CreatePage } from '../pages/CreatePage'; -import { CreatePage } from './CreatePage'; - -const ProtectedRolesCreatePage = () => ( +export const ProtectedRolesCreatePage = () => ( ); - -export default ProtectedRolesCreatePage; diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedEditPage.js b/packages/plugins/users-permissions/admin/src/pages/Roles/components/ProtectedEditPage.js similarity index 54% rename from packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedEditPage.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/components/ProtectedEditPage.js index 8d4de92861..528fbb2615 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedEditPage.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/components/ProtectedEditPage.js @@ -2,14 +2,11 @@ import React from 'react'; import { CheckPagePermissions } from '@strapi/helper-plugin'; -import { PERMISSIONS } from '../../constants'; +import { PERMISSIONS } from '../../../constants'; +import { EditPage } from '../pages/EditPage'; -import { EditPage } from './EditPage'; - -const ProtectedRolesEditPage = () => ( +export const ProtectedRolesEditPage = () => ( ); - -export default ProtectedRolesEditPage; diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedListPage.js b/packages/plugins/users-permissions/admin/src/pages/Roles/components/ProtectedListPage.js similarity index 57% rename from packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedListPage.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/components/ProtectedListPage.js index a6b84e1e87..e4b5a19860 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedListPage.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/components/ProtectedListPage.js @@ -2,16 +2,13 @@ import React from 'react'; import { CheckPagePermissions } from '@strapi/helper-plugin'; -import { PERMISSIONS } from '../../constants'; +import { PERMISSIONS } from '../../../constants'; +import RolesListPage from '../pages/ListPage'; -import RolesListPage from './ListPage'; - -const ProtectedRolesListPage = () => { +export const ProtectedRolesListPage = () => { return ( ); }; - -export default ProtectedRolesListPage; diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/index.js index 69d483f9fa..98da6dbe8e 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/index.js @@ -4,23 +4,26 @@ import { AnErrorOccurred, CheckPagePermissions } from '@strapi/helper-plugin'; import { Route, Switch } from 'react-router-dom'; import { PERMISSIONS } from '../../constants'; -import pluginId from '../../pluginId'; -import ProtectedRolesCreatePage from './ProtectedCreatePage'; -import ProtectedRolesEditPage from './ProtectedEditPage'; -import ProtectedRolesListPage from './ProtectedListPage'; +import { ProtectedRolesCreatePage } from './components/ProtectedCreatePage'; +import { ProtectedRolesEditPage } from './components/ProtectedEditPage'; +import { ProtectedRolesListPage } from './components/ProtectedListPage'; const Roles = () => { return ( - - + + diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage.js b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/CreatePage.js similarity index 96% rename from packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/pages/CreatePage.js index 5b4eef7a09..d060db381e 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/CreatePage.js @@ -26,11 +26,10 @@ import { useIntl } from 'react-intl'; import { useMutation } from 'react-query'; import { useHistory } from 'react-router-dom'; -import UsersPermissions from '../../components/UsersPermissions'; -import { usePlugins } from '../../hooks'; -import getTrad from '../../utils/getTrad'; - -import { createRoleSchema } from './constants'; +import UsersPermissions from '../../../components/UsersPermissions'; +import { usePlugins } from '../../../hooks'; +import getTrad from '../../../utils/getTrad'; +import { createRoleSchema } from '../constants'; export const CreatePage = () => { const { formatMessage } = useIntl(); diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage.js b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/EditPage.js similarity index 96% rename from packages/plugins/users-permissions/admin/src/pages/Roles/EditPage.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/pages/EditPage.js index c002801433..2cf11ac886 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/EditPage.js @@ -28,11 +28,10 @@ import { useIntl } from 'react-intl'; import { useMutation } from 'react-query'; import { useRouteMatch } from 'react-router-dom'; -import UsersPermissions from '../../components/UsersPermissions'; -import { usePlugins, useFetchRole } from '../../hooks'; -import getTrad from '../../utils/getTrad'; - -import { createRoleSchema } from './constants'; +import UsersPermissions from '../../../components/UsersPermissions'; +import { usePlugins, useFetchRole } from '../../../hooks'; +import getTrad from '../../../utils/getTrad'; +import { createRoleSchema } from '../constants'; export const EditPage = () => { const { formatMessage } = useIntl(); diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/components/TableBody.js b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/ListPage/components/TableBody.js similarity index 92% rename from packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/components/TableBody.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/pages/ListPage/components/TableBody.js index f7ce8fd5fd..7e98f7f60e 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/components/TableBody.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/ListPage/components/TableBody.js @@ -7,8 +7,6 @@ import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import { useHistory } from 'react-router-dom'; -import pluginId from '../../../../pluginId'; - const TableBody = ({ sortedRoles, canDelete, permissions, setRoleToDelete, onDelete }) => { const { formatMessage } = useIntl(); const { push } = useHistory(); @@ -23,7 +21,7 @@ const TableBody = ({ sortedRoles, canDelete, permissions, setRoleToDelete, onDel }; const handleClickEdit = (id) => { - push(`/settings/${pluginId}/roles/${id}`); + push(`/settings/users-permissions/roles/${id}`); }; return ( @@ -39,7 +37,10 @@ const TableBody = ({ sortedRoles, canDelete, permissions, setRoleToDelete, onDel {formatMessage( - { id: 'Roles.RoleRow.user-count', defaultMessage: '{number, plural, =0 {# user} one {# user} other {# users}}' }, + { + id: 'Roles.RoleRow.user-count', + defaultMessage: '{number, plural, =0 {# user} one {# user} other {# users}}', + }, { number: role.nb_users } )} diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/ListPage/index.js similarity index 97% rename from packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/pages/ListPage/index.js index 590640a15b..11a2872cea 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/ListPage/index.js @@ -36,9 +36,8 @@ import { useIntl } from 'react-intl'; import { useMutation, useQuery } from 'react-query'; import { useHistory } from 'react-router-dom'; -import { PERMISSIONS } from '../../../constants'; -import pluginId from '../../../pluginId'; -import { getTrad } from '../../../utils'; +import { PERMISSIONS } from '../../../../constants'; +import { getTrad } from '../../../../utils'; import TableBody from './components/TableBody'; import { deleteData, fetchData } from './utils/api'; @@ -91,7 +90,7 @@ const RoleListPage = () => { const handleNewRoleClick = () => { trackUsage('willCreateRole'); - push(`/settings/${pluginId}/roles/new`); + push(`/settings/users-permissions/roles/new`); }; const handleShowConfirmDelete = () => { diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/ListPage/tests/index.test.js similarity index 100% rename from packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/index.test.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/pages/ListPage/tests/index.test.js diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/utils/api.js b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/ListPage/utils/api.js similarity index 100% rename from packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/utils/api.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/pages/ListPage/utils/api.js diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/tests/CreatePage.test.js b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/tests/CreatePage.test.js similarity index 94% rename from packages/plugins/users-permissions/admin/src/pages/Roles/tests/CreatePage.test.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/pages/tests/CreatePage.test.js index 8f08bd9e07..af7a4682fc 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/tests/CreatePage.test.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/tests/CreatePage.test.js @@ -8,7 +8,6 @@ import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; import { MemoryRouter, Switch, Route } from 'react-router-dom'; -import pluginId from '../../../pluginId'; import { CreatePage } from '../CreatePage'; jest.mock('@strapi/helper-plugin', () => ({ @@ -17,7 +16,7 @@ jest.mock('@strapi/helper-plugin', () => ({ })); const render = () => ({ - ...renderRTL(, { + ...renderRTL(, { wrapper({ children }) { const client = new QueryClient({ defaultOptions: { @@ -32,7 +31,7 @@ const render = () => ({ - + {children} diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/tests/EditPage.test.js b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/tests/EditPage.test.js similarity index 96% rename from packages/plugins/users-permissions/admin/src/pages/Roles/tests/EditPage.test.js rename to packages/plugins/users-permissions/admin/src/pages/Roles/pages/tests/EditPage.test.js index 46f3bcced8..68ed5c6f5a 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/tests/EditPage.test.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/pages/tests/EditPage.test.js @@ -13,7 +13,6 @@ import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; import { MemoryRouter, Switch, Route } from 'react-router-dom'; -import pluginId from '../../../pluginId'; import { EditPage } from '../EditPage'; jest.mock('@strapi/helper-plugin', () => ({ @@ -22,7 +21,7 @@ jest.mock('@strapi/helper-plugin', () => ({ })); const render = () => ({ - ...renderRTL(, { + ...renderRTL(, { wrapper({ children }) { const client = new QueryClient({ defaultOptions: { @@ -37,7 +36,7 @@ const render = () => ({ - + {children}