[ML] Remove excludeGenerated

elastic · Jan 25, 2021 · e9ad8f1 · e9ad8f1
1 parent 3a1f788
commit e9ad8f1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
@@ -19,10 +19,10 @@ import { JOB_STATE, DATAFEED_STATE } from '../../../../../common/constants/state
 import { parseInterval } from '../../../../../common/util/parse_interval';
 import { mlCalendarService } from '../../../services/calendar_service';
 
-export function loadFullJob(jobId, excludeGenerated = false) {
+export function loadFullJob(jobId) {
   return new Promise((resolve, reject) => {
     ml.jobs
-      .jobs([jobId], excludeGenerated)
+      .jobs([jobId])
       .then((jobs) => {
         if (jobs.length) {
           resolve(jobs[0]);
@@ -201,13 +201,15 @@ export async function cloneJob(jobId) {
       loadJobForExport(jobId),
       loadFullJob(jobId, false),
     ]);
-    if (originalJob?.custom_settings?.created_by !== undefined) {
+    if (cloneableJob !== undefined && originalJob?.custom_settings?.created_by !== undefined) {
       // if the job is from a wizards, i.e. contains a created_by property
       // use tempJobCloningObjects to temporarily store the job
       // cloneableJob.custom_settings.created_by = originalJob?.custom_settings?.created_by;
 
       if (cloneableJob.custom_settings === undefined) {
-        cloneableJob.custom_settings = originalJob?.custom_settings;
+        cloneableJob.custom_settings = originalJob.custom_settings;
+      } else {
+        cloneableJob.custom_settings.created_by = originalJob.custom_settings.created_by;
       }
 
       mlJobService.tempJobCloningObjects.job = cloneableJob;

diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/jobs.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/jobs.ts
@@ -57,8 +57,8 @@ export const jobsApiProvider = (httpService: HttpService) => ({
     });
   },
 
-  jobs(jobIds: string[], excludeGenerated?: boolean) {
-    const body = JSON.stringify({ jobIds, excludeGenerated });
+  jobs(jobIds: string[]) {
+    const body = JSON.stringify({ jobIds });
     return httpService.http<CombinedJobWithStats[]>({
       path: `${basePath()}/jobs/jobs`,
       method: 'POST',

diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.ts b/x-pack/plugins/ml/server/models/job_service/jobs.ts
@@ -294,7 +294,7 @@ export function jobsProvider(client: IScopedClusterClient, mlClient: MlClient) {
     return jobs;
   }
 
-  async function createFullJobsList(jobIds: string[] = [], excludeGenerated = false) {
+  async function createFullJobsList(jobIds: string[] = []) {
     const jobs: CombinedJobWithStats[] = [];
     const groups: { [jobId: string]: string[] } = {};
     const datafeeds: { [id: string]: DatafeedWithStats } = {};
@@ -303,8 +303,6 @@ export function jobsProvider(client: IScopedClusterClient, mlClient: MlClient) {
 
     const jobIdsString = jobIds.join();
 
-    const datafeedParams = excludeGenerated ? { exclude_generated: excludeGenerated } : undefined;
-
     const [
       { body: jobResults },
       { body: jobStatsResults },
@@ -313,15 +311,11 @@ export function jobsProvider(client: IScopedClusterClient, mlClient: MlClient) {
       calendarResults,
       latestBucketTimestampByJob,
     ] = await Promise.all([
-      mlClient.getJobs<MlJobsResponse>(
-        jobIds.length > 0
-          ? { job_id: jobIdsString, exclude_generated: excludeGenerated }
-          : undefined
-      ),
+      mlClient.getJobs<MlJobsResponse>(jobIds.length > 0 ? { job_id: jobIdsString } : undefined),
       mlClient.getJobStats<MlJobsStatsResponse>(
         jobIds.length > 0 ? { job_id: jobIdsString } : undefined
       ),
-      mlClient.getDatafeeds<MlDatafeedsResponse>(datafeedParams),
+      mlClient.getDatafeeds<MlDatafeedsResponse>(),
       mlClient.getDatafeedStats<MlDatafeedsStatsResponse>(),
       calMngr.getAllCalendars(),
       getLatestBucketTimestampByJob(),

diff --git a/x-pack/plugins/ml/server/routes/job_service.ts b/x-pack/plugins/ml/server/routes/job_service.ts
@@ -329,8 +329,8 @@ export function jobServiceRoutes({ router, routeGuard }: RouteInitialization) {
     routeGuard.fullLicenseAPIGuard(async ({ client, mlClient, request, response }) => {
       try {
         const { createFullJobsList } = jobServiceProvider(client, mlClient);
-        const { jobIds, excludeGenerated } = request.body;
-        const resp = await createFullJobsList(jobIds, excludeGenerated);
+        const { jobIds } = request.body;
+        const resp = await createFullJobsList(jobIds);
 
         return response.ok({
           body: resp,