[ML] Adds $applyAsync calls to angular based new jobs pages (#28325)

* [ML] Adds $applyAsync calls to angular based new jobs pages * removing tab character * removing tab characters
elastic · Jan 9, 2019 · 22877eb · 22877eb
1 parent 68a7cbd
commit 22877eb
Show file tree

Hide file tree

Showing 13 changed files with 124 additions and 48 deletions.
diff --git a/x-pack/plugins/ml/public/file_datavisualizer/file_datavisualizer_directive.js b/x-pack/plugins/ml/public/file_datavisualizer/file_datavisualizer_directive.js
@@ -18,7 +18,6 @@ import { checkFindFileStructurePrivilege } from 'plugins/ml/privilege/check_priv
 import { getMlNodeCount } from 'plugins/ml/ml_nodes_check/check_ml_nodes';
 import { loadNewJobDefaults } from 'plugins/ml/jobs/new_job/utils/new_job_defaults';
 import { loadIndexPatterns } from '../util/index_utils';
-import { initPromise } from 'plugins/ml/util/promise';
 import { FileDataVisualizerPage } from './file_datavisualizer';
 
 import uiRoutes from 'ui/routes';
@@ -35,7 +34,6 @@ uiRoutes
       indexPatterns: loadIndexPatterns,
       mlNodeCount: getMlNodeCount,
       loadNewJobDefaults,
-      initPromise: initPromise(true)
     }
   });
 

diff --git a/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js b/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js
@@ -38,7 +38,6 @@ import {
 import { mlJobService } from 'plugins/ml/services/job_service';
 import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service';
 import { ml } from 'plugins/ml/services/ml_api_service';
-import { initPromise } from 'plugins/ml/util/promise';
 
 uiRoutes
   .when('/jobs/new_job/advanced', {
@@ -52,7 +51,6 @@ uiRoutes
       savedSearch: loadCurrentSavedSearch,
       checkMlNodesAvailable,
       loadNewJobDefaults,
-      initPromise: initPromise(true)
     }
   })
   .when('/jobs/new_job/advanced/:jobId', {
@@ -66,7 +64,6 @@ uiRoutes
       savedSearch: loadCurrentSavedSearch,
       checkMlNodesAvailable,
       loadNewJobDefaults,
-      initPromise: initPromise(true)
     }
   });
 
@@ -389,6 +386,9 @@ module.controller('MlNewJob',
       loadFields()
         .catch(() => {
           // No need to do anything here as loadFields handles the displaying of any errors.
+        })
+        .then(() => {
+          $scope.$applyAsync();
         });
     };
 
@@ -826,6 +826,9 @@ module.controller('MlNewJob',
             }
           );
           $scope.ui.cardinalityValidator.status = STATUS.FAILED;
+        })
+        .then(() => {
+          $scope.$applyAsync();
         });
     }
 
@@ -1122,6 +1125,9 @@ module.controller('MlNewJob',
       getCustomUrlSelection();
       getCategorizationFilterSelection();
       $scope.ui.jsonText = angular.toJson($scope.job, true);
+      setTimeout(() => {
+        $scope.$applyAsync();
+      }, 0);
     }
 
     // add new custom URL
@@ -1389,11 +1395,15 @@ module.controller('MlNewJob',
           })
           .catch(function (resp) {
             $scope.ui.dataPreview = angular.toJson(resp, true);
+          })
+          .then(() => {
+            $scope.$applyAsync();
           });
       } else {
         $scope.ui.dataPreview = i18n('xpack.ml.newJob.advanced.dataPreview.datafeedDoesNotExistLabel', {
           defaultMessage: 'Datafeed does not exist'
         });
+        $scope.$applyAsync();
       }
     }
 

diff --git a/...c/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_directive.js b/...c/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_directive.js
@@ -40,11 +40,13 @@ module.directive('mlBucketSpanEstimator', function (i18n) {
         console.log('Bucket span could not be estimated', error);
         $scope.ui.bucketSpanEstimator.status = STATUS.FAILED;
         $scope.ui.bucketSpanEstimator.message = 'Bucket span could not be estimated';
+        $scope.$applyAsync();
       };
 
       $scope.guessBucketSpan = function () {
         $scope.ui.bucketSpanEstimator.status = STATUS.RUNNING;
         $scope.ui.bucketSpanEstimator.message = '';
+        $scope.$applyAsync();
 
         // we need to create a request object here because $scope.formConfig
         // includes objects with methods which might break the required
@@ -91,6 +93,7 @@ module.directive('mlBucketSpanEstimator', function (i18n) {
             if (notify && typeof $scope.bucketSpanFieldChange === 'function') {
               $scope.bucketSpanFieldChange();
             }
+            $scope.$applyAsync();
           })
           .catch(errorHandler);
       };

diff --git a/..._job/simple/components/enable_model_plot_checkbox/enable_model_plot_checkbox_directive.js b/..._job/simple/components/enable_model_plot_checkbox/enable_model_plot_checkbox_directive.js
@@ -77,7 +77,10 @@ module.directive('mlEnableModelPlotCheckbox', function (i18n) {
               $scope.ui.showAdvanced = true;
             }
           })
