Bug 1505281 - Improve import YAML results message

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1505281
openshift · Nov 1, 2017 · 8f54306 · 8f54306
1 parent ae37501
commit 8f54306
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 21 deletions.
diff --git a/app/scripts/directives/create/nextSteps.js b/app/scripts/directives/create/nextSteps.js
@@ -15,14 +15,19 @@
       createdBuildConfig: '<',
       onContinue: '<',
       showProjectName: '<',
-      name: '<'
+      // Optional kind to show in front of the name
+      kind: '<?',
+      name: '<',
+      // Optional action to use instead of "created" (for example, "imported")
+      actionLabel: '<?'
     },
     templateUrl: 'views/directives/next-steps.html'
   });
 
   function NextSteps(ProcessedTemplateService, Navigate) {
     var ctrl = this;
     ctrl.showParamsTable = false;
+    ctrl.actionLabel = ctrl.actionLabel || 'created';
 
     var processedTemplateData = ProcessedTemplateService.getTemplateData();
     ctrl.parameters = processedTemplateData.params;

diff --git a/app/scripts/directives/fromFile.js b/app/scripts/directives/fromFile.js
@@ -302,7 +302,9 @@ angular.module("openshiftConsole")
           }
           else if ($scope.isDialog) {
             $scope.$emit('fileImportedFromYAMLOrJSON', {
-              project: $scope.input.selectedProject
+              project: $scope.input.selectedProject,
+              resource: $scope.resource,
+              isList: $scope.isList
             });
           }
           else {

diff --git a/app/scripts/directives/fromFileDialog.js b/app/scripts/directives/fromFileDialog.js
@@ -62,7 +62,14 @@
       ctrl.vendor = annotation(message.template, "openshift.io/provider-display-name");
       ctrl.docUrl = annotation(ctrl.template, "openshift.io/documentation-url");
       ctrl.supportUrl = annotation(ctrl.template, "openshift.io/support-url");
-      ctrl.name = "YAML / JSON";
+      ctrl.actionLabel = "imported";
+      if (message.isList) {
+        ctrl.name = "YAML / JSON";
+        ctrl.kind = null;
+      } else if (message.resource) {
+        ctrl.kind = message.resource.kind;
+        ctrl.name = message.resource.metadata.name;
+      }
       // 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() {
@@ -73,6 +80,8 @@
     $scope.$on('templateInstantiated', function(event, message) {
       ctrl.selectedProject = message.project;
       ctrl.name = $filter('displayName')(ctrl.template);
+      ctrl.actionLabel = null;
+      ctrl.kind = null;
       ctrl.currentStep = "Results";
     });
 

diff --git a/app/views/directives/from-file-dialog.html b/app/views/directives/from-file-dialog.html
@@ -98,7 +98,9 @@
                       login-base-url="$ctrl.loginBaseUrl"
                       on-continue="$ctrl.close"
                       show-project-name="$ctrl.showProjectName"
-                      name="$ctrl.name">
+                      kind="$ctrl.kind"
+                      name="$ctrl.name"
+                      action-label="$ctrl.actionLabel">
           </next-steps>
         </div>
       </div>

diff --git a/app/views/directives/next-steps.html b/app/views/directives/next-steps.html
@@ -5,7 +5,8 @@
       <span class="sr-only">Pending</span>
       <div class="results-message">
         <h1 class="h3">
-          <strong>{{$ctrl.name}}</strong> is being created<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong></span>.
+          <span ng-if="$ctrl.kind">{{$ctrl.kind | humanizeKind | upperFirst}}</span>
+          <strong>{{$ctrl.name}}</strong> is being {{$ctrl.actionLabel}}<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong></span>.
         </h1>
       </div>
     </div>
@@ -16,17 +17,21 @@ <h1 class="h3">
       <span class="sr-only">Error</span>
       <div class="results-message">
         <h1 class="h3">
-          <strong>{{$ctrl.name}}</strong> failed to be created<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong></span>.
+          <span ng-if="$ctrl.kind">{{$ctrl.kind | humanizeKind | upperFirst}}</span>
+          <strong>{{$ctrl.name}}</strong> failed to be {{$ctrl.actionLabel}}<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong></span>.
         </h1>
       </div>
     </div>
   </div>
-  <!-- if the user refreshes the next steps page -->
+  <!-- Import YAML of a single resource. -->
   <div ng-if="!tasks().length">
-    <div class="results-status results-status-unknown">
+    <div class="results-status">
+      <span class="pficon pficon-ok" aria-hidden="true"></span>
+      <span class="sr-only">Success</span>
       <div class="results-message">
         <h1 class="h3">
-          <strong>{{$ctrl.name}}</strong> completed.
+          <span ng-if="$ctrl.kind">{{$ctrl.kind | humanizeKind | upperFirst}}</span>
+          <strong>{{$ctrl.name}}</strong> has been {{$ctrl.actionLabel}}<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.
         </h1>
       </div>
     </div>
@@ -37,7 +42,8 @@ <h1 class="h3">
       <span class="sr-only">Success</span>
       <div class="results-message">
         <h1 class="h3">
-          <strong>{{$ctrl.name}}</strong> has been created<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.
+          <span ng-if="$ctrl.kind">{{$ctrl.kind | humanizeKind | upperFirst}}</span>
+          <strong>{{$ctrl.name}}</strong> has been {{$ctrl.actionLabel}}<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.
         </h1>
       </div>
     </div>

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -9525,7 +9525,9 @@ template: p.resource
 }) : (n = p.templateOptions.add || p.updateResources.length > 0 ? p.input.selectedProject.metadata.name : "", e = s.createFromTemplateURL(p.resource, p.input.selectedProject.metadata.name, {
 namespace: n
 }), t.url(e)) : p.isDialog ? p.$emit("fileImportedFromYAMLOrJSON", {
-project: p.input.selectedProject
+project: p.input.selectedProject,
+resource: p.resource,
+isList: p.isList
 }) : (e = s.projectOverviewURL(p.input.selectedProject.metadata.name), t.url(e));
 }
 function C(e) {
@@ -13369,11 +13371,11 @@ e.$broadcast("importFileFromYAMLOrJSON");
 }, s.instantiateTemplate = function() {
 e.$broadcast("instantiateTemplate");
 }, e.$on("fileImportedFromYAMLOrJSON", function(e, n) {
-s.selectedProject = n.project, s.template = n.template, s.iconClass = o(), s.image = i(), s.vendor = c(n.template, "openshift.io/provider-display-name"), s.docUrl = c(s.template, "openshift.io/documentation-url"), s.supportUrl = c(s.template, "openshift.io/support-url"), s.name = "YAML / JSON", t(function() {
+s.selectedProject = n.project, s.template = n.template, s.iconClass = o(), s.image = i(), s.vendor = c(n.template, "openshift.io/provider-display-name"), s.docUrl = c(s.template, "openshift.io/documentation-url"), s.supportUrl = c(s.template, "openshift.io/support-url"), s.actionLabel = "imported", n.isList ? (s.name = "YAML / JSON", s.kind = null) : n.resource && (s.kind = n.resource.kind, s.name = n.resource.metadata.name), t(function() {
 s.currentStep = s.template ? "Template Configuration" : "Results";
 }, 0);
 }), e.$on("templateInstantiated", function(e, t) {
-s.selectedProject = t.project, s.name = a("displayName")(s.template), s.currentStep = "Results";
+s.selectedProject = t.project, s.name = a("displayName")(s.template), s.actionLabel = null, s.kind = null, s.currentStep = "Results";
 }), s.close = function() {
 s.template = null;
 var e = s.onDialogClosed();
@@ -13408,7 +13410,7 @@ e.hasErrors && t.push(e);
 }), t;
 }
 var r = this;
