Skip to content

Commit 8f54306

Browse files
spadgettspadgett
committed
Bug 1505281 - Improve import YAML results message
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1505281
1 parent ae37501 commit 8f54306

File tree

7 files changed

+55
-21
lines changed

7 files changed

+55
-21
lines changed

‎app/scripts/directives/create/nextSteps.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,19 @@
1515
createdBuildConfig: '<',
1616
onContinue: '<',
1717
showProjectName: '<',
18-
name: '<'
18+
// Optional kind to show in front of the name
19+
kind: '<?',
20+
name: '<',
21+
// Optional action to use instead of "created" (for example, "imported")
22+
actionLabel: '<?'
1923
},
2024
templateUrl: 'views/directives/next-steps.html'
2125
});
2226

2327
function NextSteps(ProcessedTemplateService, Navigate) {
2428
var ctrl = this;
2529
ctrl.showParamsTable = false;
30+
ctrl.actionLabel = ctrl.actionLabel || 'created';
2631

2732
var processedTemplateData = ProcessedTemplateService.getTemplateData();
2833
ctrl.parameters = processedTemplateData.params;

‎app/scripts/directives/fromFile.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,9 @@ angular.module("openshiftConsole")
302302
}
303303
else if ($scope.isDialog) {
304304
$scope.$emit('fileImportedFromYAMLOrJSON', {
305-
project: $scope.input.selectedProject
305+
project: $scope.input.selectedProject,
306+
resource: $scope.resource,
307+
isList: $scope.isList
306308
});
307309
}
308310
else {

‎app/scripts/directives/fromFileDialog.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,14 @@
6262
ctrl.vendor = annotation(message.template, "openshift.io/provider-display-name");
6363
ctrl.docUrl = annotation(ctrl.template, "openshift.io/documentation-url");
6464
ctrl.supportUrl = annotation(ctrl.template, "openshift.io/support-url");
65-
ctrl.name = "YAML / JSON";
65+
ctrl.actionLabel = "imported";
66+
if (message.isList) {
67+
ctrl.name = "YAML / JSON";
68+
ctrl.kind = null;
69+
} else if (message.resource) {
70+
ctrl.kind = message.resource.kind;
71+
ctrl.name = message.resource.metadata.name;
72+
}
6673
// Need to let the current digest loop finish so the template config step becomes visible or the wizard will throw an error
6774
// from the change to currentStep
6875
$timeout(function() {
@@ -73,6 +80,8 @@
7380
$scope.$on('templateInstantiated', function(event, message) {
7481
ctrl.selectedProject = message.project;
7582
ctrl.name = $filter('displayName')(ctrl.template);
83+
ctrl.actionLabel = null;
84+
ctrl.kind = null;
7685
ctrl.currentStep = "Results";
7786
});
7887

‎app/views/directives/from-file-dialog.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@
9898
login-base-url="$ctrl.loginBaseUrl"
9999
on-continue="$ctrl.close"
100100
show-project-name="$ctrl.showProjectName"
101-
name="$ctrl.name">
101+
kind="$ctrl.kind"
102+
name="$ctrl.name"
103+
action-label="$ctrl.actionLabel">
102104
</next-steps>
103105
</div>
104106
</div>

‎app/views/directives/next-steps.html

+12-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<span class="sr-only">Pending</span>
66
<div class="results-message">
77
<h1 class="h3">
8-
<strong>{{$ctrl.name}}</strong> is being created<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong></span>.
8+
<span ng-if="$ctrl.kind">{{$ctrl.kind | humanizeKind | upperFirst}}</span>
9+
<strong>{{$ctrl.name}}</strong> is being {{$ctrl.actionLabel}}<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong></span>.
910
</h1>
1011
</div>
1112
</div>
@@ -16,17 +17,21 @@ <h1 class="h3">
1617
<span class="sr-only">Error</span>
1718
<div class="results-message">
1819
<h1 class="h3">
19-
<strong>{{$ctrl.name}}</strong> failed to be created<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong></span>.
20+
<span ng-if="$ctrl.kind">{{$ctrl.kind | humanizeKind | upperFirst}}</span>
21+
<strong>{{$ctrl.name}}</strong> failed to be {{$ctrl.actionLabel}}<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong></span>.
2022
</h1>
2123
</div>
2224
</div>
2325
</div>
24-
<!-- if the user refreshes the next steps page -->
26+
<!-- Import YAML of a single resource. -->
2527
<div ng-if="!tasks().length">
26-
<div class="results-status results-status-unknown">
28+
<div class="results-status">
29+
<span class="pficon pficon-ok" aria-hidden="true"></span>
30+
<span class="sr-only">Success</span>
2731
<div class="results-message">
2832
<h1 class="h3">
29-
<strong>{{$ctrl.name}}</strong> completed.
33+
<span ng-if="$ctrl.kind">{{$ctrl.kind | humanizeKind | upperFirst}}</span>
34+
<strong>{{$ctrl.name}}</strong> has been {{$ctrl.actionLabel}}<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.
3035
</h1>
3136
</div>
3237
</div>
@@ -37,7 +42,8 @@ <h1 class="h3">
3742
<span class="sr-only">Success</span>
3843
<div class="results-message">
3944
<h1 class="h3">
40-
<strong>{{$ctrl.name}}</strong> has been created<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.
45+
<span ng-if="$ctrl.kind">{{$ctrl.kind | humanizeKind | upperFirst}}</span>
46+
<strong>{{$ctrl.name}}</strong> has been {{$ctrl.actionLabel}}<span ng-if="$ctrl.showProjectName && $ctrl.projectName"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.
4147
</h1>
4248
</div>
4349
</div>

‎dist/scripts/scripts.js

+9-5
Original file line numberDiff line numberDiff line change
@@ -9525,7 +9525,9 @@ template: p.resource
95259525
}) : (n = p.templateOptions.add || p.updateResources.length > 0 ? p.input.selectedProject.metadata.name : "", e = s.createFromTemplateURL(p.resource, p.input.selectedProject.metadata.name, {
95269526
namespace: n
95279527
}), t.url(e)) : p.isDialog ? p.$emit("fileImportedFromYAMLOrJSON", {
9528-
project: p.input.selectedProject
9528+
project: p.input.selectedProject,
9529+
resource: p.resource,
9530+
isList: p.isList
95299531
}) : (e = s.projectOverviewURL(p.input.selectedProject.metadata.name), t.url(e));
95309532
}
95319533
function C(e) {
@@ -13369,11 +13371,11 @@ e.$broadcast("importFileFromYAMLOrJSON");
1336913371
}, s.instantiateTemplate = function() {
1337013372
e.$broadcast("instantiateTemplate");
1337113373
}, e.$on("fileImportedFromYAMLOrJSON", function(e, n) {
13372-
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() {
13374+
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() {
1337313375
s.currentStep = s.template ? "Template Configuration" : "Results";
1337413376
}, 0);
1337513377
}), e.$on("templateInstantiated", function(e, t) {
13376-
s.selectedProject = t.project, s.name = a("displayName")(s.template), s.currentStep = "Results";
13378+
s.selectedProject = t.project, s.name = a("displayName")(s.template), s.actionLabel = null, s.kind = null, s.currentStep = "Results";
1337713379
}), s.close = function() {
1337813380
s.template = null;
1337913381
var e = s.onDialogClosed();
@@ -13408,7 +13410,7 @@ e.hasErrors && t.push(e);
1340813410
}), t;
1340913411
}
1341013412
var r = this;
13411-
r.showParamsTable = !1;
13413+
r.showParamsTable = !1, r.actionLabel = r.actionLabel || "created";
1341213414
var o = e.getTemplateData();
1341313415
r.parameters = o.params, r.templateMessage = o.message, e.clearTemplateData();
1341413416
var i = function(e) {
@@ -13437,7 +13439,9 @@ fromSampleRepo: "<",
1343713439
createdBuildConfig: "<",
1343813440
onContinue: "<",
1343913441
showProjectName: "<",
13440-
name: "<"
13442+
kind: "<?",
13443+
name: "<",
13444+
actionLabel: "<?"
1344113445
},
1344213446
templateUrl: "views/directives/next-steps.html"
1344313447
});

