Merge pull request #1678 from spadgett/process-template-toasts

Merged by openshift-bot
openshift · Jun 12, 2017 · a33749d · a33749d
2 parents cdf2198 + def2450
commit a33749d
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 107 deletions.
diff --git a/app/scripts/controllers/newfromtemplate.js b/app/scripts/controllers/newfromtemplate.js
@@ -14,10 +14,10 @@ angular.module('openshiftConsole')
                        $parse,
                        $routeParams,
                        $scope,
-                       AlertMessageService,
                        CachedTemplateService,
                        DataService,
                        Navigate,
+                       NotificationsService,
                        ProjectsService) {
     var name = $routeParams.template;
 
@@ -34,9 +34,6 @@ angular.module('openshiftConsole')
       return;
     }
 
-    $scope.alerts = {};
-    $scope.precheckAlerts = {};
-
     $scope.breadcrumbs = [
       {
         title: $routeParams.project,
@@ -55,25 +52,21 @@ angular.module('openshiftConsole')
       }
     ];
 
-    $scope.alerts = $scope.alerts || {};
-    AlertMessageService.getAlerts().forEach(function(alert) {
-      $scope.alerts[alert.name] = alert.data;
-    });
-    AlertMessageService.clearAlerts();
-
     var displayName = $filter('displayName');
     var getValidTemplateParamsMap = function() {
       try {
         return JSON.parse($routeParams.templateParamsMap);
       } catch (e) {
-        $scope.alerts.invalidTemplateParams = {
+        NotificationsService.addNotification({
+          id: "template-params-invalid-json",
           type: "error",
-          message: "The templateParamsMap is not valid JSON. " + e
-        };
+          message: "Could not prefill parameter values.",
+          details: "The `templateParamsMap` URL parameter is not valid JSON. " + e
+        });
       }
     };
 
