Skip to content

Commit 312ae73

Browse files
benjaminapetersenf0x11
benjaminapetersen
authored and
f0x11
committed
Fix issue openshift#1863, kve sort quirks, and bump ng-sortable
- issue openshift#1863 could not pull second-to-last env var below last env var in kve - issue openshift#620 possibly helped (?) - bugzilla #1428991 reordering env vars down only works by twos - example: third moves to fifth, then seventh - bugzilla #1369315 possibly helped (?) I've mentioned 2 additional issues that may be helped by this fix as many quirky behaviors seem to resolve. That said, I will test more before closing them.
1 parent 5f59b88 commit 312ae73

File tree

7 files changed

+42
-34
lines changed

7 files changed

+42
-34
lines changed

Diff for: ‎app/styles/_kve.less

+14-10
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,6 @@
118118
width: 100%;
119119
}
120120

121-
.key-value-editor-input,
122-
.key-value-editor-header {
123-
float: left;
124-
padding-right: 5px;
125-
width: 50%;
126-
}
127-
128121
.key-value-editor-input .ui-select {
129122
@media(min-width: @screen-md-min) {
130123
float: left;
@@ -138,8 +131,19 @@
138131
}
139132
}
140133
}
134+
}
141135

142-
.key-value-editor-header {
143-
margin-bottom: 5px;
144-
}
136+
.key-value-editor .key-value-editor-input,
137+
.key-value-editor-header {
138+
float: left;
139+
padding-right: 5px;
140+
width: 50%;
141+
}
142+
143+
.key-value-editor-entry-header {
144+
padding-right: (@as-sortable-item-button-width * 2);
145+
}
146+
147+
.key-value-editor-header {
148+
margin-bottom: 5px;
145149
}

Diff for: ‎app/views/directives/key-value-editor.html

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<ng-form name="forms.keyValueEditor" novalidate ng-if="entries">
2-
<div class="key-value-editor" ng-model="entries" as-sortable="dragControlListeners">
32

4-
<div
5-
ng-if="showHeader"
6-
class="key-value-editor-entry">
7-
<div class="form-group key-value-editor-header key-header">
8-
<div class="input-group">
9-
<span class="help-block">{{keyPlaceholder}}</span>
10-
</div>
3+
<div
4+
ng-if="showHeader"
5+
class="key-value-editor-entry key-value-editor-entry-header">
6+
<div class="form-group key-value-editor-header key-header">
7+
<div class="input-group">
8+
<span class="help-block">{{keyPlaceholder}}</span>
119
</div>
12-
<div class="form-group key-value-editor-header value-header">
13-
<div class="input-group">
14-
<span class="help-block">{{valuePlaceholder}}</span>
15-
</div>
10+
</div>
11+
<div class="form-group key-value-editor-header value-header">
12+
<div class="input-group">
13+
<span class="help-block">{{valuePlaceholder}}</span>
1614
</div>
1715
</div>
16+
</div>
1817

18+
<div ng-model="entries" class="key-value-editor" as-sortable="dragControlListeners">
1919
<div
2020
class="key-value-editor-entry"
2121
ng-class-odd="'odd'"
@@ -149,7 +149,7 @@
149149
</div>
150150
</div>
151151
<div ng-if="!isValueFromReadonly(entry)">
152-
<div class="ui-select">
152+
<div class="ui-select key-value-editor-select">
153153
<ui-select ng-model="entry.selectedValueFrom" ng-required="true" on-select="valueFromObjectSelected(entry, $select.selected)">
154154
<ui-select-match placeholder="{{'Select a resource'|translate}}">
155155
<span>
@@ -164,7 +164,7 @@
164164
</ui-select-choices>
165165
</ui-select>
166166
</div>
167-
<div class="ui-select">
167+
<div class="ui-select key-value-editor-select">
168168
<ui-select ng-model="entry.selectedValueFromKey" ng-required="true" on-select="valueFromKeySelected(entry, $select.selected)">
169169
<ui-select-match placeholder="{{'Select key'|translate}}">
170170
{{$select.selected}}

Diff for: ‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"clipboard": "1.5.8",
3939
"ansi_up": "1.3.0",
4040
"angular-extension-registry": "1.2.6",
41-
"ng-sortable": "1.3.4",
41+
"ng-sortable": "1.3.8",
4242
"ui-select": "angular-ui-select#0.19.4",
4343
"matchHeight": "0.7.0",
4444
"angular-inview": "2.2.0",