-          .catch(errorHandler);
+          .catch(errorHandler)
+          .then(() => {
+            $scope.$applyAsync();
+          });
       }
 
       // Re-validate cardinality for updated fields/splitField

diff --git a/...ml/public/jobs/new_job/simple/components/post_save_options/post_save_options_directive.js b/...ml/public/jobs/new_job/simple/components/post_save_options/post_save_options_directive.js
@@ -43,7 +43,11 @@ module.directive('mlPostSaveOptions', function (Private, i18n) {
       };
 
       $scope.apply = function () {
-        postSaveService.apply($scope.jobId, $scope.runInRealtime, $scope.createWatch, i18n);
+        postSaveService.apply($scope.jobId, $scope.runInRealtime, $scope.createWatch, i18n)
+          .catch()
+          .then(() => {
+            $scope.$applyAsync();
+          });
       };
     }
   };

diff --git a/...k/plugins/ml/public/jobs/new_job/simple/components/post_save_options/post_save_service.js b/...k/plugins/ml/public/jobs/new_job/simple/components/post_save_options/post_save_service.js
@@ -37,7 +37,8 @@ class PostSaveService {
       const datafeedId = mlJobService.getDatafeedId(jobId);
 
       mlJobService.openJob(jobId)
-        .finally(() => {
+        .catch()
+        .then(() => {
           mlJobService.startDatafeed(datafeedId, jobId, 0, undefined)
             .then(() => {
               this.status.realtimeJob = this.STATUS.SAVED;
@@ -56,14 +57,24 @@ class PostSaveService {
   }
 
   apply(jobId, runInRealtime, createWatch, i18n) {
-    if (runInRealtime) {
-      this.startRealtimeJob(jobId, i18n)
-        .then(() => {
-          if (createWatch) {
-            mlCreateWatchService.createNewWatch(jobId);
-          }
-        });
-    }
+    return new Promise((resolve) => {
+      if (runInRealtime) {
+        this.startRealtimeJob(jobId, i18n)
+          .then(() => {
+            if (createWatch) {
+              mlCreateWatchService.createNewWatch(jobId)
+                .catch()
+                .then(() => {
+                  resolve();
+                });
+            } else {
+              resolve();
+            }
+          });
+      } else {
+        resolve();
+      }
+    });
   }
 }
 

diff --git a/x-pack/plugins/ml/public/jobs/new_job/simple/components/watcher/create_watch_directive.js b/x-pack/plugins/ml/public/jobs/new_job/simple/components/watcher/create_watch_directive.js
@@ -48,11 +48,13 @@ module.directive('mlCreateWatch', function () {
       }
 
       // load elasticsearch settings to see if email has been configured
-      ml.getNotificationSettings().then((resp) => {
-        if (_.has(resp, 'defaults.xpack.notification.email')) {
-          $scope.ui.emailEnabled = true;
-        }
-      });
+      ml.getNotificationSettings()
+        .then((resp) => {
+          if (_.has(resp, 'defaults.xpack.notification.email')) {
+            $scope.ui.emailEnabled = true;
+            $scope.$applyAsync();
+          }
+        });
 
       // check to see whether a watch for this job has already been created.
       // display a warning if it has.
@@ -62,6 +64,9 @@ module.directive('mlCreateWatch', function () {
         })
         .catch(() => {
           $scope.ui.watchAlreadyExists = false;
+        })
+        .then(() => {
+          $scope.$applyAsync();
         });
     }
   };

diff --git a/...ck/plugins/ml/public/jobs/new_job/simple/multi_metric/create_job/create_job_controller.js b/...ck/plugins/ml/public/jobs/new_job/simple/multi_metric/create_job/create_job_controller.js
@@ -40,7 +40,6 @@ import { preLoadJob } from 'plugins/ml/jobs/new_job/simple/components/utils/prep
 import { MultiMetricJobServiceProvider } from './create_job_service';
 import { FullTimeRangeSelectorServiceProvider } from 'plugins/ml/components/full_time_range_selector/full_time_range_selector_service';
 import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service';
-import { initPromise } from 'plugins/ml/util/promise';
 import { ml } from 'plugins/ml/services/ml_api_service';
 import template from './create_job.html';
 import { timefilter } from 'ui/timefilter';
@@ -56,7 +55,6 @@ uiRoutes
       savedSearch: loadCurrentSavedSearch,
       checkMlNodesAvailable,
       loadNewJobDefaults,
-      initPromise: initPromise(true)
     }
   });
 
@@ -351,20 +349,21 @@ module
 
       mlMultiMetricJobService.clearChartData();
 
-      // $scope.chartStates.eventRate = CHART_STATE.LOADING;
       setFieldsChartStates(CHART_STATE.LOADING);
 
       if (Object.keys($scope.formConfig.fields).length) {
         $scope.ui.showFieldCharts = true;
         mlMultiMetricJobService.getLineChartResults($scope.formConfig, thisLoadTimestamp)
           .then((resp) => {
+            $scope.$applyAsync();
             loadDocCountData(resp.detectors);
           })
           .catch((resp) => {
             msgs.error(resp.message);
             _.each($scope.formConfig.fields, (field, id) => {
               $scope.chartStates.fields[id] = CHART_STATE.NO_RESULTS;
             });
+            $scope.$applyAsync();
           });
       } else {
         $scope.ui.showFieldCharts = false;
@@ -382,13 +381,16 @@ module
 
               $scope.chartData.lastLoadTimestamp = null;
               chartDataUtils.updateChartMargin($scope.chartData);
-              $scope.$broadcast('render');
               $scope.chartStates.eventRate = (resp.totalResults) ? CHART_STATE.LOADED : CHART_STATE.NO_RESULTS;
+              $scope.$broadcast('render');
             }
           })
           .catch((resp) => {
             $scope.chartStates.eventRate = CHART_STATE.NO_RESULTS;
             msgs.error(resp.message);
+          })
+          .then(() => {
+            $scope.$applyAsync();
           });
       }
     };
