bump(github.com/openshift/origin-web-console): 2cb38e1044b8ac640b464f48765d9d7ba22c250f

Author: OpenShift Bot

pkg/assets/bindata.go

@@ -10158,7 +10158,7 @@ if (a.spec.resources.requests.storage = c.claim.amount + b, c.claim.selectedLabe
 var d = j.mapEntries(j.compactEntries(c.claim.selectedLabels));
 _.isEmpty(d) || _.set(a, "spec.selector.matchLabels", d);
 }
-return c.claim.storageClass && (a.metadata.annotations["volume.beta.kubernetes.io/storage-class"] = c.claim.storageClass.metadata.name), a;
+return c.claim.storageClass && "No Storage Class" !== c.claim.storageClass.metadata.name && (a.metadata.annotations["volume.beta.kubernetes.io/storage-class"] = c.claim.storageClass.metadata.name), a;
 }
 return c.project = e, c.breadcrumbs[0].title = a("displayName")(e), f.canI("persistentvolumeclaims", "create", b.project) ? void (c.createPersistentVolumeClaim = function() {
 if (c.createPersistentVolumeClaimForm.$valid) {
@@ -11349,7 +11349,7 @@ projectName:"="
 templateUrl:"views/directives/osc-persistent-volume-claim.html",
 link:function(e) {
 var f = a("amountAndUnit"), g = a("usageValue");
-e.storageClasses = [], e.claim.unit = "Gi", e.units = [ {
+e.storageClasses = [], e.defaultStorageClass = "", e.claim.unit = "Gi", e.units = [ {
 value:"Mi",
 label:"MiB"
 }, {
@@ -11390,8 +11390,24 @@ a && b && (d = a >= b), a && c && (f = a <= c), e.persistentVolumeClaimForm.capa
 b.list({
 group:"storage.k8s.io",
 resource:"storageclasses"
-}, {}, function(a) {
-e.storageClasses = a.by("metadata.name");
+}, {}, function(b) {
+var c = b.by("metadata.name");
+e.storageClasses = _.sortBy(c, "metadata.name");
+var d = a("annotation");
+if (e.defaultStorageClass = _.find(e.storageClasses, function(a) {
+return "true" === d(a, "storageclass.beta.kubernetes.io/is-default-class");
+}), e.defaultStorageClass) e.claim.storageClass = e.defaultStorageClass; else {
+var f = {
+metadata:{
+name:"No Storage Class",
+labels:{},
+annotations:{
+description:"No storage class will be assigned"
+}
+}
+};
+e.storageClasses.unshift(f);
+}
 }, {
 errorNotification:!1
 }), b.list("limitranges", {
@@ -23633,31 +23649,34 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<fieldset ng-disabled=\"claimDisabled\">\n" +
     "<div ng-show=\"storageClasses | hashSize\" class=\"form-group\">\n" +
     "\n" +
-    "<label class=\"required\">Storage Classes</label>\n" +
-    "<div id=\"claim-storage-class-help\" class=\"help-block mar-bottom-lg\">\n" +
-    "Storage classes are set by the administrator to define types of storage the users can select.\n" +
-    "<div class=\"learn-more-block\">\n" +
-    "<a ng-href=\"{{'storage_classes' | helpLink}}\" target=\"_blank\">Learn More&nbsp;<i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a>\n" +
-    "</div>\n" +
-    "</div>\n" +
-    "<div ng-repeat=\"sclass in storageClasses track by (sclass | uid)\" id=\"storageclass-{{sclass.metadata.name}}\">\n" +
-    "<div class=\"radio\">\n" +
-    "<label>\n" +
-    "<input type=\"radio\" name=\"storageClass\" ng-value=\"sclass\" ng-model=\"claim.storageClass\">\n" +
-    "{{sclass.metadata.name}}\n" +
-    "</label>\n" +
+    "<label>Storage Class</label>\n" +
+    "<div>\n" +
+    "<ui-select ng-if=\"storageClasses\" ng-model=\"claim.storageClass\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a storage class\" class=\"select-role\">\n" +
+    "<ui-select-match placeholder=\"Select a storage class\">\n" +
+    "<span>\n" +
+    "{{$select.selected.metadata.name}}\n" +
+    "</span>\n" +
+    "</ui-select-match>\n" +
+    "<ui-select-choices repeat=\"sclass as sclass in storageClasses | toArray | filter : { metadata: { name: $select.search } } \">\n" +
+    "<div>\n" +
+    "<span ng-bind-html=\"sclass.metadata.name  | highlight : $select.search\"></span>\n" +
+    "<span ng-if=\"sclass | annotation : 'description'\" class=\"text-muted\">\n" +
+    "<small>&ndash;\n" +
+    "<span ng-if=\"sclass.parameters.type\">Type: {{sclass.parameters.type}} | </span>\n" +
+    "<span ng-if=\"sclass.parameters.zone\">Zone: {{sclass.parameters.zone}} | </span>\n" +
+    "{{sclass | annotation : 'description'}}\n" +
+    "</small>\n" +
+    "</span>\n" +
     "</div>\n" +
-    "<div class=\"help-block\">\n" +
-    "Type: {{sclass.parameters.type}} | Zone: {{sclass.parameters.zone}}\n" +
-    "<span ng-if=\"sclass.metadata.annotations.description\"> | {{sclass.metadata.annotations.description}}</span>\n" +
+    "</ui-select-choices>\n" +
+    "</ui-select>\n" +
     "</div>\n" +
+    "<div id=\"claim-storage-class-help\" class=\"help-block\">\n" +
+    "Storage classes are set by the administrator to define types of storage the users can select.\n" +
+    "<span ng-if=\"defaultStorageClass\"> If another storage class is not chosen, the default storage class <var>{{defaultStorageClass.metadata.name}}</var> will be used.</span>\n" +
+    "<div class=\"learn-more-block\">\n" +
+    "<a ng-href=\"{{'storage_classes' | helpLink}}\" target=\"_blank\">Learn More&nbsp;<i class=\"fa fa-external-link\" aria-hidden=\"true\"> </i></a>\n" +
     "</div>\n" +
-    "<div class=\"radio\">\n" +
-    "<label>\n" +
-    "<input type=\"radio\" name=\"storageClass\" ng-model=\"claim.storageClass\">\n" +
-    "No Storage Class\n" +
-    "<div class=\"help-block\">No storage class will be assigned unless a default class has been assigned by the system administrator.</div>\n" +
-    "</label>\n" +
     "</div>\n" +
     "</div>\n" +
     "\n" +