Skip to content
This repository has been archived by the owner on Jul 2, 2024. It is now read-only.

EVG-16587 Bump Apollo and graphql deps #1365

Merged
merged 12 commits into from
Jul 7, 2022
Merged

EVG-16587 Bump Apollo and graphql deps #1365

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
86c6624
Bump apollo and graphql
khelif96 Jul 6, 2022
6a5200a
Revert graphql eslint deps
khelif96 Jul 6, 2022
f8f136b
remove graphql-tag as dep
khelif96 Jul 6, 2022
69fcf07
Remove types/graphql
khelif96 Jul 6, 2022
dab34f7
Fix failing unit tests
khelif96 Jul 6, 2022
ceae854
Remove addTypename param
khelif96 Jul 6, 2022
62167cd
Merge branch 'main' into EVG-16587
khelif96 Jul 7, 2022
04d23a5
Update fetch policy usage to address apollo behavior changes
khelif96 Jul 7, 2022
fec545a
Update loading behavior for more user friendly pagination
khelif96 Jul 7, 2022
f480bd0
Handle scenario where a version may not have tasks
khelif96 Jul 7, 2022
cf461d5
Bypass antd popup blocking click
khelif96 Jul 7, 2022
15df23b
CR
khelif96 Jul 7, 2022
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
6 changes: 2 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"extends": "react-app"
},
"dependencies": {
"@apollo/client": "3.3.7",
"@apollo/client": "3.6.9",
"@bugsnag/js": "7.16.0",
"@bugsnag/plugin-react": "7.16.0",
"@emotion/css": "^11.9.0",
Expand Down Expand Up @@ -104,7 +104,7 @@
"date-fns-tz": "^1.1.2",
"deep-object-diff": "1.1.0",
"env-cmd": "10.1.0",
"graphql": "15.5.0",
"graphql": "16.5.0",
"html-react-parser": "1.2.4",
"js-cookie": "2.2.1",
"linkifyjs": "2.1.9",
Expand Down Expand Up @@ -151,7 +151,6 @@
"@testing-library/react": "12.1.5",
"@testing-library/react-hooks": "8.0.0",
"@testing-library/user-event": "12.5.0",
"@types/graphql": "^14.5.0",
"@types/jest": "^27.5.1",
"@types/js-cookie": "^2.2.7",
"@types/lodash.debounce": "4.0.6",
Expand Down Expand Up @@ -189,7 +188,6 @@
"eslint-plugin-storybook": "0.5.6",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(placement of comment is random)

Could we possibly remove @types/graphql from devDependencies?

Screen Shot 2022-07-06 at 3 56 58 PM

"eslint-plugin-testing-library": "^3.9.2",
"eslint-webpack-plugin": "^2.1.0",
"graphql-tag": "^2.11.0",
"http-proxy": "^1.18.1",
"husky": "4.3.0",
"identity-obj-proxy": "3.0.0",
Expand Down
8 changes: 6 additions & 2 deletions src/pages/projectSettings/tabs/GeneralTab/Fields/RepoConfigField.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,9 @@ const attachProjectToRepoMock = {
},
result: {
data: {
id: "evergreen",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These mocks were invalid and were fixed.

attachProjectToRepo: {
id: "evergreen",
},
},
},
};
Expand All @@ -322,7 +324,9 @@ const detachProjectFromRepoMock = {
},
result: {
data: {
id: "evergreen",
detachProjectFromRepo: {
id: "evergreen",
},
},
},
};
Expand Down
7 changes: 2 additions & 5 deletions src/pages/spawn/spawnVolume/spawnVolumeButton/SpawnVolumeModal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,7 @@ describe("spawnVolumeModal", () => {
<SpawnVolumeModal visible onCancel={() => {}} />
);
const { queryByText, queryByDataCy } = render(
<MockedProvider
addTypename={false}
mocks={[...baseMocks, spawnVolumeMutation]}
>
<MockedProvider mocks={[...baseMocks, spawnVolumeMutation]}>
<Component />
</MockedProvider>
);
Expand All @@ -130,7 +127,6 @@ describe("spawnVolumeModal", () => {
fireEvent.click(queryByDataCy("i-00b212e96b3f91079-option"));
fireEvent.click(queryByText("Spawn"));
await waitFor(() => expect(dispatchToast.success).toHaveBeenCalledTimes(1));
await waitFor(() => expect(dispatchToast.error).toHaveBeenCalledTimes(0));
});
});

Expand Down Expand Up @@ -292,6 +288,7 @@ const userMock = {
user: {
userId: "a",
displayName: "A",
emailAddress: "[email protected]",
},
},
},
Expand Down
Loading