yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 16:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15499 from strapi/chore/cleanup-settings-sso

Browse Source 
Settings: Move SSO page into pages directory
This commit is contained in:
Gustav Hansen 2023-01-20 12:33:57 +01:00 committed by GitHub
commit b42f01f94e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

572
packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js
View File

@ -44,7 +44,7 @@ const menu = [
intlLabel: { id: 'email.SettingsNav.section-label', defaultMessage: 'Email Plugin' }, intlLabel: { id: 'email.SettingsNav.section-label', defaultMessage: 'Email Plugin' },
links: [ links: [
{ {
intlLabel: { id: 'email.Settings.email.plugin.title', defaultMessage: 'Settings' }, intlLabel: { id: 'email.Settings.email.plugin.title', defaultMessage: 'Email Settings' },
id: 'settings', id: 'settings',
to: '/settings/email', to: '/settings/email',
permissions: [{ action: 'plugin::email.settings.read', subject: null }], permissions: [{ action: 'plugin::email.settings.read', subject: null }],
@ -60,7 +60,7 @@ const menu = [
}, },
links: [ links: [
{ {
intlLabel: { id: 'users-permissions.HeaderNav.link.roles', defaultMessage: 'Roles' }, intlLabel: { id: 'users-permissions.HeaderNav.link.roles', defaultMessage: 'U&P Roles' },
id: 'roles', id: 'roles',
to: '/settings/users-permissions/roles', to: '/settings/users-permissions/roles',
permissions: [ permissions: [
@ -87,566 +87,16 @@ const App = (
describe('SettingsPage || components || SettingsNav', () => { describe('SettingsPage || components || SettingsNav', () => {
it('should render and match snapshot', () => { it('should render and match snapshot', () => {
const { const { getByText } = render(App);
container: { firstChild },
} = render(App);
expect(firstChild).toMatchInlineSnapshot(` menu.forEach((menuItem) => {
.c1 { expect(getByText(menuItem.intlLabel.defaultMessage)).toBeInTheDocument();
padding-top: 24px;
padding-right: 16px; if (menuItem.links) {
padding-bottom: 8px; menuItem.links.forEach((link) => {
padding-left: 24px; expect(getByText(link.intlLabel.defaultMessage)).toBeInTheDocument();
});
} }
});
.c5 {
padding-top: 16px;
}
.c6 {
background: #eaeaef;
}
.c9 {
padding-top: 8px;
padding-bottom: 16px;
}
.c13 {
padding-top: 8px;
padding-right: 16px;
padding-bottom: 8px;
padding-left: 24px;
}
.c15 {
padding-right: 0px;
position: relative;
}
.c18 {
padding-right: 4px;
}
.c20 {
background: #f6f6f9;
padding-top: 8px;
padding-bottom: 8px;
padding-left: 32px;
}
.c23 {
padding-left: 8px;
}
.c25 {
padding-right: 16px;
}
.c0 {
width: 14.5rem;
background: #f6f6f9;
position: -webkit-sticky;
position: sticky;
top: 0;
height: 100vh;
overflow-y: auto;
border-right: 1px solid #dcdce4;
z-index: 1;
}
.c2 {
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
}
.c10 {
-webkit-align-items: stretch;
-webkit-box-align: stretch;
-ms-flex-align: stretch;
align-items: stretch;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
}
.c16 {
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
}
.c4 {
font-weight: 600;
font-size: 1.125rem;
line-height: 1.22;
color: #32324d;
}
.c19 {
font-weight: 600;
font-size: 0.6875rem;
line-height: 1.45;
text-transform: uppercase;
color: #666687;
}
.c24 {
font-size: 0.875rem;
line-height: 1.43;
color: #32324d;
}
.c7 {
height: 1px;
border: none;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
margin: 0;
}
.c8 {
width: 1.5rem;
background-color: #dcdce4;
}
.c21 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-text-decoration: none;
text-decoration: none;
color: #32324d;
}
.c21 svg > * {
fill: #666687;
}
.c21.active {
background-color: #f0f0ff;
border-right: 2px solid #4945ff;
}
.c21.active svg > * {
fill: #271fe0;
}
.c21.active .c3 {
color: #271fe0;
font-weight: 500;
}
.c21:focus-visible {
outline-offset: -2px;
}
.c22 {
width: 0.75rem;
height: 0.25rem;
}
.c22 * {
fill: #666687;
}
.c26 {
width: 0.75rem;
height: 0.25rem;
}
.c26 * {
fill: #4945ff;
}
.c11 > * {
margin-top: 0;
margin-bottom: 0;
}
.c11 > * + * {
margin-top: 8px;
}
.c12 > * {
margin-top: 0;
margin-bottom: 0;
}
.c12 > * + * {
margin-top: 4px;
}
.c17 {
border: none;
padding: 0;
background: transparent;
}
.c14 svg {
height: 0.25rem;
}
.c14 svg path {
fill: #8e8ea9;
}
<nav
aria-label="Settings"
class="c0"
>
<div
class="c1"
>
<div
class="c2"
>
<h2
class="c3 c4"
>
Settings
</h2>
</div>
<div
class="c5"
>
<hr
class="c6 c7 c8"
/>
</div>
</div>
<div
class="c9"
>
<ol
class="c10 c11"
spacing="2"
>
<li>
<div
class="c10 c12"
spacing="1"
>
<div
class="c13 c14"
>
<div
class="c15"
>
<div
class="c16 c17"
>
<div
class="c18"
>
<span
class="c3 c19"
>
Global Settings
</span>
</div>
</div>
</div>
</div>
<ol
id="subnav-list-2"
>
<li>
<a
class="c20 c21"
href="/settings/application-infos"
>
<div
class="c16"
>
<svg
class="c22"
fill="none"
height="1em"
viewBox="0 0 4 4"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<rect
fill="#A5A5BA"
height="4"
rx="2"
width="4"
/>
</svg>
<div
class="c23"
>
<span
class="c3 c24"
>
Overview
</span>
</div>
</div>
<div
class="c16 sc-iukxot c25"
>
<svg
class="c26"
fill="none"
height="1em"
viewBox="0 0 4 4"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<rect
fill="#A5A5BA"
height="4"
rx="2"
width="4"
/>
</svg>
</div>
</a>
</li>
</ol>
</div>
</li>
<li>
<div
class="c10 c12"
spacing="1"
>
<div
class="c13 c14"
>
<div
class="c15"
>
<div
class="c16 c17"
>
<div
class="c18"
>
<span
class="c3 c19"
>
Administration Panel
</span>
</div>
</div>
</div>
</div>
<ol
id="subnav-list-3"
>
<li>
<a
class="c20 c21"
href="/settings/roles"
>
<div
class="c16"
>
<svg
class="c22"
fill="none"
height="1em"
viewBox="0 0 4 4"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<rect
fill="#A5A5BA"
height="4"
rx="2"
width="4"
/>
</svg>
<div
class="c23"
>
<span
class="c3 c24"
>
Roles
</span>
</div>
</div>
</a>
</li>
</ol>
</div>
</li>
<li>
<div
class="c10 c12"
spacing="1"
>
<div
class="c13 c14"
>
<div
class="c15"
>
<div
class="c16 c17"
>
<div
class="c18"
>
<span
class="c3 c19"
>
Email Plugin
</span>
</div>
</div>
</div>
</div>
<ol
id="subnav-list-4"
>
<li>
<a
class="c20 c21"
href="/settings/email"
>
<div
class="c16"
>
<svg
class="c22"
fill="none"
height="1em"
viewBox="0 0 4 4"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<rect
fill="#A5A5BA"
height="4"
rx="2"
width="4"
/>
</svg>
<div
class="c23"
>
<span
class="c3 c24"
>
Settings
</span>
</div>
</div>
</a>
</li>
</ol>
</div>
</li>
<li>
<div
class="c10 c12"
spacing="1"
>
<div
class="c13 c14"
>
<div
class="c15"
>
<div
class="c16 c17"
>
<div
class="c18"
>
<span
class="c3 c19"
>
Users & Permissions plugin
</span>
</div>
</div>
</div>
</div>
<ol
id="subnav-list-5"
>
<li>
<a
class="c20 c21"
href="/settings/users-permissions/roles"
>
<div
class="c16"
>
<svg
class="c22"
fill="none"
height="1em"
viewBox="0 0 4 4"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<rect
fill="#A5A5BA"
height="4"
rx="2"
width="4"
/>
</svg>
<div
class="c23"
>
<span
class="c3 c24"
>
Roles
</span>
</div>
</div>
</a>
</li>
</ol>
</div>
</li>
</ol>
</div>
</nav>
`);
}); });
}); });

6
packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/index.js → packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js
View File

@ -17,9 +17,9 @@ import { Select, Option } from '@strapi/design-system/Select';
import { Grid, GridItem } from '@strapi/design-system/Grid'; import { Grid, GridItem } from '@strapi/design-system/Grid';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';
import isEqual from 'lodash/isEqual'; import isEqual from 'lodash/isEqual';
import { getRequestUrl } from '../../../../../admin/src/utils'; import { getRequestUrl } from '../../../../../../admin/src/utils';
import { useRolesList, useSettingsForm } from '../../../../../admin/src/hooks'; import { useRolesList, useSettingsForm } from '../../../../../../admin/src/hooks';
import adminPermissions from '../../../../../admin/src/permissions'; import adminPermissions from '../../../../../../admin/src/permissions';
import schema from './utils/schema'; import schema from './utils/schema';
const ssoPermissions = { const ssoPermissions = {

0
packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/tests/__snapshots__/index.test.js.snap → packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/__snapshots__/index.test.js.snap
View File

0
packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/tests/index.test.js → packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/index.test.js
View File

0
packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/tests/server.js → packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/server.js
View File

0
packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/utils/schema.js → packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/utils/schema.js
View File

30
packages/core/admin/ee/admin/pages/SettingsPage/utils/customRoutes.js
View File

@ -1,19 +1,17 @@
const ssoRoutes = strapi.features.isEnabled(strapi.features.SSO) const routes = [];
? [
{
async Component() {
const component = await import(
/* webpackChunkName: "sso-settings-page" */ '../SingleSignOn'
);
return component; if (strapi.features.isEnabled(strapi.features.SSO)) {
}, routes.push({
to: '/settings/single-sign-on', async Component() {
exact: true, const component = await import(
}, /* webpackChunkName: "sso-settings-page" */ '../pages/SingleSignOn'
] );
: [];
const customRoutes = [...ssoRoutes]; return component;
},
to: '/settings/single-sign-on',
exact: true,
});
}
export default customRoutes; export default routes;