From 3a1297ef7c87b7ca80960d9b543dc4a0e496acdf Mon Sep 17 00:00:00 2001
From: Jakub Hadvig <jhadvig@redhat.com>
Date: Wed, 1 Nov 2017 13:00:07 +0100
Subject: [PATCH] Show proper type of imported item in import wizard results

---
 app/scripts/directives/fromFile.js       | 3 ++-
 app/scripts/directives/fromFileDialog.js | 2 +-
 dist/scripts/scripts.js                  | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/scripts/directives/fromFile.js b/app/scripts/directives/fromFile.js
index f395520c97..0709a1a617 100644
--- a/app/scripts/directives/fromFile.js
+++ b/app/scripts/directives/fromFile.js
@@ -302,7 +302,8 @@ angular.module("openshiftConsole")
           }
           else if ($scope.isDialog) {
             $scope.$emit('fileImportedFromYAMLOrJSON', {
-              project: $scope.input.selectedProject
+              project: $scope.input.selectedProject,
+              resource: $scope.resource
             });
           }
           else {
diff --git a/app/scripts/directives/fromFileDialog.js b/app/scripts/directives/fromFileDialog.js
index 34772c6adc..ba3a7cf26b 100644
--- a/app/scripts/directives/fromFileDialog.js
+++ b/app/scripts/directives/fromFileDialog.js
@@ -62,7 +62,7 @@
       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.name = message.resource ? $filter('humanizeKind')(message.resource.kind, true) : "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() {
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index d1521259ad..3c885d6170 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -9518,7 +9518,8 @@ 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
 }) : (e = s.projectOverviewURL(p.input.selectedProject.metadata.name), t.url(e));
 }
 function C(e) {
@@ -13358,7 +13359,7 @@ 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.name = n.resource ? a("humanizeKind")(n.resource.kind, !0) : "YAML / JSON", t(function() {
 s.currentStep = s.template ? "Template Configuration" : "Results";
 }, 0);
 }), e.$on("templateInstantiated", function(e, t) {