From 93b461bd960051c11754508f3e39f2d9b1b5bb75 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 2 May 2023 15:05:19 +0300 Subject: [PATCH] Authentication UI: Remove auth settings (#67647) --- .../features/auth-config/AuthConfigPage.tsx | 36 ++----------------- public/app/features/auth-config/utils.ts | 9 ----- 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/public/app/features/auth-config/AuthConfigPage.tsx b/public/app/features/auth-config/AuthConfigPage.tsx index 1fa89e990bc..09d9a3fc1b9 100644 --- a/public/app/features/auth-config/AuthConfigPage.tsx +++ b/public/app/features/auth-config/AuthConfigPage.tsx @@ -11,7 +11,7 @@ import { StoreState } from 'app/types'; import ConfigureAuthCTA from './components/ConfigureAuthCTA'; import { ProviderCard } from './components/ProviderCard'; import { loadSettings } from './state/actions'; -import { filterAuthSettings, getProviderUrl } from './utils'; +import { getProviderUrl } from './utils'; import { getRegisteredAuthProviders } from '.'; @@ -20,9 +20,8 @@ interface OwnProps {} export type Props = OwnProps & ConnectedProps; function mapStateToProps(state: StoreState) { - const { settings, isLoading, providerStatuses } = state.authConfig; + const { isLoading, providerStatuses } = state.authConfig; return { - settings, isLoading, providerStatuses, }; @@ -34,12 +33,7 @@ const mapDispatchToProps = { const connector = connect(mapStateToProps, mapDispatchToProps); -export const AuthConfigPageUnconnected = ({ - settings, - providerStatuses, - isLoading, - loadSettings, -}: Props): JSX.Element => { +export const AuthConfigPageUnconnected = ({ providerStatuses, isLoading, loadSettings }: Props): JSX.Element => { const styles = useStyles2(getStyles); useEffect(() => { @@ -54,7 +48,6 @@ export const AuthConfigPageUnconnected = ({ const availableProviders = authProviders.filter( (p) => !providerStatuses[p.id]?.enabled && !providerStatuses[p.id]?.configured ); - const authSettings = filterAuthSettings(settings); const firstAvailableProvider = availableProviders?.length ? availableProviders[0] : null; return ( @@ -100,29 +93,6 @@ export const AuthConfigPageUnconnected = ({ ))} )} - {!isEmpty(authSettings) && ( -
-

Settings

- - - {Object.entries(authSettings).map(([sectionName, sectionSettings], i) => ( - - - - - {Object.entries(sectionSettings).map(([settingName, settingValue], j) => ( - - - - - ))} - - ))} - -
{sectionName} -
{settingName}{settingValue}
-
- )} ); diff --git a/public/app/features/auth-config/utils.ts b/public/app/features/auth-config/utils.ts index 6513cbccc7c..872918065fb 100644 --- a/public/app/features/auth-config/utils.ts +++ b/public/app/features/auth-config/utils.ts @@ -1,15 +1,6 @@ -import { Settings } from 'app/types'; - import { BASE_PATH } from './constants'; import { AuthProviderInfo } from './types'; -export function filterAuthSettings(settings: Settings) { - const authSettings: Settings = Object.fromEntries( - Object.entries(settings).filter(([sectionName]) => sectionName === 'auth') - ); - return authSettings; -} - export function getProviderUrl(provider: AuthProviderInfo) { return BASE_PATH + (provider.configPath || provider.id); }