diff --git a/packages/console/src/components/ConnectorForm/ConfigForm/index.module.scss b/packages/console/src/components/ConnectorForm/ConfigForm/index.module.scss index ccd87402f..ff7d8279a 100644 --- a/packages/console/src/components/ConnectorForm/ConfigForm/index.module.scss +++ b/packages/console/src/components/ConnectorForm/ConfigForm/index.module.scss @@ -1,9 +1,5 @@ @use '@/scss/underscore' as _; -.copyToClipboard { - display: block; -} - .description { color: var(--color-text-secondary); font: var(--font-body-2); diff --git a/packages/console/src/components/ConnectorForm/ConfigForm/index.tsx b/packages/console/src/components/ConnectorForm/ConfigForm/index.tsx index bfff21886..b13a45d52 100644 --- a/packages/console/src/components/ConnectorForm/ConfigForm/index.tsx +++ b/packages/console/src/components/ConnectorForm/ConfigForm/index.tsx @@ -56,7 +56,7 @@ function ConfigForm({ tip={conditional(!isSamlConnector && t('connectors.guide.callback_uri_description'))} > diff --git a/packages/console/src/ds-components/CopyToClipboard/index.module.scss b/packages/console/src/ds-components/CopyToClipboard/index.module.scss index 3440dcf43..1e5779006 100644 --- a/packages/console/src/ds-components/CopyToClipboard/index.module.scss +++ b/packages/console/src/ds-components/CopyToClipboard/index.module.scss @@ -19,8 +19,8 @@ border: 1px solid var(--color-border); } - &.fullWidth { - width: 100%; + &.block { + display: block; } .row { diff --git a/packages/console/src/ds-components/CopyToClipboard/index.tsx b/packages/console/src/ds-components/CopyToClipboard/index.tsx index 2013a4369..03314fdf7 100644 --- a/packages/console/src/ds-components/CopyToClipboard/index.tsx +++ b/packages/console/src/ds-components/CopyToClipboard/index.tsx @@ -30,8 +30,8 @@ type Props = { readonly variant?: 'text' | 'contained' | 'border' | 'icon'; readonly hasVisibilityToggle?: boolean; readonly size?: 'default' | 'small'; + readonly displayType?: 'block' | 'inline'; readonly isWordWrapAllowed?: boolean; - readonly isFullWidth?: boolean; }; type CopyState = TFuncKey<'translation', 'admin_console.general'>; @@ -46,7 +46,7 @@ function CopyToClipboard( variant = 'contained', size = 'default', isWordWrapAllowed = false, - isFullWidth = false, + displayType = 'inline', }: Props, ref: ForwardedRef ) { @@ -90,7 +90,7 @@ function CopyToClipboard( styles.container, styles[variant], styles[size], - isFullWidth && styles.fullWidth, + styles[displayType], className )} role="button" diff --git a/packages/console/src/mdx-components/ApplicationCredentials/index.tsx b/packages/console/src/mdx-components/ApplicationCredentials/index.tsx index 093983f03..b52ec1571 100644 --- a/packages/console/src/mdx-components/ApplicationCredentials/index.tsx +++ b/packages/console/src/mdx-components/ApplicationCredentials/index.tsx @@ -34,12 +34,17 @@ function ApplicationCredentials() { )} > - + )} {secret && ( - + )} diff --git a/packages/console/src/mdx-components/OidcCallbackUri/index.module.scss b/packages/console/src/mdx-components/OidcCallbackUri/index.module.scss index 12baadb79..ceb606d23 100644 --- a/packages/console/src/mdx-components/OidcCallbackUri/index.module.scss +++ b/packages/console/src/mdx-components/OidcCallbackUri/index.module.scss @@ -1,9 +1,5 @@ @use '@/scss/underscore' as _; -.copyToClipboard { - display: block; -} - .inputField { margin: _.unit(4) 0; } diff --git a/packages/console/src/mdx-components/OidcCallbackUri/index.tsx b/packages/console/src/mdx-components/OidcCallbackUri/index.tsx index 2489870bf..1502cf6a2 100644 --- a/packages/console/src/mdx-components/OidcCallbackUri/index.tsx +++ b/packages/console/src/mdx-components/OidcCallbackUri/index.tsx @@ -25,7 +25,7 @@ function OidcCallbackUri() { className={styles.inputField} > diff --git a/packages/console/src/mdx-components/SsoSamlSpMetadata/index.module.scss b/packages/console/src/mdx-components/SsoSamlSpMetadata/index.module.scss index 12baadb79..ceb606d23 100644 --- a/packages/console/src/mdx-components/SsoSamlSpMetadata/index.module.scss +++ b/packages/console/src/mdx-components/SsoSamlSpMetadata/index.module.scss @@ -1,9 +1,5 @@ @use '@/scss/underscore' as _; -.copyToClipboard { - display: block; -} - .inputField { margin: _.unit(4) 0; } diff --git a/packages/console/src/mdx-components/SsoSamlSpMetadata/index.tsx b/packages/console/src/mdx-components/SsoSamlSpMetadata/index.tsx index adea951ac..38de02ff2 100644 --- a/packages/console/src/mdx-components/SsoSamlSpMetadata/index.tsx +++ b/packages/console/src/mdx-components/SsoSamlSpMetadata/index.tsx @@ -47,7 +47,7 @@ function SsoSamlSpMetadata() { className={styles.inputField} > @@ -57,7 +57,7 @@ function SsoSamlSpMetadata() { className={styles.inputField} > diff --git a/packages/console/src/pages/ApplicationDetails/ApplicationDetailsContent/EndpointsAndCredentials.tsx b/packages/console/src/pages/ApplicationDetails/ApplicationDetailsContent/EndpointsAndCredentials.tsx index 5601f0aab..cbc79cef1 100644 --- a/packages/console/src/pages/ApplicationDetails/ApplicationDetailsContent/EndpointsAndCredentials.tsx +++ b/packages/console/src/pages/ApplicationDetails/ApplicationDetailsContent/EndpointsAndCredentials.tsx @@ -54,7 +54,7 @@ function EndpointsAndCredentials({ app: { type, secret, id, isThirdParty }, oidc {tenantEndpoint && !isThirdParty && ( @@ -63,7 +63,7 @@ function EndpointsAndCredentials({ app: { type, secret, id, isThirdParty }, oidc {tenantEndpoint && ( @@ -90,21 +90,21 @@ function EndpointsAndCredentials({ app: { type, secret, id, isThirdParty }, oidc )} > @@ -137,7 +137,7 @@ function EndpointsAndCredentials({ app: { type, secret, id, isThirdParty }, oidc )} - + {[ ApplicationType.Traditional, @@ -145,7 +145,12 @@ function EndpointsAndCredentials({ app: { type, secret, id, isThirdParty }, oidc ApplicationType.Protected, ].includes(type) && ( - + )} diff --git a/packages/console/src/pages/EnterpriseSsoDetails/Connection/OidcMetadataForm/index.module.scss b/packages/console/src/pages/EnterpriseSsoDetails/Connection/OidcMetadataForm/index.module.scss index a87c37caf..36ac80235 100644 --- a/packages/console/src/pages/EnterpriseSsoDetails/Connection/OidcMetadataForm/index.module.scss +++ b/packages/console/src/pages/EnterpriseSsoDetails/Connection/OidcMetadataForm/index.module.scss @@ -1,9 +1,5 @@ @use '@/scss/underscore' as _; -.copyToClipboard { - display: block; -} - .oidcConfigPreview { margin-top: _.unit(3); } diff --git a/packages/console/src/pages/EnterpriseSsoDetails/Connection/OidcMetadataForm/index.tsx b/packages/console/src/pages/EnterpriseSsoDetails/Connection/OidcMetadataForm/index.tsx index b679078a6..b8c52e400 100644 --- a/packages/console/src/pages/EnterpriseSsoDetails/Connection/OidcMetadataForm/index.tsx +++ b/packages/console/src/pages/EnterpriseSsoDetails/Connection/OidcMetadataForm/index.tsx @@ -57,7 +57,7 @@ function OidcMetadataForm({ providerConfig, config, providerName }: Props) { > {providerName === SsoProviderName.GOOGLE_WORKSPACE ? ( - + {/* Show default value of `id` field to show that Logto has handled the default value. */} {/* Per SAML protocol, this field is not eligible to change in most cases. */} {key === 'id' ? ( diff --git a/packages/console/src/pages/EnterpriseSsoDetails/Connection/SamlMetadataForm/ParsedConfigPreview/index.module.scss b/packages/console/src/pages/EnterpriseSsoDetails/Connection/SamlMetadataForm/ParsedConfigPreview/index.module.scss index 8ef084c53..42ca608ca 100644 --- a/packages/console/src/pages/EnterpriseSsoDetails/Connection/SamlMetadataForm/ParsedConfigPreview/index.module.scss +++ b/packages/console/src/pages/EnterpriseSsoDetails/Connection/SamlMetadataForm/ParsedConfigPreview/index.module.scss @@ -44,8 +44,4 @@ .errorStatus { background: var(--color-on-error-container); } - - .copyToClipboard { - margin-left: _.unit(1); - } } diff --git a/packages/console/src/pages/EnterpriseSsoDetails/Connection/SamlMetadataForm/ParsedConfigPreview/index.tsx b/packages/console/src/pages/EnterpriseSsoDetails/Connection/SamlMetadataForm/ParsedConfigPreview/index.tsx index e3be72a75..9b0866c8b 100644 --- a/packages/console/src/pages/EnterpriseSsoDetails/Connection/SamlMetadataForm/ParsedConfigPreview/index.tsx +++ b/packages/console/src/pages/EnterpriseSsoDetails/Connection/SamlMetadataForm/ParsedConfigPreview/index.tsx @@ -46,7 +46,7 @@ export function CertificatePreview({ ), }} /> - + ); } diff --git a/packages/console/src/pages/EnterpriseSsoDetails/Connection/ServiceProviderInfo/OidcConnectorSpInfo.tsx b/packages/console/src/pages/EnterpriseSsoDetails/Connection/ServiceProviderInfo/OidcConnectorSpInfo.tsx index 03e3d0c8d..198c90205 100644 --- a/packages/console/src/pages/EnterpriseSsoDetails/Connection/ServiceProviderInfo/OidcConnectorSpInfo.tsx +++ b/packages/console/src/pages/EnterpriseSsoDetails/Connection/ServiceProviderInfo/OidcConnectorSpInfo.tsx @@ -5,8 +5,6 @@ import CopyToClipboard from '@/ds-components/CopyToClipboard'; import FormField from '@/ds-components/FormField'; import useCustomDomain from '@/hooks/use-custom-domain'; -import * as styles from './index.module.scss'; - type Props = { readonly ssoConnectorId: string; }; @@ -19,7 +17,7 @@ function OidcConnectorSpInfo({ ssoConnectorId }: Props) { {/* Generated and passed in by Admin console. */} diff --git a/packages/console/src/pages/EnterpriseSsoDetails/Connection/ServiceProviderInfo/SamlConnectorSpInfo.tsx b/packages/console/src/pages/EnterpriseSsoDetails/Connection/ServiceProviderInfo/SamlConnectorSpInfo.tsx index 3f61865a7..51cb6e2be 100644 --- a/packages/console/src/pages/EnterpriseSsoDetails/Connection/ServiceProviderInfo/SamlConnectorSpInfo.tsx +++ b/packages/console/src/pages/EnterpriseSsoDetails/Connection/ServiceProviderInfo/SamlConnectorSpInfo.tsx @@ -6,8 +6,6 @@ import useCustomDomain from '@/hooks/use-custom-domain'; import { type SamlProviderConfig } from '../../types/saml'; -import * as styles from './index.module.scss'; - type Props = { readonly samlProviderConfig?: SamlProviderConfig; }; @@ -23,7 +21,7 @@ function SamlConnectorSpInfo({ samlProviderConfig }: Props) { <> - + element.textContent );