Making next steps/results messaging consistent

openshift · Sep 29, 2017 · 6f50f95 · 6f50f95
1 parent 8498bca
commit 6f50f95
Show file tree

Hide file tree

Showing 19 changed files with 339 additions and 266 deletions.
diff --git a/app/scripts/controllers/create/nextSteps.js b/app/scripts/controllers/create/nextSteps.js
@@ -33,6 +33,7 @@ angular.module("openshiftConsole")
 
     $scope.projectName = $routeParams.project;
     $scope.fromSampleRepo = $routeParams.fromSample;
+    $scope.name = $routeParams.breadcrumbTitle || $routeParams.name;
 
     $scope.breadcrumbs = [
       {

diff --git a/app/scripts/directives/create/nextSteps.js b/app/scripts/directives/create/nextSteps.js
@@ -13,7 +13,10 @@
       loginBaseUrl: '<',
       fromSampleRepo: '<',
       createdBuildConfig: '<',
-      onContinue: '<'
+      onContinue: '<',
+      showProjectName: '<',
+      name: '<',
+      isDialog: '<'
     },
     templateUrl: 'views/directives/next-steps.html'
   });

diff --git a/app/scripts/directives/deployImageDialog.js b/app/scripts/directives/deployImageDialog.js
@@ -4,6 +4,7 @@
   angular.module('openshiftConsole').component('deployImageDialog', {
     controller: [
       '$scope',
+      '$routeParams',
       'DataService',
       DeployImageDialog
     ],
@@ -16,12 +17,16 @@
     templateUrl: 'views/directives/deploy-image-dialog.html'
   });
 
