From b08103e6ad910637568cf0a92ceffb4bd2cfe939 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 5 Oct 2021 22:14:31 +0000 Subject: [PATCH 01/12] chore(deps): update dependency @types/node to v14.17.21 --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index e07c9b9f57..db7da546aa 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -45,7 +45,7 @@ "@types/enzyme": "3.10.9", "@types/enzyme-adapter-react-16": "1.0.6", "@types/jest": "27.0.2", - "@types/node": "14.17.20", + "@types/node": "14.17.21", "@types/react": "17.0.27", "@types/react-dom": "17.0.9", "@types/react-router-dom": "5.3.0", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 6911685392..768518f8b6 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2107,10 +2107,10 @@ resolved "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz" integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw== -"@types/node@14.17.20": - version "14.17.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.20.tgz#74cc80438fd0467dc4377ee5bbad89a886df3c10" - integrity sha512-gI5Sl30tmhXsqkNvopFydP7ASc4c2cLfGNQrVKN3X90ADFWFsPEsotm/8JHSUJQKTHbwowAHtcJPeyVhtKv0TQ== +"@types/node@14.17.21": + version "14.17.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz#6359d8cf73481e312a43886fa50afc70ce5592c6" + integrity sha512-zv8ukKci1mrILYiQOwGSV4FpkZhyxQtuFWGya2GujWg+zVAeRQ4qbaMmWp9vb9889CFA8JECH7lkwCL6Ygg8kA== "@types/node@^14.14.31": version "14.17.19" From 20dd35287523fe5395225d695cf067b4d5824151 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 6 Oct 2021 00:16:41 +0000 Subject: [PATCH 02/12] chore(deps): update dependency date-fns to v2.25.0 --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index db7da546aa..84794d5e5c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -55,7 +55,7 @@ "craco": "0.0.3", "css-loader": "6.3.0", "cypress": "8.5.0", - "date-fns": "2.24.0", + "date-fns": "2.25.0", "debounce": "1.2.1", "enzyme": "3.11.0", "enzyme-adapter-react-16": "1.15.6", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 768518f8b6..3a98438458 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4631,10 +4631,10 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -date-fns@2.24.0: - version "2.24.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.24.0.tgz#7d86dc0d93c87b76b63d213b4413337cfd1c105d" - integrity sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw== +date-fns@2.25.0: + version "2.25.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.25.0.tgz#8c5c8f1d958be3809a9a03f4b742eba894fc5680" + integrity sha512-ovYRFnTrbGPD4nqaEqescPEv1mNwvt+UTqI3Ay9SzNtey9NZnYu6E2qCcBBgJ6/2VF1zGGygpyTDITqpQQ5e+w== dayjs@^1.10.4: version "1.10.7" From 10fa0fd9085c6c1b4f906bf98eb5dcfd833b1672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Wed, 6 Oct 2021 12:37:41 +0200 Subject: [PATCH 03/12] fix: remove console.log --- .../FeatureOverviewEnvironment/FeatureOverviewEnvironment.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewStrategies/FeatureOverviewEnvironment/FeatureOverviewEnvironment.tsx b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewStrategies/FeatureOverviewEnvironment/FeatureOverviewEnvironment.tsx index 4fb8b4e4b1..b25610e261 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewStrategies/FeatureOverviewEnvironment/FeatureOverviewEnvironment.tsx +++ b/frontend/src/component/feature/FeatureView2/FeatureOverview/FeatureOverviewStrategies/FeatureOverviewEnvironment/FeatureOverviewEnvironment.tsx @@ -26,8 +26,6 @@ const FeatureOverviewEnvironment = ({ const { toast, setToastData } = useToast(); const history = useHistory(); - console.log(env); - const handleClick = () => { history.push( `/projects/${projectId}/features2/${featureId}/strategies?environment=${env.name}` From cdf54667c52eff6d60b1d8604227cb0de7e92809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Wed, 6 Oct 2021 13:45:56 +0200 Subject: [PATCH 04/12] fix: add edit project icon in header --- .../common/BreadcrumbNav/BreadcrumbNav.tsx | 1 - .../src/component/project/Project/Project.tsx | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/frontend/src/component/common/BreadcrumbNav/BreadcrumbNav.tsx b/frontend/src/component/common/BreadcrumbNav/BreadcrumbNav.tsx index 8c7ff41fd1..e746891fa8 100644 --- a/frontend/src/component/common/BreadcrumbNav/BreadcrumbNav.tsx +++ b/frontend/src/component/common/BreadcrumbNav/BreadcrumbNav.tsx @@ -16,7 +16,6 @@ const BreadcrumbNav = () => { item => item !== 'create' && item !== 'edit' && - item !== 'access' && item !== 'view' && item !== 'variants' && item !== 'logs' && diff --git a/frontend/src/component/project/Project/Project.tsx b/frontend/src/component/project/Project/Project.tsx index fcfd600e21..e9cc62d9db 100644 --- a/frontend/src/component/project/Project/Project.tsx +++ b/frontend/src/component/project/Project/Project.tsx @@ -6,7 +6,8 @@ import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig'; import ApiError from '../../common/ApiError/ApiError'; import ConditionallyRender from '../../common/ConditionallyRender'; import { useStyles } from './Project.styles'; -import { Tab, Tabs } from '@material-ui/core'; +import { IconButton, Tab, Tabs } from '@material-ui/core'; +import { Edit } from '@material-ui/icons'; import useToast from '../../../hooks/useToast'; import useQueryParams from '../../../hooks/useQueryParams'; import { useEffect } from 'react'; @@ -59,6 +60,15 @@ const Project = () => { /* eslint-disable-next-line */ }, []); + const goToTabWithName = (name: string) => { + const index = tabData.findIndex(t => t.name === name); + if(index >= 0) { + const tab = tabData[index]; + history.push(tab.path); + setActiveTab(index); + } + } + const tabData = [ { title: 'Overview', @@ -127,8 +137,11 @@ const Project = () => {
-

+

Project: {project?.name}{' '} + goToTabWithName('settings')}> + +

{project?.description}

From 440da6ea1b678b40247ab08f77bfd526bd923b9c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 6 Oct 2021 21:19:37 +0000 Subject: [PATCH 05/12] chore(deps): update dependency @types/react-router-dom to v5.3.1 --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 84794d5e5c..18616839bf 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -48,7 +48,7 @@ "@types/node": "14.17.21", "@types/react": "17.0.27", "@types/react-dom": "17.0.9", - "@types/react-router-dom": "5.3.0", + "@types/react-router-dom": "5.3.1", "@welldone-software/why-did-you-render": "6.2.1", "array-move": "3.0.1", "classnames": "2.3.1", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 3a98438458..87b180bf52 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2159,10 +2159,10 @@ hoist-non-react-statics "^3.3.0" redux "^4.0.0" -"@types/react-router-dom@5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.0.tgz#8c4e0aa0ccaf638ba965829ad29a10ac3cbe2212" - integrity sha512-svUzpEpKDwK8nmfV2vpZNSsiijFNKY8+gUqGqvGGOVrXvX58k1JIJubZa5igkwacbq/0umphO5SsQn/BQsnKpw== +"@types/react-router-dom@5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.1.tgz#76700ccce6529413ec723024b71f01fc77a4a980" + integrity sha512-UvyRy73318QI83haXlaMwmklHHzV9hjl3u71MmM6wYNu0hOVk9NLTa0vGukf8zXUqnwz4O06ig876YSPpeK28A== dependencies: "@types/history" "*" "@types/react" "*" From 81b4ea412cc6a052e6fe664ba0c4d7055767513e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 7 Oct 2021 01:38:30 +0000 Subject: [PATCH 06/12] chore(deps): update dependency web-vitals to v2.1.1 --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 18616839bf..d87b365521 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -82,7 +82,7 @@ "sass": "1.42.1", "swr": "1.0.1", "typescript": "4.4.3", - "web-vitals": "2.1.0" + "web-vitals": "2.1.1" }, "jest": { "moduleNameMapper": { diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 87b180bf52..0caf610940 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -12742,10 +12742,10 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -web-vitals@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-2.1.0.tgz#ebf5428875ab5bfc1056c2e80cd177001287de7b" - integrity sha512-npEyJP8jHf3J71t1tRTEtz9FeKp8H2udWJUUq5ykfPhhstr//TUxiYhIEzLNwk4zv2ybAilMn7v7N6Mxmuitmg== +web-vitals@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-2.1.1.tgz#9ae64fa9054b8865a3fa093cd8db302676822c2a" + integrity sha512-6i/cE+7l095Etvjo2kbtVC8OXzLc9D8XMIWBPWAt2CME/7qmIMZWQwVoKDD277poVHNdPcLgW5Jruhbi8+8Vcw== webidl-conversions@^3.0.0: version "3.0.1" From 14ee56d91481c265e6b1f2c8b4f619318ae8e1f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 10:53:47 +0200 Subject: [PATCH 07/12] chore(deps): update material-ui monorepo (#371) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update material-ui monorepo * fix: test snapshots and deprecation warnings Co-authored-by: Renovate Bot Co-authored-by: Ivar Conradi Østhus --- frontend/package.json | 4 +- .../application-edit-component-test.js.snap | 4 +- .../view/__tests__/view-component-test.jsx | 1 + frontend/src/component/menu/Footer/Footer.jsx | 2 +- .../__snapshots__/footer-test.jsx.snap | 4 +- .../strategy-details-component-test.jsx.snap | 2 +- frontend/src/themes/main-theme.js | 4 +- frontend/yarn.lock | 44 +++++++++---------- 8 files changed, 33 insertions(+), 32 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index d87b365521..ce73cbd127 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -35,9 +35,9 @@ "e2e:enterprise": "yarn run cypress open --config baseUrl='http://localhost:3000' --env PASSWORD_AUTH=true,ENTERPRISE=true,AUTH_TOKEN=$AUTH_TOKEN" }, "devDependencies": { - "@material-ui/core": "4.11.3", + "@material-ui/core": "4.12.3", "@material-ui/icons": "4.11.2", - "@material-ui/lab": "4.0.0-alpha.57", + "@material-ui/lab": "4.0.0-alpha.60", "@testing-library/jest-dom": "5.14.1", "@testing-library/react": "12.1.2", "@testing-library/user-event": "13.2.1", diff --git a/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.js.snap b/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.js.snap index aa39a68aa9..bf0c1bff96 100644 --- a/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.js.snap +++ b/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.js.snap @@ -53,7 +53,7 @@ exports[`renders correctly with permissions 1`] = ` } >
'ProjectSelect'); jest.mock('../../tag-type-select-container', () => 'TagTypeSelect'); jest.mock('../../feature-tag-component', () => 'FeatureTagComponent'); jest.mock('../../add-tag-dialog-container', () => 'AddTagDialog'); +jest.spyOn(console, 'error').mockImplementation(); test('renders correctly with one feature', () => { const feature = { diff --git a/frontend/src/component/menu/Footer/Footer.jsx b/frontend/src/component/menu/Footer/Footer.jsx index b4c3017f57..e0eecc33dc 100644 --- a/frontend/src/component/menu/Footer/Footer.jsx +++ b/frontend/src/component/menu/Footer/Footer.jsx @@ -11,7 +11,7 @@ export const Footer = () => { return (