‎dist/scripts/templates.js

+12-6
Original file line numberDiff line numberDiff line change
@@ -7222,7 +7222,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
72227222
"<div class=\"order-service-config\">\n" +
72237223
"<div class=\"wizard-pf-main-form-contents\">\n" +
72247224
"\n" +
7225-
"<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" +
7225+
"<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" +
72267226
"</next-steps>\n" +
72277227
"</div>\n" +
72287228
"</div>\n" +
@@ -7776,7 +7776,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
77767776
"<span class=\"sr-only\">Pending</span>\n" +
77777777
"<div class=\"results-message\">\n" +
77787778
"<h1 class=\"h3\">\n" +
7779-
"<strong>{{$ctrl.name}}</strong> is being created<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong></span>.\n" +
7779+
"<span ng-if=\"$ctrl.kind\">{{$ctrl.kind | humanizeKind | upperFirst}}</span>\n" +
7780+
"<strong>{{$ctrl.name}}</strong> is being {{$ctrl.actionLabel}}<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong></span>.\n" +
77807781
"</h1>\n" +
77817782
"</div>\n" +
77827783
"</div>\n" +
@@ -7787,17 +7788,21 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
77877788
"<span class=\"sr-only\">Error</span>\n" +
77887789
"<div class=\"results-message\">\n" +
77897790
"<h1 class=\"h3\">\n" +
7790-
"<strong>{{$ctrl.name}}</strong> failed to be created<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong></span>.\n" +
7791+
"<span ng-if=\"$ctrl.kind\">{{$ctrl.kind | humanizeKind | upperFirst}}</span>\n" +
7792+
"<strong>{{$ctrl.name}}</strong> failed to be {{$ctrl.actionLabel}}<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong></span>.\n" +
77917793
"</h1>\n" +
77927794
"</div>\n" +
77937795
"</div>\n" +
77947796
"</div>\n" +
77957797
"\n" +
77967798
"<div ng-if=\"!tasks().length\">\n" +
7797-
"<div class=\"results-status results-status-unknown\">\n" +
7799+
"<div class=\"results-status\">\n" +
7800+
"<span class=\"pficon pficon-ok\" aria-hidden=\"true\"></span>\n" +
7801+
"<span class=\"sr-only\">Success</span>\n" +
77987802
"<div class=\"results-message\">\n" +
77997803
"<h1 class=\"h3\">\n" +
7800-
"<strong>{{$ctrl.name}}</strong> completed.\n" +
7804+
"<span ng-if=\"$ctrl.kind\">{{$ctrl.kind | humanizeKind | upperFirst}}</span>\n" +
7805+
"<strong>{{$ctrl.name}}</strong> has been {{$ctrl.actionLabel}}<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.\n" +
78017806
"</h1>\n" +
78027807
"</div>\n" +
78037808
"</div>\n" +
@@ -7808,7 +7813,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
78087813
"<span class=\"sr-only\">Success</span>\n" +
78097814
"<div class=\"results-message\">\n" +
78107815
"<h1 class=\"h3\">\n" +
7811-
"<strong>{{$ctrl.name}}</strong> has been created<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.\n" +
7816+
"<span ng-if=\"$ctrl.kind\">{{$ctrl.kind | humanizeKind | upperFirst}}</span>\n" +
7817+
"<strong>{{$ctrl.name}}</strong> has been {{$ctrl.actionLabel}}<span ng-if=\"$ctrl.showProjectName && $ctrl.projectName\"> in <strong>{{$ctrl.projectName}}</strong> successfully</span>.\n" +
78127818
"</h1>\n" +
78137819
"</div>\n" +
78147820
"</div>\n" +

0 commit comments

Comments
 (0)