Skip to content

Commit 832cec0

Browse files
author
OpenShift Bot
authored
Merge pull request #1133 from spadgett/storage-units
Merged by openshift-bot
2 parents c421188 + 37d1499 commit 832cec0

9 files changed

+184
-81
lines changed

‎app/scripts/directives/editRequestLimit.js

+19-6
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,34 @@ angular.module('openshiftConsole')
6868
case 'memory':
6969
scope.input.unit = 'Mi';
7070
scope.units = [{
71-
value: "M",
72-
label: "MB"
73-
}, {
74-
value: "G",
75-
label: "GB"
76-
}, {
7771
value: "Mi",
7872
label: "MiB"
7973
}, {
8074
value: "Gi",
8175
label: "GiB"
76+
}, {
77+
value: "M",
78+
label: "MB"
79+
}, {
80+
value: "G",
81+
label: "GB"
8282
}];
8383
break;
8484
}
8585

86+
scope.groupUnits = function(unit) {
87+
switch (unit.value) {
88+
case 'Mi':
89+
case 'Gi':
90+
return 'Binary Units';
91+
case 'M':
92+
case 'G':
93+
return 'Decimal Units';
94+
}
95+
96+
return '';
97+
};
98+
8699
var validateLimitRange = function() {
87100
// Use usageValue filter to normalize units for comparison.
88101
var value = scope.input.amount && usageValue(scope.input.amount + scope.input.unit),

‎app/scripts/directives/oscPersistentVolumeClaim.js

+32-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
"use strict";
22

33
angular.module("openshiftConsole")
4-
.directive("oscPersistentVolumeClaim", function(DataService){
4+
.directive("oscPersistentVolumeClaim",
5+
function(DataService,
6+
ModalsService) {
57
return {
68
restrict: 'E',
79
scope: {
@@ -10,7 +12,7 @@ angular.module("openshiftConsole")
1012
templateUrl: 'views/directives/osc-persistent-volume-claim.html',
1113
link: function(scope) {
1214
scope.storageClasses = [];
13-
scope.claim.unit = 'Mi';
15+
scope.claim.unit = 'Gi';
1416
scope.units = [{
1517
value: "Mi",
1618
label: "MiB"
@@ -21,10 +23,36 @@ angular.module("openshiftConsole")
2123
value: "Ti",
2224
label: "TiB"
2325
}, {
24-
value: "Pi",
25-
label: "PiB"
26+
value: "M",
27+
label: "MB"
28+
}, {
29+
value: "G",
30+
label: "GB"
31+
}, {
32+
value: "T",
33+
label: "TB"
2634
}];
2735
scope.claim.selectedLabels = [];
36+
37+
scope.groupUnits = function(unit) {
38+
switch (unit.value) {
39+
case 'Mi':
40+
case 'Gi':
41+
case 'Ti':
42+
return 'Binary Units';
43+
case 'M':
44+
case 'G':
45+
case 'T':
46+
return 'Decimal Units';
47+
}
48+
49+
return '';
50+
};
51+
52+
scope.showComputeUnitsHelp = function() {
53+
ModalsService.showComputeUnitsHelp();
54+
};
55+
2856
DataService.list({group: 'storage.k8s.io', resource: 'storageclasses'}, {}, function(storageClasses) {
2957
scope.storageClasses = storageClasses.by('metadata.name');
3058
}, {errorNotification: false});

‎app/styles/_select.less

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
min-height: 24px;
3636
cursor: pointer;
3737
}
38+
.ui-select-choices-group-label:empty {
39+
// Prevent extra space above the first choice when the group label is empty.
40+
padding: 0;
41+
}
3842
.ui-select-match-text, .ui-select-placeholder {
3943
font-weight: normal;
4044
}

‎app/views/_compute-resource.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<label class="sr-only" ng-attr-for="{{id}}-unit">Unit</label>
1818
<ui-select search-enabled="false" ng-model="input.unit" input-id="{{id}}-unit">
1919
<ui-select-match>{{$select.selected.label}}</ui-select-match>
20-
<ui-select-choices repeat="option.value as option in units">
20+
<ui-select-choices repeat="option.value as option in units" group-by="groupUnits">
2121
{{option.label}}
2222
</ui-select-choices>
2323
</ui-select>

‎app/views/directives/osc-persistent-volume-claim.html

+55-45
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,23 @@
3838
<!-- Name -->
3939
<div class="form-group">
4040
<label for="claim-name" class="required">Name</label>
41-
<input
42-
id="claim-name"
43-
class="form-control"
44-
type="text"
45-
name="name"
46-
ng-model="claim.name"
47-
ng-required="true"
48-
ng-pattern="/^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/"
49-
ng-maxlength="253"
50-
placeholder="my-storage-claim"
51-
select-on-focus
52-
autocorrect="off"
53-
autocapitalize="off"
54-
spellcheck="false"
55-
aria-describedby="claim-name-help">
41+
<span ng-class="{ 'has-error': persistentVolumeClaimForm.name.$invalid && persistentVolumeClaimForm.name.$touched && !claimDisabled }">
42+
<input
43+
id="claim-name"
44+
class="form-control"
45+
type="text"
46+
name="name"
47+
ng-model="claim.name"
48+
ng-required="true"
49+
ng-pattern="/^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/"
50+
ng-maxlength="253"
51+
placeholder="my-storage-claim"
52+
select-on-focus
53+
autocorrect="off"
54+
autocapitalize="off"
55+
spellcheck="false"
56+
aria-describedby="claim-name-help">
57+
</span>
5658
<div>
5759
<span id="claim-name-help" class="help-block">A unique name for the storage claim within the project.</span>
5860
</div>
@@ -92,38 +94,46 @@
9294
<!-- capacity -->
9395
<div class="form-group">
9496
<fieldset class="form-inline compute-resource">
95-
<label class="required">Size</label>
96-
<div class="resource-size" ng-class="{ 'has-error': form.$invalid }">
97-
<div class="resource-amount">
98-
<label class="sr-only">Amount</label>
99-
<input type="number"
100-
name="amount"
101-
ng-attr-id="claim-amount"
102-
ng-model="claim.amount"
103-
ng-required="true"
104-
min="0"
105-
ng-attr-placeholder="10"
106-
class="form-control"
107-
ng-attr-aria-describedby="claim-capacity-help">
97+
<label class="required">Size</label>
98+
<div class="resource-size">
99+
<div class="resource-amount" ng-class="{ 'has-error': persistentVolumeClaimForm.capacity.$invalid && persistentVolumeClaimForm.capacity.$touched && !claimDisabled }">
100+
<label class="sr-only">Amount</label>
101+
<input type="number"
102+
name="capacity"
103+
ng-attr-id="claim-amount"
104+
ng-model="claim.amount"
105+
ng-required="true"
106+
min="0"
107+
ng-attr-placeholder="10"
108+
class="form-control"
109+
ng-attr-aria-describedby="claim-capacity-help">
110+
</div>
111+
<div class="resource-unit">
112+
<label class="sr-only" >Unit</label>
113+
<ui-select search-enabled="false" ng-model="claim.unit" input-id="claim-capacity-unit">
114+
<ui-select-match>{{$select.selected.label}}</ui-select-match>
115+
<ui-select-choices repeat="option.value as option in units" group-by="groupUnits">
116+
{{option.label}}
117+
</ui-select-choices>
118+
</ui-select>
119+
</div>
120+
</div>
121+
<div id="claim-capacity-help" class="help-block">
122+
Desired storage capacity.
108123
</div>
109-
<div class="resource-unit">
110-
<label class="sr-only" >Unit</label>
111-
<ui-select search-enabled="false" ng-model="claim.unit" input-id="claim-capacity-unit">
112-
<ui-select-match>{{$select.selected.label}}</ui-select-match>
113-
<ui-select-choices repeat="option.value as option in units">
114-
{{option.label}}
115-
</ui-select-choices>
116-
</ui-select>
124+
<div class="has-error" ng-show="persistentVolumeClaimForm.capacity.$error.number && persistentVolumeClaimForm.capacity.$touched && !claimDisabled">
125+
<span class="help-block">
126+
Must be a number.
127+
</span>
128+
</div>
129+
<div class="has-error" ng-show="persistentVolumeClaimForm.capacity.$error.min && persistentVolumeClaimForm.capacity.$touched && !claimDisabled">
130+
<span class="help-block">
131+
Must be a positive number.
132+
</span>
133+
</div>
134+
<div class="learn-more-block mar-top-sm">
135+
<a href="" ng-click="showComputeUnitsHelp()">What are GiB?</a>
117136
</div>
118-
</div>
119-
<div id="claim-capacity-help" class="help-block">
120-
Desired storage capacity.
121-
</div>
122-
<div class="has-error" ng-show="persistentVolumeClaimForm.capacity.$error.pattern && persistentVolumeClaimForm.capacity.$touched && !claimDisabled">
123-
<span class="help-block">
124-
Must be a positive integer.
125-
</span>
126-
</div>
127137
</fieldset>
128138
</div>
129139
<!--advanced options-->

‎app/views/modals/about-compute-units-modal.html

+5-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ <h3>CPU</h3>
2222
1000 millcores = 1 core
2323
</pre>
2424

25-
<h3>Memory</h3>
25+
<h3>Memory and Storage</h3>
2626

2727
<p>
28-
Memory is measured in binary units like <var>KiB</var>, <var>MiB</var>, and <var>GiB</var> or
29-
decimal units like <var>kB</var>, <var>MB</var>, and&nbsp;<var>GB</var>.
28+
Memory and storage are measured in binary units like <var>KiB</var>, <var>MiB</var>, <var>GiB</var>, and <var>TiB</var> or
29+
decimal units like <var>kB</var>, <var>MB</var>, <var>GB</var>, and&nbsp;<var>TB</var>.
3030
</p>
3131

3232
<div class="row">
@@ -36,6 +36,7 @@ <h4>Binary Units</h4>
3636
1024 bytes = 1 KiB
3737
1024 KiB = 1 MiB
3838
1024 MiB = 1 GiB
39+
1024 GiB = 1 TiB
3940
</pre>
4041
</div>
4142
<div class="col-sm-6">
@@ -44,6 +45,7 @@ <h4>Decimal Units</h4>
4445
1000 bytes = 1 kB
4546
1000 kB = 1 MB
4647
1000 MB = 1 GB
48+
1000 GB = 1 TB
4749
</pre>
4850
</div>
4951
</div>

‎dist/scripts/scripts.js

+46-13
Original file line numberDiff line numberDiff line change
@@ -10063,15 +10063,15 @@ _.set(a, "model.service", c);
1006310063
});
1006410064
}
1006510065
};
10066-
}), angular.module("openshiftConsole").directive("oscPersistentVolumeClaim", [ "DataService", function(a) {
10066+
}), angular.module("openshiftConsole").directive("oscPersistentVolumeClaim", [ "DataService", "ModalsService", function(a, b) {
1006710067
return {
1006810068
restrict:"E",
1006910069
scope:{
1007010070
claim:"=model"
1007110071
},
1007210072
templateUrl:"views/directives/osc-persistent-volume-claim.html",
10073-
link:function(b) {
10074-
b.storageClasses = [], b.claim.unit = "Mi", b.units = [ {
10073+
link:function(c) {
10074+
c.storageClasses = [], c.claim.unit = "Gi", c.units = [ {
1007510075
value:"Mi",
1007610076
label:"MiB"
1007710077
}, {
@@ -10081,13 +10081,34 @@ label:"GiB"
1008110081
value:"Ti",
1008210082
label:"TiB"
1008310083
}, {
10084-
value:"Pi",
10085-
label:"PiB"
10086-
} ], b.claim.selectedLabels = [], a.list({
10084+
value:"M",
10085+
label:"MB"
10086+
}, {
10087+
value:"G",
10088+
label:"GB"
10089+
}, {
10090+
value:"T",
10091+
label:"TB"
10092+
} ], c.claim.selectedLabels = [], c.groupUnits = function(a) {
10093+
switch (a.value) {
10094+
case "Mi":
10095+
case "Gi":
10096+
case "Ti":
10097+
return "Binary Units";
10098+
10099+
case "M":
10100+
case "G":
10101+
case "T":
10102+
return "Decimal Units";
10103+
}
10104+
return "";
10105+
}, c.showComputeUnitsHelp = function() {
10106+
b.showComputeUnitsHelp();
10107+
}, a.list({
1008710108
group:"storage.k8s.io",
1008810109
resource:"storageclasses"
1008910110
}, {}, function(a) {
10090-
b.storageClasses = a.by("metadata.name");
10111+
c.storageClasses = a.by("metadata.name");
1009110112
}, {
1009210113
errorNotification:!1
1009310114
});
@@ -12461,19 +12482,31 @@ break;
1246112482

1246212483
case "memory":
1246312484
b.input.unit = "Mi", b.units = [ {
12464-
value:"M",
12465-
label:"MB"
12466-
}, {
12467-
value:"G",
12468-
label:"GB"
12469-
}, {
1247012485
value:"Mi",
1247112486
label:"MiB"
1247212487
}, {
1247312488
value:"Gi",
1247412489
label:"GiB"
12490+
}, {
12491+
value:"M",
12492+
label:"MB"
12493+
}, {
12494+
value:"G",
12495+
label:"GB"
1247512496
} ];
1247612497
}
12498+
b.groupUnits = function(a) {
12499+
switch (a.value) {
12500+
case "Mi":
12501+
case "Gi":
12502+
return "Binary Units";
12503+
12504+
case "M":
12505+
case "G":
12506+
return "Decimal Units";
12507+
}
12508+
return "";
12509+
};
1247712510
var j = function() {
1247812511
var a = b.input.amount && f(b.input.amount + b.input.unit), c = b.limitRangeMin && f(b.limitRangeMin), d = b.limitRangeMax && f(b.limitRangeMax), e = !0, g = !0;
1247912512
a && c && (e = a >= c), a && d && (g = a <= d), b.form.amount.$setValidity("limitRangeMin", e), b.form.amount.$setValidity("limitRangeMax", g);

0 commit comments

Comments
 (0)