From ca77a3daa383a47d27c1ce8b1f44616962faff76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Maro=C5=A1i?= Date: Thu, 21 May 2020 15:57:46 +0200 Subject: [PATCH] Use direct imports of PF4 components --- package-lock.json | 273 +++++++++++++++++++++++---- package.json | 3 +- src/js/App/Header/Brand.js | 4 +- src/js/App/Header/InsightsAbout.js | 20 +- src/js/App/Header/Login.js | 2 +- src/js/App/Header/LogoutAlert.js | 3 +- src/js/App/Header/ToolbarToggle.js | 11 +- src/js/App/Header/Tools.js | 11 +- src/js/App/Header/UserIcon.js | 2 +- src/js/App/Header/UserToggle.js | 14 +- src/js/App/NoAccess.js | 15 +- src/js/App/Sidenav/Navigation.js | 6 +- src/js/App/Sidenav/NavigationItem.js | 2 +- src/js/App/Sidenav/index.js | 5 +- 14 files changed, 293 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6081a49d2..4582c4c15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8365,16 +8365,26 @@ "integrity": "sha512-kkPVr+B9UKDeko8F31RzO7g1ecMbp4rVVQhg6X95rrzPd9mqBC8TGuwhyXnnHCbSAyNyqsp+ldGhDMsN5yMPiw==" }, "@patternfly/react-core": { - "version": "3.153.13", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-3.153.13.tgz", - "integrity": "sha512-OyssAlsdsHWXRuKXvkcagG8PcplpE02FSLClON+407Fzhj4t0BLGWECI8RQwZ0Tapr+qVXikKQRukM5MY9zIqg==", + "version": "3.158.1", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-3.158.1.tgz", + "integrity": "sha512-LUknvaIBoo0ftu7OBZhyGn7Cu3IfhaO4nXx17M99OYc76yKBv1jJMmTTUh7OX3QyWH961gH1K7Z3GlJV7v57ZA==", "requires": { - "@patternfly/react-icons": "^3.15.16", - "@patternfly/react-styles": "^3.7.13", - "@patternfly/react-tokens": "^2.8.13", + "@patternfly/react-icons": "^3.15.17", + "@patternfly/react-styles": "^3.7.14", + "@patternfly/react-tokens": "^2.8.14", "focus-trap": "4.0.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2" + }, + "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" + } + } } }, "@patternfly/react-icons": { @@ -8386,9 +8396,9 @@ } }, "@patternfly/react-styles": { - "version": "3.7.13", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-3.7.13.tgz", - "integrity": "sha512-rpyYJj9QzjhEXb1MqY+6/vRlaS3z3NTHSoANvy28n65ZRhBxTiCZd7BxQ+CyiUMIPuUBbebBbZw/6MaToqJakg==", + "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", @@ -8398,9 +8408,9 @@ } }, "@patternfly/react-tokens": { - "version": "2.8.13", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-2.8.13.tgz", - "integrity": "sha512-k3r58ShieAiqHfn+tyMwhrk+/r1VP/ABy7S5no7mzgs1cOP9bJzCRk08X0KmEDzsZqHqTBM8dsffYlPT2OGCcQ==" + "version": "2.8.14", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-2.8.14.tgz", + "integrity": "sha512-pha0XyZ3ZiXuQoKstuFsiEHARFQKUFsS6WxVuRSEyNbGTToRNJkKR9cW5swzHgXK6Fuw5EA2XFHLuu8osj52KA==" }, "@redhat-cloud-services/entitlements-client": { "version": "1.0.63", @@ -10729,14 +10739,6 @@ "resolve": "^1.12.0" }, "dependencies": { - "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, "cosmiconfig": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", @@ -10774,11 +10776,6 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - }, "resolve": { "version": "1.17.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", @@ -13536,6 +13533,12 @@ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", "dev": true }, + "duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "dev": true + }, "duplexer2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", @@ -16413,6 +16416,16 @@ "dev": true, "optional": true }, + "gzip-size": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-4.1.0.tgz", + "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=", + "dev": true, + "requires": { + "duplexer": "^0.1.1", + "pify": "^3.0.0" + } + }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -16650,13 +16663,6 @@ "minimist": "~1.2.5", "readable-stream": "~1.0.27-1", "through2": "~0.4.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - } } }, "htmlnano": { @@ -17247,6 +17253,12 @@ "loose-envify": "^1.0.0" } }, + "invert-kv": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", + "dev": true + }, "ip-regex": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", @@ -22067,6 +22079,15 @@ "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", "dev": true }, + "lcid": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", + "dev": true, + "requires": { + "invert-kv": "^2.0.0" + } + }, "left-pad": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", @@ -22384,6 +22405,15 @@ "tmpl": "1.0.x" } }, + "map-age-cleaner": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", + "dev": true, + "requires": { + "p-defer": "^1.0.0" + } + }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -22462,6 +22492,25 @@ "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==", "dev": true }, + "mem": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", + "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", + "dev": true, + "requires": { + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" + }, + "dependencies": { + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + } + } + }, "memorystream": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", @@ -23832,6 +23881,17 @@ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, + "os-locale": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", + "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", + "dev": true, + "requires": { + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" + } + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -23859,6 +23919,12 @@ "object-assign": "^4.1.0" } }, + "p-defer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", + "dev": true + }, "p-each-series": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz", @@ -23870,6 +23936,12 @@ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, + "p-is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", + "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==", + "dev": true + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -24897,6 +24969,143 @@ } } }, + "parcel-plugin-bundle-visualiser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/parcel-plugin-bundle-visualiser/-/parcel-plugin-bundle-visualiser-1.2.0.tgz", + "integrity": "sha512-/O+26nsOwXbl1q6A/X9lEJWAPwZt5VauTV32omC3a/09bfUgHTogkAIYB/BqrGQm6OyuoG5FATToT3AGGk9RTA==", + "dev": true, + "requires": { + "filesize": "^3.6.0", + "gzip-size": "^4.1.0", + "yargs": "^11.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "dev": true, + "requires": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" + } + }, + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true + }, + "yargs": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz", + "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==", + "dev": true, + "requires": { + "cliui": "^4.0.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.1.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^9.0.2" + } + }, + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "^4.1.0" + } + } + } + }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", diff --git a/package.json b/package.json index 585472e53..46a078a51 100644 --- a/package.json +++ b/package.json @@ -101,6 +101,7 @@ "node-sass": "^4.14.1", "npm-run-all": "^4.1.5", "parcel": "^1.12.4", + "parcel-plugin-bundle-visualiser": "^1.2.0", "pug": "^2.0.4", "pug-cli": "^1.0.0-alpha6", "redux-logger": "^3.0.6", @@ -113,7 +114,7 @@ "@babel/polyfill": "^7.8.7", "@babel/runtime": "^7.9.6", "@patternfly/patternfly": "^2.71.5", - "@patternfly/react-core": "^3.153.13", + "@patternfly/react-core": "^3.158.1", "@patternfly/react-icons": "^3.15.16", "@redhat-cloud-services/entitlements-client": "^1.0.63", "@redhat-cloud-services/frontend-components": "1.0.24", diff --git a/src/js/App/Header/Brand.js b/src/js/App/Header/Brand.js index 90125b4b5..db6115f08 100644 --- a/src/js/App/Header/Brand.js +++ b/src/js/App/Header/Brand.js @@ -2,8 +2,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { onToggle } from '../../redux/actions'; -import { Button } from '@patternfly/react-core'; -import { BarsIcon } from '@patternfly/react-icons'; +import { Button } from '@patternfly/react-core/dist/js/components/Button/Button'; +import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon'; import Logo from './Logo'; export const Brand = ({ toggleNav, navHidden }) => ( diff --git a/src/js/App/Header/InsightsAbout.js b/src/js/App/Header/InsightsAbout.js index de0c92a74..5db98dcc9 100644 --- a/src/js/App/Header/InsightsAbout.js +++ b/src/js/App/Header/InsightsAbout.js @@ -1,14 +1,16 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { - AboutModal, - Button, - Tooltip, - TextContent, TextList, TextListItem, - Stack, StackItem -} from '@patternfly/react-core'; - -import { CopyIcon } from '@patternfly/react-icons'; + +import { AboutModal } from '@patternfly/react-core/dist/js/components/AboutModal/AboutModal'; +import { Button } from '@patternfly/react-core/dist/js/components/Button/Button'; +import { Tooltip } from '@patternfly/react-core/dist/js/components/Tooltip/Tooltip'; +import { TextContent } from '@patternfly/react-core/dist/js/components/Text/TextContent'; +import { TextList } from '@patternfly/react-core/dist/js/components/Text/TextList'; +import { TextListItem } from '@patternfly/react-core/dist/js/components/Text/TextListItem'; +import { Stack } from '@patternfly/react-core/dist/js/layouts/Stack/Stack'; +import { StackItem } from '@patternfly/react-core/dist/js/layouts/Stack/StackItem'; + +import CopyIcon from '@patternfly/react-icons/dist/js/icons/copy-icon'; import logo from '../../../../static/images/logo.svg'; import { connect } from 'react-redux'; diff --git a/src/js/App/Header/Login.js b/src/js/App/Header/Login.js index 012180d5e..4eb1ccc8f 100644 --- a/src/js/App/Header/Login.js +++ b/src/js/App/Header/Login.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Button } from '@patternfly/react-core'; +import { Button } from '@patternfly/react-core/dist/js/components/Button/Button'; import { login } from '../../jwt/jwt'; const Login = () => ( diff --git a/src/js/App/Header/LogoutAlert.js b/src/js/App/Header/LogoutAlert.js index ab784a559..75623c8d7 100644 --- a/src/js/App/Header/LogoutAlert.js +++ b/src/js/App/Header/LogoutAlert.js @@ -1,5 +1,6 @@ import React from 'react'; -import { Alert, AlertActionCloseButton } from '@patternfly/react-core'; +import { Alert } from '@patternfly/react-core/dist/js/components/Alert/Alert'; +import { AlertActionCloseButton } from '@patternfly/react-core/dist/js/components/Alert/AlertActionCloseButton'; import cookie from 'js-cookie'; class LogoutAlert extends React.Component { diff --git a/src/js/App/Header/ToolbarToggle.js b/src/js/App/Header/ToolbarToggle.js index 5d0b1fc0f..679f4d588 100644 --- a/src/js/App/Header/ToolbarToggle.js +++ b/src/js/App/Header/ToolbarToggle.js @@ -1,10 +1,9 @@ import React, { Component } from 'react'; -import { - Dropdown, - DropdownToggle, - DropdownItem, - DropdownPosition -} from '@patternfly/react-core'; + +import { Dropdown } from '@patternfly/react-core/dist/js/components/Dropdown/Dropdown'; +import { DropdownToggle } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownToggle'; +import { DropdownItem } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownItem'; +import { DropdownPosition } from '@patternfly/react-core/dist/js/components/Dropdown/dropdownConstants'; import PropTypes from 'prop-types'; class ToolbarToggle extends Component { diff --git a/src/js/App/Header/Tools.js b/src/js/App/Header/Tools.js index e026324ad..e97193a89 100644 --- a/src/js/App/Header/Tools.js +++ b/src/js/App/Header/Tools.js @@ -1,8 +1,11 @@ import React, { Component } from 'react'; -import { Button } from '@patternfly/react-core'; -import { Toolbar, ToolbarGroup, ToolbarItem } from '@patternfly/react-core'; -import { DropdownItem } from '@patternfly/react-core'; -import { QuestionCircleIcon, CogIcon } from '@patternfly/react-icons'; +import { Button } from '@patternfly/react-core/dist/js/components/Button/Button'; +import { Toolbar } from '@patternfly/react-core/dist/js/layouts/Toolbar/Toolbar'; +import { ToolbarGroup } from '@patternfly/react-core/dist/js/layouts/Toolbar/ToolbarGroup'; +import { ToolbarItem } from '@patternfly/react-core/dist/js/layouts/Toolbar/ToolbarItem'; +import { DropdownItem } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownItem'; +import QuestionCircleIcon from '@patternfly/react-icons/dist/js/icons/question-circle-icon'; +import CogIcon from '@patternfly/react-icons/dist/js/icons/cog-icon'; import UserToggle from './UserToggle'; import UserIcon from './UserIcon'; diff --git a/src/js/App/Header/UserIcon.js b/src/js/App/Header/UserIcon.js index c19ceaf45..c084ef692 100644 --- a/src/js/App/Header/UserIcon.js +++ b/src/js/App/Header/UserIcon.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Avatar } from '@patternfly/react-core'; +import { Avatar } from '@patternfly/react-core/dist/js/components/Avatar/Avatar'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; diff --git a/src/js/App/Header/UserToggle.js b/src/js/App/Header/UserToggle.js index 18b2e386e..153657850 100644 --- a/src/js/App/Header/UserToggle.js +++ b/src/js/App/Header/UserToggle.js @@ -1,12 +1,10 @@ import React, { Component } from 'react'; -import { - Dropdown, - DropdownToggle, - KebabToggle, - DropdownItem, - DropdownSeparator, - DropdownPosition -} from '@patternfly/react-core'; +import { Dropdown } from '@patternfly/react-core/dist/js/components/Dropdown/Dropdown'; +import { DropdownToggle } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownToggle'; +import { KebabToggle } from '@patternfly/react-core/dist/js/components/Dropdown/KebabToggle'; +import { DropdownItem } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownItem'; +import { DropdownSeparator } from '@patternfly/react-core/dist/js/components/Dropdown/DropdownSeparator'; +import { DropdownPosition } from '@patternfly/react-core/dist/js/components/Dropdown/dropdownConstants'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; diff --git a/src/js/App/NoAccess.js b/src/js/App/NoAccess.js index 6f27389f9..5eb899be4 100644 --- a/src/js/App/NoAccess.js +++ b/src/js/App/NoAccess.js @@ -2,16 +2,13 @@ import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; -import { - Title, - Button, - EmptyState, - EmptyStateVariant, - EmptyStateIcon, - EmptyStateBody -} from '@patternfly/react-core'; +import { Title } from '@patternfly/react-core/dist/js/components/Title/Title'; +import { Button } from '@patternfly/react-core/dist/js/components/Button/Button'; +import { EmptyState, EmptyStateVariant } from '@patternfly/react-core/dist/js/components/EmptyState/EmptyState'; +import { EmptyStateIcon } from '@patternfly/react-core/dist/js/components/EmptyState/EmptyStateIcon'; +import { EmptyStateBody } from '@patternfly/react-core/dist/js/components/EmptyState/EmptyStateBody'; -import { LockIcon } from '@patternfly/react-icons'; +import LockIcon from '@patternfly/react-icons/dist/js/icons/lock-icon'; const NoAccess = ({ activeAppTitle }) => { return ( diff --git a/src/js/App/Sidenav/Navigation.js b/src/js/App/Sidenav/Navigation.js index 8991d57bf..57ba5ab5a 100644 --- a/src/js/App/Sidenav/Navigation.js +++ b/src/js/App/Sidenav/Navigation.js @@ -1,5 +1,9 @@ import React, { Component } from 'react'; -import { Nav, NavItem, NavExpandable, NavList, NavItemSeparator } from '@patternfly/react-core'; +import { Nav } from '@patternfly/react-core/dist/js/components/Nav/Nav'; +import { NavItem } from '@patternfly/react-core/dist/js/components/Nav/NavItem'; +import { NavExpandable } from '@patternfly/react-core/dist/js/components/Nav/NavExpandable'; +import { NavList } from '@patternfly/react-core/dist/js/components/Nav/NavList'; +import { NavItemSeparator } from '@patternfly/react-core/dist/js/components/Nav/NavItemSeparator'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { appNavClick, clearActive } from '../../redux/actions'; diff --git a/src/js/App/Sidenav/NavigationItem.js b/src/js/App/Sidenav/NavigationItem.js index 640a1707b..46fe46b3a 100644 --- a/src/js/App/Sidenav/NavigationItem.js +++ b/src/js/App/Sidenav/NavigationItem.js @@ -1,5 +1,5 @@ import React from 'react'; -import { NavItem } from '@patternfly/react-core'; +import { NavItem } from '@patternfly/react-core/dist/js/components/Nav/NavItem'; import PropTypes from 'prop-types'; const basepath = document.baseURI; diff --git a/src/js/App/Sidenav/index.js b/src/js/App/Sidenav/index.js index 59c997a24..7aaadb1b6 100644 --- a/src/js/App/Sidenav/index.js +++ b/src/js/App/Sidenav/index.js @@ -1,8 +1,9 @@ import React, { Fragment, Component } from 'react'; import PropTypes from 'prop-types'; import Navigation from './Navigation'; -import { Split, SplitItem } from '@patternfly/react-core'; -import { HomeIcon } from '@patternfly/react-icons'; +import { Split } from '@patternfly/react-core/dist/js/layouts/Split/Split'; +import { SplitItem } from '@patternfly/react-core/dist/js/layouts/Split/SplitItem'; +import HomeIcon from '@patternfly/react-icons/dist/js/icons/home-icon'; import { connect } from 'react-redux'; const documentationLink = {