Diff for: ‎dist/scripts/scripts.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -19687,10 +19687,13 @@ uniqueForKey: r.uniqueForKey,
1968719687
uniqueForValue: r.uniqueForValue,
1968819688
dragControlListeners: {
1968919689
accept: function(e, t) {
19690-
return e.itemScope.sortableScope.$id === t.$id;
19690+
return console.log("accept?"), e.itemScope.sortableScope.$id === t.$id;
1969119691
},
1969219692
orderChanged: function() {
1969319693
t.forms.keyValueEditor.$setDirty();
19694+
},
19695+
itemMoved: function(e) {
19696+
console.log("itemMoved"), console.log("event", e), console.log("source", e.source), console.log("dest", e.dest), e.source.itemScope.modelValue.status = e.dest.sortableScope.$parent.column.name, t.forms.keyValueEditor.$setDirty();
1969419697
}
1969519698
},
1969619699
deleteEntry: function(e, n) {

Diff for: ‎dist/scripts/templates.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -7681,8 +7681,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
76817681

76827682
$templateCache.put('views/directives/key-value-editor.html',
76837683
"<ng-form name=\"forms.keyValueEditor\" novalidate ng-if=\"entries\">\n" +
7684-
"<div class=\"key-value-editor\" ng-model=\"entries\" as-sortable=\"dragControlListeners\">\n" +
7685-
"<div ng-if=\"showHeader\" class=\"key-value-editor-entry\">\n" +
7684+
"<div ng-if=\"showHeader\" class=\"key-value-editor-entry key-value-editor-entry-header\">\n" +
76867685
"<div class=\"form-group key-value-editor-header key-header\">\n" +
76877686
"<div class=\"input-group\">\n" +
76887687
"<span class=\"help-block\">{{keyPlaceholder}}</span>\n" +
@@ -7694,6 +7693,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
76947693
"</div>\n" +
76957694
"</div>\n" +
76967695
"</div>\n" +
7696+
"<div ng-model=\"entries\" class=\"key-value-editor\" as-sortable=\"dragControlListeners\">\n" +
76977697
"<div class=\"key-value-editor-entry\" ng-class-odd=\"'odd'\" ng-class-even=\"'even'\" ng-repeat=\"entry in entries\" as-sortable-item>\n" +
76987698
"\n" +
76997699
"<div class=\"form-group key-value-editor-input\" ng-class=\"{ 'has-error' : (forms.keyValueEditor[uniqueForKey(unique, $index)].$invalid && forms.keyValueEditor[uniqueForKey(unique, $index)].$touched) }\">\n" +
@@ -7756,7 +7756,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
77567756
"</div>\n" +
77577757
"</div>\n" +
77587758
"<div ng-if=\"!isValueFromReadonly(entry)\">\n" +
7759-
"<div class=\"ui-select\">\n" +
7759+
"<div class=\"ui-select key-value-editor-select\">\n" +
77607760
"<ui-select ng-model=\"entry.selectedValueFrom\" ng-required=\"true\" on-select=\"valueFromObjectSelected(entry, $select.selected)\">\n" +
77617761
"<ui-select-match placeholder=\"{{'Select a resource'|translate}}\">\n" +
77627762
"<span>\n" +
@@ -7769,7 +7769,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
77697769
"</ui-select-choices>\n" +
77707770
"</ui-select>\n" +
77717771
"</div>\n" +
7772-
"<div class=\"ui-select\">\n" +
7772+
"<div class=\"ui-select key-value-editor-select\">\n" +
77737773
"<ui-select ng-model=\"entry.selectedValueFromKey\" ng-required=\"true\" on-select=\"valueFromKeySelected(entry, $select.selected)\">\n" +
77747774
"<ui-select-match placeholder=\"{{'Select key'|translate}}\">\n" +
77757775
"{{$select.selected}}\n" +

Diff for: ‎dist/scripts/vendor.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -70151,7 +70151,6 @@ angular.element(r[0].body).unbind("keydown", H);
7015170151
}), B = function(e) {
7015270152
return "function" == typeof a.sortableScope.options.placeholder ? angular.element(a.sortableScope.options.placeholder(e)) : "string" == typeof a.sortableScope.options.placeholder ? angular.element(a.sortableScope.options.placeholder) : angular.element(r[0].createElement(e.element.prop("tagName")));
7015370153
}, x = function(e) {
70154-
e.preventDefault();
7015570154
var t, i = function() {
7015670155
angular.element(r).unbind("mousemove", o), angular.element(r).unbind("touchmove", o), s.unbind("mouseup", i), s.unbind("touchend", i), s.unbind("touchcancel", i);
7015770156
}, o = function(r) {
@@ -70178,7 +70177,7 @@ var s, l, c, f, m;
7017870177
if ((!M || !n.isTouchInvalid(o)) && N && p) {
7017970178
if (o.preventDefault(), s = n.eventObj(o), a.callbacks.dragMove !== angular.noop && a.sortableScope.$apply(function() {
7018070179
a.callbacks.dragMove(v, y, s);
70181-
}), l = s.pageX - r[0].documentElement.scrollLeft, c = s.pageY - (i.pageYOffset || r[0].documentElement.scrollTop), m = angular.element(r[0].elementFromPoint(l, c)), p.addClass(t.hiddenClass), p.removeClass(t.hiddenClass), n.movePosition(s, p, v, y, w, _), p.addClass(t.dragging), !(f = h(m)) || !f.type) return;
70180+
}), l = s.pageX - r[0].documentElement.scrollLeft, c = s.pageY - (i.pageYOffset || r[0].documentElement.scrollTop), p.addClass(t.hiddenClass), m = angular.element(r[0].elementFromPoint(l, c)), p.removeClass(t.hiddenClass), n.movePosition(s, p, v, y, w, _), p.addClass(t.dragging), !(f = h(m)) || !f.type) return;
7018270181
if ("handle" === f.type && (f = f.itemScope), "item" !== f.type && "sortable" !== f.type) return;
7018370182
if ("item" === f.type && f.accept(a, f.sortableScope, f)) {
7018470183
m = f.element;

Diff for: ‎dist/styles/main.css

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

0 commit comments

Comments
 (0)