@@ -397,6 +399,7 @@ module
       _.each($scope.chartStates.fields, (chart, key) => {
         $scope.chartStates.fields[key] = state;
       });
+      $scope.$applyAsync();
     }
 
     function showSparseDataCheckbox() {
@@ -508,7 +511,6 @@ module
                 // as it may have failed because we've hit the limit of open jobs
                 saveNewDatafeed(job, false);
               });
-
           })
           .catch((resp) => {
             // save failed
@@ -518,6 +520,7 @@ module
               }),
               resp.resp
             );
+            $scope.$applyAsync();
           });
       } else {
         // show the advanced section as the model memory limit is invalid
@@ -532,7 +535,6 @@ module
       function saveNewDatafeed(job, startDatafeedAfterSave) {
         mlJobService.saveNewDatafeed(job.datafeed_config, job.job_id)
           .then(() => {
-
             if (startDatafeedAfterSave) {
               mlMultiMetricJobService.startDatafeed($scope.formConfig)
                 .then(() => {
@@ -566,7 +568,12 @@ module
                     }),
                     resp
                   );
+                })
+                .then(() => {
+                  $scope.$applyAsync();
                 });
+            } else {
+              $scope.$applyAsync();
             }
           })
           .catch((resp) => {
@@ -576,6 +583,7 @@ module
               }),
               resp
             );
+            $scope.$applyAsync();
           });
       }
     };
@@ -596,6 +604,7 @@ module
           .then((state) => {
             if (state === 'stopped') {
               console.log('Stopping poll because datafeed state is: ' + state);
+              $scope.$applyAsync();
               $scope.$broadcast('render-results');
               forceStop = true;
             }
@@ -642,6 +651,7 @@ module
       // fade the bar chart once we have results
         toggleSwimlaneVisibility();
       }
+      $scope.$applyAsync();
       $scope.$broadcast('render-results');
     }
 
@@ -693,7 +703,11 @@ module
     $scope.stopJob = function () {
     // setting the status to STOPPING disables the stop button
       $scope.jobState = JOB_STATE.STOPPING;
-      mlMultiMetricJobService.stopDatafeed($scope.formConfig);
+      mlMultiMetricJobService.stopDatafeed($scope.formConfig)
+        .catch()
+        .then(() => {
+          $scope.$applyAsync();
+        });
     };
 
     $scope.moveToAdvancedJobCreation = function () {