Upgrade UI deps #3163
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,24 +10,6 @@ | |
| "@clr/ui": "^5.4.1", | ||
| "@improbable-eng/grpc-web": "^0.14.0", | ||
| "@paciolan/remote-component": "^2.11.0", | ||
| "ajv": "^8.6.2", | ||
| "axios": "^0.21.1", | ||
| "connected-react-router": "^6.9.1", | ||
|
|
@@ -37,6 +19,7 @@ | |
| "google-protobuf": "^3.17.3", | ||
| "history": "^4.10.1", | ||
| "immutable": "^4.0.0-rc.14", | ||
| "isomorphic-form-data": "^2.0.0", | ||
|
There was a problem hiding this comment. So it sounds from @dlaloue-vmware 's comments that this dependency is required by swagger-ui-react but wasn't declared as a dependency by them? Or something similar: swagger-api/swagger-ui#7436 Hah, although they mention there that: "On Thursday 29.7.2021 there will a new release of swagger-ui-react that will fix this issue automatically by updating to it.". Not sure if we wait, but if not, let's at least include a #TODO to remove it refering to the swagger-ui issue ? There was a problem hiding this comment. While writing this message, they have just bumped up the version: https://github.com/swagger-api/swagger-ui/releases/tag/v3.51.2, so I have updated it and removed the unnecessary dep straight away. Thanks for the pointer! |
||
| "js-yaml": "^4.1.0", | ||
| "json-schema": "^0.3.0", | ||
| "jsonwebtoken": "^8.5.1", | ||
|
|
@@ -59,7 +42,6 @@ | |
| "react-markdown": "^6.0.2", | ||
| "react-minimal-pie-chart": "^8.2.0", | ||
| "react-redux": "^7.2.4", | ||
| "react-router-dom": "^5.2.0", | ||
| "react-router-hash-link": "^2.4.3", | ||
| "react-switch": "^6.0.0", | ||
|
|
@@ -119,14 +101,21 @@ | |
| "@formatjs/cli": "^4.2.29", | ||
| "@types/enzyme": "^3.10.9", | ||
| "@types/enzyme-adapter-react-16": "^1.0.6", | ||
| "@types/google-protobuf": "^3.15.3", | ||
| "@types/jest": "^26.0.24", | ||
| "@types/js-yaml": "^4.0.2", | ||
| "@types/jsonwebtoken": "^8.5.4", | ||
| "@types/moxios": "^0.4.12", | ||
| "@types/qs": "^6.9.7", | ||
| "@types/react-copy-to-clipboard": "^5.0.1", | ||
| "@types/react-dom": "^17.0.9", | ||
| "@types/react-helmet": "^6.1.2", | ||
| "@types/react-router": "^5.1.16", | ||
| "@types/react-router-dom": "^5.1.8", | ||
| "@types/react-router-hash-link": "^2.4.1", | ||
| "@types/react-transition-group": "^4.4.2", | ||
| "@types/redux-mock-store": "^1.0.3", | ||
| "@types/semver": "^7.3.8", | ||
| "@types/swagger-ui-react": "^3.35.2", | ||
| "enzyme": "^3.11.0", | ||
| "eslint-config-prettier": "^8.3.0", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,13 @@ | ||
| import { deepClone } from "@cds/core/internal"; | ||
| import actions from "actions"; | ||
| import LoadingWrapper from "components/LoadingWrapper"; | ||
| import SearchFilter from "components/SearchFilter/SearchFilter"; | ||
| import context from "jest-plugin-context"; | ||
| import qs from "qs"; | ||
| import React from "react"; | ||
| import { act } from "react-dom/test-utils"; | ||
| import * as ReactRedux from "react-redux"; | ||
| import { MemoryRouter } from "react-router"; | ||
| import { Kube } from "shared/Kube"; | ||
| import { defaultStore, getStore, initialState, mountWrapper } from "shared/specs/mountWrapper"; | ||
| import { FetchError, IAppOverview, IStoreState } from "../../shared/types"; | ||
|
|
@@ -57,15 +56,25 @@ context("when changing props", () => { | |
| jest.spyOn(qs, "parse").mockReturnValue({ | ||
| q: "foo", | ||
| }); | ||
| const wrapper = mountWrapper( | ||
| defaultStore, | ||
| <MemoryRouter initialEntries={["/foo?q=foo"]}> | ||
| <AppList /> | ||
| </MemoryRouter>, | ||
|
Comment on lines
+61
to
+63
There was a problem hiding this comment. The main change here is replacing the jest.spyOn with the approach suggested in the official website: https://reactrouter.com/web/guides/testing |
||
| ); | ||
| expect(wrapper.find(SearchFilter).prop("value")).toEqual("foo"); | ||
| }); | ||
|
|
||
| it("should list apps in all namespaces", () => { | ||
| jest.spyOn(qs, "parse").mockReturnValue({ | ||
| allns: "yes", | ||
| }); | ||
| const wrapper = mountWrapper( | ||
| defaultStore, | ||
| <MemoryRouter initialEntries={["/foo?allns=yes"]}> | ||
| <AppList /> | ||
| </MemoryRouter>, | ||
| ); | ||
| expect(wrapper.find("input[type='checkbox']")).toBeChecked(); | ||
| }); | ||
|
|
||
|
|
@@ -92,10 +101,8 @@ context("when changing props", () => { | |
|
|
||
| describe("when store changes", () => { | ||
| let spyOnUseState: jest.SpyInstance; | ||
| afterEach(() => { | ||
| spyOnUseState.mockRestore(); | ||
| }); | ||
|
|
||
| it("should not set all-ns prop when getting changes in the namespace", async () => { | ||
|
|
@@ -111,11 +118,13 @@ context("when changing props", () => { | |
| } | ||
| return [init, useState]; | ||
| }); | ||
|
|
||
| mountWrapper( | ||
| defaultStore, | ||
| <MemoryRouter initialEntries={["/foo?allns=yes"]}> | ||
| <AppList /> | ||
| </MemoryRouter>, | ||
| ); | ||
| expect(setAllNS).not.toHaveBeenCalledWith(false); | ||
| }); | ||
| }); | ||
|
|
@@ -231,7 +240,12 @@ context("when apps available", () => { | |
| jest.spyOn(qs, "parse").mockReturnValue({ | ||
| q: "bar", | ||
| }); | ||
| const wrapper = mountWrapper( | ||
| getStore(state), | ||
| <MemoryRouter initialEntries={["/foo?q=bar"]}> | ||
| <AppList /> | ||
| </MemoryRouter>, | ||
| ); | ||
| expect(wrapper.find(AppListItem).key()).toBe("foobar/bar"); | ||
| }); | ||
| }); | ||
|
|
@@ -273,7 +287,12 @@ context("when custom resources available", () => { | |
| jest.spyOn(qs, "parse").mockReturnValue({ | ||
| q: "nop", | ||
| }); | ||
| const wrapper = mountWrapper( | ||
| getStore(state), | ||
| <MemoryRouter initialEntries={["/foo?q=nop"]}> | ||
| <AppList /> | ||
| </MemoryRouter>, | ||
| ); | ||
| const itemList = wrapper.find(CustomResourceListItem); | ||
| expect(itemList).not.toExist(); | ||
| }); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved to dev deps. Also, I removed all of them and just installed those ones Typescript was complaining (this way we reduce the types dependencies (as many of them are including also the definition of the types)