root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 99 Packages Projects Releases Wiki Activity

SCIM: add non ga banner (#108301) 

* Add warning banner to Authentication List Page

* i18n update
This commit is contained in:
linoman 2025-07-18 14:01:05 +02:00 committed by GitHub
parent 28109ee192
commit b4f7c692f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/features/auth-config/AuthProvidersListPage.tsx
View File

@ -4,7 +4,7 @@ import { connect, ConnectedProps } from 'react-redux';
import { GrafanaEdition } from '@grafana/data/internal'; import { GrafanaEdition } from '@grafana/data/internal';
import { Trans } from '@grafana/i18n'; import { Trans } from '@grafana/i18n';
import { reportInteraction } from '@grafana/runtime'; import { reportInteraction } from '@grafana/runtime';
import { Grid, TextLink, ToolbarButton } from '@grafana/ui'; import { Alert, Grid, TextLink, ToolbarButton } from '@grafana/ui';
import { Page } from 'app/core/components/Page/Page'; import { Page } from 'app/core/components/Page/Page';
import { config } from 'app/core/config'; import { config } from 'app/core/config';
import { StoreState } from 'app/types/store'; import { StoreState } from 'app/types/store';
@ -46,6 +46,13 @@ export const AuthConfigPageUnconnected = ({
}, [loadSettings]); }, [loadSettings]);
const [showDrawer, setShowDrawer] = useState(false); const [showDrawer, setShowDrawer] = useState(false);
const [showSCIMBanner, setShowSCIMBanner] = useState(false);
// Check if SCIM banner should be shown
useEffect(() => {
const isSCIMEnabled = config.featureToggles.enableSCIM || false;
setShowSCIMBanner(isSCIMEnabled);
}, []);
const authProviders = getRegisteredAuthProviders(); const authProviders = getRegisteredAuthProviders();
const availableProviders = authProviders.filter((p) => !providerStatuses[p.id]?.hide); const availableProviders = authProviders.filter((p) => !providerStatuses[p.id]?.hide);
@ -102,6 +109,14 @@ export const AuthConfigPageUnconnected = ({
} }
> >
<Page.Contents isLoading={isLoading}> <Page.Contents isLoading={isLoading}>
{showSCIMBanner && (
<Alert severity="warning" title="" onRemove={() => setShowSCIMBanner(false)} style={{ marginBottom: 16 }}>
<Trans i18nKey="auth-config.scim-banner.message">
SCIM is currently in development and not recommended for production use. Please use with caution and
expect potential changes.
</Trans>
</Alert>
)}
{!providerList.length ? ( {!providerList.length ? (
<ConfigureAuthCTA /> <ConfigureAuthCTA />
) : ( ) : (

3
public/locales/en-US/grafana.json
View File

@ -3359,6 +3359,9 @@
"text-badge-enabled": "Enabled", "text-badge-enabled": "Enabled",
"text-badge-not-enabled": "Not enabled" "text-badge-not-enabled": "Not enabled"
}, },
"scim-banner": {
"message": "SCIM is currently in development and not recommended for production use. Please use with caution and expect potential changes."
},
"server-discovery-modal": { "server-discovery-modal": {
"label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "The .well-known/openid-configuration endpoint for your IdP", "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "The .well-known/openid-configuration endpoint for your IdP",
"title-open-id-connect-discovery-url": "OpenID Connect Discovery URL" "title-open-id-connect-discovery-url": "OpenID Connect Discovery URL"