diff --git a/dashboards-reports/public/components/report_definitions/create/create_report_definition.tsx b/dashboards-reports/public/components/report_definitions/create/create_report_definition.tsx index f935589c..786af39c 100644 --- a/dashboards-reports/public/components/report_definitions/create/create_report_definition.tsx +++ b/dashboards-reports/public/components/report_definitions/create/create_report_definition.tsx @@ -37,7 +37,6 @@ import { EuiSpacer, } from '@elastic/eui'; import { ReportSettings } from '../report_settings'; -import { ReportDelivery } from '../delivery'; import { generateReportFromDefinitionId } from '../../main/main_utils'; import { converter } from '../utils'; import { @@ -159,29 +158,6 @@ export function CreateReport(props: { [x: string]: any; setBreadcrumbs?: any; ht setShowTriggerIntervalNaNError, ] = useState(false); const [showCronError, setShowCronError] = useState(false); - const [showDeliveryChannelError, setShowDeliveryChannelError] = useState( - false - ); - const [ - deliveryChannelError, - setDeliveryChannelError, - ] = useState(''); - const [ - showDeliverySubjectError, - setShowDeliverySubjectError - ] = useState(false); - const [ - deliverySubjectError, - setDeliverySubjectError - ] = useState(''); - const [ - showDeliveryTextError, - setShowDeliveryTextError - ] = useState(false); - const [ - deliveryTextError, - setDeliveryTextError - ] = useState(''); const [showTimeRangeError, setShowTimeRangeError] = useState(false); // preserve the state of the request after an invalid create report definition request @@ -287,12 +263,6 @@ export function CreateReport(props: { [x: string]: any; setBreadcrumbs?: any; ht timeRange, setShowTimeRangeError, setShowCronError, - setShowDeliveryChannelError, - setDeliveryChannelError, - setShowDeliverySubjectError, - setDeliverySubjectError, - setShowDeliveryTextError, - setDeliveryTextError ).then((response) => { error = response; }); @@ -385,19 +355,6 @@ export function CreateReport(props: { [x: string]: any; setBreadcrumbs?: any; ht showCronError={showCronError} /> - - { @@ -262,8 +254,6 @@ export function EditReportDefinition(props: { [x: string]: any; setBreadcrumbs?: timeRange, setShowTimeRangeError, setShowCronError, - setShowDeliveryChannelError, - setDeliveryChannelError ).then((response) => { error = response; }); @@ -347,15 +337,6 @@ export function EditReportDefinition(props: { [x: string]: any; setBreadcrumbs?: showCronError={showCronError} /> - - { // check report name // allow a-z, A-Z, 0-9, (), [], ',' - and _ and spaces @@ -104,41 +98,5 @@ export const definitionInputValidation = async ( error = true; } } - // delivery - if (includeDelivery) { - if (metadata.delivery.configIds.length === 0) { - // no channels are listed - setShowDeliveryChannelError(true); - setDeliveryChannelsErrorMessage( - i18n.translate( - 'opensearch.reports.error.channelListCannotBeEmpty', - { defaultMessage: 'Channels list cannot be empty.' } - ) - ); - error = true; - } - // subject is empty - if (metadata.delivery.title === '') { - setShowDeliverySubjectError(true); - setDeliverySubjectError( - i18n.translate( - 'opensearch.reports.error.deliverySubjectCannotBeEmpty', - { defaultMessage: 'Subject cannot be empty.' } - ) - ); - error = true; - } - // message is empty - if (metadata.delivery.textDescription === '') { - setShowDeliveryTextError(true); - setDeliveryTextError( - i18n.translate( - 'opensearch.reports.error.deliverySubjectCannotBeEmpty', - { defaultMessage: 'Subject cannot be empty.' } - ) - ); - error = true; - } - } return error; };