From 09f9ab09c869918ddc64232c6a924c2b10f86f33 Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Thu, 6 Jul 2023 17:41:45 +0100 Subject: [PATCH] fix: only run the query if sso is enabled fix: test --- .../admin/src/pages/ProfilePage/index.js | 24 +++++++++---------- .../src/pages/ProfilePage/tests/index.test.js | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/core/admin/admin/src/pages/ProfilePage/index.js b/packages/core/admin/admin/src/pages/ProfilePage/index.js index c4635593b6..c4bcaa7406 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/index.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/index.js @@ -77,19 +77,14 @@ const ProfilePage = () => { const { isLoading: isLoadingSSO, data: dataSSO } = useQuery( ['providers', 'isSSOLocked'], async () => { - if (window.strapi.isEE) { - const { - data: { data }, - } = await get('/admin/providers/isSSOLocked'); + const { + data: { data }, + } = await get('/admin/providers/isSSOLocked'); - return data; - } - - return { - isSSOLocked: false, - }; + return data; }, { + enabled: window.strapi.isEE && window.strapi.features.isEnabled('sso'), onError() { toggleNotification({ 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 initialData = { email, firstname, lastname, username, preferedLanguage, currentTheme }; @@ -203,7 +198,12 @@ const ProfilePage = () => { } loading={isSubmitting} type="submit" disabled={!dirty}> + } diff --git a/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js b/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js index 7bc06d6cce..96fe7c88dd 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js @@ -26,6 +26,7 @@ const setup = (props) => render(, { wrapper({ children }) { window.strapi.isEE = true; + window.strapi.features.isEnabled = () => true; const client = new QueryClient({ defaultOptions: { queries: {