Skip to content

Commit 18eeb46

Browse files
cdcabreracdcabrera
committed
DEV Review Updates
Removed problematic display logic
1 parent 0cf80b5 commit 18eeb46

File tree

6 files changed

+65
-101
lines changed

6 files changed

+65
-101
lines changed

‎app/scripts/directives/editEnvironmentFrom.js

+1-18
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
controller: [
55
'$attrs',
66
'$filter',
7-
'$routeParams',
87
'keyValueEditorUtils',
98
EditEnvironmentFrom
109
],
@@ -19,13 +18,11 @@
1918

2019
function EditEnvironmentFrom($attrs,
2120
$filter,
22-
$routeParams,
2321
utils) {
2422
var ctrl = this;
2523

2624
var canI = $filter('canI');
2725
var humanizeKind = $filter('humanizeKind');
28-
var namespace = $routeParams.project;
2926
var uniqueId = _.uniqueId();
3027

3128
ctrl.setFocusClass = 'edit-environment-from-set-focus-' + uniqueId;
@@ -40,7 +37,7 @@
4037
};
4138

4239
ctrl.deleteEntry = function(start, deleteCount) {
43-
if(ctrl.entries && !ctrl.entries.length) {
40+
if(ctrl.envFromEntries && !ctrl.envFromEntries.length) {
4441
return;
4542
}
4643

@@ -152,20 +149,6 @@
152149
_.set(referenceValue, 'selectedEnvFrom', option);
153150
}
154151
});
155-
156-
} else {
157-
_.each(entries, function(entry) {
158-
var entryKind = (entry.secretRef)? 'Secret' : 'ConfigMap';
159-
var entryName = _.get(entry.configMapRef, 'name') || _.get(entry.secretRef, 'name');
160-
161-
_.set(entry, 'apiObj', {
162-
kind: entryKind,
163-
metadata: {
164-
name: entryName,
165-
namespace: namespace
166-
}
167-
});
168-
});
169152
}
170153
};
171154

‎app/views/directives/edit-environment-from.html

+9-19
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,11 @@
2121
class="form-group environment-from-input"
2222
ng-class="{ 'has-error': ($ctrl.editEnvironmentFromForm[uniqueForValue(unique, $index)].$invalid && $ctrl.editEnvironmentFromForm[uniqueForValue(unique, $index)].$touched) }">
2323
<div ng-if="$ctrl.isEnvFromReadonly(entry)" class="faux-input-group">
24-
<div class="faux-form-control readonly">
25-
Set to values in {{entry.apiObj.kind | humanizeKind : true | lowercase}}
26-
<span
27-
ng-if="!('configmaps' | canI : 'get') || !('secrets' | canI : 'get')">
28-
{{entry.configMapRef.name || entry.secretRef.name}}
29-
</span>
30-
<a
31-
ng-if="('configmaps' | canI : 'get') || ('secrets' | canI : 'get')"
32-
ng-href="{{entry.apiObj | navigateResourceURL}}">
33-
{{entry.configMapRef.name || entry.secretRef.name}}
34-
</a>
24+
<div ng-if="!entry.configMapRef.name && !entry.secretRef.name">
25+
No secrets or config maps have been added as Environment From.
26+
</div>
27+
<div ng-if="entry.configMapRef.name || entry.secretRef.name" class="faux-form-control readonly">
28+
Set to values in {{entry.configMapRef.name || entry.secretRef.name}}
3529
</div>
3630
</div>
3731

