From 2a922861c3b2ccd4e0b049b85fe43de801540da7 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 9 Jun 2020 14:16:29 -0400 Subject: [PATCH 01/19] update pf deps to v4 --- awx/ui_next/package-lock.json | 390 +++++----------------------------- awx/ui_next/package.json | 8 +- 2 files changed, 54 insertions(+), 344 deletions(-) diff --git a/awx/ui_next/package-lock.json b/awx/ui_next/package-lock.json index e9635701b6..5b2eede2a8 100644 --- a/awx/ui_next/package-lock.json +++ b/awx/ui_next/package-lock.json @@ -1150,31 +1150,6 @@ "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz", "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==" }, - "@emotion/babel-utils": { - "version": "0.6.10", - "resolved": "https://registry.npmjs.org/@emotion/babel-utils/-/babel-utils-0.6.10.tgz", - "integrity": "sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow==", - "requires": { - "@emotion/hash": "^0.6.6", - "@emotion/memoize": "^0.6.6", - "@emotion/serialize": "^0.9.1", - "convert-source-map": "^1.5.1", - "find-root": "^1.1.0", - "source-map": "^0.7.2" - }, - "dependencies": { - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" - } - } - }, - "@emotion/hash": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.6.6.tgz", - "integrity": "sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ==" - }, "@emotion/is-prop-valid": { "version": "0.8.8", "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", @@ -1190,50 +1165,6 @@ } } }, - "@emotion/memoize": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz", - "integrity": "sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ==" - }, - "@emotion/serialize": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.9.1.tgz", - "integrity": "sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ==", - "requires": { - "@emotion/hash": "^0.6.6", - "@emotion/memoize": "^0.6.6", - "@emotion/unitless": "^0.6.7", - "@emotion/utils": "^0.8.2" - } - }, - "@emotion/stylis": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.7.1.tgz", - "integrity": "sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ==" - }, - "@emotion/unitless": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.6.7.tgz", - "integrity": "sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg==" - }, - "@emotion/utils": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.8.2.tgz", - "integrity": "sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw==" - }, - "@fortawesome/fontawesome-common-types": { - "version": "0.2.28", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.28.tgz", - "integrity": "sha512-gtis2/5yLdfI6n0ia0jH7NJs5i/Z/8M/ZbQL6jXQhCthEOe5Cr5NcQPhgTvFxNOtURE03/ZqUcEskdn2M+QaBg==" - }, - "@fortawesome/free-brands-svg-icons": { - "version": "5.13.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.13.0.tgz", - "integrity": "sha512-/6xXiJFCMEQxqxXbL0FPJpwq5Cv6MRrjsbJEmH/t5vOvB4dILDpnY0f7zZSlA8+TG7jwlt12miF/yZpZkykucA==", - "requires": { - "@fortawesome/fontawesome-common-types": "^0.2.28" - } - }, "@hapi/address": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", @@ -1704,62 +1635,50 @@ "dev": true }, "@patternfly/patternfly": { - "version": "2.71.6", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-2.71.6.tgz", - "integrity": "sha512-mqqtuCVa+/FbyyK8hSAcfEIwNX73+zbnzHpmC4NrW0kyMzSszPtBqev/ZO79ZxGqZUpLOyUBTVaH7oKn8cL35Q==" + "version": "4.10.31", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.10.31.tgz", + "integrity": "sha512-UxdZ/apWRowXYZ5qPz5LPfXwyB4YGpomrCJPX7c36+Zg8jFpYyVqgVYainL8Yf/GrChtC2LKyoHg7UUTtMtp4A==" }, "@patternfly/react-core": { - "version": "3.158.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-3.158.1.tgz", - "integrity": "sha512-LUknvaIBoo0ftu7OBZhyGn7Cu3IfhaO4nXx17M99OYc76yKBv1jJMmTTUh7OX3QyWH961gH1K7Z3GlJV7v57ZA==", + "version": "4.18.5", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.18.5.tgz", + "integrity": "sha512-wUHLXPOklcAVA9nCnmUvGwdfTZnypxNUnA0l+eEiq1QWhQoSRdI7S/HNOelYhpRjMMwPwy3yMsJUjHsXdqv2FQ==", "requires": { - "@patternfly/react-icons": "^3.15.17", - "@patternfly/react-styles": "^3.7.14", - "@patternfly/react-tokens": "^2.8.14", + "@patternfly/react-icons": "^4.3.5", + "@patternfly/react-styles": "^4.3.4", + "@patternfly/react-tokens": "^4.4.4", "focus-trap": "4.0.2", "react-dropzone": "9.0.0", - "tippy.js": "5.1.2" + "tippy.js": "5.1.2", + "tslib": "^1.11.1" }, "dependencies": { "@patternfly/react-icons": { - "version": "3.15.17", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-3.15.17.tgz", - "integrity": "sha512-Q0JAlxEvSAl5kcMSUMItLiKi9fweO941g5+lS45t3o/Rv4Eg91Ig7AyK1YWw6m1ah+/eHslLfox0Uqw7m7usLg==", - "requires": { - "@fortawesome/free-brands-svg-icons": "^5.8.1" - } + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.3.5.tgz", + "integrity": "sha512-+GublxpFXR+y/5zygf9q00/LvIvso8jr0mxZGhVxsKmi2dUu7xAvN+T+5vjS9fiMbXf7WXsSPXST/UTiBIVTdQ==" }, "@patternfly/react-tokens": { - "version": "2.8.14", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-2.8.14.tgz", - "integrity": "sha512-pha0XyZ3ZiXuQoKstuFsiEHARFQKUFsS6WxVuRSEyNbGTToRNJkKR9cW5swzHgXK6Fuw5EA2XFHLuu8osj52KA==" + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.4.4.tgz", + "integrity": "sha512-vhDBtwkp1PTAqXDjAsUPRf/ewBh2Asong8MPr9ZGeXAeOULW8creW7GJx+JZX9eaEJMA3ESMeZ6wZ5j/yyWMGQ==" } } }, "@patternfly/react-icons": { - "version": "3.15.17", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-3.15.17.tgz", - "integrity": "sha512-Q0JAlxEvSAl5kcMSUMItLiKi9fweO941g5+lS45t3o/Rv4Eg91Ig7AyK1YWw6m1ah+/eHslLfox0Uqw7m7usLg==", - "requires": { - "@fortawesome/free-brands-svg-icons": "^5.8.1" - } + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.3.5.tgz", + "integrity": "sha512-+GublxpFXR+y/5zygf9q00/LvIvso8jr0mxZGhVxsKmi2dUu7xAvN+T+5vjS9fiMbXf7WXsSPXST/UTiBIVTdQ==" }, "@patternfly/react-styles": { - "version": "3.7.14", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-3.7.14.tgz", - "integrity": "sha512-NVwbPP9JroulfQgj0LOLWKP4DumArW8RrP1FB1lLOCuw13KkuAcFbLN9MSF8ZBwJ8syxGEdux5mDC3jPjsrQiw==", - "requires": { - "camel-case": "^3.0.0", - "css": "^2.2.3", - "cssstyle": "^0.3.1", - "emotion": "^9.2.9", - "emotion-server": "^9.2.9" - } + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.3.4.tgz", + "integrity": "sha512-d5W5G9g7sr7DthGPFiF6Oa33w8JFJ+ocLZDogyZcS1Oq0BJJX8j+hZNXZfhXxmHoXufxQL6RJ4dOyoa2zEZUvA==" }, "@patternfly/react-tokens": { - "version": "2.8.14", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-2.8.14.tgz", - "integrity": "sha512-pha0XyZ3ZiXuQoKstuFsiEHARFQKUFsS6WxVuRSEyNbGTToRNJkKR9cW5swzHgXK6Fuw5EA2XFHLuu8osj52KA==" + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.4.4.tgz", + "integrity": "sha512-vhDBtwkp1PTAqXDjAsUPRf/ewBh2Asong8MPr9ZGeXAeOULW8creW7GJx+JZX9eaEJMA3ESMeZ6wZ5j/yyWMGQ==" }, "@sheerun/mutationobserver-shim": { "version": "0.3.3", @@ -2565,11 +2484,6 @@ "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz", "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==" }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" - }, "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -3180,32 +3094,6 @@ "object.assign": "^4.1.0" } }, - "babel-plugin-emotion": { - "version": "9.2.11", - "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz", - "integrity": "sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ==", - "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@emotion/babel-utils": "^0.6.4", - "@emotion/hash": "^0.6.2", - "@emotion/memoize": "^0.6.1", - "@emotion/stylis": "^0.7.0", - "babel-plugin-macros": "^2.0.0", - "babel-plugin-syntax-jsx": "^6.18.0", - "convert-source-map": "^1.5.0", - "find-root": "^1.1.0", - "mkdirp": "^0.5.1", - "source-map": "^0.5.7", - "touch": "^2.0.1" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - } - } - }, "babel-plugin-istanbul": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz", @@ -3293,7 +3181,7 @@ }, "babel-plugin-syntax-jsx": { "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", + "resolved": "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=" }, "babel-plugin-syntax-object-rest-spread": { @@ -3735,7 +3623,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "requires": { "buffer-xor": "^1.0.3", @@ -3769,7 +3657,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "requires": { "bn.js": "^4.1.0", @@ -3867,11 +3755,6 @@ } } }, - "buffer-from": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz", - "integrity": "sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg==" - }, "buffer-indexof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", @@ -3976,15 +3859,6 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -4633,33 +4507,9 @@ } } }, - "create-emotion": { - "version": "9.2.12", - "resolved": "https://registry.npmjs.org/create-emotion/-/create-emotion-9.2.12.tgz", - "integrity": "sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA==", - "requires": { - "@emotion/hash": "^0.6.2", - "@emotion/memoize": "^0.6.1", - "@emotion/stylis": "^0.7.0", - "@emotion/unitless": "^0.6.2", - "csstype": "^2.5.2", - "stylis": "^3.5.0", - "stylis-rule-sheet": "^0.0.10" - } - }, - "create-emotion-server": { - "version": "9.2.12", - "resolved": "https://registry.npmjs.org/create-emotion-server/-/create-emotion-server-9.2.12.tgz", - "integrity": "sha512-ET+E6A5MkQTEBNDYAnjh6+0cB33qStFXhtflkZNPEaOmvzYlB/xcPnpUk4J7ul3MVa8PCQx2Ei5g2MGY/y1n+g==", - "requires": { - "html-tokenize": "^2.0.0", - "multipipe": "^1.0.2", - "through": "^2.3.8" - } - }, "create-hash": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "requires": { "cipher-base": "^1.0.1", @@ -4671,7 +4521,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "requires": { "cipher-base": "^1.0.3", @@ -5015,14 +4865,6 @@ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" }, - "cssstyle": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.3.1.tgz", - "integrity": "sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==", - "requires": { - "cssom": "0.3.x" - } - }, "csstype": { "version": "2.6.10", "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.10.tgz", @@ -5593,7 +5435,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "requires": { "bn.js": "^4.1.0", @@ -5792,43 +5634,6 @@ "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" }, - "duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", - "requires": { - "readable-stream": "^2.0.2" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", @@ -5919,23 +5724,6 @@ "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" }, - "emotion": { - "version": "9.2.12", - "resolved": "https://registry.npmjs.org/emotion/-/emotion-9.2.12.tgz", - "integrity": "sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ==", - "requires": { - "babel-plugin-emotion": "^9.2.11", - "create-emotion": "^9.2.12" - } - }, - "emotion-server": { - "version": "9.2.12", - "resolved": "https://registry.npmjs.org/emotion-server/-/emotion-server-9.2.12.tgz", - "integrity": "sha512-Bhjdl7eNoIeiAVa2QPP5d+1nP/31SiO/K1P/qI9cdXCydg91NwGYmteqhhge8u7PF8fLGTEVQfcPwj21815eBw==", - "requires": { - "create-emotion-server": "^9.2.12" - } - }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -6496,7 +6284,7 @@ }, "load-json-file": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "requires": { "graceful-fs": "^4.1.2", @@ -7145,7 +6933,8 @@ "find-root": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", - "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" + "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==", + "dev": true }, "find-up": { "version": "2.1.0", @@ -7220,13 +7009,6 @@ "requires": { "tabbable": "^3.1.2", "xtend": "^4.0.1" - }, - "dependencies": { - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" - } } }, "follow-redirects": { @@ -7812,7 +7594,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" @@ -7892,18 +7674,6 @@ } } }, - "html-tokenize": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/html-tokenize/-/html-tokenize-2.0.1.tgz", - "integrity": "sha512-QY6S+hZ0f5m1WT8WffYN+Hg+xm/w5I8XeUcAq/ZYP5wVC8xbKi4Whhru3FtrAebD5EhBW8rmFzkDI6eCAuFe2w==", - "requires": { - "buffer-from": "~0.1.1", - "inherits": "~2.0.1", - "minimist": "~1.2.5", - "readable-stream": "~1.0.27-1", - "through2": "~0.4.1" - } - }, "html-webpack-plugin": { "version": "4.0.0-beta.11", "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz", @@ -9661,11 +9431,6 @@ "js-tokens": "^3.0.0 || ^4.0.0" } }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" - }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -9767,7 +9532,7 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "mem": { @@ -10171,15 +9936,6 @@ "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=" }, - "multipipe": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-1.0.2.tgz", - "integrity": "sha1-zBPv2DPJzamfIk+GhGG44aP9k50=", - "requires": { - "duplexer2": "^0.1.2", - "object-assign": "^4.1.0" - } - }, "mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", @@ -10262,17 +10018,9 @@ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "requires": { - "lower-case": "^1.1.1" - } - }, "node-fetch": { "version": "1.6.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz", + "resolved": "http://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz", "integrity": "sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=", "dev": true, "requires": { @@ -10415,14 +10163,6 @@ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz", "integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==" }, - "nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", - "requires": { - "abbrev": "1" - } - }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -10545,11 +10285,6 @@ "es-abstract": "^1.17.5" } }, - "object-keys": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", - "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=" - }, "object-path": { "version": "0.11.4", "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz", @@ -10700,7 +10435,7 @@ "dependencies": { "ansi-escapes": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", "dev": true }, @@ -10746,7 +10481,7 @@ }, "external-editor": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", + "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { @@ -10808,7 +10543,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -10829,7 +10564,7 @@ }, "opn": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz", + "resolved": "http://registry.npmjs.org/opn/-/opn-4.0.2.tgz", "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=", "dev": true, "requires": { @@ -13284,7 +13019,7 @@ }, "readable-stream": { "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "requires": { "core-util-is": "~1.0.0", @@ -13789,7 +13524,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { "ret": "~0.1.10" @@ -14053,7 +13788,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "requires": { "inherits": "^2.0.1", @@ -14814,7 +14549,7 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, "strip-indent": { @@ -15133,18 +14868,9 @@ }, "through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, - "through2": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", - "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", - "requires": { - "readable-stream": "~1.0.17", - "xtend": "~2.1.1" - } - }, "thunky": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", @@ -15237,14 +14963,6 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, - "touch": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/touch/-/touch-2.0.2.tgz", - "integrity": "sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A==", - "requires": { - "nopt": "~1.0.10" - } - }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", @@ -15458,11 +15176,6 @@ "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" - }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -16629,12 +16342,9 @@ } }, "xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", - "requires": { - "object-keys": "~0.4.0" - } + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { "version": "4.0.0", diff --git a/awx/ui_next/package.json b/awx/ui_next/package.json index ce52806302..5460d57fe6 100644 --- a/awx/ui_next/package.json +++ b/awx/ui_next/package.json @@ -4,10 +4,10 @@ "private": true, "dependencies": { "@lingui/react": "^2.9.1", - "@patternfly/patternfly": "^2.71.6", - "@patternfly/react-core": "^3.158.1", - "@patternfly/react-icons": "^3.15.17", - "@patternfly/react-tokens": "^2.8.14", + "@patternfly/patternfly": "^4.10.31", + "@patternfly/react-core": "^4.18.5", + "@patternfly/react-icons": "^4.3.5", + "@patternfly/react-tokens": "^4.4.4", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", From 475b73389098c495c109c46bc9186e11ba0cfdc0 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 9 Jun 2020 14:17:12 -0400 Subject: [PATCH 02/19] first pass of tweaks needed to compile pf v4 branch --- .../src/components/AlertModal/AlertModal.jsx | 2 +- .../src/components/Background/Background.jsx | 12 +-- .../components/ContentEmpty/ContentEmpty.jsx | 2 +- .../components/ContentError/ContentError.jsx | 2 +- .../DataListToolbar/DataListToolbar.jsx | 62 ++++++++-------- .../components/ErrorDetail/ErrorDetail.jsx | 2 +- .../src/components/ListHeader/ListHeader.jsx | 14 ++-- .../Schedule/shared/ScheduleForm.jsx | 2 +- awx/ui_next/src/components/Search/Search.jsx | 20 +++-- .../src/components/Search/Search.test.jsx | 74 +++++++++---------- .../src/screens/AuthSetting/AuthSettings.jsx | 2 +- .../src/screens/Dashboard/Dashboard.jsx | 2 +- .../screens/InstanceGroup/InstanceGroups.jsx | 2 +- .../InventoryGroupsList.test.jsx | 4 +- .../Inventory/shared/InventorySourceForm.jsx | 2 +- .../InventoryScript/InventoryScripts.jsx | 2 +- .../src/screens/JobsSetting/JobsSettings.jsx | 2 +- awx/ui_next/src/screens/License/License.jsx | 2 +- .../screens/ManagementJob/ManagementJobs.jsx | 2 +- .../NotificationTemplates.jsx | 2 +- awx/ui_next/src/screens/Portal/Portal.jsx | 2 +- .../screens/Project/shared/ProjectForm.jsx | 2 +- .../shared/ProjectSubForms/SharedFields.jsx | 2 +- .../screens/SystemSetting/SystemSettings.jsx | 2 +- .../Template/Survey/SurveyList.test.jsx | 2 +- .../screens/Template/Survey/SurveyToolbar.jsx | 44 +++++------ .../Template/Survey/SurveyToolbar.test.jsx | 2 +- .../Modals/LinkModals/LinkAddModal.jsx | 4 +- .../Modals/LinkModals/LinkEditModal.jsx | 4 +- .../src/screens/UISetting/UISettings.jsx | 2 +- 30 files changed, 136 insertions(+), 144 deletions(-) diff --git a/awx/ui_next/src/components/AlertModal/AlertModal.jsx b/awx/ui_next/src/components/AlertModal/AlertModal.jsx index 06b6853220..b18b3e3285 100644 --- a/awx/ui_next/src/components/AlertModal/AlertModal.jsx +++ b/awx/ui_next/src/components/AlertModal/AlertModal.jsx @@ -60,7 +60,7 @@ export default function AlertModal({ const customHeader = (
{variant ? variantIcons[variant] : null} - {title} + {title}
); diff --git a/awx/ui_next/src/components/Background/Background.jsx b/awx/ui_next/src/components/Background/Background.jsx index 7857a1ed54..755393712c 100644 --- a/awx/ui_next/src/components/Background/Background.jsx +++ b/awx/ui_next/src/components/Background/Background.jsx @@ -1,18 +1,10 @@ import React, { Fragment } from 'react'; -import { BackgroundImage, BackgroundImageSrc } from '@patternfly/react-core'; - -const backgroundImageConfig = { - [BackgroundImageSrc.xs]: './images/pfbg_576.jpg', - [BackgroundImageSrc.xs2x]: './images/pfbg_576@2x.jpg', - [BackgroundImageSrc.sm]: './images/pfbg_768.jpg', - [BackgroundImageSrc.sm2x]: './images/pfbg_768@2x.jpg', - [BackgroundImageSrc.lg]: './images/pfbg_2000.jpg', -}; +import { BackgroundImage } from '@patternfly/react-core'; export default ({ children }) => ( - + {children} ); diff --git a/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx b/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx index f01c8468ec..3c03463788 100644 --- a/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx +++ b/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx @@ -12,7 +12,7 @@ import { CubesIcon } from '@patternfly/react-icons'; const ContentEmpty = ({ i18n, title = '', message = '' }) => ( - {title || i18n._(t`No items found.`)} + {title || i18n._(t`No items found.`)} {message} ); diff --git a/awx/ui_next/src/components/ContentError/ContentError.jsx b/awx/ui_next/src/components/ContentError/ContentError.jsx index f0d4f80a1d..3c56a2630d 100644 --- a/awx/ui_next/src/components/ContentError/ContentError.jsx +++ b/awx/ui_next/src/components/ContentError/ContentError.jsx @@ -35,7 +35,7 @@ function ContentError({ error, children, isNotFound, i18n }) { ) : ( - + <Title size="lg" headingLevel="h3"> {is404 ? i18n._(t`Not Found`) : i18n._(t`Something went wrong...`)} diff --git a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx index f8b7adfa8a..01dbf2fccd 100644 --- a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx +++ b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx @@ -2,27 +2,27 @@ import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; -import { Checkbox } from '@patternfly/react-core'; +import { + Checkbox, + Toolbar, + ToolbarContent as _ToolbarContent, + ToolbarGroup as _ToolbarGroup, + ToolbarItem, + ToolbarToggleGroup, + } from '@patternfly/react-core'; import styled from 'styled-components'; import { SearchIcon } from '@patternfly/react-icons'; -import { - DataToolbar, - DataToolbarContent as _DataToolbarContent, - DataToolbarGroup as _DataToolbarGroup, - DataToolbarItem, - DataToolbarToggleGroup, -} from '@patternfly/react-core/dist/umd/experimental'; import ExpandCollapse from '../ExpandCollapse'; import Search from '../Search'; import Sort from '../Sort'; import { SearchColumns, SortColumns, QSConfig } from '../../types'; -const DataToolbarContent = styled(_DataToolbarContent)` +const ToolbarContent = styled(_ToolbarContent)` --pf-c-data-toolbar__content--PaddingLeft: 24px; --pf-c-data-toolbar__content--PaddingRight: 8px; `; -const DataToolbarGroup = styled(_DataToolbarGroup)` +const ToolbarGroup = styled(_ToolbarGroup)` --pf-c-data-toolbar__group--spacer: 24px; `; @@ -49,26 +49,26 @@ class DataListToolbar extends React.Component { const showExpandCollapse = onCompact && onExpand; return ( - - + {showSelectAll && ( - - + + - - + + )} - } breakpoint="lg"> - + } breakpoint="lg"> + - - + + - - + + {showExpandCollapse && ( - + - + - + - + )} - + {additionalControls.map(control => ( - {control} + {control} ))} - - - + + + ); } } diff --git a/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx b/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx index 898eef3609..cef7bf885a 100644 --- a/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx +++ b/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx @@ -7,7 +7,7 @@ import { t } from '@lingui/macro'; import { Card as PFCard, CardBody as PFCardBody, - Expandable as PFExpandable, + ExpandableSection as PFExpandable, } from '@patternfly/react-core'; import getErrorMessage from './getErrorMessage'; diff --git a/awx/ui_next/src/components/ListHeader/ListHeader.jsx b/awx/ui_next/src/components/ListHeader/ListHeader.jsx index ebc745174d..79899acb8c 100644 --- a/awx/ui_next/src/components/ListHeader/ListHeader.jsx +++ b/awx/ui_next/src/components/ListHeader/ListHeader.jsx @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import { withRouter } from 'react-router-dom'; import styled from 'styled-components'; import { - DataToolbar, - DataToolbarContent, -} from '@patternfly/react-core/dist/umd/experimental'; + Toolbar, + ToolbarContent, +} from '@patternfly/react-core'; import DataListToolbar from '../DataListToolbar'; import { @@ -107,17 +107,17 @@ class ListHeader extends React.Component { return ( {isEmpty ? ( - - + {emptyStateControls} - - + + ) : ( {renderToolbar({ diff --git a/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx b/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx index 795af0035a..6597e27ec4 100644 --- a/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx +++ b/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx @@ -153,7 +153,7 @@ function ScheduleFormFields({ i18n, zoneOptions }) { {frequency.value !== 'none' && ( - {i18n._(t`Frequency Details`)} + {i18n._(t`Frequency Details`)} diff --git a/awx/ui_next/src/components/Search/Search.jsx b/awx/ui_next/src/components/Search/Search.jsx index 91c3987cea..287c9c11da 100644 --- a/awx/ui_next/src/components/Search/Search.jsx +++ b/awx/ui_next/src/components/Search/Search.jsx @@ -16,12 +16,10 @@ import { SelectOption, SelectVariant, TextInput, + ToolbarGroup, + ToolbarItem, + ToolbarFilter, } from '@patternfly/react-core'; -import { - DataToolbarGroup, - DataToolbarItem, - DataToolbarFilter, -} from '@patternfly/react-core/dist/umd/experimental'; import { SearchIcon } from '@patternfly/react-icons'; import styled from 'styled-components'; import { parseQueryString } from '../../util/qs'; @@ -205,8 +203,8 @@ class Search extends React.Component { const chipsByKey = getChipsByKey(); return ( - - + + {searchDropdownItems.length > 0 ? ( {searchColumnName} )} - + {columns.map( ({ key, name, options, isBoolean, booleanLabels = {} }) => ( - { const [columnKey, ...value] = chip.key.split(':'); @@ -311,10 +309,10 @@ class Search extends React.Component { )} - + ) )} - + ); } } diff --git a/awx/ui_next/src/components/Search/Search.test.jsx b/awx/ui_next/src/components/Search/Search.test.jsx index 503fa9ec58..3163aa8032 100644 --- a/awx/ui_next/src/components/Search/Search.test.jsx +++ b/awx/ui_next/src/components/Search/Search.test.jsx @@ -1,8 +1,8 @@ import React from 'react'; import { - DataToolbar, - DataToolbarContent, -} from '@patternfly/react-core/dist/umd/experimental'; + Toolbar, + ToolbarContent, +} from '@patternfly/react-core'; import { createMemoryHistory } from 'history'; import { act } from 'react-dom/test-utils'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; @@ -33,15 +33,15 @@ describe('', () => { const onSearch = jest.fn(); search = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - + + ); search.find(searchTextInput).instance().value = 'test-321'; @@ -56,15 +56,15 @@ describe('', () => { const columns = [{ name: 'Name', key: 'name', isDefault: true }]; const onSearch = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - + + ).find('Search'); expect(wrapper.state('isSearchDropdownOpen')).toEqual(false); wrapper.instance().handleDropdownToggle(true); @@ -78,15 +78,15 @@ describe('', () => { ]; const onSearch = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - + + ).find('Search'); expect(wrapper.state('searchKey')).toEqual('name'); wrapper @@ -101,15 +101,15 @@ describe('', () => { const columns = [{ name: 'Name', key: 'name', isDefault: true }]; const onSearch = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - + + ); wrapper.find(searchTextInput).instance().value = ''; @@ -125,15 +125,15 @@ describe('', () => { const columns = [{ name: 'Name', key: 'name', isDefault: true }]; const onSearch = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - + + ); wrapper.find(searchTextInput).instance().value = 'test-321'; @@ -156,23 +156,23 @@ describe('', () => { initialEntries: [`/organizations/${query}`], }); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - , + + , { context: { router: { history } } } ); const typeFilterWrapper = wrapper.find( - 'DataToolbarFilter[categoryName="Type"]' + 'ToolbarFilter[categoryName="Type"]' ); expect(typeFilterWrapper.prop('chips')[0].key).toEqual('or__type:foo'); const nameFilterWrapper = wrapper.find( - 'DataToolbarFilter[categoryName="Name"]' + 'ToolbarFilter[categoryName="Name"]' ); expect(nameFilterWrapper.prop('chips')[0].key).toEqual('name:bar'); }); @@ -197,19 +197,19 @@ describe('', () => { }); const onRemove = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - , + + , { context: { router: { history } } } ); expect(history.location.search).toEqual(query); @@ -243,19 +243,19 @@ describe('', () => { }); const onRemove = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - , + + , { context: { router: { history } } } ); expect(history.location.search).toEqual(query); diff --git a/awx/ui_next/src/screens/AuthSetting/AuthSettings.jsx b/awx/ui_next/src/screens/AuthSetting/AuthSettings.jsx index a0fc4b5f73..26652113bb 100644 --- a/awx/ui_next/src/screens/AuthSetting/AuthSettings.jsx +++ b/awx/ui_next/src/screens/AuthSetting/AuthSettings.jsx @@ -15,7 +15,7 @@ class AuthSettings extends Component { return ( - {i18n._(t`Authentication Settings`)} + {i18n._(t`Authentication Settings`)} diff --git a/awx/ui_next/src/screens/Dashboard/Dashboard.jsx b/awx/ui_next/src/screens/Dashboard/Dashboard.jsx index 0f2a7ceb79..4c45f6724a 100644 --- a/awx/ui_next/src/screens/Dashboard/Dashboard.jsx +++ b/awx/ui_next/src/screens/Dashboard/Dashboard.jsx @@ -15,7 +15,7 @@ class Dashboard extends Component { return ( - {i18n._(t`Dashboard`)} + {i18n._(t`Dashboard`)} diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx b/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx index 022247193e..80f5b942cb 100644 --- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx +++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx @@ -15,7 +15,7 @@ class InstanceGroups extends Component { return ( - {i18n._(t`Instance Groups`)} + {i18n._(t`Instance Groups`)} diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx index fbd02a9ad4..8d3ccf9c68 100644 --- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx +++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx @@ -164,7 +164,7 @@ describe('', () => { wrapper.update(); await act(async () => { wrapper - .find('DataToolbar Button[aria-label="Delete"]') + .find('Toolbar Button[aria-label="Delete"]') .invoke('onClick')(); }); await waitForElement( @@ -198,7 +198,7 @@ describe('', () => { wrapper.update(); await act(async () => { wrapper - .find('DataToolbar Button[aria-label="Delete"]') + .find('Toolbar Button[aria-label="Delete"]') .invoke('onClick')(); }); await waitForElement( diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx index ffcab9f148..6d367aa40c 100644 --- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx +++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx @@ -161,7 +161,7 @@ const InventorySourceFormFields = ({ sourceOptions, i18n }) => { )} {sourceField.value !== '' && ( - {i18n._(t`Source details`)} + {i18n._(t`Source details`)} { { diff --git a/awx/ui_next/src/screens/InventoryScript/InventoryScripts.jsx b/awx/ui_next/src/screens/InventoryScript/InventoryScripts.jsx index 9fe0aea136..e95e062ebd 100644 --- a/awx/ui_next/src/screens/InventoryScript/InventoryScripts.jsx +++ b/awx/ui_next/src/screens/InventoryScript/InventoryScripts.jsx @@ -15,7 +15,7 @@ class InventoryScripts extends Component { return ( - {i18n._(t`Inventory Scripts`)} + {i18n._(t`Inventory Scripts`)} diff --git a/awx/ui_next/src/screens/JobsSetting/JobsSettings.jsx b/awx/ui_next/src/screens/JobsSetting/JobsSettings.jsx index ded44676f6..325579f1ea 100644 --- a/awx/ui_next/src/screens/JobsSetting/JobsSettings.jsx +++ b/awx/ui_next/src/screens/JobsSetting/JobsSettings.jsx @@ -15,7 +15,7 @@ class JobsSettings extends Component { return ( - {i18n._(t`Jobs Settings`)} + {i18n._(t`Jobs Settings`)} diff --git a/awx/ui_next/src/screens/License/License.jsx b/awx/ui_next/src/screens/License/License.jsx index cebf2a4734..ceb3cbe722 100644 --- a/awx/ui_next/src/screens/License/License.jsx +++ b/awx/ui_next/src/screens/License/License.jsx @@ -15,7 +15,7 @@ class License extends Component { return ( - {i18n._(t`License`)} + {i18n._(t`License`)} diff --git a/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx b/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx index f86e9b3040..125df4429d 100644 --- a/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx +++ b/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx @@ -15,7 +15,7 @@ class ManagementJobs extends Component { return ( - {i18n._(t`Management Jobs`)} + {i18n._(t`Management Jobs`)} diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx index abcf1ab511..fd217d5c99 100644 --- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx +++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx @@ -15,7 +15,7 @@ class NotificationTemplates extends Component { return ( - {i18n._(t`Notification Templates`)} + {i18n._(t`Notification Templates`)} diff --git a/awx/ui_next/src/screens/Portal/Portal.jsx b/awx/ui_next/src/screens/Portal/Portal.jsx index d5f6cbecec..e668e8b115 100644 --- a/awx/ui_next/src/screens/Portal/Portal.jsx +++ b/awx/ui_next/src/screens/Portal/Portal.jsx @@ -15,7 +15,7 @@ class Portal extends Component { return ( - {i18n._(t`My View`)} + {i18n._(t`My View`)} diff --git a/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx index eee485d646..ac90aeaee2 100644 --- a/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx +++ b/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx @@ -204,7 +204,7 @@ function ProjectFormFields({ {formik.values.scm_type !== '' && ( - {i18n._(t`Type Details`)} + {i18n._(t`Type Details`)} { { diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx index 0833c9e49d..99a71718cc 100644 --- a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx +++ b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx @@ -104,7 +104,7 @@ export const ScmTypeOptions = withI18n()( {scmUpdateOnLaunch && ( <> - {i18n._(t`Option Details`)} + {i18n._(t`Option Details`)} - {i18n._(t`System Settings`)} + {i18n._(t`System Settings`)} diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyList.test.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyList.test.jsx index 755956a5f4..bdc70c4fff 100644 --- a/awx/ui_next/src/screens/Template/Survey/SurveyList.test.jsx +++ b/awx/ui_next/src/screens/Template/Survey/SurveyList.test.jsx @@ -142,7 +142,7 @@ describe('', () => { expect( wrapper - .find('DataToolbar') + .find('Toolbar') .find('Checkbox') .prop('isDisabled') ).toBe(true); diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx index af6144025a..16eac2be70 100644 --- a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx +++ b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx @@ -5,15 +5,17 @@ import { withI18n } from '@lingui/react'; import styled from 'styled-components'; import { - DataToolbar as _DataToolbar, - DataToolbarContent, - DataToolbarGroup, - DataToolbarItem, -} from '@patternfly/react-core/dist/umd/experimental'; -import { Switch, Checkbox, Button } from '@patternfly/react-core'; + Switch, + Checkbox, + Button, + Toolbar as _Toolbar, + ToolbarContent, + ToolbarGroup, + ToolbarItem, +} from '@patternfly/react-core'; import { ToolbarAddButton } from '../../../components/PaginatedDataList'; -const DataToolbar = styled(_DataToolbar)` +const Toolbar = styled(_Toolbar)` margin-left: 52px; `; @@ -30,9 +32,9 @@ function SurveyToolbar({ isDeleteDisabled = !canEdit || isDeleteDisabled; const match = useRouteMatch(); return ( - - - + + + - - + + onToggleSurvey(!surveyEnabled)} /> - - - + + + - - + + - - - - + + + + ); } diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.test.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.test.jsx index 8fb4857525..2311f1d443 100644 --- a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.test.jsx +++ b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.test.jsx @@ -102,7 +102,7 @@ describe('', () => { }); expect( wrapper - .find('DataToolbar') + .find('Toolbar') .find('Checkbox') .prop('isDisabled') ).toBe(true); diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx index 97a941755e..af976cc38f 100644 --- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx +++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx @@ -1,5 +1,5 @@ import React, { useContext } from 'react'; -import { BaseSizes, Title, TitleLevel } from '@patternfly/react-core'; +import { BaseSizes, Title } from '@patternfly/react-core'; import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; import { WorkflowDispatchContext } from '../../../../../contexts/Workflow'; @@ -10,7 +10,7 @@ function LinkAddModal({ i18n }) { return ( + {i18n._(t`Add Link`)} } diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx index 177e11bb32..d98496487b 100644 --- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx +++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx @@ -1,5 +1,5 @@ import React, { useContext } from 'react'; -import { BaseSizes, Title, TitleLevel } from '@patternfly/react-core'; +import { BaseSizes, Title } from '@patternfly/react-core'; import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; import { WorkflowDispatchContext } from '../../../../../contexts/Workflow'; @@ -10,7 +10,7 @@ function LinkEditModal({ i18n }) { return ( + {i18n._(t`Edit Link`)} } diff --git a/awx/ui_next/src/screens/UISetting/UISettings.jsx b/awx/ui_next/src/screens/UISetting/UISettings.jsx index 1905463cd2..bb1007fedc 100644 --- a/awx/ui_next/src/screens/UISetting/UISettings.jsx +++ b/awx/ui_next/src/screens/UISetting/UISettings.jsx @@ -15,7 +15,7 @@ class UISettings extends Component { return ( - {i18n._(t`User Interface Settings`)} + {i18n._(t`User Interface Settings`)} From e49a99e0f602ab6b88ecf96ee48c01d180e6f518 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 10 Jun 2020 11:20:07 -0400 Subject: [PATCH 03/19] after running pf code mod tool to auto update files to conform to v4 and a few manual tweaks --- .../src/components/AlertModal/AlertModal.jsx | 4 +- .../AnsibleSelect/AnsibleSelect.jsx | 2 +- .../AssociateModal/AssociateModal.jsx | 4 +- .../CodeMirrorInput/VariablesDetail.jsx | 2 +- .../CodeMirrorInput/VariablesField.jsx | 2 +- .../CodeMirrorInput/VariablesInput.jsx | 2 +- .../DataListToolbar/DataListToolbar.jsx | 2 +- .../src/components/FormField/FormField.jsx | 8 +- .../components/FormField/PasswordField.jsx | 2 +- .../components/FormField/PasswordInput.jsx | 2 +- .../src/components/HostForm/HostForm.jsx | 2 +- .../LaunchPrompt/steps/OtherPromptsStep.jsx | 4 +- .../LaunchPrompt/steps/SurveyStep.jsx | 6 +- .../components/Lookup/CredentialLookup.jsx | 2 +- awx/ui_next/src/components/Lookup/Lookup.jsx | 6 +- .../components/Lookup/OrganizationLookup.jsx | 2 +- .../src/components/Lookup/ProjectLookup.jsx | 2 +- .../components/MultiSelect/TagMultiSelect.jsx | 4 +- .../components/PromptDetail/PromptDetail.jsx | 4 +- .../PromptInventorySourceDetail.jsx | 6 +- .../PromptDetail/PromptJobTemplateDetail.jsx | 8 +- .../PromptWFJobTemplateDetail.jsx | 2 +- .../ResourceAccessListItem.jsx | 2 +- .../src/components/RoutedTabs/RoutedTabs.jsx | 4 +- .../ScheduleDetail/ScheduleDetail.jsx | 4 +- .../ScheduleOccurrences.jsx | 2 +- .../shared/FrequencyDetailSubform.jsx | 10 +- .../Schedule/shared/ScheduleForm.jsx | 6 +- awx/ui_next/src/components/Search/Search.jsx | 4 +- .../components/SelectedList/SelectedList.jsx | 2 +- .../Credential/shared/CredentialForm.jsx | 2 +- .../CredentialPluginField.jsx | 103 +++++++++++++ .../GoogleComputeEngineSubForm.jsx | 136 ++++++++++++++++++ .../InventoryDetail/InventoryDetail.jsx | 2 +- .../InventorySourceDetail.jsx | 6 +- .../Inventory/shared/InventorySourceForm.jsx | 2 +- .../InventorySourceSubForms/SCMSubForm.jsx | 6 +- .../InventorySourceSubForms/SharedFields.jsx | 2 +- .../src/screens/Job/JobDetail/JobDetail.jsx | 2 +- .../screens/Job/JobOutput/HostEventModal.jsx | 10 +- .../OrganizationDetail/OrganizationDetail.jsx | 2 +- .../screens/Project/shared/ProjectForm.jsx | 2 +- .../shared/ProjectSubForms/ManualSubForm.jsx | 2 +- .../Team/TeamAccess/TeamAccessListItem.jsx | 4 +- .../JobTemplateDetail/JobTemplateDetail.jsx | 8 +- .../Template/Survey/SurveyListItem.jsx | 2 +- .../Template/Survey/SurveyPreviewModal.jsx | 4 +- .../WorkflowJobTemplateDetail.jsx | 2 +- .../Modals/LinkModals/LinkAddModal.jsx | 4 +- .../Modals/LinkModals/LinkEditModal.jsx | 4 +- .../Modals/LinkModals/LinkModal.jsx | 2 +- .../NodeModals/NodeTypeStep/NodeTypeStep.jsx | 4 +- .../Modals/NodeModals/NodeViewModal.jsx | 4 +- .../Modals/UnsavedChangesModal.jsx | 2 +- .../VisualizerToolbar.jsx | 2 +- .../Template/shared/JobTemplateForm.jsx | 4 +- .../screens/Template/shared/LabelSelect.jsx | 4 +- .../User/UserAccess/UserAccessListItem.jsx | 4 +- .../src/screens/User/shared/UserForm.jsx | 2 +- 59 files changed, 339 insertions(+), 106 deletions(-) create mode 100644 awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx create mode 100644 awx/ui_next/src/screens/Credential/shared/CredentialSubForms/GoogleComputeEngineSubForm.jsx diff --git a/awx/ui_next/src/components/AlertModal/AlertModal.jsx b/awx/ui_next/src/components/AlertModal/AlertModal.jsx index b18b3e3285..2c6c9eaed9 100644 --- a/awx/ui_next/src/components/AlertModal/AlertModal.jsx +++ b/awx/ui_next/src/components/AlertModal/AlertModal.jsx @@ -67,9 +67,9 @@ export default function AlertModal({ return ( diff --git a/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx b/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx index bd348998d1..69fd9e40bf 100644 --- a/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx +++ b/awx/ui_next/src/components/AnsibleSelect/AnsibleSelect.jsx @@ -43,7 +43,7 @@ class AnsibleSelect extends React.Component { onChange={this.onSelectChange} onBlur={onBlur} aria-label={i18n._(t`Select Input`)} - isValid={isValid} + validated={(isValid) ? 'default' : 'error'} className={className} isDisabled={isDisabled} > diff --git a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx index 86aa534f12..94fe8330bb 100644 --- a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx +++ b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx @@ -74,8 +74,8 @@ function AssociateModal({ return ( - +
- +