-  function DeployImageDialog($scope, DataService) {
+  function DeployImageDialog($scope, $routeParams, DataService) {
     var ctrl = this;
 
     ctrl.$onInit = function() {
       ctrl.loginBaseUrl = DataService.openshiftAPIBaseUrl();
       ctrl.currentStep = "Image";
+      // if on the landing page, show the project name in next-steps
+      if (!$routeParams.project) {
+        ctrl.showProjectName = true;
+      }
     };
 
     ctrl.deployImage = function() {
@@ -30,6 +35,7 @@
 
     $scope.$on('deployImageNewAppCreated', function(event, message) {
       ctrl.selectedProject = message.project;
+      ctrl.appName = message.appName;
       ctrl.deployImageNewAppCreated = true;
       ctrl.currentStep = "Results";
     });

diff --git a/app/scripts/directives/fromFile.js b/app/scripts/directives/fromFile.js
@@ -350,11 +350,14 @@ angular.module("openshiftConsole")
             DataService.create(APIService.kindToResource(resource.kind), null, resource, {namespace: $scope.input.selectedProject.metadata.name}).then(
               // create resource success
               function() {
-                var kind = humanizeKind(resource.kind);
-                NotificationsService.addNotification({
-                  type: "success",
-                  message: _.capitalize(kind) + " " + resource.metadata.name + " was successfully created."
-                });
+                if (!$scope.isDialog) {
+                  var kind = humanizeKind(resource.kind);
+                  NotificationsService.addNotification({
+                    type: "success",
+                    message: _.capitalize(kind) + " " + resource.metadata.name + " was successfully created."
+                  });
+                }
+
                 redirect();
               },
               // create resource failure
@@ -371,11 +374,14 @@ angular.module("openshiftConsole")
             DataService.update(APIService.kindToResource(resource.kind), resource.metadata.name, resource, {namespace: $scope.input.selectedProject.metadata.name}).then(
               // update resource success
               function() {
-                var kind = humanizeKind(resource.kind);
-                NotificationsService.addNotification({
-                  type: "success",
-                  message: _.capitalize(kind) + " " + resource.metadata.name + " was successfully updated."
-                });
+                if (!$scope.isDialog) {
+                  var kind = humanizeKind(resource.kind);
+                  NotificationsService.addNotification({
+                    type: "success",
+                    message: _.capitalize(kind) + " " + resource.metadata.name + " was successfully updated."
+                  });
+                }
+
                 redirect();
               },
               // update resource failure

diff --git a/app/scripts/directives/fromFileDialog.js b/app/scripts/directives/fromFileDialog.js
@@ -5,6 +5,8 @@
     controller: [
       '$scope',
       '$timeout',
+      '$routeParams',
+      '$filter',
       'DataService',
       FromFileDialog
     ],
@@ -17,12 +19,16 @@
     templateUrl: 'views/directives/from-file-dialog.html'
   });
 
-  function FromFileDialog($scope, $timeout, DataService) {
+  function FromFileDialog($scope, $timeout, $routeParams, $filter, DataService) {
     var ctrl = this;
 
     ctrl.$onInit = function() {
       ctrl.alerts = {};
       ctrl.loginBaseUrl = DataService.openshiftAPIBaseUrl();
+      // if on the landing page, show the project name in next-steps
+      if (!$routeParams.project) {
+        ctrl.showProjectName = true;
+      }
     };
 
     function getIconClass() {
@@ -42,6 +48,7 @@
       ctrl.selectedProject = message.project;
       ctrl.template = message.template;
       ctrl.iconClass = getIconClass();
+      ctrl.name = "YAML / JSON";
       // Need to let the current digest loop finish so the template config step becomes visible or the wizard will throw an error
       // from the change to currentStep
       $timeout(function() {
@@ -51,6 +58,7 @@
 
     $scope.$on('templateInstantiated', function(event, message) {
       ctrl.selectedProject = message.project;
+      ctrl.name = $filter('displayName')(ctrl.template);
       ctrl.currentStep = "Results";
     });
 
@@ -73,7 +81,7 @@
       }
     };
 
-    ctrl.currentStep = "JSON / YAML";
+    ctrl.currentStep = "YAML / JSON";
 
     ctrl.nextCallback = function (step) {
       if (step.stepId === 'file') {

diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js
@@ -5,6 +5,7 @@
     controller: [
       '$scope',
       '$filter',
+      '$routeParams',
       'Catalog',
       'DataService',
       'KeywordService',
@@ -25,6 +26,7 @@
 
   function ProcessTemplateDialog($scope,
                                  $filter,
+                                 $routeParams,
                                  Catalog,
                                  DataService,
                                  KeywordService,
@@ -78,7 +80,6 @@
       onShow: showResults
     };
 
-
     ctrl.$onInit = function() {
       ctrl.loginBaseUrl = DataService.openshiftAPIBaseUrl();
       ctrl.preSelectedProject = ctrl.selectedProject = ctrl.project;
@@ -113,6 +114,10 @@
         appliedFilters: [],
         onFilterChange: filterChange
       };
+      // if on the landing page, show the project name in next-steps
+      if (!$routeParams.project) {
+        ctrl.showProjectName = true;
+      }
     };
 
     ctrl.$onChanges = function(changes) {

diff --git a/app/styles/_core.less b/app/styles/_core.less
@@ -703,16 +703,13 @@ label.checkbox {
 }
 
 .template-message {
-  background-color: #d9edf7;
-  border-color: #31708f;
-  border-style: solid;
-  border-width: 1px;
-  color: black;
+  background-color: transparent;
+  border: 1px solid @color-pf-black-300;
   .resource-description {
-    margin-bottom: 0;
     font-family: @font-family-monospace;
     // Consistent font-size with the CLI examples in code blocks below the template message.
     font-size: (@font-size-base - 1);
+    margin-bottom: 0;
   }
 }
 

diff --git a/app/views/create/next-steps.html b/app/views/create/next-steps.html
@@ -1,15 +1,16 @@
   <div class="middle surface-shaded">
-        <div class="middle-content">
-          <div class="container-fluid next-steps">
-            <breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
+    <div class="middle-content">
+      <div class="container-fluid next-steps">
+        <breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
 
-            <next-steps
-              project="project"
-              project-name="projectName"
-              login-base-url="loginBaseUrl"
-              from-sample-repo="fromSampleRepo"
-              created-build-config="createdBuildConfig"></next-steps>
+        <next-steps
+          project="project"
+          project-name="projectName"
+          login-base-url="loginBaseUrl"
+          from-sample-repo="fromSampleRepo"
+          created-build-config="createdBuildConfig"
+          name="name"></next-steps>
 
-          </div>
-        </div><!-- /middle-content -->
+      </div>
+    </div><!-- /middle-content -->
   </div><!-- /middle -->
diff --git a/app/views/directives/deploy-image-dialog.html b/app/views/directives/deploy-image-dialog.html
@@ -41,7 +41,10 @@
           <next-steps project="$ctrl.selectedProject"
                       project-name="$ctrl.selectedProject.metadata.name"
                       login-base-url="$ctrl.loginBaseUrl"
-                      on-continue="$ctrl.close">
+                      on-continue="$ctrl.close"
+                      show-project-name="$ctrl.showProjectName"
+                      name="$ctrl.appName"
+                      is-dialog="true">
           </next-steps>
         </div>
       </div>

diff --git a/app/views/directives/from-file-dialog.html b/app/views/directives/from-file-dialog.html
@@ -10,7 +10,7 @@
      on-step-changed="$ctrl.stepChanged(step)"
      step-class="order-service-wizard-step">
   <pf-wizard-step
-       step-title="JSON / YAML"
+       step-title="YAML / JSON"
        step-id="file"
        step-priority="1"
        substeps="false"
@@ -84,7 +84,10 @@
           <next-steps ng-if="$ctrl.currentStep === 'Results'" project="$ctrl.selectedProject"
                       project-name="$ctrl.selectedProject.metadata.name"
                       login-base-url="$ctrl.loginBaseUrl"
-                      on-continue="$ctrl.close">
+                      on-continue="$ctrl.close"
+                      show-project-name="$ctrl.showProjectName"
+                      name="$ctrl.name"
+                      is-dialog="true">
           </next-steps>
         </div>
       </div>