Skip to content

Commit

Permalink
update react-core, remove cluster settings change for now
Browse files Browse the repository at this point in the history
  • Loading branch information
@priley86
priley86 committed Jun 11, 2019
1 parent fd4cfac commit 09d43a6
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 81 deletions.
6 changes: 3 additions & 3 deletions frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"dependencies": {
"@patternfly/patternfly": "2.8.2",
"@patternfly/react-charts": "3.6.6",
"@patternfly/react-core": "3.33.1",
"@patternfly/react-table": "2.10.2",
"@patternfly/react-virtualized-extension": "1.0.1",
"@patternfly/react-core": "3.38.1",
"@patternfly/react-table": "2.11.1",
"@patternfly/react-virtualized-extension": "1.0.5",
"brace": "0.11.x",
"classnames": "2.x",
"core-js": "2.x",
Expand Down
33 changes: 3 additions & 30 deletions frontend/public/components/cluster-settings/cluster-settings.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as _ from 'lodash-es';
import { Helmet } from 'react-helmet';
import { Button } from 'patternfly-react';
import { Link } from 'react-router-dom';
import { Table } from '../factory';

import { ClusterOperatorPage } from './cluster-operator';
import { clusterChannelModal, clusterUpdateModal, errorModal } from '../modals';
import { GlobalConfigPage } from './global-config';
Expand Down Expand Up @@ -146,26 +146,6 @@ const ClusterVersionDetailsTable: React.SFC<ClusterVersionDetailsTableProps> = (
// Split image on `@` to emphasize the digest.
const imageParts = desiredImage.split('@');

const HistoryHeader = () => {
return [
{ title: 'Version' },
{ title: 'State' },
{ title: 'Started' },
{ title: 'Completed' },
];
};

const HistoryRows = ({componentProps}) => {
return _.map(componentProps.data, (update) => {
return [
{ title: update.version || '-'},
{ title: update.state || '-' },
{ title: <Timestamp timestamp={update.startedTime} /> },
{ title: update.completionTime ? <Timestamp timestamp={update.completionTime} /> : '-' },
];
});
};

return <React.Fragment>
<div className="co-m-pane__body">
<div className="co-m-pane__body-group">
Expand Down Expand Up @@ -225,14 +205,7 @@ const ClusterVersionDetailsTable: React.SFC<ClusterVersionDetailsTableProps> = (
{_.isEmpty(history)
? <EmptyBox label="History" />
: <div className="co-table-container">
<Table
aria-label="Update History"
data={history || []}
Header={HistoryHeader}
Rows={HistoryRows}
virtualize={false}
loaded={true} />
{/* <table className="table">
<table className="table">
<thead>
<tr>
<th>Version</th>
Expand All @@ -249,7 +222,7 @@ const ClusterVersionDetailsTable: React.SFC<ClusterVersionDetailsTableProps> = (
<td>{update.completionTime ? <Timestamp timestamp={update.completionTime} /> : '-'}</td>
</tr>)}
</tbody>
</table> */}
</table>
</div>
}
</div>
Expand Down
89 changes: 41 additions & 48 deletions frontend/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@
resolved "https://registry.yarnpkg.com/@novnc/novnc/-/novnc-1.1.0.tgz#3827b623e9e201ee1e1c8a61d107c51cbfaeb871"
integrity sha512-W90Q79EuCYT++39aT/VKGyk7hUt2gPN3rN+ifPUvY4rdjgZlfwdCg9q7yzj04hke/zgdHsbXFfyFijBvrRuU5A==

"@patternfly/patternfly@2.12.5":
version "2.12.5"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-2.12.5.tgz#f2c5924deb875a8cde95e09e6d5c9022f00429da"
integrity sha512-zB+pwtUXZVbv6l76XMU3ggMZrbHZtbZDBHrNBeWVfDngp2xnwTNVu0Ha4WaZVtZzutyVaF6F1VHTLnef6mO5ug==

"@patternfly/patternfly@2.8.2":
version "2.8.2"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-2.8.2.tgz#8362795b17a73be76dd9408b3c0d370e8a030d77"
Expand Down Expand Up @@ -207,36 +212,23 @@
file-saver "^1.3.8"
xterm "^3.3.0"

"@patternfly/react-core@3.33.1":
version "3.33.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-3.33.1.tgz#af3a7032ff78030afcc49a0a02e0e26596048e82"
integrity sha512-a17AOG+GmlF9nZtqLyzaHdZtTuhCCzafVECFkVG3qBWtN1qcZd17GkpSrwlZU8qH+3JOECPi0uEmUqBtDQf1jg==
"@patternfly/react-core@3.38.1", "@patternfly/react-core@^3.38.1":
version "3.38.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-3.38.1.tgz#ca2ac43c2860b4aad49197328126331f2d21f207"
integrity sha512-BZUZD+DCryfNCiqhFqIR6IV0AMfFeIl0mfcIZ+N7tSM/S9GPJAAN6xtohBItYe+dM6oEs1lVFYae9MiYEieAkw==
dependencies:
"@patternfly/react-icons" "^3.9.3"
"@patternfly/react-styles" "^3.2.3"
"@patternfly/react-tokens" "^2.5.3"
"@patternfly/react-icons" "^3.9.5"
"@patternfly/react-styles" "^3.3.3"
"@patternfly/react-tokens" "^2.5.5"
"@tippy.js/react" "^1.1.1"
emotion "^9.2.9"
exenv "^1.2.2"
focus-trap-react "^4.0.1"

"@patternfly/react-core@^3.36.0", "@patternfly/react-core@^3.36.1":
version "3.36.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-3.36.1.tgz#17bcf0de41344260b6a275fec9b4ef6463cc9b66"
integrity sha512-zQRotzJLe3mMwqC7q52HQP1mGk59XC1oUPuXSkeQ8ZExxYwsqm/peer67YC0bmvLK9EVsui5YfzHdo6GuyWeeQ==
dependencies:
"@patternfly/react-icons" "^3.9.3"
"@patternfly/react-styles" "^3.3.0"
"@patternfly/react-tokens" "^2.5.3"
"@tippy.js/react" "^1.1.1"
emotion "^9.2.9"
exenv "^1.2.2"
focus-trap-react "^4.0.1"

"@patternfly/react-icons@^3.9.3":
version "3.9.3"
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-3.9.3.tgz#a06a589ef90472568a40a01491473e741e6a91a5"
integrity sha512-tLKuA5Qt4Kq+Bex2eDVazJrrixzbKQdxwkbPwzjzRdJ6oGb2CpZNjCVWIxKxibDsc0vGZ6aUaHguY6AFVcydQQ==
"@patternfly/react-icons@^3.9.5":
version "3.9.5"
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-3.9.5.tgz#c21bf16475aad39426abf76198acfa14c0556752"
integrity sha512-SFKeEqMXjVZlVl4rl8q4P36R8Bn5e7Log0+g6602/jUO0tX1qdKK5FlGInUZ73AVqYsJ/WdKXDmoI++m/ys3Ew==
dependencies:
"@fortawesome/free-brands-svg-icons" "^5.8.1"

Expand All @@ -258,10 +250,10 @@
relative "^3.0.2"
resolve-from "^4.0.0"

"@patternfly/react-styles@^3.3.0":
version "3.3.0"
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-3.3.0.tgz#fd4c43b70bb60e1a2011bfa18b9ceadecf5e6abd"
integrity sha512-rE6UumrQp00qL7WIVeAkiNJcR/lHQ2ZcbpqoJPseQI/yRO0kis1/0cXf1lN1H8ZAlSnUXevAg85Pndb+YWoxxg==
"@patternfly/react-styles@^3.3.3":
version "3.3.3"
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-3.3.3.tgz#30b82b38b8976b9102cbc863a8261f056db092a6"
integrity sha512-Mhs+wsysc9XT+rTMHIrvsLEa6jJEkYCs97x7woFmHBJBcdl31bhT9n9gWgg5JstOUjtdMkmBHMo8gJcjgbxQxw==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0-beta.48"
camel-case "^3.0.0"
Expand All @@ -277,32 +269,33 @@
resolve-from "^4.0.0"
typescript "3.4.5"

"@patternfly/react-table@2.10.2":
version "2.10.2"
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-2.10.2.tgz#b7ffbcd44005ede943047d0a5ddff9f7655bc9dc"
integrity sha512-xdL6RJO5GS+IJQgTEAz/H6PW3mELFwJwIhWlT4341menzB30lwa0+DQE7wlVwQGovtpGJLxoV+aW7Zfq1DWN3Q==
"@patternfly/react-table@2.11.1":
version "2.11.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-2.11.1.tgz#2bf52436797f2ef5a2f0aa49f75c680c50343bcf"
integrity sha512-SWCFw4N95Z35emLPwI0N3rFZKBGBtZKjklTyeTqTd1jhKrZWmyBTCCig89fKy6D5RlYFEn0D+4TkDeOebNC4EA==
dependencies:
"@patternfly/patternfly" "2.8.2"
"@patternfly/react-core" "^3.36.1"
"@patternfly/react-icons" "^3.9.3"
"@patternfly/react-styles" "^3.3.0"
"@patternfly/patternfly" "2.12.5"
"@patternfly/react-core" "^3.38.1"
"@patternfly/react-icons" "^3.9.5"
"@patternfly/react-styles" "^3.3.3"
"@patternfly/react-tokens" "^2.5.5"
classnames "^2.2.5"
exenv "^1.2.2"

"@patternfly/react-tokens@^2.5.3":
version "2.5.3"
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-2.5.3.tgz#b1804626762583534745cede7599acf5a715fab8"
integrity sha512-vH3fHKkx7VxyKkAiLx+VvOzZAuFIHhX01lW3HP66koFeUnKbCRynPuBy/Ep4nGZINZAgf5l9LNDmLS1ymntrLg==
"@patternfly/react-tokens@^2.5.5":
version "2.5.5"
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-2.5.5.tgz#4d1ff0c2f6091be5c0031a70079e0b745c5d57f0"
integrity sha512-5ztqkgBjSNcBnCqJFltG2OaP1bUgk+s5+Fp4kTDpVZLu3LNI46O/gPTRwObYXkbCna0r/hv2k3JVGER53G9fEA==

"@patternfly/react-virtualized-extension@1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-virtualized-extension/-/react-virtualized-extension-1.0.1.tgz#d5e5e416445d7bc55170a96e3c04caf8c98e309b"
integrity sha512-pRuSmhpSTwZ0EIqwGXkuEBGOPEeaB/6Gckt9NBRBXynbjL3MJ+zQLs/qohdUwezFLQnFgGWufmG/KN2h9HuzHA==
"@patternfly/react-virtualized-extension@1.0.5":
version "1.0.5"
resolved "https://registry.yarnpkg.com/@patternfly/react-virtualized-extension/-/react-virtualized-extension-1.0.5.tgz#08e5f8190de46fa068b82fe6d72956f449bfd48d"
integrity sha512-FOtq4sapKtKayZ0o9gh0ziGqlgd4UM3/C6nKNOuDEQszdIjofk1fixhCFPGdpu4mL6IrWawQO4UPCPL9dcDQ4w==
dependencies:
"@patternfly/patternfly" "2.8.2"
"@patternfly/react-core" "^3.36.0"
"@patternfly/react-icons" "^3.9.3"
"@patternfly/react-styles" "^3.3.0"
"@patternfly/patternfly" "2.12.5"
"@patternfly/react-core" "^3.38.1"
"@patternfly/react-icons" "^3.9.5"
"@patternfly/react-styles" "^3.3.3"
clsx "^1.0.1"
dom-helpers "^2.4.0 || ^3.0.0"
exenv "^1.2.2"
Expand Down

0 comments on commit 09d43a6

Please sign in to comment.