yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 06:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: only run the query if sso is enabled

Browse Source 
fix: test
This commit is contained in:
Josh 2023-07-06 17:41:45 +01:00
parent 10bf49a9d1
commit 09f9ab09c8
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/core/admin/admin/src/pages/ProfilePage/index.js
View File

@ -77,19 +77,14 @@ const ProfilePage = () => {
const { isLoading: isLoadingSSO, data: dataSSO } = useQuery( const { isLoading: isLoadingSSO, data: dataSSO } = useQuery(
['providers', 'isSSOLocked'], ['providers', 'isSSOLocked'],
async () => { async () => {
if (window.strapi.isEE) { const {
const { data: { data },
data: { data }, } = await get('/admin/providers/isSSOLocked');
} = await get('/admin/providers/isSSOLocked');
return data; return data;
}
return {
isSSOLocked: false,
};
}, },
{ {
enabled: window.strapi.isEE && window.strapi.features.isEnabled('sso'),
onError() { onError() {
toggleNotification({ toggleNotification({
type: 'warning', type: 'warning',
@ -178,7 +173,7 @@ const ProfilePage = () => {
); );
} }
const hasLockedRole = dataSSO?.isSSOLocked; const hasLockedRole = dataSSO?.isSSOLocked ?? false;
const { email, firstname, lastname, username, preferedLanguage } = data; const { email, firstname, lastname, username, preferedLanguage } = data;
const initialData = { email, firstname, lastname, username, preferedLanguage, currentTheme }; const initialData = { email, firstname, lastname, username, preferedLanguage, currentTheme };
@ -203,7 +198,12 @@ const ProfilePage = () => {
<HeaderLayout <HeaderLayout
title={data.username || getFullName(data.firstname, data.lastname)} title={data.username || getFullName(data.firstname, data.lastname)}
primaryAction={ primaryAction={
<Button startIcon={<Check />} loading={isSubmitting} type="submit" disabled={!dirty}> <Button
startIcon={<Check />}
loading={isSubmitting}
type="submit"
disabled={!dirty}
>
{formatMessage({ id: 'global.save', defaultMessage: 'Save' })} {formatMessage({ id: 'global.save', defaultMessage: 'Save' })}
</Button> </Button>
} }

1
packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js
View File

@ -26,6 +26,7 @@ const setup = (props) =>
render(<ProfilePage {...props} />, { render(<ProfilePage {...props} />, {
wrapper({ children }) { wrapper({ children }) {
window.strapi.isEE = true; window.strapi.isEE = true;
window.strapi.features.isEnabled = () => true;
const client = new QueryClient({ const client = new QueryClient({
defaultOptions: { defaultOptions: {
queries: { queries: {