From 333e8ffbe9c735048089944b5dc2ec48ab8e5d44 Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Wed, 24 Jul 2024 00:46:12 +0300 Subject: [PATCH] Client: SSO: show settings for paid --- .../integration/SingleSignOn/SubmitButton.js | 9 +++++++-- .../categories/integration/SingleSignOn/index.js | 5 ++--- .../styled-containers/StyledSsoPageContainer.js | 3 --- .../SingleSignOn/sub-components/HideButton.js | 15 +++------------ .../SingleSignOn/sub-components/ToggleSSO.js | 5 ++++- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js index dd7f2fa63b..683fbfbbe0 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js @@ -45,6 +45,7 @@ const SubmitResetButtons = (props) => { hasChanges, isLoadingXml, enableSso, + isSSOAvailable, } = props; return ( @@ -62,7 +63,9 @@ const SubmitResetButtons = (props) => { saveButtonDisabled={ !enableSso || hasErrors || !hasChanges || isLoadingXml } - cancelEnable={!(isSubmitLoading || isLoadingXml)} + disableRestoreToDefault={ + isSubmitLoading || isLoadingXml || !isSSOAvailable + } additionalClassSaveButton="save-button" additionalClassCancelButton="restore-button" /> @@ -71,7 +74,7 @@ const SubmitResetButtons = (props) => { ); }; -export default inject(({ ssoStore }) => { +export default inject(({ ssoStore, currentQuotaStore }) => { const { saveSsoSettings, isSsoEnabled, @@ -84,6 +87,7 @@ export default inject(({ ssoStore }) => { isLoadingXml, enableSso, } = ssoStore; + const { isSSOAvailable } = currentQuotaStore; return { saveSsoSettings, @@ -96,5 +100,6 @@ export default inject(({ ssoStore }) => { hasChanges, isLoadingXml, enableSso, + isSSOAvailable, }; })(observer(SubmitResetButtons)); diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js index 0258c3fafc..a1c76126e1 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js @@ -69,7 +69,6 @@ const SingleSignOn = (props) => { {t("SsoIntro")} @@ -88,7 +87,7 @@ const SingleSignOn = (props) => { })} label={SERVICE_PROVIDER_SETTINGS} value={serviceProviderSettings} - isDisabled={!isSSOAvailable} + //isDisabled={!isSSOAvailable} /> @@ -101,7 +100,7 @@ const SingleSignOn = (props) => { })} label={SP_METADATA} value={spMetadata} - isDisabled={!isSSOAvailable} + //isDisabled={!isSSOAvailable} /> diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js index ca26278a8a..f37c6e5d73 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js @@ -25,7 +25,6 @@ // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode import styled, { css } from "styled-components"; -import { UnavailableStyles } from "../../../../utils/commonSettingsStyles"; const StyledSsoPage = styled.div` max-width: 100%; @@ -147,8 +146,6 @@ const StyledSsoPage = styled.div` `} } } - - ${(props) => !props.isSettingPaid && UnavailableStyles} `; export default StyledSsoPage; diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/HideButton.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/HideButton.js index 0b7f14380d..49f57524cf 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/HideButton.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/HideButton.js @@ -52,22 +52,13 @@ const StyledWrapper = styled.div` const HideButton = (props) => { const { t } = useTranslation("SingleSignOn"); - const { - text, - label, - isAdditionalParameters, - value, - setHideLabel, - isDisabled, - id, - } = props; + const { text, label, isAdditionalParameters, value, setHideLabel, id } = + props; const onClick = () => { setHideLabel(label); }; - const onClickProp = isDisabled ? {} : { onClick: onClick }; - return ( {!isAdditionalParameters && ( @@ -86,7 +77,7 @@ const HideButton = (props) => { id={id} className="hide-button settings_unavailable" isHovered - {...onClickProp} + onClick={onClick} type="action" > {value diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ToggleSSO.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ToggleSSO.js index 2ee3eff74c..3935eb8240 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ToggleSSO.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ToggleSSO.js @@ -32,6 +32,7 @@ import { Text } from "@docspace/shared/components/text"; import { ToggleButton } from "@docspace/shared/components/toggle-button"; import { Badge } from "@docspace/shared/components/badge"; import { mobile } from "@docspace/shared/utils"; +import { UnavailableStyles } from "../../../../utils/commonSettingsStyles"; const StyledWrapper = styled.div` display: flex; @@ -69,6 +70,8 @@ const StyledWrapper = styled.div` } } } + + ${(props) => !props.isSSOAvailable && UnavailableStyles} `; const ToggleSSO = ({ enableSso, ssoToggle, isSSOAvailable }) => { @@ -76,7 +79,7 @@ const ToggleSSO = ({ enableSso, ssoToggle, isSSOAvailable }) => { const theme = useTheme(); return ( - +