From 15ce9643e2c5d0bfe5cc96c017203548850643cf Mon Sep 17 00:00:00 2001 From: Darcy Ye Date: Tue, 28 Nov 2023 17:52:25 +0800 Subject: [PATCH] feat(console,phrases): add inline notification if email domain not configured (#4986) --- .../Experience/MultiInput/index.module.scss | 6 ++++++ .../Experience/index.module.scss | 4 ++++ .../EnterpriseSsoDetails/Experience/index.tsx | 16 +++++++++++++++- .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 3 +++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ .../admin-console/enterprise-sso-details.ts | 5 +++++ 18 files changed, 98 insertions(+), 1 deletion(-) diff --git a/packages/console/src/pages/EnterpriseSsoDetails/Experience/MultiInput/index.module.scss b/packages/console/src/pages/EnterpriseSsoDetails/Experience/MultiInput/index.module.scss index be34dbdcd..af6108618 100644 --- a/packages/console/src/pages/EnterpriseSsoDetails/Experience/MultiInput/index.module.scss +++ b/packages/console/src/pages/EnterpriseSsoDetails/Experience/MultiInput/index.module.scss @@ -71,3 +71,9 @@ outline-color: var(--color-focused-variant); } } + +.error { + border-color: var(--color-error); + font: var(--font-body-2); + margin-top: _.unit(1); +} diff --git a/packages/console/src/pages/EnterpriseSsoDetails/Experience/index.module.scss b/packages/console/src/pages/EnterpriseSsoDetails/Experience/index.module.scss index 515346fa4..cdb2f36d4 100644 --- a/packages/console/src/pages/EnterpriseSsoDetails/Experience/index.module.scss +++ b/packages/console/src/pages/EnterpriseSsoDetails/Experience/index.module.scss @@ -11,3 +11,7 @@ color: var(--color-error); margin-top: _.unit(1); } + +.inlineNotification { + margin-top: _.unit(6); +} diff --git a/packages/console/src/pages/EnterpriseSsoDetails/Experience/index.tsx b/packages/console/src/pages/EnterpriseSsoDetails/Experience/index.tsx index ad3c8fff9..6fe170e06 100644 --- a/packages/console/src/pages/EnterpriseSsoDetails/Experience/index.tsx +++ b/packages/console/src/pages/EnterpriseSsoDetails/Experience/index.tsx @@ -17,6 +17,7 @@ import DetailsForm from '@/components/DetailsForm'; import FormCard from '@/components/FormCard'; import UnsavedChangesAlertModal from '@/components/UnsavedChangesAlertModal'; import FormField from '@/ds-components/FormField'; +import InlineNotification from '@/ds-components/InlineNotification'; import Select from '@/ds-components/Select'; import TextInput from '@/ds-components/TextInput'; import useApi from '@/hooks/use-api'; @@ -98,7 +99,7 @@ function Experience({ data, isDeleted, onUpdated }: Props) { clearErrors, handleSubmit, register, - formState: { isDirty, isSubmitting, errors }, + formState: { defaultValues, isDirty, isSubmitting, errors }, reset, } = formMethods; @@ -172,6 +173,11 @@ function Experience({ data, isDeleted, onUpdated }: Props) { error={errors.connectorName?.message} /> + {!defaultValues?.domains?.length && ( + + {t('enterprise_sso_details.configure_domain_field_info_text')} + + )}
{t('enterprise_sso_details.email_domain_field_description')} @@ -179,6 +185,14 @@ function Experience({ data, isDeleted, onUpdated }: Props) { { + if (value.length === 0) { + return t('enterprise_sso_details.email_domain_field_required'); + } + return true; + }, + }} render={({ field: { onChange, value } }) => (