-r.showParamsTable = !1;
+r.showParamsTable = !1, r.actionLabel = r.actionLabel || "created";
 var o = e.getTemplateData();
 r.parameters = o.params, r.templateMessage = o.message, e.clearTemplateData();
 var i = function(e) {
@@ -13437,7 +13439,9 @@ fromSampleRepo: "<",
 createdBuildConfig: "<",
 onContinue: "<",
 showProjectName: "<",
-name: "<"
+kind: "<?",
+name: "<",
+actionLabel: "<?"
 },
 templateUrl: "views/directives/next-steps.html"
 });

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -7222,7 +7222,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"order-service-config\">\n" +
     "<div class=\"wizard-pf-main-form-contents\">\n" +
     "\n" +
-    "<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\" show-project-name=\"$ctrl.showProjectName\" name=\"$ctrl.name\">\n" +
+    "<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\" show-project-name=\"$ctrl.showProjectName\" kind=\"$ctrl.kind\" name=\"$ctrl.name\" action-label=\"$ctrl.actionLabel\">\n" +
     "</next-steps>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -7776,7 +7776,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"sr-only\">Pending</span>\n" +
     "<div class=\"results-message\">\n" +
     "<h1 class=\"h3\">\n" +
-    "<strong>{{$ctrl.name}}</strong> is being created<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong></span>.\n" +
+    "<span ng-if=\"$ctrl.kind\">{{$ctrl.kind | humanizeKind | upperFirst}}</span>\n" +
+    "<strong>{{$ctrl.name}}</strong> is being {{$ctrl.actionLabel}}<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong></span>.\n" +
     "</h1>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -7787,17 +7788,21 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"sr-only\">Error</span>\n" +
     "<div class=\"results-message\">\n" +
     "<h1 class=\"h3\">\n" +
-    "<strong>{{$ctrl.name}}</strong> failed to be created<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong></span>.\n" +
+    "<span ng-if=\"$ctrl.kind\">{{$ctrl.kind | humanizeKind | upperFirst}}</span>\n" +
+    "<strong>{{$ctrl.name}}</strong> failed to be {{$ctrl.actionLabel}}<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong></span>.\n" +
     "</h1>\n" +
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +
     "\n" +
     "<div ng-if=\"!tasks().length\">\n" +
-    "<div class=\"results-status results-status-unknown\">\n" +
+    "<div class=\"results-status\">\n" +
+    "<span class=\"pficon pficon-ok\" aria-hidden=\"true\"></span>\n" +
+    "<span class=\"sr-only\">Success</span>\n" +
     "<div class=\"results-message\">\n" +
     "<h1 class=\"h3\">\n" +
-    "<strong>{{$ctrl.name}}</strong> completed.\n" +
+    "<span ng-if=\"$ctrl.kind\">{{$ctrl.kind | humanizeKind | upperFirst}}</span>\n" +
+    "<strong>{{$ctrl.name}}</strong> has been {{$ctrl.actionLabel}}<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.\n" +
     "</h1>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -7808,7 +7813,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"sr-only\">Success</span>\n" +
     "<div class=\"results-message\">\n" +
     "<h1 class=\"h3\">\n" +
-    "<strong>{{$ctrl.name}}</strong> has been created<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.\n" +
+    "<span ng-if=\"$ctrl.kind\">{{$ctrl.kind | humanizeKind | upperFirst}}</span>\n" +
+    "<strong>{{$ctrl.name}}</strong> has been {{$ctrl.actionLabel}}<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.\n" +
     "</h1>\n" +
     "</div>\n" +
     "</div>\n" +