@@ -57,26 +51,22 @@
5751
</div>
5852
</div>
5953
</div>
60-
<div class="environment-from-editor-button">
54+
55+
<div ng-if="!$ctrl.isEnvFromReadonly(entry)" class="environment-from-editor-button">
6156
<span
62-
ng-if="!$ctrl.cannotSort && ($ctrl.entries.length > 1)"
57+
ng-if="!$ctrl.cannotSort"
6358
class="fa fa-bars sort-row"
6459
role="button"
6560
aria-label="Move row"
6661
aria-grabbed="false"
6762
as-sortable-item-handle></span>
6863
<a
64+
ng-if="!$ctrl.cannotDeleteAny"
6965
href=""
7066
class="pficon pficon-close delete-row as-sortable-item-delete"
7167
role="button"
7268
aria-label="Delete row"
73-
ng-hide="$ctrl.cannotDeleteAny"
7469
ng-click="$ctrl.deleteEntry($index, 1)"></a>
75-
<!-- <a
76-
ng-if="!$ctrl.editEnvironmentFromForm.$dirty"
77-
ng-href="{{entry.selectedEnvFrom | navigateResourceURL}}"
78-
class="pficon"
79-
ng-show="entry.selectedEnvFrom">View {{entry.selectedEnvFrom.kind | humanizeKind : true}}</a> -->
8070
</div>
8171
</div>
8272

‎app/views/directives/edit-environment-variables.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ <h4>Variables</h4>
3030
key-validator="[A-Za-z_][A-Za-z0-9_]*"
3131
key-validator-error="Please enter a valid key."
3232
key-validator-error-tooltip="A valid environment variable name is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores."
33-
add-row-link="Add Environment Variable"
34-
add-row-with-selectors-link="Add Environment Variable Using a Config Map or Secret"
33+
add-row-link="Add Variable"
34+
add-row-with-selectors-link="Add Variable from Config Map or Secret"
3535
show-header>
3636
</key-value-editor>
3737

‎dist/scripts/scripts.js

