Revert "fix(console): update captcha backlink and always show captcha toggle" (#7400)

Revert "fix(console): update captcha backlink and always show captcha toggle …"

This reverts commit 21a2ea7.

Author: simeng-li

.changeset/perfect-phones-relax.md

@@ -71,7 +71,7 @@ function CaptchaDetails() {
 
   return (
     <DetailsPage
-      backLink="/security/captcha"
+      backLink="/security"
       backLinkTitle="security.captcha_details.back_to_security"
       isLoading={isLoading}
       error={error}

packages/console/src/pages/CaptchaDetails/index.tsx

@@ -10,12 +10,7 @@ import { type RequestError } from '@/hooks/use-api';
 
 import styles from './index.module.scss';
 
-type Props = {
-  // eslint-disable-next-line react/boolean-prop-naming
-  readonly disabled?: boolean;
-};
-
-function EnableCaptcha({ disabled }: Props) {
+function EnableCaptcha() {
   const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
   const { register, reset } = useFormContext<CaptchaPolicy>();
   const { data, isLoading } = useSWR<SignInExperience, RequestError>('api/sign-in-exp');
@@ -37,7 +32,6 @@ function EnableCaptcha({ disabled }: Props) {
           <Switch
             label={t('security.bot_protection.enable_captcha_description')}
             {...register('enabled')}
-            disabled={disabled}
           />
         </div>
       </FormField>

packages/console/src/pages/Security/Captcha/EnableCaptcha/index.tsx

@@ -105,7 +105,10 @@ function Captcha() {
                   {t('security.bot_protection.captcha.placeholder')}
                 </div>
                 {data && !isFreeTenant ? (
-                  <CaptchaCard captchaProvider={data} />
+                  <>
+                    <CaptchaCard captchaProvider={data} />
+                    <EnableCaptcha />
+                  </>
                 ) : (
                   <Button
                     title="security.bot_protection.captcha.add"
@@ -116,7 +119,6 @@ function Captcha() {
                     }}
                   />
                 )}
-                <EnableCaptcha disabled={isFreeTenant || !data} />
               </FormField>
             </FormCard>
           </DetailsForm>