From 609ee225b4f9b5e1329f6b11816736195349a57d Mon Sep 17 00:00:00 2001 From: OpenShift Bot Date: Wed, 28 Jun 2017 16:27:09 -0400 Subject: [PATCH] bump(github.com/openshift/origin-web-console): 648bef724e728a1c16129997aba33e17ce065081 --- pkg/assets/bindata.go | 111 ++++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 52 deletions(-) diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go index 209a90b1a721..942199ce5b5a 100644 --- a/pkg/assets/bindata.go +++ b/pkg/assets/bindata.go @@ -13549,11 +13549,9 @@ l.serviceInstances = a.by("metadata.name"), l.serviceToBind || n(), o(); }); }; l.$onInit = function() { -l.serviceSelection = {}; -var a = "Instance" === l.target.kind ? "Applications" :"Services"; -l.steps = [ { +l.serviceSelection = {}, l.projectDisplayName = b("displayName")(l.project), l.steps = [ { id:"bindForm", -label:a, +label:"Binding", view:"views/directives/bind-service/bind-service-form.html", valid:!0, onShow:q @@ -13569,6 +13567,8 @@ resource:"serviceclasses" }, {}).then(function(a) { l.serviceClasses = a.by("metadata.name"), "Instance" === l.target.kind && (l.serviceClass = l.serviceClasses[l.target.spec.serviceClassName], l.serviceClassName = l.target.spec.serviceClassName), o(); }), "Instance" === l.target.kind ? (l.bindType = "secret-only", l.appToBind = null, l.serviceToBind = l.target.metadata.name, s()) :(l.bindType = "application", l.appToBind = l.target, t()); +}, l.$onChanges = function(a) { +a.project && !a.project.isFirstChange() && (l.projectDisplayName = b("displayName")(l.project)); }, l.$onDestroy = function() { e && (e(), e = void 0), f && c.unwatch(f); }, l.bindService = function() { @@ -13591,6 +13591,7 @@ controller:[ "$scope", "$filter", "DataService", "BindingService", a ], controllerAs:"ctrl", bindings:{ target:"<", +project:"<", onClose:"<" }, templateUrl:"views/directives/bind-service.html" @@ -22053,7 +22054,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', [] "\n" + "\n" + "
\n" + - "\n" + + "\n" + "\n" + "
" ); @@ -28262,7 +28263,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', [] "\n" + "\n" + "
\n" + - "\n" + + "\n" + "
\n" + "
\n" + "\n" + @@ -28596,7 +28597,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', [] "
\n" + "\n" + "
\n" + - "\n" + + "\n" + "
\n" + "
\n" + "\n" + @@ -89559,9 +89560,9 @@ maxlength:253, description:"Name must consist of lower-case letters, numbers, periods, and hyphens. It must start and end with a letter or a number." }).constant("IS_IOS", /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream), hawtioPluginLoader.addModule("openshiftCommonUI"), angular.module("openshiftCommonUI").run([ "$templateCache", function(a) { "use strict"; -a.put("src/components/binding/bindApplicationForm.html", '
\n
\n
\n \n \n Binding to a provisioned service will create a secret containing the information necessary for your application to use the service.\n \n
\n
\n\n
\n
\n
\n \n
\n \n You can create the binding later from your project.\n \n
\n
\n \n
\n \n \n \n {{serviceInstance.metadata.name}}\n \n
\n
\n

\n \n \n There are no bindable services in this project\n \n

\n
\n
\n
\n
\n'), +a.put("src/components/binding/bindApplicationForm.html", '
\n
\n
\n \n \n Bindings create a secret containing the necessary information for an application to use a service.\n \n
\n
\n\n \n
\n
\n
\n
\n \n
\n \n Bindings can be created later from within a project.\n \n
\n
\n
\n \n
\n \n \n \n {{serviceInstance.metadata.name}}\n \n
\n
\n

\n \n \n There are no bindable services in this project\n \n

\n
\n
\n
\n
\n'), a.put("src/components/binding/bindResults.html", '
\n
\n \n

\n Pending\n
The binding was created but is not ready yet.
\n

\n
\n
\n
\n \n Success\n

\n {{ctrl.serviceToBind}}\n has been bound\n to {{ctrl.applicationToBind}} successfully\n

\n
\n
\n The binding operation created the secret\n {{ctrl.binding.spec.secretName}}\n {{ctrl.binding.spec.secretName}}\n that you may need to reference in your application.\n Its data will be available to your application as environment variables.\n
\n
\n \n Info\n The binding secret will only be available to new pods. You will need to redeploy your application.\n
\n
\n
\n
\n
\n \n Error\n

\n Binding Failed\n

\n
\n
\n \n {{ctrl.error.data.message | upperFirst}}\n \n \n An error occurred creating the binding.\n \n
\n
\n'), -a.put("src/components/binding/bindServiceForm.html", '
\n
\n
\n \n Binding to a provisioned service will create a secret containing the information necessary for your application to use the service.\n
\n
\n\n
\n
\n
\n \n
\n \n \n \n {{$select.selected.metadata.name}}\n – {{$select.selected.kind | humanizeKind : true}}\n \n \n \n \n \n \n
\n \n
\n You can reference this secret later from any application either as environment variables or configuration files mounted as volumes.\n
\n \n
\n You can create the binding later from your project.\n
\n
\n
\n
\n
\n'), +a.put("src/components/binding/bindServiceForm.html", '
\n
\n
\n \n Bindings create a secret containing the necessary information for an application to use this service.\n
\n
\n\n
\n
\n
\n \n
\n \n \n \n {{$select.selected.metadata.name}}\n – {{$select.selected.kind | humanizeKind : true}}\n \n \n \n \n \n \n
\n \n
\n Secrets can be referenced later from an application.\n
\n \n
\n Bindings can be created later from within a project.\n
\n
\n
\n
\n
\n'), a.put("src/components/create-project/createProject.html", '
\n
\n
\n \n \n \n \n
\n A unique name for the project.\n
\n
\n \n Name is required.\n \n
\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 Cancel\n \n
\n
\n
\n'), a.put("src/components/delete-project/delete-project-button.html", '\n'), a.put("src/components/delete-project/delete-project-modal.html", '
\n \n
\n \n \n
\n
\n'), a.put("src/components/delete-project/delete-project.html", '{{label || \'Delete\'}}\n'), a.put("src/components/edit-project/editProject.html", '
\n
\n
\n \n \n
\n\n
\n \n \n
\n\n
\n \n \n Cancel\n \n
\n
\n
\n'), @@ -89617,6 +89618,7 @@ serviceClassName:"<", applications:"<", formName:"=", allowNoBinding:"\n \n \n \n \n
\n
\n {{match.label}}\n
\n
\n \n {{tag}}\n \n
\n
\n \n View All {{match.model.totalNumResults}} Results for Keyword: {{match.model.name}} \n \n\n'; }, function(a, b) { -a.exports = '\n\n'; +a.exports = '\n\n'; }, function(a, b) { a.exports = '
\n
\n
\n \n \n \n {{$select.selected.name}}\n \n \n {{tag.name}}\n \n {{otherTag}},\n \n \n \n
\n \n
\n \n
\n \n \n
\n
\n \n Application name is required.\n \n
\n
\n \n Application name consists of lower-case letters, numbers, and dashes. It must start with a letter and can\'t end with a -.\n \n
\n
\n \n Application name must be at least 2 characters.\n \n
\n
\n \n Application name can\'t be more than 24 characters.\n \n
\n
\n
\n
\n\n
\n \n
\n \n \n
\n \n Git repository is required.\n \n
\n
\n \n This might not be a valid Git URL. Check that it is the correct URL to a remote Git repository.\n \n
\n
\n
\n\n \n
\n If you have a private Git repository or need to change application defaults, view\n advanced options.\n
\n
\n
\n'; }, function(a, b) { a.exports = '
\n
\n

\n \n

\n

\n The application is being created\n

\n
\n
\n \n

\n The application is being created\n

\n
\n
\n
\n
\n \n Success\n

\n \n {{$ctrl.name}} has been created in {{$ctrl.selectedProject.metadata.name}} successfully\n \n

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

\n Continue to your project to check the status of your application as it builds and deploys.\n

\n
\n
\n
\n \n

\n Error creating {{$ctrl.name}} in\n {{$ctrl.selectedProject | displayName}}\n

\n
\n
\n \n {{$ctrl.error.data.message | upperFirst}}\n \n \n An error occurred creating the application.\n \n
\n \n
    \n
  • \n {{failure.data.message}}\n
  • \n
\n
\n\n'; }, function(a, b) { -a.exports = '\n\n'; +a.exports = '\n\n'; }, function(a, b) { a.exports = '
\n
\n \n \n \n \n
\n {{$ctrl.error}}\n
\n
\n'; }, function(a, b) { @@ -94507,7 +94507,7 @@ a.exports = '
\n

{{$ctrl.saasTitle}}

\n \n \n\n'; }, function(a, b) { -a.exports = '\n
\n \n \n \n {{$select.selected | displayName}}\n \n \n \n \n \n \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'; +a.exports = '\n
\n \n \n \n {{$select.selected | displayName}}\n \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\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'; }, function(a, b) { a.exports = '
\n
\n
\n
\n
\n

Browse Catalog

\n \n\n
\n \n \n\n \n
\n
\n
There are no catalog items.
\n
\n \n
\n \n
\n
\n \n
\n
\n {{item.name}}\n
\n
\n
\n
\n
\n
\n
\n'; }, function(a, b, c) { @@ -94787,7 +94787,7 @@ j.clearValidityWatcher(), j.ctrl.configPageShown = !0, j.reviewStep.allowed = j. j.configStep.valid = a, j.bindStep.allowed = j.configStep.valid, j.reviewStep.allowed = j.bindStep.hidden && j.configStep.valid; }); }, this.showBind = function() { -j.clearValidityWatcher(), j.ctrl.configPageShown = !1, j.ctrl.nextTitle = "Create", j.reviewStep.allowed = j.bindStep.valid, j.validityWatcher = j.$scope.$watch("$ctrl.forms.bindForm.$valid", function(a, b) { +j.clearValidityWatcher(), j.ctrl.configPageShown = !1, j.ctrl.nextTitle = "Create", j.reviewStep.allowed = j.bindStep.valid, j.isNewProject() ? j.ctrl.projectDisplayName = j.ctrl.selectedProject.metadata.annotations["new-display-name"] || j.ctrl.selectedProject.metadata.name :j.ctrl.projectDisplayName = j.$filter("displayName")(j.ctrl.selectedProject), j.validityWatcher = j.$scope.$watch("$ctrl.forms.bindForm.$valid", function(a, b) { j.bindStep.valid = a, j.reviewStep.allowed = j.bindStep.valid; }); }, this.showResults = function() { @@ -95090,8 +95090,8 @@ f.$inject = [ "$scope", "$window", "$element", "BREAKPOINTS" ], b.SaasListContro "use strict"; b.__esModule = !0; var d = c(0), e = function() { -function a(a, b, c, d, e, f) { -this.ctrl = this, this.$scope = a, this.$filter = b, this.DataService = c, this.AuthService = f, this.ProjectsService = d, this.Logger = e; +function a(a, b, c, d, e, f, g) { +this.ctrl = this, this.$scope = a, this.$filter = b, this.DataService = c, this.AuthService = f, this.AuthorizationService = g, this.ProjectsService = d, this.Logger = e; } return a.prototype.$onInit = function() { var a = this; @@ -95107,10 +95107,15 @@ a.listProjects(); }); }, a.prototype.$onChanges = function(a) { a.nameTaken && !a.nameTaken.isFirstChange() && this.ctrl.forms.createProjectForm.name.$setValidity("nameTaken", !this.ctrl.nameTaken); +}, a.prototype.onSelectProjectChange = function() { +this.canIAddToProject(); }, a.prototype.onNewProjectNameChange = function() { this.ctrl.nameTaken = !1, this.ctrl.forms.createProjectForm.name.$setValidity("nameTaken", !this.ctrl.nameTaken); }, a.prototype.isNewProject = function() { return this.ctrl.projects && this.ctrl.selectedProject && !d.has(this.ctrl.selectedProject, "metadata.uid"); +}, a.prototype.canIAddToProject = function() { +var a = !0; +return this.isNewProject() || (a = this.AuthorizationService.canIAddToProject(d.get(this.ctrl.selectedProject, "metadata.name"))), this.ctrl.forms.selectProjectForm.selectProject.$setValidity("cannotAddToProject", a); }, a.prototype.listProjects = function() { var a = this; this.DataService.list("projects", this.$scope).then(function(b) { @@ -95122,11 +95127,11 @@ annotations:{ } } }, e = b.by("metadata.name"); -e = d.reject(e, "metadata.deletionTimestamp"), a.ctrl.projects = d.sortBy(e, a.$filter("displayName")), a.ctrl.existingProjectNames = d.map(a.ctrl.projects, "metadata.name"), !a.ctrl.selectedProject && d.size(a.ctrl.projects) > 0 && (a.ctrl.selectedProject = a.$filter("mostRecent")(a.ctrl.projects)), a.ctrl.canCreate && (a.ctrl.projects.unshift(c), 1 === d.size(a.ctrl.projects) && (a.ctrl.selectedProject = c)); +e = d.reject(e, "metadata.deletionTimestamp"), a.ctrl.projects = d.sortBy(e, a.$filter("displayName")), a.ctrl.existingProjectNames = d.map(a.ctrl.projects, "metadata.name"), !a.ctrl.selectedProject && d.size(a.ctrl.projects) > 0 && (a.ctrl.selectedProject = a.$filter("mostRecent")(a.ctrl.projects)), a.ctrl.canCreate && (a.ctrl.projects.unshift(c), 1 === d.size(a.ctrl.projects) && (a.ctrl.selectedProject = c)), a.canIAddToProject(); }); }, a; }(); -e.$inject = [ "$scope", "$filter", "DataService", "ProjectsService", "Logger", "AuthService" ], b.SelectProjectController = e; +e.$inject = [ "$scope", "$filter", "DataService", "ProjectsService", "Logger", "AuthService", "AuthorizationService" ], b.SelectProjectController = e; }, function(a, b, c) { "use strict"; b.__esModule = !0; @@ -291222,7 +291227,6 @@ button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance .popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:220px;text-align:left;text-align:start;text-shadow:none;background-color:#fff;border:1px solid #bbb;border-radius:1px} .carousel-caption,.carousel-control{color:#fff;text-shadow:0 1px 2px rgba(0,0,0,.6);text-align:center} .progress-description,.text-overflow-pf{white-space:nowrap;text-overflow:ellipsis} -.delete-resource-modal h1,.word-break{word-break:break-word;overflow-wrap:break-word} .popover.top{margin-top:-10px} .popover.right{margin-left:10px} .popover.bottom{margin-top:10px} @@ -293769,6 +293773,7 @@ div.hopscotch-bubble .hopscotch-bubble-arrow-container.left,div.hopscotch-bubble .bind-form .help-block.service-instance-name{display:inline-block;margin-top:0} .bind-form .radio label[disabled]{cursor:not-allowed} .bind-info{margin-bottom:20px;margin-top:30px} +.bind-service-selection{margin-bottom:5px} .bind-status{display:flex;font-size:16px;margin-top:0} .bind-status .bind-message{flex:1;line-height:1.4;margin-top:0;padding-left:10px} .bind-status .pficon{margin-top:3px} @@ -293778,7 +293783,7 @@ div.hopscotch-bubble .hopscotch-bubble-arrow-container.left,div.hopscotch-bubble .bind-pending-message{margin-top:15px} .bind-pending-message.progress-inline{margin-top:0} .delete-resource-modal{background-color:#f1f1f1} -.delete-resource-modal h1{font-size:21px;font-weight:500;margin-bottom:20px;word-wrap:break-word;min-width:0} +.delete-resource-modal h1{font-size:21px;font-weight:500;margin-bottom:20px;word-wrap:break-word;word-break:break-word;overflow-wrap:break-word;min-width:0} .delete-resource-modal p{font-size:16px} .delete-resource-modal .help-block{margin-top:0px;margin-bottom:10px} .dialog-btn{float:right!important;margin-right:10px} @@ -293810,11 +293815,13 @@ div.hopscotch-bubble .hopscotch-bubble-number{background:#0088ce;border-radius:1 div.hopscotch-bubble .hopscotch-nav-button{border-radius:0;font-family:"Open Sans";font-size:12px} div.hopscotch-bubble .hopscotch-nav-button.next{background-color:#0088ce;background-image:none;margin-left:5px} div.hopscotch-bubble .hopscotch-nav-button.prev{color:#030303} -.word-break{word-wrap:break-word;min-width:0} +.word-break{word-wrap:break-word;word-break:break-word;overflow-wrap:break-word;min-width:0} .word-break-all{word-break:break-all;word-break:break-word;overflow-wrap:break-word} .toast-action-divider{color:#9c9c9c} .toast-notification-message{font-weight:700;margin-right:5px} -.toast-notifications-list-pf{top:28px;z-index:1055} +.toast-notifications-list-pf{top:28px;word-wrap:break-word;word-break:break-word;overflow-wrap:break-word;min-width:0;z-index:1055} +@media (max-width:767px){.toast-notifications-list-pf{max-width:calc(100% - 40px)} +} .toast-notifications-list-pf>div.ng-enter{animation:toastSlideIn .2s ease-out} .toast-notifications-list-pf>div.ng-leave{animation:toastSlideOut .2s ease-in} .toast-notifications-list-pf>div .toast-pf{border-color:#fff;margin-bottom:5px;width:100%}