-    if($routeParams.templateParamsMap) {
+    if ($routeParams.templateParamsMap) {
       $scope.prefillParameters = getValidTemplateParamsMap();
     }
 

diff --git a/app/scripts/directives/processTemplate.js b/app/scripts/directives/processTemplate.js
@@ -8,6 +8,7 @@ angular.module('openshiftConsole').component('processTemplate', {
     '$uibModal',
     'DataService',
     'Navigate',
+    'NotificationsService',
     'ProcessedTemplateService',
     'QuotaService',
     'SecurityCheckService',
@@ -19,7 +20,6 @@ angular.module('openshiftConsole').component('processTemplate', {
   bindings: {
     template: '<',
     project: '<',
-    alerts: '<',
     prefillParameters: '<',
     isDialog: '<'
   },
@@ -32,6 +32,7 @@ function ProcessTemplate($filter,
                          $uibModal,
                          DataService,
                          Navigate,
+                         NotificationsService,
                          ProcessedTemplateService,
                          QuotaService,
                          SecurityCheckService,
@@ -152,16 +153,32 @@ function ProcessTemplate($filter,
     modalInstance.result.then(createResources);
   };
 
+  var alerts = {};
+  var hideNotificationErrors = function() {
+    NotificationsService.hideNotification("process-template-error");
+    _.each(alerts, function(alert) {
+      if (alert.id && (alert.type === 'error' || alert.type === 'warning')) {
+        NotificationsService.hideNotification(alert.id);
+      }
+    });
+  };
+
   var showWarningsOrCreate = function(result) {
-    var alerts = SecurityCheckService.getSecurityAlerts(processedResources, ctrl.selectedProject.metadata.name);
+    // Hide any previous notifications when form is resubmitted.
+    hideNotificationErrors();
+
+    alerts = SecurityCheckService.getSecurityAlerts(processedResources, ctrl.selectedProject.metadata.name);
 
     // Now that all checks are completed, show any Alerts if we need to
     var quotaAlerts = result.quotaAlerts || [];
     alerts = alerts.concat(quotaAlerts);
     var errorAlerts = _.filter(alerts, {type: 'error'});
     if (errorAlerts.length) {
       ctrl.disableInputs = false;
-      ctrl.precheckAlerts = alerts;
+      _.each(alerts, function(alert) {
+        alert.id = _.uniqueId('process-template-alert-');
+        NotificationsService.addNotification(alert);
+      });
     }
     else if (alerts.length) {
        launchConfirmationDialog(alerts);
@@ -217,12 +234,12 @@ function ProcessTemplate($filter,
           if (result.data && result.data.message) {
             details = result.data.message;
           }
-          ctrl.alerts["process"] =
-            {
-              type: "error",
-              message: "An error occurred processing the template.",
-              details: details
-            };
+          NotificationsService.addNotification({
+            id: "process-template-error",
+            type: "error",
+            message: "An error occurred processing the template.",
+            details: details
+          });
         }
       );
     }, function(result) {
@@ -231,18 +248,26 @@ function ProcessTemplate($filter,
       if (result.data && result.data.message) {
         details = result.data.message;
       }
-      ctrl.alerts["create-project"] = {
+      NotificationsService.addNotification({
+        id: "process-template-error",
         type: "error",
         message: "An error occurred creating the project.",
         details: details
-      };
+      });
     });
   };
 
+  // Only called when not in a dialog.
+  ctrl.cancel = function() {
+    hideNotificationErrors();
+    Navigate.toProjectOverview(ctrl.project.metadata.name);
+  };
+
   // When the process-template component is displayed in a dialog, the create
   // button is outside the component since it is in the wizard footer. Listen
   // for an event for when the button is clicked.
   $scope.$on('instantiateTemplate', ctrl.createFromTemplate);
+  $scope.$on('hideTemplateNotificationErrors', hideNotificationErrors);
 
   var shouldAddAppLabel = function() {
     // If the template defines its own app label, we don't need to add one at all

diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js
@@ -42,7 +42,6 @@
 
 
     ctrl.$onInit = function() {
-      ctrl.alerts = {};
       ctrl.loginBaseUrl = DataService.openshiftAPIBaseUrl();
     };
 
@@ -80,6 +79,8 @@
     };
 
     ctrl.close = function() {
+      $scope.$broadcast('hideTemplateNotificationErrors');
+
       var cb = ctrl.onDialogClosed();
       if (_.isFunction(cb)) {
         cb();

diff --git a/app/views/directives/process-template-dialog/process-template-config.html b/app/views/directives/process-template-dialog/process-template-config.html
@@ -1,6 +1,5 @@
 <div class="osc-form">
-  <alerts alerts="$ctrl.alerts"></alerts>
   <form name="$ctrl.form">
-    <process-template template="$ctrl.template" alerts="$ctrl.alerts" is-dialog="true"></process-template>
+    <process-template template="$ctrl.template" is-dialog="true"></process-template>
   </form>
 </div>
diff --git a/app/views/directives/process-template.html b/app/views/directives/process-template.html
@@ -17,10 +17,9 @@
         can-toggle="false"
         help-text="Each label is applied to each created resource.">
     </label-editor>
-    <alerts alerts="$ctrl.precheckAlerts"></alerts>
     <div ng-if="!$ctrl.isDialog" class="buttons gutter-top-bottom">
       <button class="btn btn-primary btn-lg" ng-click="$ctrl.createFromTemplate()" ng-disabled="$ctrl.templateForm.$invalid || $ctrl.disableInputs">Create</button>
-      <a class="btn btn-default btn-lg" ng-href="{{$ctrl.project | projectOverviewURL}}">Cancel</a>
+      <a class="btn btn-default btn-lg" href="" ng-click="$ctrl.cancel()" role="button">Cancel</a>
     </div>
   </ng-form>
 </fieldset>
diff --git a/app/views/newfromtemplate.html b/app/views/newfromtemplate.html
@@ -16,7 +16,6 @@
                   Loading...
                 </div>
                 <div ng-if="template" class="row osc-form">
-                  <alerts alerts="alerts"></alerts>
                   <div class="col-md-2 icon hidden-sm hidden-xs">
                     <custom-icon resource="template" kind="template"></custom-icon>
                   </div>
@@ -43,7 +42,6 @@ <h2>Images</h2>
                     <process-template
                         project="project"
                         template="template"
-                        alerts="alerts"
                         prefill-parameters="prefillParameters">
                     </process-template>
                   </div>