From fb5714248ba76acf91634ec19f943d0958455e93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 17:17:10 +0000 Subject: [PATCH 1/3] Bump @material-ui/icons from 4.9.1 to 4.11.2 in /web/app Bumps [@material-ui/icons](https://github.com/mui-org/material-ui/tree/HEAD/packages/material-ui-icons) from 4.9.1 to 4.11.2. - [Release notes](https://github.com/mui-org/material-ui/releases) - [Changelog](https://github.com/mui-org/material-ui/blob/v4.11.2/CHANGELOG.md) - [Commits](https://github.com/mui-org/material-ui/commits/v4.11.2/packages/material-ui-icons) --- updated-dependencies: - dependency-name: "@material-ui/icons" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- web/app/package.json | 2 +- web/app/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/app/package.json b/web/app/package.json index 5f5118f93ecf9..6cbaed7a7a08e 100644 --- a/web/app/package.json +++ b/web/app/package.json @@ -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", diff --git a/web/app/yarn.lock b/web/app/yarn.lock index 44a740f846571..c9543a6a95751 100644 --- a/web/app/yarn.lock +++ b/web/app/yarn.lock @@ -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" From 2c3223947f664de6e029793aeb09d4e86a5a8708 Mon Sep 17 00:00:00 2001 From: Dennis Adjei-Baah Date: Fri, 18 Jun 2021 19:46:45 +0000 Subject: [PATCH 2/3] fix BaseTable.test.jsx Signed-off-by: Dennis Adjei-Baah --- web/app/js/components/BaseTable.test.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/web/app/js/components/BaseTable.test.js b/web/app/js/components/BaseTable.test.js index 01f4384c07e46..44e6b54318c6f 100644 --- a/web/app/js/components/BaseTable.test.js +++ b/web/app/js/components/BaseTable.test.js @@ -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'; @@ -30,7 +31,7 @@ describe("Tests for ", () => { deployment: "authors", namespace: "default", key: "default-deployment-authors", - pods: {totalPods: "1", meshedPods: "1"} + pods: { totalPods: "1", meshedPods: "1" } }], tableColumns: tableColumns, }); @@ -51,13 +52,13 @@ describe("Tests for ", () => { 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 @@ -91,13 +92,13 @@ describe("Tests for ", () => { 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 @@ -107,14 +108,14 @@ describe("Tests for ", () => { 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); From 35b940edde020176802bcc13872e388f6f746608 Mon Sep 17 00:00:00 2001 From: Dennis Adjei-Baah Date: Mon, 21 Jun 2021 17:18:42 +0000 Subject: [PATCH 3/3] review feedback Signed-off-by: Dennis Adjei-Baah --- web/app/js/components/BaseTable.test.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/app/js/components/BaseTable.test.js b/web/app/js/components/BaseTable.test.js index 44e6b54318c6f..cd6e1b4fc027d 100644 --- a/web/app/js/components/BaseTable.test.js +++ b/web/app/js/components/BaseTable.test.js @@ -31,7 +31,7 @@ describe("Tests for ", () => { deployment: "authors", namespace: "default", key: "default-deployment-authors", - pods: { totalPods: "1", meshedPods: "1" } + pods: {totalPods: "1", meshedPods: "1"} }], tableColumns: tableColumns, }); @@ -52,13 +52,13 @@ describe("Tests for ", () => { 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 @@ -92,13 +92,13 @@ describe("Tests for ", () => { 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 @@ -110,12 +110,12 @@ describe("Tests for ", () => { const enableFilter = component.prop("enableFilter"); const filterIcon = table.find(FilterListIcon); expect(enableFilter).toEqual(true); - expect(filterIcon).toBeDefined(); + expect(filterIcon).toHaveLength(1); 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);