From 8d63ebf0e00ff01443108807278f57949427c0c0 Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 15 Jun 2020 17:20:30 -0400 Subject: [PATCH 1/5] Upgrade to the latest angular-scheduler --- awx/ui/package-lock.json | 58 +++++++++++++++++++++++++--------------- awx/ui/package.json | 2 +- 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/awx/ui/package-lock.json b/awx/ui/package-lock.json index 3e072d5294..00fe8894d5 100644 --- a/awx/ui/package-lock.json +++ b/awx/ui/package-lock.json @@ -246,14 +246,14 @@ "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#f9595a06db0e08d426b144a6fbe68f3966b77ae4", + "from": "git+https://git@github.com/ansible/angular-scheduler.git#v0.4.2", "requires": { - "angular": "~1.7.2", - "angular-tz-extensions": "github:ansible/angular-tz-extensions#fc60660f43ee9ff84da94ca71ab27ef0c20fd77d", + "angular": "^1.7.9", + "angular-tz-extensions": "github:ansible/angular-tz-extensions", "jquery": "*", "jquery-ui": "*", - "lodash": "~3.8.0", + "lodash": "^4.17.15", "moment": "^2.10.2", "rrule": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c" }, @@ -266,14 +266,9 @@ "angular-filters": "^1.1.2", "jquery": "^3.1.0", "jstimezonedetect": "1.0.5", - "timezone-js": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f" + "timezone-js": "github:ansible/timezone-js#0.4.14" } }, - "lodash": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz", - "integrity": "sha1-N265i9zZOCqTZcM8TLglDeEyW5E=" - }, "rrule": { "version": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c", "from": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c" @@ -1817,6 +1812,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "dev": true, + "optional": true, "requires": { "hoek": "2.x.x" } @@ -5381,7 +5377,8 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -5405,13 +5402,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5421,19 +5420,22 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5554,7 +5556,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5568,6 +5571,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5584,6 +5588,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5689,7 +5694,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5703,6 +5709,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5798,7 +5805,8 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5840,6 +5848,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5861,6 +5870,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5893,7 +5903,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dev": true, + "optional": true } } }, @@ -6640,7 +6651,8 @@ "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true + "dev": true, + "optional": true }, "home-or-tmp": { "version": "2.0.0", @@ -9138,6 +9150,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -9147,7 +9160,8 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true + "dev": true, + "optional": true } } }, diff --git a/awx/ui/package.json b/awx/ui/package.json index 60e79f0cd1..1fd3d7152d 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -107,7 +107,7 @@ "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-scheduler": "git+https://git@github.com/ansible/angular-scheduler.git#v0.4.2", "angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#v0.5.2", "angular-xeditable": "~0.8.0", "ansi-to-html": "^0.6.3", From d5fcf733f074027c1af602b72ce5754aa720966a Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 15 Jun 2020 17:56:20 -0400 Subject: [PATCH 2/5] Upgrades to the latest angular-codemirror --- awx/ui/package-lock.json | 19 +++++++------------ awx/ui/package.json | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/awx/ui/package-lock.json b/awx/ui/package-lock.json index 00fe8894d5..f55c54c56a 100644 --- a/awx/ui/package-lock.json +++ b/awx/ui/package-lock.json @@ -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==" } } }, diff --git a/awx/ui/package.json b/awx/ui/package.json index 1fd3d7152d..28af9e0f4a 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -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", From 34dd034f7ca02b299578c68a839e4ce493c4858e Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 15 Jun 2020 18:06:44 -0400 Subject: [PATCH 3/5] Upgrades to the latest angular-tz-extensions --- awx/ui/package-lock.json | 25 ++++++++----------------- awx/ui/package.json | 2 +- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/awx/ui/package-lock.json b/awx/ui/package-lock.json index f55c54c56a..10774dc279 100644 --- a/awx/ui/package-lock.json +++ b/awx/ui/package-lock.json @@ -271,29 +271,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" + "timezone-js": "github:ansible/timezone-js#0.4.14" }, "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==" } } }, diff --git a/awx/ui/package.json b/awx/ui/package.json index 28af9e0f4a..ffe76211f7 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -108,7 +108,7 @@ "angular-mousewheel": "^1.0.5", "angular-sanitize": "^1.7.9", "angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler.git#v0.4.2", - "angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#v0.5.2", + "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", From 5e3ce7b7eacd1a4699377eea0dafd89f83ab3bed Mon Sep 17 00:00:00 2001 From: mabashian Date: Tue, 16 Jun 2020 10:27:28 -0400 Subject: [PATCH 4/5] Update ngToast to most recent version --- awx/ui/package-lock.json | 20 ++++---------------- awx/ui/package.json | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/awx/ui/package-lock.json b/awx/ui/package-lock.json index 10774dc279..70c42991ab 100644 --- a/awx/ui/package-lock.json +++ b/awx/ui/package-lock.json @@ -9458,23 +9458,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": { diff --git a/awx/ui/package.json b/awx/ui/package.json index ffe76211f7..b4a94fd4e4 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -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", From 781b6758375731bb188828b0c96b33404fb0ca31 Mon Sep 17 00:00:00 2001 From: mabashian Date: Tue, 16 Jun 2020 12:39:48 -0400 Subject: [PATCH 5/5] Upgrade jquery to 3.5.1 --- awx/ui/client/src/shared/form-generator.js | 14 ++-- .../list-generator/list-generator.factory.js | 2 +- .../job_templates/job-template.form.js | 2 +- awx/ui/client/src/templates/workflows.form.js | 2 +- awx/ui/package-lock.json | 77 +++++++++---------- awx/ui/package.json | 4 +- 6 files changed, 47 insertions(+), 54 deletions(-) diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index b5f515537b..fca3a419f2 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -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 += `>${field.label}`; + html += `/>${field.label}`; html += (field.awPopOver) ? Attr(field, 'awPopOver', fld) : ""; html += ``; @@ -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" > - + `; 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 += "\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 += "\n"; html += "
'; } else { if (options.input_type === "radio") { //added by JT so that lookup forms can be either radio inputs or check box inputs - innerTable += ``; + innerTable += ``; } else { // its assumed that options.input_type = checkbox innerTable += " - + `, diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js index d0acdf134a..f65f08f353 100644 --- a/awx/ui/client/src/templates/workflows.form.js +++ b/awx/ui/client/src/templates/workflows.form.js @@ -218,7 +218,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) { data-placement="top" id="workflow_job_template_webhook_key_gen_btn" > - + `, diff --git a/awx/ui/package-lock.json b/awx/ui/package-lock.json index 70c42991ab..27bdc044cc 100644 --- a/awx/ui/package-lock.json +++ b/awx/ui/package-lock.json @@ -241,12 +241,12 @@ "integrity": "sha512-nB/xe7JQWF9nLvhHommAICQ3eWrfRETo0EVGFESi952CDzDa+GAJ/2BFBNw44QqQPxj1Xua/uYKrbLsOGWZdbQ==" }, "angular-scheduler": { - "version": "git+https://git@github.com/ansible/angular-scheduler.git#f9595a06db0e08d426b144a6fbe68f3966b77ae4", - "from": "git+https://git@github.com/ansible/angular-scheduler.git#v0.4.2", + "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.9", - "angular-tz-extensions": "github:ansible/angular-tz-extensions", - "jquery": "*", + "angular-tz-extensions": "github:ansible/angular-tz-extensions#5c594b5756d29637601020bba16274f10ee0ed65", + "jquery": "^3.5.1", "jquery-ui": "*", "lodash": "^4.17.15", "moment": "^2.10.2", @@ -254,16 +254,21 @@ }, "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#0.4.14" + "timezone-js": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f" } }, + "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", "from": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c" @@ -278,7 +283,7 @@ "angular-filters": "^1.1.2", "jquery": "^3.5.1", "jstimezonedetect": "1.0.5", - "timezone-js": "github:ansible/timezone-js#0.4.14" + "timezone-js": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f" }, "dependencies": { "jquery": { @@ -1798,7 +1803,6 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "dev": true, - "optional": true, "requires": { "hoek": "2.x.x" } @@ -1814,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": { @@ -5363,8 +5374,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -5388,15 +5398,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5406,22 +5414,19 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5542,8 +5547,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5557,7 +5561,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5574,7 +5577,6 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5680,8 +5682,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5695,7 +5696,6 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5791,8 +5791,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -5834,7 +5833,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5856,7 +5854,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5889,8 +5886,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true, - "optional": true + "dev": true } } }, @@ -6637,8 +6633,7 @@ "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true, - "optional": true + "dev": true }, "home-or-tmp": { "version": "2.0.0", @@ -7830,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", @@ -9136,7 +9131,6 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -9146,8 +9140,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true, - "optional": true + "dev": true } } }, diff --git a/awx/ui/package.json b/awx/ui/package.json index b4a94fd4e4..1f6b603665 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -107,7 +107,7 @@ "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.git#v0.4.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", @@ -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",