Skip to content
This repository has been archived by the owner on Aug 9, 2022. It is now read-only.

fix email recipients render in edit report definition page #146

Merged
merged 1 commit into from
Oct 23, 2020
Merged

fix email recipients render in edit report definition page #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions kibana-reports/public/components/report_definitions/delivery/email.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const EmailDelivery = (props: ReportDeliveryProps) => {
showEmailRecipientsError,
} = props;

const [emailRecipients, setOptions] = useState([]);
const [emailRecipients, setEmailRecipients] = useState([]);
const [selectedEmailRecipients, setSelectedEmailRecipients] = useState([]);
const [emailSubject, setEmailSubject] = useState('');
const [emailBody, setEmailBody] = useState('');
Expand Down Expand Up @@ -59,14 +59,13 @@ export const EmailDelivery = (props: ReportDeliveryProps) => {
(option) => option.label.trim().toLowerCase() === normalizedSearchValue
) === -1
) {
setOptions([...emailRecipients, newOption]);
setEmailRecipients([...emailRecipients, newOption]);
}

// Select the option.
handleEmailRecipients([...selectedEmailRecipients, newOption]);
handleSelectEmailRecipients([...selectedEmailRecipients, newOption]);
};

const handleEmailRecipients = (e) => {
const handleSelectEmailRecipients = (e) => {
setSelectedEmailRecipients(e);
reportDefinitionRequest.delivery.delivery_params.recipients = e.map(
(option) => option.label
Expand Down Expand Up @@ -100,9 +99,10 @@ export const EmailDelivery = (props: ReportDeliveryProps) => {
const emailParams: ChannelSchemaType = delivery.delivery_params;
const { recipients, title, textDescription } = emailParams;

recipients.map((emailRecipient) =>
handleCreateEmailRecipient(emailRecipient, selectedEmailRecipients)
);
const recipientsOptions = recipients.map((email) => ({ label: email }));
handleSelectEmailRecipients(recipientsOptions);
setEmailRecipients(recipientsOptions);

setEmailSubject(title);
reportDefinitionRequest.delivery.delivery_params.title = title;
reportDefinitionRequest.delivery.delivery_params.origin = location.origin;
Expand Down Expand Up @@ -144,7 +144,7 @@ export const EmailDelivery = (props: ReportDeliveryProps) => {
placeholder={'Add users here'}
options={emailRecipients}
selectedOptions={selectedEmailRecipients}
onChange={handleEmailRecipients}
onChange={handleSelectEmailRecipients}
onCreateOption={handleCreateEmailRecipient}
isClearable={true}
data-test-subj="demoComboBox"
Expand Down