From 298384cea9c041446f3130836c7fdaf8ee82a022 Mon Sep 17 00:00:00 2001 From: linoman <2051016+linoman@users.noreply.github.com> Date: Tue, 12 Mar 2024 01:31:52 -0600 Subject: [PATCH] Disable skip button when strong password feature is enabled (#84211) --- .../app/core/components/ForgottenPassword/ChangePassword.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/app/core/components/ForgottenPassword/ChangePassword.tsx b/public/app/core/components/ForgottenPassword/ChangePassword.tsx index 845db05de95..4f5dbec643d 100644 --- a/public/app/core/components/ForgottenPassword/ChangePassword.tsx +++ b/public/app/core/components/ForgottenPassword/ChangePassword.tsx @@ -2,6 +2,7 @@ import React, { SyntheticEvent, useState } from 'react'; import { useForm } from 'react-hook-form'; import { selectors } from '@grafana/e2e-selectors'; +import { config } from '@grafana/runtime'; import { Tooltip, Field, VerticalGroup, Button, Alert, useStyles2 } from '@grafana/ui'; import { getStyles } from '../Login/LoginForm'; @@ -85,7 +86,7 @@ export const ChangePassword = ({ onSubmit, onSkip, showDefaultPasswordWarning }: Submit - {onSkip && ( + {!config.auth.basicAuthStrongPasswordPolicy && onSkip && (