mirror of
https://github.com/ansible/awx.git
synced 2024-10-31 06:51:10 +03:00
Merge pull request #7357 from mabashian/awx-dep-upgrades-June-15
UI dependency upgrades Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
GitHub
commit
6682dcbc7c
@ -589,7 +589,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
|
||||
html += (field.readonly) ? "disabled " : "";
|
||||
html += (field.ngChange) ? "ng-change=\"" +field.ngChange + "\" " : "";
|
||||
html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
|
||||
html += `><span class="Form-inputLabel">${field.label}</span></label>`;
|
||||
html += `/><span class="Form-inputLabel">${field.label}</span></label>`;
|
||||
html += (field.awPopOver) ? Attr(field, 'awPopOver', fld) : "";
|
||||
html += `</div>`;
|
||||
|
||||
@ -781,7 +781,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
|
||||
html += field.awRequiredWhen.alwaysShowAsterisk ? "data-awrequired-always-show-asterisk=true " : "";
|
||||
}
|
||||
html += (field.awValidUrl) ? "aw-valid-url " : "";
|
||||
html += ">\n";
|
||||
html += "/>\n";
|
||||
}
|
||||
|
||||
if (field.clear) {
|
||||
@ -806,7 +806,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
|
||||
data-placement="top"
|
||||
id="${this.form.name}_${fld}_gen_btn"
|
||||
>
|
||||
<i class="fa fa-refresh" />
|
||||
<i class="fa fa-refresh"></i>
|
||||
</button>
|
||||
</span>`;
|
||||
const genHashButtonTemplate = _.get(field, 'genHashButtonTemplate', defaultGenHashButtonTemplate);
|
||||
@ -900,7 +900,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
|
||||
html += field.awRequiredWhen.alwaysShowAsterisk ? "data-awrequired-always-show-asterisk=true " : "";
|
||||
}
|
||||
html += (field.awValidUrl) ? "aw-valid-url " : "";
|
||||
html += ">\n";
|
||||
html += "/>\n";
|
||||
}
|
||||
|
||||
html += "</div>\n";
|
||||
@ -1117,7 +1117,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
|
||||
html += field.awRequiredWhen.reqExpression ? "aw-required-when=\"" + field.awRequiredWhen.reqExpression + "\" " : "";
|
||||
html += field.awRequiredWhen.alwaysShowAsterisk ? "data-awrequired-always-show-asterisk=true " : "";
|
||||
}
|
||||
html += " >\n";
|
||||
html += " />\n";
|
||||
|
||||
// Add error messages
|
||||
if (field.required) {
|
||||
@ -1219,7 +1219,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
|
||||
html += (field.ngChange) ? Attr(field, 'ngChange') : "";
|
||||
html += (field.readonly) ? "disabled " : "";
|
||||
html += (field.ngDisabled) ? Attr(field, 'ngDisabled') : "";
|
||||
html += " > ";
|
||||
html += " /> ";
|
||||
html += field.label;
|
||||
html += "</label>\n";
|
||||
html += "<div class=\"error api-error\" id=\"" + this.form.name + "-" + fld + "-api-error\" ng-bind=\"" +
|
||||
@ -1286,7 +1286,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
|
||||
html += (field.watchBasePath !== undefined) ? ` watchBasePath=${field.watchBasePath} ` : "";
|
||||
html += `ng-model-options="{ updateOn: 'default blur', debounce: { 'default': 300, 'blur': 0 } }"`;
|
||||
html += (field.awLookupWhen !== undefined) ? this.attr(field, 'awLookupWhen') : "";
|
||||
html += " awlookup >\n";
|
||||
html += " awlookup />\n";
|
||||
html += "</div>\n";
|
||||
|
||||
// Add error messages
|
||||
|
||||
@ -352,7 +352,7 @@ export default ['$compile', 'Attr', 'Icon',
|
||||
innerTable += '<select-list-item item=\"' + list.iterator + '\" disabled="'+list.disableRowValue+'"></select-list-item>';
|
||||
} else {
|
||||
if (options.input_type === "radio") { //added by JT so that lookup forms can be either radio inputs or check box inputs
|
||||
innerTable += `<input type="radio" ng-model="${list.iterator}.checked" ng-value="1" ng-false-value="0" name="check_${list.iterator}_{{${list.iterator}.id}}" ng-click="toggle_row(${list.iterator})" ng-disabled="${list.disableRowValue}">`;
|
||||
innerTable += `<input type="radio" ng-model="${list.iterator}.checked" ng-value="1" ng-false-value="0" name="check_${list.iterator}_{{${list.iterator}.id}}" ng-click="toggle_row(${list.iterator})" ng-disabled="${list.disableRowValue}" />`;
|
||||
}
|
||||
else { // its assumed that options.input_type = checkbox
|
||||
innerTable += "<input type=\"checkbox\" ng-model=\"" + list.iterator + ".checked\" name=\"check_{{" +
|
||||
|
||||
@ -445,7 +445,7 @@ function(NotificationsList, i18n) {
|
||||
data-placement="top"
|
||||
id="job_template_webhook_key_gen_btn"
|
||||
>
|
||||
<i class="fa fa-refresh" />
|
||||
<i class="fa fa-refresh"></i>
|
||||
</button>
|
||||
</span>
|
||||
`,
|
||||
|
||||
@ -218,7 +218,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
|
||||
data-placement="top"
|
||||
id="workflow_job_template_webhook_key_gen_btn"
|
||||
>
|
||||
<i class="fa fa-refresh" />
|
||||
<i class="fa fa-refresh"></i>
|
||||
</button>
|
||||
</span>
|
||||
`,
|
||||
|
||||
101
awx/ui/package-lock.json
generated
101
awx/ui/package-lock.json
generated
@ -158,23 +158,18 @@
|
||||
"from": "git+https://git@github.com/ansible/angular-breadcrumb.git#0.4.1"
|
||||
},
|
||||
"angular-codemirror": {
|
||||
"version": "git+https://git@github.com/ansible/angular-codemirror.git#447f071eff8f6fde7b5ec769c57c7dc98a014fdf",
|
||||
"from": "git+https://git@github.com/ansible/angular-codemirror.git#v1.1.2",
|
||||
"version": "git+https://git@github.com/ansible/angular-codemirror.git#4ee3223f505cb0df2406a1e61073beaeebd3b56a",
|
||||
"from": "git+https://git@github.com/ansible/angular-codemirror.git#v1.2.1",
|
||||
"requires": {
|
||||
"angular": "~1.6.6",
|
||||
"angular": "^1.7.9",
|
||||
"codemirror": "^5.17.0",
|
||||
"jquery": "^3.2.1"
|
||||
"jquery": "^3.5.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"angular": {
|
||||
"version": "1.6.10",
|
||||
"resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz",
|
||||
"integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg=="
|
||||
},
|
||||
"jquery": {
|
||||
"version": "3.3.1",
|
||||
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
|
||||
"integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
|
||||
"version": "3.5.1",
|
||||
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
|
||||
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -246,33 +241,33 @@
|
||||
"integrity": "sha512-nB/xe7JQWF9nLvhHommAICQ3eWrfRETo0EVGFESi952CDzDa+GAJ/2BFBNw44QqQPxj1Xua/uYKrbLsOGWZdbQ=="
|
||||
},
|
||||
"angular-scheduler": {
|
||||
"version": "git+https://git@github.com/ansible/angular-scheduler.git#a519c52312cb4430a59a8d58e01d3eac3fe5018a",
|
||||
"from": "git+https://git@github.com/ansible/angular-scheduler.git#v0.4.1",
|
||||
"version": "git+https://git@github.com/ansible/angular-scheduler.git#6a2d33b06b1143e7449c4427f222fd05559f3a23",
|
||||
"from": "git+https://git@github.com/ansible/angular-scheduler.git#v0.4.3",
|
||||
"requires": {
|
||||
"angular": "~1.7.2",
|
||||
"angular-tz-extensions": "github:ansible/angular-tz-extensions#fc60660f43ee9ff84da94ca71ab27ef0c20fd77d",
|
||||
"jquery": "*",
|
||||
"angular": "^1.7.9",
|
||||
"angular-tz-extensions": "github:ansible/angular-tz-extensions#5c594b5756d29637601020bba16274f10ee0ed65",
|
||||
"jquery": "^3.5.1",
|
||||
"jquery-ui": "*",
|
||||
"lodash": "~3.8.0",
|
||||
"lodash": "^4.17.15",
|
||||
"moment": "^2.10.2",
|
||||
"rrule": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c"
|
||||
},
|
||||
"dependencies": {
|
||||
"angular-tz-extensions": {
|
||||
"version": "github:ansible/angular-tz-extensions#fc60660f43ee9ff84da94ca71ab27ef0c20fd77d",
|
||||
"version": "github:ansible/angular-tz-extensions#5c594b5756d29637601020bba16274f10ee0ed65",
|
||||
"from": "github:ansible/angular-tz-extensions",
|
||||
"requires": {
|
||||
"angular": "~1.7.2",
|
||||
"angular": "^1.7.9",
|
||||
"angular-filters": "^1.1.2",
|
||||
"jquery": "^3.1.0",
|
||||
"jquery": "^3.5.1",
|
||||
"jstimezonedetect": "1.0.5",
|
||||
"timezone-js": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f"
|
||||
}
|
||||
},
|
||||
"lodash": {
|
||||
"version": "3.8.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz",
|
||||
"integrity": "sha1-N265i9zZOCqTZcM8TLglDeEyW5E="
|
||||
"jquery": {
|
||||
"version": "3.5.1",
|
||||
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
|
||||
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
|
||||
},
|
||||
"rrule": {
|
||||
"version": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c",
|
||||
@ -281,29 +276,20 @@
|
||||
}
|
||||
},
|
||||
"angular-tz-extensions": {
|
||||
"version": "git+https://git@github.com/ansible/angular-tz-extensions.git#9cabb05d58079092bfb29ccae721b35b46f28af6",
|
||||
"from": "git+https://git@github.com/ansible/angular-tz-extensions.git#v0.5.2",
|
||||
"version": "git+https://git@github.com/ansible/angular-tz-extensions.git#5c594b5756d29637601020bba16274f10ee0ed65",
|
||||
"from": "git+https://git@github.com/ansible/angular-tz-extensions.git#v0.6.1",
|
||||
"requires": {
|
||||
"angular": "~1.6.6",
|
||||
"angular": "^1.7.9",
|
||||
"angular-filters": "^1.1.2",
|
||||
"jquery": "^3.1.0",
|
||||
"jquery": "^3.5.1",
|
||||
"jstimezonedetect": "1.0.5",
|
||||
"timezone-js": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f"
|
||||
},
|
||||
"dependencies": {
|
||||
"angular": {
|
||||
"version": "1.6.10",
|
||||
"resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz",
|
||||
"integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg=="
|
||||
},
|
||||
"jquery": {
|
||||
"version": "3.3.1",
|
||||
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
|
||||
"integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
|
||||
},
|
||||
"timezone-js": {
|
||||
"version": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f",
|
||||
"from": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f"
|
||||
"version": "3.5.1",
|
||||
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
|
||||
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1832,6 +1818,13 @@
|
||||
"integrity": "sha512-213St/G8KT3mjs4qu4qwww74KWysMaIeqgq5OhrboZjIjemIpyuxlSo9FNNI5+KzpkkxkRRba+oewiRGV42B1A==",
|
||||
"requires": {
|
||||
"jquery": ">=1.7.1 <4.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"jquery": {
|
||||
"version": "3.5.1",
|
||||
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
|
||||
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
|
||||
}
|
||||
}
|
||||
},
|
||||
"brace-expansion": {
|
||||
@ -7832,9 +7825,9 @@
|
||||
"integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
|
||||
},
|
||||
"jquery": {
|
||||
"version": "3.4.1",
|
||||
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
|
||||
"integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
|
||||
"version": "3.5.1",
|
||||
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
|
||||
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
|
||||
},
|
||||
"jquery-mousewheel": {
|
||||
"version": "3.1.13",
|
||||
@ -9458,23 +9451,11 @@
|
||||
"dev": true
|
||||
},
|
||||
"ng-toast": {
|
||||
"version": "git+https://git@github.com/ansible/ngToast.git#2c2038381d5cfcab26fdefe98e0408a52e71daa5",
|
||||
"from": "git+https://git@github.com/ansible/ngToast.git#v2.1.1",
|
||||
"version": "git+https://git@github.com/ansible/ngToast.git#4550efb9cf7fb90c9bfbd9476f1fe650aaad5b6e",
|
||||
"from": "git+https://git@github.com/ansible/ngToast.git#v2.2.1",
|
||||
"requires": {
|
||||
"angular": "~1.6.6",
|
||||
"angular-sanitize": "~1.6.6"
|
||||
},
|
||||
"dependencies": {
|
||||
"angular": {
|
||||
"version": "1.6.10",
|
||||
"resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz",
|
||||
"integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg=="
|
||||
},
|
||||
"angular-sanitize": {
|
||||
"version": "1.6.10",
|
||||
"resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.6.10.tgz",
|
||||
"integrity": "sha512-01i1Xoq9ykUrsoYQMSB6dWZmPp9Df5hfCqMAGGzJBWZ7L2WY0OtUphdI0YvR8ZF9lAsWtGNtsEFilObjq5nTgQ=="
|
||||
}
|
||||
"angular": "^1.7.9",
|
||||
"angular-sanitize": "^1.7.9"
|
||||
}
|
||||
},
|
||||
"ngtemplate-loader": {
|
||||
|
||||
@ -99,7 +99,7 @@
|
||||
"@uirouter/angularjs": "1.0.18",
|
||||
"angular": "^1.7.9",
|
||||
"angular-breadcrumb": "git+https://git@github.com/ansible/angular-breadcrumb#0.4.1",
|
||||
"angular-codemirror": "git+https://git@github.com/ansible/angular-codemirror#v1.1.2",
|
||||
"angular-codemirror": "git+https://git@github.com/ansible/angular-codemirror.git#v1.2.1",
|
||||
"angular-cookies": "^1.7.9",
|
||||
"angular-drag-and-drop-lists": "git+https://git@github.com/ansible/angular-drag-and-drop-lists#v1.4.1",
|
||||
"angular-duration-format": "^1.0.1",
|
||||
@ -107,8 +107,8 @@
|
||||
"angular-moment": "^1.3.0",
|
||||
"angular-mousewheel": "^1.0.5",
|
||||
"angular-sanitize": "^1.7.9",
|
||||
"angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler#v0.4.1",
|
||||
"angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#v0.5.2",
|
||||
"angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler.git#v0.4.3",
|
||||
"angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions.git#v0.6.1",
|
||||
"angular-xeditable": "~0.8.0",
|
||||
"ansi-to-html": "^0.6.3",
|
||||
"babel-polyfill": "^6.26.0",
|
||||
@ -122,7 +122,7 @@
|
||||
"html-entities": "^1.2.1",
|
||||
"inherits": "^1.0.2",
|
||||
"javascript-detect-element-resize": "^0.5.3",
|
||||
"jquery": "^3.4.1",
|
||||
"jquery": "^3.5.1",
|
||||
"jquery-ui": "^1.12.1",
|
||||
"js-yaml": "^3.13.1",
|
||||
"legacy-loader": "0.0.2",
|
||||
@ -130,7 +130,7 @@
|
||||
"lr-infinite-scroll": "git+https://git@github.com/lorenzofox3/lrInfiniteScroll",
|
||||
"mathjs": "^3.15.0",
|
||||
"moment": "^2.19.4",
|
||||
"ng-toast": "git+https://git@github.com/ansible/ngToast#v2.1.1",
|
||||
"ng-toast": "git+https://git@github.com/ansible/ngToast.git#v2.2.1",
|
||||
"nvd3": "^1.8.6",
|
||||
"popper.js": "~1.14.4",
|
||||
"reconnectingwebsocket": "^1.0.0",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user