diff --git a/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js b/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js index 3191221a75..fbe66f29a4 100644 --- a/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js +++ b/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js @@ -10,6 +10,7 @@ import { useHistory } from 'react-router-dom'; import adminPermissions from '../../../../src/permissions'; import { useFetchPermissionsLayout } 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'; @@ -93,77 +94,80 @@ const CreatePage = () => { ]; return ( - - {({ handleSubmit, values, errors, handleReset, handleChange, handleBlur }) => ( -
- -
- - - + + + {({ handleSubmit, values, errors, handleReset, handleChange, handleBlur }) => ( + + +
- - - - {!isLayoutLoading && ( - - + + - - )} - - - )} - + + + + {!isLayoutLoading && ( + + + + )} + + + )} + + ); }; diff --git a/packages/strapi-admin/admin/ee/containers/Roles/ListPage/index.js b/packages/strapi-admin/admin/ee/containers/Roles/ListPage/index.js index c6327ceb0b..cd2e9bc508 100644 --- a/packages/strapi-admin/admin/ee/containers/Roles/ListPage/index.js +++ b/packages/strapi-admin/admin/ee/containers/Roles/ListPage/index.js @@ -15,6 +15,7 @@ import { } 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'; @@ -158,6 +159,7 @@ const RoleListPage = () => { return ( <> +
{ + const { formatMessage } = useIntl(); + const text = formatMessage({ id: 'Settings.PageTitle' }, { name }); + + return ; +}; + +SettingsPageTitle.propTypes = { + name: PropTypes.string.isRequired, +}; + +export default SettingsPageTitle; diff --git a/packages/strapi-admin/admin/src/containers/Roles/EditPage/index.js b/packages/strapi-admin/admin/src/containers/Roles/EditPage/index.js index 84409ad7c9..62e659fc82 100644 --- a/packages/strapi-admin/admin/src/containers/Roles/EditPage/index.js +++ b/packages/strapi-admin/admin/src/containers/Roles/EditPage/index.js @@ -6,8 +6,8 @@ import { Header } from '@buffetjs/custom'; import { Padded } from '@buffetjs/core'; import { Formik } from 'formik'; import { useIntl } from 'react-intl'; - import BaselineAlignement from '../../../components/BaselineAlignement'; +import PageTitle from '../../../components/SettingsPageTitle'; import ContainerFluid from '../../../components/ContainerFluid'; import { Permissions, RoleForm } from '../../../components/Roles'; import { useFetchRole, useFetchPermissionsLayout } from '../../../hooks'; @@ -88,55 +88,59 @@ const EditPage = () => { }; return ( - - {({ handleSubmit, values, errors, handleReset, handleChange, handleBlur }) => ( -
- -
- - - {!isLayoutLoading && !isRoleLoading && ( - - - - )} - - - )} - + <> + + + {({ handleSubmit, values, errors, handleReset, handleChange, handleBlur }) => ( +
+ +
+ + + {!isLayoutLoading && !isRoleLoading && ( + + + + )} + + + )} + + ); }; diff --git a/packages/strapi-admin/admin/src/containers/Roles/ListPage/index.js b/packages/strapi-admin/admin/src/containers/Roles/ListPage/index.js index 60ee8143e2..94e9aefc9b 100644 --- a/packages/strapi-admin/admin/src/containers/Roles/ListPage/index.js +++ b/packages/strapi-admin/admin/src/containers/Roles/ListPage/index.js @@ -6,6 +6,7 @@ import { useIntl } from 'react-intl'; import { useHistory } from 'react-router-dom'; import { useGlobalContext, useQuery, useUserPermissions } from 'strapi-helper-plugin'; import adminPermissions from '../../../permissions'; +import PageTitle from '../../../components/SettingsPageTitle'; import { EmptyRole, RoleListWrapper, RoleRow } from '../../../components/Roles'; import { useRolesList, useSettingsHeaderSearchContext } from '../../../hooks'; import BaselineAlignment from './BaselineAlignment'; @@ -36,6 +37,7 @@ const RoleListPage = () => { return ( <> +
{ const { plugins } = useGlobalContext(); const { pluginId } = useParams(); + console.log({ pluginId }); const pluginToRender = get(plugins, [pluginId, 'settings', 'mainComponent'], null); @@ -15,7 +17,12 @@ const SettingDispatcher = () => { const Compo = pluginToRender; - return ; + return ( + <> + + + + ); }; export default memo(SettingDispatcher); diff --git a/packages/strapi-admin/admin/src/containers/SettingsPage/index.js b/packages/strapi-admin/admin/src/containers/SettingsPage/index.js index 270b5c6873..b98978c2e8 100644 --- a/packages/strapi-admin/admin/src/containers/SettingsPage/index.js +++ b/packages/strapi-admin/admin/src/containers/SettingsPage/index.js @@ -17,12 +17,13 @@ import { LoadingIndicatorPage, } from 'strapi-helper-plugin'; import { Switch, Redirect, Route, useParams, useHistory } from 'react-router-dom'; - +import { useIntl } from 'react-intl'; import RolesCreatePage from 'ee_else_ce/containers/Roles/CreatePage'; import ProtectedRolesListPage from 'ee_else_ce/containers/Roles/ProtectedListPage'; // TODO remove this line when feature finished // import ProtectedRolesListPage from '../Roles/ProtectedListPage'; import HeaderSearch from '../../components/HeaderSearch'; +import PageTitle from '../../components/PageTitle'; import { useSettingsMenu } from '../../hooks'; import { retrieveGlobalLinks } from '../../utils'; import SettingsSearchHeaderProvider from '../SettingsHeaderSearchContextProvider'; @@ -49,6 +50,7 @@ function SettingsPage() { const { settingsBaseURL, plugins } = useGlobalContext(); const [headerSearchState, setShowHeaderSearchState] = useState({ show: false, label: '' }); const { isLoading, menu } = useSettingsMenu(); + const { formatMessage } = useIntl(); const pluginsGlobalLinks = useMemo(() => retrieveGlobalLinks(plugins), [plugins]); const firstAvailableEndpoint = useMemo(() => { // Don't need to compute while permissions are being checked @@ -99,8 +101,11 @@ function SettingsPage() { return ; } + const settingTitle = formatMessage({ id: 'app.components.LeftMenuLinkContainer.settings' }); + return ( + diff --git a/packages/strapi-admin/admin/src/containers/Users/EditPage/index.js b/packages/strapi-admin/admin/src/containers/Users/EditPage/index.js index 588299b6a5..9945a3890f 100644 --- a/packages/strapi-admin/admin/src/containers/Users/EditPage/index.js +++ b/packages/strapi-admin/admin/src/containers/Users/EditPage/index.js @@ -5,8 +5,8 @@ import { get, isEmpty } from 'lodash'; import { useGlobalContext, auth } from 'strapi-helper-plugin'; import { Col } from 'reactstrap'; import { Padded } from '@buffetjs/core'; - import BaselineAlignement from '../../../components/BaselineAlignement'; +import PageTitle from '../../../components/SettingsPageTitle'; import ContainerFluid from '../../../components/ContainerFluid'; import FormBloc from '../../../components/FormBloc'; import SizedInput from '../../../components/SizedInput'; @@ -59,6 +59,7 @@ const EditPage = () => { return ( <> +
{ return (
+
+
diff --git a/packages/strapi-admin/admin/src/containers/Webhooks/ListView/index.js b/packages/strapi-admin/admin/src/containers/Webhooks/ListView/index.js index 82f07ce0ea..6032210df5 100644 --- a/packages/strapi-admin/admin/src/containers/Webhooks/ListView/index.js +++ b/packages/strapi-admin/admin/src/containers/Webhooks/ListView/index.js @@ -10,15 +10,16 @@ import { Header, List } from '@buffetjs/custom'; import { Button } from '@buffetjs/core'; import { Plus } from '@buffetjs/icons'; import { omit } from 'lodash'; +import { useIntl } from 'react-intl'; import { request, - useGlobalContext, ListButton, PopUpWarning, useUserPermissions, LoadingIndicatorPage, } from 'strapi-helper-plugin'; import adminPermissions from '../../../permissions'; +import PageTitle from '../../../components/SettingsPageTitle'; import { EmptyList, ListRow } from '../../../components/Webhooks'; import Wrapper from './Wrapper'; import reducer, { initialState } from './reducer'; @@ -30,7 +31,7 @@ function ListView() { } = useUserPermissions(adminPermissions.settings.webhooks); const isMounted = useRef(true); - const { formatMessage } = useGlobalContext(); + const { formatMessage } = useIntl(); const [showModal, setShowModal] = useState(false); const [reducerState, dispatch] = useReducer(reducer, initialState); const { push } = useHistory(); @@ -260,6 +261,7 @@ function ListView() { return ( +
{canRead && (
diff --git a/packages/strapi-admin/admin/src/translations/en.json b/packages/strapi-admin/admin/src/translations/en.json index 7e11d453f4..93de46239a 100644 --- a/packages/strapi-admin/admin/src/translations/en.json +++ b/packages/strapi-admin/admin/src/translations/en.json @@ -354,5 +354,6 @@ "Roles.ListPage.notification.delete-all-not-allowed": "Some roles could not be deleted since they are associated with users", "Roles.RoleRow.user-count.plural": "{number} users", "Roles.RoleRow.user-count.singular": "{number} user", - "Roles.components.List.empty.withSearch": "There is no role corresponding to the search ({search})..." + "Roles.components.List.empty.withSearch": "There is no role corresponding to the search ({search})...", + "Settings.PageTitle": "Settings - {name}" }