From d952bcbc2fc2fff55026f79142ec14ac1e57ade9 Mon Sep 17 00:00:00 2001 From: Samuel Padgett Date: Wed, 18 Oct 2017 15:23:12 -0400 Subject: [PATCH] Update template annotations template.openshift.io/provider-display-name -> openshift.io/provider-display-Name template.openshift.io/documentation-url -> openshift.io/documentation-url template.openshift.io/support-url -> openshift.io/support-url --- app/scripts/directives/fromFileDialog.js | 6 +++--- app/scripts/directives/processTemplateDialog.js | 12 ++++++------ dist/scripts/scripts.js | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/scripts/directives/fromFileDialog.js b/app/scripts/directives/fromFileDialog.js index c1b39a947b..cc8bbada74 100644 --- a/app/scripts/directives/fromFileDialog.js +++ b/app/scripts/directives/fromFileDialog.js @@ -56,9 +56,9 @@ ctrl.template = message.template; ctrl.iconClass = getIconClass(); ctrl.image = getImage(); - ctrl.vendor = annotation(message.template, "template.openshift.io/provider-display-name"); - ctrl.docUrl = annotation(ctrl.template, "template.openshift.io/documentation-url"); - ctrl.supportUrl = annotation(ctrl.template, "template.openshift.io/support-url"); + 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"; // 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 diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js index 39bc5ef980..31b5b05fba 100644 --- a/app/scripts/directives/processTemplateDialog.js +++ b/app/scripts/directives/processTemplateDialog.js @@ -126,9 +126,9 @@ initializeSteps(); ctrl.iconClass = getIconClass(); ctrl.image = getImage(); - ctrl.docUrl = annotation(ctrl.template, "template.openshift.io/documentation-url"); - ctrl.supportUrl = annotation(ctrl.template, "template.openshift.io/support-url"); - ctrl.vendor = annotation(ctrl.template, "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.vendor = annotation(ctrl.template, "openshift.io/provider-display-name"); } } if (changes.useProjectTemplate) { @@ -178,9 +178,9 @@ ctrl.selectStep.valid = !!template; ctrl.iconClass = getIconClass(); ctrl.image = getImage(); - ctrl.docUrl = annotation(ctrl.template, "template.openshift.io/documentation-url"); - ctrl.supportUrl = annotation(ctrl.template, "template.openshift.io/support-url"); - ctrl.vendor = annotation(ctrl.template, "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.vendor = annotation(ctrl.template, "openshift.io/provider-display-name"); }; ctrl.templateProjectChange = function () { diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js index 487a76eff9..e263e3f4c9 100644 --- a/dist/scripts/scripts.js +++ b/dist/scripts/scripts.js @@ -13242,7 +13242,7 @@ appliedFilters: [], onFilterChange: g }, n.project || (b.showProjectName = !0); }, b.$onChanges = function(e) { -e.template && b.template && (d(), b.iconClass = l(), b.image = u(), b.docUrl = C(b.template, "template.openshift.io/documentation-url"), b.supportUrl = C(b.template, "template.openshift.io/support-url"), b.vendor = C(b.template, "template.openshift.io/provider-display-name")), e.useProjectTemplate && d(); +e.template && b.template && (d(), b.iconClass = l(), b.image = u(), b.docUrl = C(b.template, "openshift.io/documentation-url"), b.supportUrl = C(b.template, "openshift.io/support-url"), b.vendor = C(b.template, "openshift.io/provider-display-name")), e.useProjectTemplate && d(); }, e.$on("templateInstantiated", function(e, t) { b.selectedProject = t.project, b.currentStep = b.resultsStep.label; }), b.$onDestroy = function() { @@ -13255,7 +13255,7 @@ _.isFunction(e) && e(); }, b.onProjectSelected = function(t) { b.selectedProject = t, b.configStep.valid = e.$ctrl.form.$valid && b.selectedProject; }, b.templateSelected = function(e) { -b.selectedTemplate = e, b.template = _.get(e, "resource"), b.selectStep.valid = !!e, b.iconClass = l(), b.image = u(), b.docUrl = C(b.template, "template.openshift.io/documentation-url"), b.supportUrl = C(b.template, "template.openshift.io/support-url"), b.vendor = C(b.template, "template.openshift.io/provider-display-name"); +b.selectedTemplate = e, b.template = _.get(e, "resource"), b.selectStep.valid = !!e, b.iconClass = l(), b.image = u(), b.docUrl = C(b.template, "openshift.io/documentation-url"), b.supportUrl = C(b.template, "openshift.io/support-url"), b.vendor = C(b.template, "openshift.io/provider-display-name"); }, b.templateProjectChange = function() { b.templateProjectName = _.get(b.templateProject, "metadata.name"), b.catalogItems = {}, b.templateSelected(), a.getProjectCatalogItems(b.templateProjectName, !1, !0).then(_.spread(function(e, t) { b.catalogItems = e, b.totalCount = b.catalogItems.length, g(), t && i.addNotification({ @@ -13324,7 +13324,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, "template.openshift.io/provider-display-name"), s.docUrl = c(s.template, "template.openshift.io/documentation-url"), s.supportUrl = c(s.template, "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 = "YAML / JSON", t(function() { s.currentStep = s.template ? "Template Configuration" : "Results"; }, 0); }), e.$on("templateInstantiated", function(e, t) {