Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump @material-ui/icons from 4.9.1 to 4.11.2 in /web/app #6310

Merged
merged 3 commits into from
Jun 21, 2021
Merged

Bump @material-ui/icons from 4.9.1 to 4.11.2 in /web/app #6310

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb57142
Bump @material-ui/icons from 4.9.1 to 4.11.2 in /web/app
dependabot[bot] Jun 18, 2021
2c32239
fix BaseTable.test.jsx
Jun 18, 2021
35b940e
review feedback
Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions web/app/js/components/BaseTable.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import _merge from 'lodash/merge';
import ApiHelpers from './util/ApiHelpers.jsx';
import BaseTable from './BaseTable.jsx';
import TableBody from '@material-ui/core/TableBody';
import FilterListIcon from '@material-ui/icons/FilterList';
import TableRow from '@material-ui/core/TableRow';
import { routerWrap } from '../../test/testHelpers.jsx';
import { mount } from 'enzyme';
Expand Down Expand Up @@ -30,7 +31,7 @@ describe("Tests for <BaseTable>", () => {
deployment: "authors",
namespace: "default",
key: "default-deployment-authors",
pods: {totalPods: "1", meshedPods: "1"}
pods: { totalPods: "1", meshedPods: "1" }
}],
tableColumns: tableColumns,
});
Expand All @@ -51,13 +52,13 @@ describe("Tests for <BaseTable>", () => {
deployment: "authors",
namespace: "default",
key: "default-deployment-authors",
pods: {totalPods: "1", meshedPods: "1"}
pods: { totalPods: "1", meshedPods: "1" }
},
{
deployment: "books",
namespace: "default",
key: "default-deployment-books",
pods: {totalPods: "2", meshedPods: "1"}
pods: { totalPods: "2", meshedPods: "1" }
}],
tableColumns: tableColumns,
enableFilter: true
Expand Down Expand Up @@ -91,13 +92,13 @@ describe("Tests for <BaseTable>", () => {
deployment: "authors",
namespace: "default",
key: "default-deployment-authors",
pods: {totalPods: "1", meshedPods: "1"}
pods: { totalPods: "1", meshedPods: "1" }
},
{
deployment: "books",
namespace: "default",
key: "default-deployment-books",
pods: {totalPods: "2", meshedPods: "1"}
pods: { totalPods: "2", meshedPods: "1" }
}],
tableColumns: tableColumns,
enableFilter: true
Expand All @@ -107,14 +108,14 @@ describe("Tests for <BaseTable>", () => {
const table = component.dive();
expect(table.find(TableBody).find(TableRow)).toHaveLength(2);
const enableFilter = component.prop("enableFilter");
const filterIcon = table.find("FilterListIcon");
const filterIcon = table.find(FilterListIcon);
expect(enableFilter).toEqual(true);
expect(filterIcon).toHaveLength(1);
expect(filterIcon).toBeDefined();

filterIcon.simulate("click");
setTimeout(() => {
const input = table.find("input");
input.simulate("change", {target: {value: "authors"}});
input.simulate("change", { target: { value: "authors" } });
expect(table.html()).not.toContain('books');
expect(table.html()).toContain('authors');
expect(table.find(TableBody).find(TableRow)).toHaveLength(1);
Expand Down
2 changes: 1 addition & 1 deletion web/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@lingui/macro": "2.9.2",
"@lingui/react": "2.9.2",
"@material-ui/core": "4.11.4",
"@material-ui/icons": "4.9.1",
"@material-ui/icons": "4.11.2",
"@material-ui/lab": "^4.0.0-alpha.58",
"classnames": "2.2.6",
"css-mediaquery": "^0.1.2",
Expand Down
8 changes: 4 additions & 4 deletions web/app/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,10 +1545,10 @@
react-is "^16.8.0 || ^17.0.0"
react-transition-group "^4.4.0"

"@material-ui/icons@4.9.1":
version "4.9.1"
resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.9.1.tgz#fdeadf8cb3d89208945b33dbc50c7c616d0bd665"
integrity sha512-GBitL3oBWO0hzBhvA9KxqcowRUsA0qzwKkURyC8nppnC3fw54KPKZ+d4V1Eeg/UnDRSzDaI9nGCdel/eh9AQMg==
"@material-ui/icons@4.11.2":
version "4.11.2"
resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.2.tgz#b3a7353266519cd743b6461ae9fdfcb1b25eb4c5"
integrity sha512-fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ==
dependencies:
"@babel/runtime" "^7.4.4"

Expand Down