From 052372bb016adfc88b490f514b1b87cad3a55122 Mon Sep 17 00:00:00 2001 From: Samuel Padgett Date: Tue, 7 Nov 2017 15:45:27 -0500 Subject: [PATCH] Bump origin-web-catalog to 0.0.64 https://github.com/openshift/origin-web-catalog/releases/tag/v0.0.64 --- bower.json | 2 +- dist/scripts/vendor.js | 36 ++++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/bower.json b/bower.json index 4bacdeb09b..7854c11401 100644 --- a/bower.json +++ b/bower.json @@ -47,7 +47,7 @@ "angular-utf8-base64": "0.0.5", "file-saver": "1.3.3", "origin-web-common": "0.0.72", - "origin-web-catalog": "0.0.63" + "origin-web-catalog": "0.0.64" }, "devDependencies": { "angular-mocks": "1.5.11", diff --git a/dist/scripts/vendor.js b/dist/scripts/vendor.js index f841470d95..e1246cc2ca 100644 --- a/dist/scripts/vendor.js +++ b/dist/scripts/vendor.js @@ -77328,7 +77328,7 @@ e.exports = '
\n
\n }, function(e, t) { e.exports = '
\n \n \n
\n'; }, function(e, t) { -e.exports = '
\n
\n
\n \n \n \n \n
\n {{$ctrl.error}}\n
\n
\n
\n'; +e.exports = '
\n
\n
\n \n \n \n \n
\n {{$ctrl.error}}\n
\n
\n
\n'; }, function(e, t) { e.exports = '
\n
\n
\n \n \n
\n
\n
\n {{$ctrl.serviceName}}\n
\n
\n {{$ctrl.serviceClass.vendor}}\n
\n
\n \n {{tag}}\n \n
\n \n
\n
\n
\n

\n \n Plan {{$ctrl.selectedPlan.spec.externalMetadata.displayName}}\n –\n \n {{$ctrl.selectedPlan.spec.description}}\n

\n

No description provided.

\n

\n

\n
\n
Image Dependencies
\n
\n \n Image\n {{imageName}}\n
\n
\n
\n
\n'; }, function(e, t) { @@ -78268,11 +78268,11 @@ e.exports = '\x3c!-- Use angular-schema-form to show a form based on the paramet }, function(e, t) { e.exports = '
\n
\n
\n
\n \n \n \n \n Clear Search Input\n \n \n
\n
\n
\n
\n'; }, function(e, t) { -e.exports = '
\n \n \n
\n
\n
\n
\n
\n \n \n
\n'; +e.exports = '
\n \n \n
\n
\n
\n
\n
\n \n \n
\n'; }, function(e, t) { e.exports = '
\n
\n \n \n \n \n \n \n
\n
\n
\n
\n
\n
\n
\n
\n'; }, function(e, t) { -e.exports = '
\n \n \n
\n
\n
\n \n \n
\n'; +e.exports = '
\n \n \n
\n
\n
\n \n \n
\n'; }, function(e, t) { e.exports = '\n'; }, function(e, t) { @@ -78282,7 +78282,7 @@ e.exports = '\n

Select a Plan

\n
\n \n
\n
\n
\n \n
\n

\n No Plans Available\n

\n

\n There are no plans currently available for this service.\n

\n
\n
\n'; }, function(e, t) { -e.exports = '\n \n

\n A cluster admin can create a project for you by running the command:\n

\n oc adm new-project <projectname> --admin={{$ctrl.user.metadata.name || \'<YourUsername>\'}}\n
\n

\n
\n\n\n\x3c!-- Use `ng-show` instead of `ng-if` so that the form exists and the `canI` works when projects load. --\x3e\n\n
\n

Create Project

\n \n \n \n {{$select.selected | displayName}}\n \n \x3c!-- refresh-delay must be set using ng-attr-refresh-delay to work as a dynamic value --\x3e\n \n \n \n –\n \n \n \n \n
\n \n You are not authorized to add to this project.\n \n
\n
\n \n Please select or create a project.\n \n
\n
\n\n\n\n
\n \n
\n \n
A unique name for the project.
\n
\n \n Name must have at least two characters.\n \n
\n
\n \n Project names may only contain lower-case letters, numbers, and dashes.\n They may not start or end with a dash.\n \n
\n
\n \n This name is already in use. Please choose a different name.\n \n
\n
\n
\n\n
\n \n \n
\n\n
\n \n \n
\n\n
\n\n'; +e.exports = '\n \n

\n A cluster admin can create a project for you by running the command:\n

\n oc adm new-project <projectname> --admin={{$ctrl.user.metadata.name || \'<YourUsername>\'}}\n
\n

\n
\n\n\n\x3c!-- Use `ng-show` instead of `ng-if` so that the form exists and the `canI` works when projects load. --\x3e\n\n
\n

Create Project

\n \n \n \n {{$select.selected | displayName}}\n \n \x3c!-- refresh-delay must be set using ng-attr-refresh-delay to work as a dynamic value --\x3e\n \n \n \n –\n \n \n \n \n
\n \n You are not authorized to add to this project.\n \n
\n
\n \n Please select or create a project.\n \n
\n
\n\n\n\n
\n \n
\n \n
\n
A unique name for the project.
\n
\n \n Name must have at least two characters.\n \n
\n
\n \n Project names may only contain lower-case letters, numbers, and dashes.\n They may not start or end with a dash.\n \n
\n
\n \n This name is already in use. Please choose a different name.\n \n
\n
\n\n
\n \n \n
\n\n
\n \n \n
\n\n
\n\n'; }, function(e, t) { e.exports = '
\n \n
\n
\n

Browse Catalog

\n
\n \n \n
\n
\n \n\n
\n \x3c!-- Do not show sub-category items for \'All\' or \'Other\' main categories --\x3e\n \n\n \x3c!-- Show catalog item for \'All\' and \'Other\' main categories --\x3e\n
\n
\n
There are no catalog items.
\n \n \n
\n \n
\n \n
\n \n
\n
\n \n
\n
\n {{item.name}}\n
\n \n
\n
\n
\n
\n
\n'; }, function(e, t) { @@ -78511,13 +78511,13 @@ h.validityWatcher && (h.validityWatcher(), h.validityWatcher = void 0); }, this.showInfo = function() { h.clearValidityWatcher(), h.ctrl.nextTitle = "Next >"; }, this.showConfig = function() { -h.clearValidityWatcher(), h.ctrl.nextTitle = h.bindStep.hidden ? "Create" : "Next >", h.reviewStep.allowed = h.bindStep.hidden && h.configStep.valid, h.validityWatcher = h.$scope.$watch("$ctrl.builderForm.$valid", function(e, t) { +h.ctrl.currentStep = "Configuration", h.clearValidityWatcher(), h.ctrl.nextTitle = h.bindStep.hidden ? "Create" : "Next >", h.reviewStep.allowed = h.bindStep.hidden && h.configStep.valid, h.validityWatcher = h.$scope.$watch("$ctrl.builderForm.$valid", function(e, t) { h.configStep.valid = e, !0 === h.ctrl.noProjectsCantCreate && (h.configStep.valid = !1); }); }, this.showBind = function() { h.clearValidityWatcher(), h.ctrl.nextTitle = "Create", h.reviewStep.allowed = !0; }, this.showResults = function() { -h.clearValidityWatcher(), h.ctrl.nextTitle = "Close", h.ctrl.wizardDone = !0, h.createApp(); +h.clearValidityWatcher(), h.ctrl.nextTitle = "Close", h.ctrl.wizardDone = !0, h.ctrl.currentStep = "Results", h.createApp(); }, this.onProjectUpdate = function() { if (!h.instancesSupported || h.isNewProject()) h.ctrl.serviceInstances = [], h.updateBindability(); else if (h.ctrl.showPodPresets) { h.ctrl.updating = !0; @@ -78576,11 +78576,13 @@ hidden: !1, prevEnabled: !1, allowClickNav: !1, onShow: this.showResults -}, this.ctrl.steps = [ this.infoStep, this.configStep, this.bindStep, this.reviewStep ], this.ctrl.versions = this.getVersions(), this.ctrl.istag = r.head(this.ctrl.versions), this.ctrl.nameMaxLength = 24, this.ctrl.namePattern = /^[a-z]([-a-z0-9]*[a-z0-9])?$/, this.ctrl.repositoryPattern = /^[a-z][a-z0-9+.-@]*:(\/\/)?[0-9a-z_-]+/, this.ctrl.wizardDone = !1, this.ctrl.serviceToBind = null, this.ctrl.updating = !1, this.ctrl.noProjectsCantCreate = !1; +}, this.ctrl.steps = [ this.infoStep, this.configStep, this.bindStep, this.reviewStep ], this.ctrl.currentStep = "Information", this.ctrl.versions = this.getVersions(), this.ctrl.istag = r.head(this.ctrl.versions), this.ctrl.nameMaxLength = 24, this.ctrl.namePattern = /^[a-z]([-a-z0-9]*[a-z0-9])?$/, this.ctrl.repositoryPattern = /^[a-z][a-z0-9+.-@]*:(\/\/)?[0-9a-z_-]+/, this.ctrl.wizardDone = !1, this.ctrl.serviceToBind = null, this.ctrl.updating = !1, this.ctrl.noProjectsCantCreate = !1; var t = this.$filter("annotation"); this.ctrl.documentationUrl = t(this.ctrl.imageStream.resource, "openshift.io/documentation-url"), this.ctrl.supportUrl = t(this.ctrl.imageStream.resource, "openshift.io/support-url"), this.ctrl.serviceInstances = [], this.selectedProjectWatch = this.$scope.$watch(function() { return e.ctrl.selectedProject; -}, this.onProjectUpdate), this.ctrl.showPodPresets ? (this.getServiceClassesAndPlans(), this.instancesSupported = !!this.APIService.apiInfo(this.APIService.getPreferredVersion("serviceinstances"))) : this.instancesSupported = !1, this.noProjectsCantCreateWatch = this.$scope.$on("no-projects-cannot-create", function() { +}, this.onProjectUpdate), this.$scope.$watch("$ctrl.selectedProject.metadata.name", function() { +e.ctrl.projectNameTaken = !1; +}), this.ctrl.showPodPresets ? (this.getServiceClassesAndPlans(), this.instancesSupported = !!this.APIService.apiInfo(this.APIService.getPreferredVersion("serviceinstances"))) : this.instancesSupported = !1, this.noProjectsCantCreateWatch = this.$scope.$on("no-projects-cannot-create", function() { e.ctrl.noProjectsCantCreate = !0; }), this.getServiceClassesAndPlans(), this.instancesSupported = !!this.APIService.apiInfo(this.APIService.getPreferredVersion("serviceinstances")); }, e.prototype.closePanel = function() { @@ -78657,7 +78659,7 @@ kind: "DeploymentConfig" e.ctrl.error = t; }); }, function(t) { -e.ctrl.error = t; +"AlreadyExists" === t.data.reason ? (e.ctrl.projectNameTaken = !0, e.ctrl.wizardDone = !1, e.ctrl.currentStep = "Configuration") : e.ctrl.error = t; }); }, e.prototype.createProjectIfNecessary = function() { if (!this.isNewProject()) return this.$q.when(this.ctrl.selectedProject); @@ -78743,7 +78745,7 @@ u.clearValidityWatcher(), u.ctrl.configPageShown = !1, u.ctrl.nextTitle = "Next }, this.showPlan = function() { u.clearValidityWatcher(), u.ctrl.configPageShown = !1, u.ctrl.nextTitle = "Next >"; }, this.showConfig = function() { -u.clearValidityWatcher(), u.ctrl.configPageShown = !0, u.reviewStep.allowed = u.bindStep.hidden && u.configStep.valid, u.updateBindability(), u.validityWatcher = u.$scope.$watch("$ctrl.forms.orderConfigureForm.$valid", function(e, t) { +u.ctrl.currentStep = "Configuration", u.clearValidityWatcher(), u.ctrl.configPageShown = !0, u.reviewStep.allowed = u.bindStep.hidden && u.configStep.valid, u.updateBindability(), u.validityWatcher = u.$scope.$watch("$ctrl.forms.orderConfigureForm.$valid", function(e, t) { u.configStep.valid = e && !u.ctrl.noProjectsCantCreate, u.bindStep.allowed = u.configStep.valid, u.reviewStep.allowed = u.bindStep.hidden && u.configStep.valid; }); }, this.showBind = function() { @@ -78755,7 +78757,7 @@ u.clearValidityWatcher(), u.ctrl.nextTitle = "Create", u.validityWatcher = u.$sc u.bindParametersStep.valid = e, u.reviewStep.allowed = u.bindParametersStep.valid; }); }, this.showResults = function() { -u.clearValidityWatcher(), u.ctrl.configPageShown = !1, u.ctrl.nextTitle = "Close", u.ctrl.wizardDone = !0, u.provisionService(); +u.ctrl.currentStep = "Results", u.clearValidityWatcher(), u.ctrl.configPageShown = !1, u.ctrl.nextTitle = "Close", u.ctrl.wizardDone = !0, u.provisionService(); }, this.selectPlan = function(e) { u.ctrl.selectedPlan = e, u.ctrl.parameterData = {}, u.updateParameterSchema(e), u.updateBindability(); }, this.provisionService = function() { @@ -78764,7 +78766,7 @@ var e = u.ctrl.selectedProject.metadata.name, t = u.ctrl.selectedProject.metadat u.ProjectsService.create(e, t, n).then(function(e) { u.ctrl.selectedProject = e, u.ctrl.projectDisplayName = u.$filter("displayName")(e), u.createService(); }, function(e) { -u.ctrl.error = e.data; +"AlreadyExists" === e.data.reason ? (u.ctrl.projectNameTaken = !0, u.ctrl.wizardDone = !1, u.ctrl.currentStep = "Configuration") : u.ctrl.error = e; }); } else u.ctrl.projectDisplayName = u.$filter("displayName")(u.ctrl.selectedProject), u.createService(); }, this.onProjectUpdate = function() { @@ -78848,9 +78850,11 @@ valid: !0, prevEnabled: !1, allowClickNav: !1, onShow: this.showResults -}, this.ctrl.steps = [ this.infoStep, this.planStep, this.configStep, this.bindStep, this.bindParametersStep, this.reviewStep ], this.ctrl.nameTaken = !1, this.ctrl.wizardDone = !1, this.ctrl.bindType = "none", this.ctrl.orderedPlans = r.orderBy(this.ctrl.servicePlans, [ "spec.externalMetadata.displayName", "metadata.name" ]), this.selectPlan(r.head(this.ctrl.orderedPlans)), this.ctrl.updating = !0, this.selectedProjectWatch = this.$scope.$watch(function() { +}, this.ctrl.steps = [ this.infoStep, this.planStep, this.configStep, this.bindStep, this.bindParametersStep, this.reviewStep ], this.ctrl.currentStep = "Information", this.ctrl.projectNameTaken = !1, this.ctrl.wizardDone = !1, this.ctrl.bindType = "none", this.ctrl.orderedPlans = r.orderBy(this.ctrl.servicePlans, [ "spec.externalMetadata.displayName", "metadata.name" ]), this.selectPlan(r.head(this.ctrl.orderedPlans)), this.ctrl.updating = !0, this.selectedProjectWatch = this.$scope.$watch(function() { return e.ctrl.selectedProject; -}, this.onProjectUpdate), this.bindTypeWatch = this.$scope.$watch("$ctrl.bindType", function(t, n) { +}, this.onProjectUpdate), this.$scope.$watch("$ctrl.selectedProject.metadata.name", function() { +e.ctrl.projectNameTaken = !1; +}), this.bindTypeWatch = this.$scope.$watch("$ctrl.bindType", function(t, n) { t !== n && (e.updateBindParametersStepVisibility(), e.ctrl.nextTitle = e.bindParametersStep.hidden ? "Create" : "Next >", e.reviewStep.allowed = e.bindParametersStep.hidden && e.bindStep.valid); }), this.noProjectsCantCreateWatch = this.$scope.$on("no-projects-cannot-create", function() { e.ctrl.noProjectsCantCreate = !0; @@ -79115,7 +79119,7 @@ e = u.AuthorizationService.canIAddToProject(t), u.ctrl.forms && u.ctrl.forms.sel } return e.prototype.$onInit = function() { var e = this; -this.ctrl.nameTaken = !1, this.ctrl.noProjectsCantCreate = !1, this.ctrl.noProjectsConfig = { +this.ctrl.noProjectsCantCreate = !1, this.ctrl.noProjectsConfig = { title: "No Projects Found", info: "Services cannot be provisioned without a project." }, void 0 === this.ctrl.showDivider && (this.ctrl.showDivider = !0), this.ProjectsService.canCreate().then(function() { @@ -79140,7 +79144,7 @@ e.nameTaken && !e.nameTaken.isFirstChange() && this.ctrl.forms.createProjectForm }, e.prototype.onSelectProjectChange = function() { this.canIAddToProject(), i.isFunction(this.ctrl.onProjectSelected) && this.ctrl.onProjectSelected(this.ctrl.selectedProject); }, e.prototype.onNewProjectNameChange = function() { -this.ctrl.nameTaken = !1, this.ctrl.forms.createProjectForm.name.$setValidity("nameTaken", !this.ctrl.nameTaken); +this.ctrl.forms.createProjectForm.name.$setValidity("nameTaken", !0); }, e.prototype.isNewProject = function() { return this.projects && this.ctrl.selectedProject && !r.has(this.ctrl.selectedProject, "metadata.uid"); }, e.prototype.canOnlyCreateProject = function() {