Skip to content

[ML] Fix saving of custom URLs for job created in Advanced page #21207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peteharverson merged 2 commits into from
Jul 26, 2018
Merged

[ML] Fix saving of custom URLs for job created in Advanced page #21207

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b21e15
[ML] Fix saving of custom URLs for job created in Advanced page
peteharverson Jul 25, 2018
3f176b4
[ML] Edit to custom URL save custom_settings following review
peteharverson Jul 25, 2018
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
10 changes: 6 additions & 4 deletions x-pack/plugins/ml/public/jobs/jobs_list/components/edit_job_flyout/edit_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export function saveJob(job, newJobData, finish) {
};

if (jobData.custom_settings !== undefined) {
// remove the created_by setting if too much of the job has changed
jobData.custom_settings = processCustomSettings(jobData, datafeedData);
}

Expand Down Expand Up @@ -194,8 +193,8 @@ function extractDetectorDescriptions(job, newJobData) {

function extractCustomSettings(job, newJobData) {
const settingsData = {};
if (job.custom_settings && newJobData && newJobData.customUrls) {
settingsData.custom_settings = job.custom_settings;
if (newJobData && newJobData.customUrls) {
settingsData.custom_settings = job.custom_settings || {};
settingsData.custom_settings.custom_urls = newJobData.customUrls;
}
return settingsData;
Expand Down Expand Up @@ -230,12 +229,15 @@ function extractDatafeed(job, newDatafeedData) {
}

function processCustomSettings(jobData, datafeedData) {
// remove the created_by setting if parts of the job contain
// fields which won't be retained when cloned in a wizard
let customSettings = {};
if (jobData.custom_settings !== undefined) {
customSettings = { ...jobData.custom_settings };

if (jobData.custom_settings.created_by !== undefined) {
if (jobData.detectors !== undefined || Object.keys(datafeedData).length) {
if (jobData.detectors !== undefined || Object.keys(datafeedData).length ||
(jobData.custom_settings.custom_urls !== undefined && jobData.custom_settings.custom_urls.length)) {
delete customSettings.created_by;
}
}
Expand Down