diff --git a/public/app/features/auth-config/AuthConfigPage.tsx b/public/app/features/auth-config/AuthConfigPage.tsx index 88d51a33a18..847a2414f0e 100644 --- a/public/app/features/auth-config/AuthConfigPage.tsx +++ b/public/app/features/auth-config/AuthConfigPage.tsx @@ -85,8 +85,8 @@ export const AuthConfigPageUnconnected = ({ providerStatuses, isLoading, loadSet { @@ -111,7 +111,7 @@ export const AuthConfigPageUnconnected = ({ providerStatuses, isLoading, loadSet onClick && onClick()}> - {displayName} +
+ {authType} + {displayName} +
- {authType && } - {enabled ? : } +
+ {enabled ? : } +
+ + Edit + +
); @@ -36,27 +44,49 @@ export function ProviderCard({ providerId, displayName, enabled, configPath, aut export const getStyles = (theme: GrafanaTheme2) => { return { container: css` - min-height: ${theme.spacing(16)}; + min-height: ${theme.spacing(18)}; display: flex; flex-direction: column; - justify-content: space-between; - padding: ${theme.spacing(2)}; + justify-content: space-around; + border-radius: ${theme.spacing(0.5)}; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); `, header: css` + margin-top: -${theme.spacing(2)}; display: flex; - justify-content: space-between; + flex-direction: column; + justify-content: start; align-items: flex-start; margin-bottom: ${theme.spacing(2)}; `, footer: css` + margin-top: ${theme.spacing(2)}; display: flex; justify-content: space-between; + align-items: center; `, name: css` align-self: flex-start; font-size: ${theme.typography.h4.fontSize}; color: ${theme.colors.text.primary}; margin: 0; + margin-top: ${theme.spacing(-1)}; + `, + smallText: css` + font-size: ${theme.typography.bodySmall.fontSize}; + color: ${theme.colors.text.secondary}; + padding: ${theme.spacing(1)} 0; // Add some padding + max-width: 90%; // Add a max-width to prevent text from stretching too wide + `, + badgeContainer: css` + display: flex; + gap: ${theme.spacing(1)}; + `, + edit: css` + display: flex; + align-items: center; + color: ${theme.colors.text.link}; + gap: ${theme.spacing(0.5)}; `, }; }; diff --git a/public/app/features/auth-config/types.ts b/public/app/features/auth-config/types.ts index dfff571706e..6dfb6ae5f7e 100644 --- a/public/app/features/auth-config/types.ts +++ b/public/app/features/auth-config/types.ts @@ -21,8 +21,9 @@ export interface AuthConfigState { export interface AuthProviderStatus { enabled: boolean; configured: boolean; - configFoundInIniFile?: boolean; + name?: string; hide?: boolean; + configFoundInIniFile?: boolean; } export interface SettingsError {