+38-47
Original file line numberDiff line numberDiff line change
@@ -9080,93 +9080,84 @@ n[e.key] = e.value;
90809080
};
90819081
} ]), function() {
90829082
angular.module("openshiftConsole").component("editEnvironmentFrom", {
9083-
controller: [ "$attrs", "$filter", "$routeParams", "keyValueEditorUtils", function(e, t, n, a) {
9084-
var r = this, o = t("canI"), i = t("humanizeKind"), s = n.project, c = _.uniqueId();
9085-
r.setFocusClass = "edit-environment-from-set-focus-" + c;
9086-
var l = function(e, t) {
9083+
controller: [ "$attrs", "$filter", "keyValueEditorUtils", function(e, t, n) {
9084+
var a = this, r = t("canI"), o = t("humanizeKind"), i = _.uniqueId();
9085+
a.setFocusClass = "edit-environment-from-set-focus-" + i;
9086+
var s = function(e, t) {
90879087
e && e.push(t || {});
90889088
};
9089-
r.onAddRow = function() {
9090-
l(r.envFromEntries), a.setFocusOn("." + r.setFocusClass);
9091-
}, r.deleteEntry = function(e, t) {
9092-
r.entries && !r.entries.length || (r.envFromEntries.splice(e, t), !r.envFromEntries.length && r.addRowLink && l(r.envFromEntries), r.updateEntries(r.envFromEntries), r.editEnvironmentFromForm.$setDirty());
9093-
}, r.isEnvFromReadonly = function(e) {
9094-
return r.isReadonlyAny || !0 === e.isReadonlyValue || (e.secretRef || e.configMapRef) && !e.selectedEnvFrom || _.isEmpty(r.envFromSelectorOptions);
9095-
}, r.groupByKind = function(e) {
9096-
return i(e.kind);
9097-
}, r.dragControlListeners = {
9089+
a.onAddRow = function() {
9090+
s(a.envFromEntries), n.setFocusOn("." + a.setFocusClass);
9091+
}, a.deleteEntry = function(e, t) {
9092+
a.envFromEntries && !a.envFromEntries.length || (a.envFromEntries.splice(e, t), !a.envFromEntries.length && a.addRowLink && s(a.envFromEntries), a.updateEntries(a.envFromEntries), a.editEnvironmentFromForm.$setDirty());
9093+
}, a.isEnvFromReadonly = function(e) {
9094+
return a.isReadonlyAny || !0 === e.isReadonlyValue || (e.secretRef || e.configMapRef) && !e.selectedEnvFrom || _.isEmpty(a.envFromSelectorOptions);
9095+
}, a.groupByKind = function(e) {
9096+
return o(e.kind);
9097+
}, a.dragControlListeners = {
90989098
accept: function(e, t) {
90999099
return e.itemScope.sortableScope.$id === t.$id;
91009100
},
91019101
orderChanged: function() {
9102-
r.editEnvironmentFromForm.$setDirty();
9102+
a.editEnvironmentFromForm.$setDirty();
91039103
}
9104-
}, r.envFromObjectSelected = function(e, t, n) {
9105-
var a = {};
9104+
}, a.envFromObjectSelected = function(e, t, n) {
9105+
var r = {};
91069106
switch (n.kind) {
91079107
case "Secret":
9108-
a.secretRef = {
9108+
r.secretRef = {
91099109
name: n.metadata.name
9110-
}, delete r.envFromEntries[e].configMapRef;
9110+
}, delete a.envFromEntries[e].configMapRef;
91119111
break;
91129112

91139113
case "ConfigMap":
9114-
a.configMapRef = {
9114+
r.configMapRef = {
91159115
name: n.metadata.name
9116-
}, delete r.envFromEntries[e].secretRef;
9116+
}, delete a.envFromEntries[e].secretRef;
91179117
}
9118-
_.assign(r.envFromEntries[e], a), r.updateEntries(r.envFromEntries);
9119-
}, r.updateEntries = function(e) {
9120-
r.entries = _.filter(e, function(e) {
9118+
_.assign(a.envFromEntries[e], r), a.updateEntries(a.envFromEntries);
9119+
}, a.updateEntries = function(e) {
9120+
a.entries = _.filter(e, function(e) {
91219121
return e.secretRef || e.configMapRef;
91229122
});
91239123
};
9124-
var u = function(e) {
9125-
r.envFromEntries = e || [], r.envFromEntries.length || l(r.envFromEntries), _.each(r.envFromEntries, function(e) {
9126-
e && (e.configMapRef && !o("configmaps", "get") && (e.isReadonlyValue = !0), e.secretRef && !o("secrets", "get") && (e.isReadonlyValue = !0));
9124+
var c = function(e) {
9125+
a.envFromEntries = e || [], a.envFromEntries.length || s(a.envFromEntries), _.each(a.envFromEntries, function(e) {
9126+
e && (e.configMapRef && !r("configmaps", "get") && (e.isReadonlyValue = !0), e.secretRef && !r("secrets", "get") && (e.isReadonlyValue = !0));
91279127
});
9128-
}, d = function(e) {
9128+
}, l = function(e) {
91299129
var t;
91309130
switch (e.kind) {
91319131
case "ConfigMap":
9132-
t = _.find(r.envFromEntries, {
9132+
t = _.find(a.envFromEntries, {
91339133
configMapRef: {
91349134
name: e.metadata.name
91359135
}
91369136
});
91379137
break;
91389138

91399139
case "Secret":
9140-
t = _.find(r.envFromEntries, {
9140+
t = _.find(a.envFromEntries, {
91419141
secretRef: {
91429142
name: e.metadata.name
91439143
}
91449144
});
91459145
}
91469146
return t;
91479147
};
9148-
r.checkEntries = function(e) {
9149-
return !!d(e);
9148+
a.checkEntries = function(e) {
9149+
return !!l(e);
91509150
};
9151-
var m = function(e, t) {
9152-
r.cannotAdd = r.isReadonlyAny || _.isEmpty(t), t ? _.each(t, function(e) {
9153-
var t = d(e);
9151+
var u = function(e, t) {
9152+
a.cannotAdd = a.isReadonlyAny || _.isEmpty(t), t && _.each(t, function(e) {
9153+
var t = l(e);
91549154
t && _.set(t, "selectedEnvFrom", e);
9155-
}) : _.each(e, function(e) {
9156-
var t = e.secretRef ? "Secret" : "ConfigMap", n = _.get(e.configMapRef, "name") || _.get(e.secretRef, "name");
9157-
_.set(e, "apiObj", {
9158-
kind: t,
9159-
metadata: {
9160-
name: n,
9161-
namespace: s
9162-
}
9163-
});
91649155
});
91659156
};
9166-
r.$onInit = function() {
9167-
u(r.entries), m(r.entries, r.envFromSelectorOptions), "cannotDelete" in e && (r.cannotDeleteAny = !0), "cannotSort" in e && (r.cannotSort = !0), "isReadonly" in e && (r.isReadonlyAny = !0), "showHeader" in e && (r.showHeader = !0), r.envFromEntries && !r.envFromEntries.length && l(r.envFromEntries);
9168-
}, r.$onChanges = function(e) {
9169-
e.entries && u(e.entries.currentValue), e.envFromSelectorOptions && m(r.envFromEntries, e.envFromSelectorOptions.currentValue);
9157+
a.$onInit = function() {
9158+
c(a.entries), u(a.entries, a.envFromSelectorOptions), "cannotDelete" in e && (a.cannotDeleteAny = !0), "cannotSort" in e && (a.cannotSort = !0), "isReadonly" in e && (a.isReadonlyAny = !0), "showHeader" in e && (a.showHeader = !0), a.envFromEntries && !a.envFromEntries.length && s(a.envFromEntries);
9159+
}, a.$onChanges = function(e) {
9160+
e.entries && c(e.entries.currentValue), e.envFromSelectorOptions && u(a.envFromEntries, e.envFromSelectorOptions.currentValue);
91709161
};
91719162
} ],
91729163
bindings: {

‎dist/scripts/templates.js

+9-13
Original file line numberDiff line numberDiff line change
@@ -6664,14 +6664,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
66646664
"<div class=\"environment-from-entry\" ng-class-odd=\"'odd'\" ng-class-even=\"'even'\" ng-repeat=\"entry in $ctrl.envFromEntries\" as-sortable-item>\n" +
66656665
"<div class=\"form-group environment-from-input\" ng-class=\"{ 'has-error': ($ctrl.editEnvironmentFromForm[uniqueForValue(unique, $index)].$invalid && $ctrl.editEnvironmentFromForm[uniqueForValue(unique, $index)].$touched) }\">\n" +
66666666
"<div ng-if=\"$ctrl.isEnvFromReadonly(entry)\" class=\"faux-input-group\">\n" +
6667-
"<div class=\"faux-form-control readonly\">\n" +
6668-
"Set to values in {{entry.apiObj.kind | humanizeKind : true | lowercase}}\n" +
6669-
"<span ng-if=\"!('configmaps' | canI : 'get') || !('secrets' | canI : 'get')\">\n" +
6670-
"{{entry.configMapRef.name || entry.secretRef.name}}\n" +
6671-
"</span>\n" +
6672-
"<a ng-if=\"('configmaps' | canI : 'get') || ('secrets' | canI : 'get')\" ng-href=\"{{entry.apiObj | navigateResourceURL}}\">\n" +
6673-
"{{entry.configMapRef.name || entry.secretRef.name}}\n" +
6674-
"</a>\n" +
6667+
"<div ng-if=\"!entry.configMapRef.name && !entry.secretRef.name\">\n" +
6668+
"No secrets or config maps have been added as Environment From.\n" +
6669+
"</div>\n" +
6670+
"<div ng-if=\"entry.configMapRef.name || entry.secretRef.name\" class=\"faux-form-control readonly\">\n" +
6671+
"Set to values in {{entry.configMapRef.name || entry.secretRef.name}}\n" +
66756672
"</div>\n" +
66766673
"</div>\n" +
66776674
"<div ng-if=\"!$ctrl.isEnvFromReadonly(entry)\">\n" +
@@ -6690,10 +6687,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
66906687
"</div>\n" +
66916688
"</div>\n" +
66926689
"</div>\n" +
6693-
"<div class=\"environment-from-input\">\n" +
6694-
"<span ng-if=\"!$ctrl.cannotSort && ($ctrl.entries.length > 1)\" class=\"fa fa-bars sort-row\" role=\"button\" aria-label=\"Move row\" aria-grabbed=\"false\" as-sortable-item-handle></span>\n" +
6695-
"<a href=\"\" class=\"pficon pficon-close delete-row as-sortable-item-delete\" role=\"button\" aria-label=\"Delete row\" ng-hide=\"$ctrl.cannotDeleteAny\" ng-click=\"$ctrl.deleteEntry($index, 1)\"></a>\n" +
6696-
"<a ng-if=\"!$ctrl.editEnvironmentFromForm.$dirty\" ng-href=\"{{entry.selectedEnvFrom | navigateResourceURL}}\" class=\"pficon\" ng-show=\"entry.selectedEnvFrom\">View {{entry.selectedEnvFrom.kind | humanizeKind : true}}</a>\n" +
6690+
"<div ng-if=\"!$ctrl.isEnvFromReadonly(entry)\" class=\"environment-from-editor-button\">\n" +
6691+
"<span ng-if=\"!$ctrl.cannotSort\" class=\"fa fa-bars sort-row\" role=\"button\" aria-label=\"Move row\" aria-grabbed=\"false\" as-sortable-item-handle></span>\n" +
6692+
"<a ng-if=\"!$ctrl.cannotDeleteAny\" href=\"\" class=\"pficon pficon-close delete-row as-sortable-item-delete\" role=\"button\" aria-label=\"Delete row\" ng-click=\"$ctrl.deleteEntry($index, 1)\"></a>\n" +
66976693
"</div>\n" +
66986694
"</div>\n" +
66996695
"<div class=\"environment-from-entry form-group\" ng-if=\"!$ctrl.cannotAdd\">\n" +
@@ -6717,7 +6713,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
67176713
"<key-value-editor ng-if=\"container.env.length\" entries=\"container.env\" key-placeholder=\"Name\" value-placeholder=\"Value\" cannot-add cannot-sort cannot-delete is-readonly show-header>\n" +
67186714
"</key-value-editor>\n" +
67196715
"</div>\n" +
6720-
"<key-value-editor ng-if=\"$ctrl.canIUpdate && !$ctrl.ngReadonly\" entries=\"container.env\" key-placeholder=\"Name\" value-placeholder=\"Value\" value-from-selector-options=\"$ctrl.valueFromObjects\" key-validator=\"[A-Za-z_][A-Za-z0-9_]*\" key-validator-error=\"Please enter a valid key.\" key-validator-error-tooltip=\"A valid environment variable name is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.\" add-row-link=\"Add Environment Variable\" add-row-with-selectors-link=\"Add Environment Variable Using a Config Map or Secret\" show-header>\n" +
6716+
"<key-value-editor ng-if=\"$ctrl.canIUpdate && !$ctrl.ngReadonly\" entries=\"container.env\" key-placeholder=\"Name\" value-placeholder=\"Value\" value-from-selector-options=\"$ctrl.valueFromObjects\" key-validator=\"[A-Za-z_][A-Za-z0-9_]*\" key-validator-error=\"Please enter a valid key.\" key-validator-error-tooltip=\"A valid environment variable name is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.\" add-row-link=\"Add Variable\" add-row-with-selectors-link=\"Add Variable from Config Map or Secret\" show-header>\n" +
67216717
"</key-value-editor>\n" +
67226718
"<h4>\n" +
67236719
"Environment From\n" +

‎dist/styles/main.css

+6-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)