From fd41d16385919eb27b1f43f9572c4e03741e22ea Mon Sep 17 00:00:00 2001 From: Mohamed Khelif Date: Fri, 15 Sep 2023 16:06:17 +0100 Subject: [PATCH] EVG-20835 Upgrade tooltip (#2040) --- package.json | 4 +- .../GroupedTaskStatusBadge.test.tsx | 2 +- src/gql/generated/types.ts | 14 +++++ yarn.lock | 54 +++++++++++-------- 4 files changed, 48 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 1d3206524a..a34d3e78ef 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "@leafygreen-ui/number-input": "1.0.4", "@leafygreen-ui/pagination": "1.0.12", "@leafygreen-ui/palette": "4.0.7", - "@leafygreen-ui/popover": "11.0.1", + "@leafygreen-ui/popover": "11.0.17", "@leafygreen-ui/radio-box-group": "12.0.1", "@leafygreen-ui/radio-group": "10.1.1", "@leafygreen-ui/search-input": "2.0.8", @@ -99,7 +99,7 @@ "@leafygreen-ui/toast": "6.1.4", "@leafygreen-ui/toggle": "10.0.1", "@leafygreen-ui/tokens": "2.1.0", - "@leafygreen-ui/tooltip": "9.1.6", + "@leafygreen-ui/tooltip": "10.0.10", "@leafygreen-ui/typography": "16.4.1", "@rjsf/core": "4.2.3", "@sentry/react": "7.56.0", diff --git a/src/components/GroupedTaskStatusBadge/GroupedTaskStatusBadge.test.tsx b/src/components/GroupedTaskStatusBadge/GroupedTaskStatusBadge.test.tsx index eab9fd0eb5..59e317231f 100644 --- a/src/components/GroupedTaskStatusBadge/GroupedTaskStatusBadge.test.tsx +++ b/src/components/GroupedTaskStatusBadge/GroupedTaskStatusBadge.test.tsx @@ -84,7 +84,7 @@ describe("groupedTaskStatusBadgeIcon", () => { await waitFor(() => { expect( screen.getByDataCy("grouped-task-status-badge-tooltip") - ).toBeInTheDocument(); + ).toBeVisible(); }); expect(screen.queryByText("30")).toBeVisible(); expect(screen.queryByText("Running")).toBeVisible(); diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts index 59f47f7dd8..a518e5d843 100644 --- a/src/gql/generated/types.ts +++ b/src/gql/generated/types.ts @@ -258,6 +258,19 @@ export enum CommunicationMethod { Ssh = "SSH", } +export type ContainerPool = { + __typename?: "ContainerPool"; + distro: Scalars["String"]["output"]; + id: Scalars["String"]["output"]; + maxContainers: Scalars["Int"]["output"]; + port: Scalars["Int"]["output"]; +}; + +export type ContainerPoolsConfig = { + __typename?: "ContainerPoolsConfig"; + pools: Array; +}; + export type ContainerResources = { __typename?: "ContainerResources"; cpu: Scalars["Int"]["output"]; @@ -2330,6 +2343,7 @@ export type SpruceConfig = { __typename?: "SpruceConfig"; banner?: Maybe; bannerTheme?: Maybe; + containerPools?: Maybe; githubOrgs: Array; jira?: Maybe; keys: Array; diff --git a/yarn.lock b/yarn.lock index c070c3963e..e7a8247a5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3840,17 +3840,17 @@ resolved "https://registry.yarnpkg.com/@leafygreen-ui/polymorphic/-/polymorphic-1.3.6.tgz#9df179df9176a5c1eaa1120bc22a4cc5356f3ed2" integrity sha512-ZJqrYNAAO/CLgl3vtl01jQl2xz6pvzPRMEDqOgCykEn2/vk6wZUOJJ4FVK0cbLZuzwvKixbrTgOSw4WrF19sKg== -"@leafygreen-ui/popover@11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@leafygreen-ui/popover/-/popover-11.0.1.tgz#864fb3d39cab2e98b600bd1b5bf930f3592af188" - integrity sha512-OLAjYWomhc3wL+pZnmzrbQOOLtCH0Fm0cLfK0AY3h1QVV0XGZQVDt1+soa6KKZInb7wcAtHZpDHqxWzVlwkuZg== +"@leafygreen-ui/popover@11.0.17", "@leafygreen-ui/popover@^11.0.17": + version "11.0.17" + resolved "https://registry.yarnpkg.com/@leafygreen-ui/popover/-/popover-11.0.17.tgz#27ee654712fdf5f41bf3233a9c26a1d76affd2ff" + integrity sha512-8ikJSmLTsDBpXou2lNY54ZCOVRwsb6v8L6e6Fxanb/74OElrYU38iNoUdR/inW+pzdRiUQT6qx8oaqZ7EKrS0Q== dependencies: - "@leafygreen-ui/emotion" "^4.0.3" - "@leafygreen-ui/hooks" "^7.3.3" - "@leafygreen-ui/lib" "^10.0.0" - "@leafygreen-ui/portal" "^4.0.7" - "@leafygreen-ui/tokens" "^1.4.0" - react-transition-group "^4.4.1" + "@leafygreen-ui/emotion" "^4.0.7" + "@leafygreen-ui/hooks" "^8.0.0" + "@leafygreen-ui/lib" "^11.0.0" + "@leafygreen-ui/portal" "^5.0.1" + "@leafygreen-ui/tokens" "^2.2.0" + react-transition-group "^4.4.5" "@leafygreen-ui/popover@^11.0.0", "@leafygreen-ui/popover@^11.0.12", "@leafygreen-ui/popover@^11.0.4", "@leafygreen-ui/popover@^11.0.5", "@leafygreen-ui/popover@^11.0.8", "@leafygreen-ui/popover@^11.0.9": version "11.0.12" @@ -3876,7 +3876,7 @@ "@leafygreen-ui/tokens" "^2.1.4" react-transition-group "^4.4.1" -"@leafygreen-ui/portal@^4.0.7", "@leafygreen-ui/portal@^4.0.9", "@leafygreen-ui/portal@^4.1.1", "@leafygreen-ui/portal@^4.1.2", "@leafygreen-ui/portal@^4.1.4": +"@leafygreen-ui/portal@^4.0.9", "@leafygreen-ui/portal@^4.1.1", "@leafygreen-ui/portal@^4.1.2", "@leafygreen-ui/portal@^4.1.4": version "4.1.4" resolved "https://registry.yarnpkg.com/@leafygreen-ui/portal/-/portal-4.1.4.tgz#31513ce87c8619cdfa514900cac5f4bb882d28e5" integrity sha512-gtzQno7yXGmbblHIVBWpJ6+TIFwep/PL4M6vcloCzAaV88+gSMJ9lhrBJbqYQkfd65xeEaycClDsfCpI35p/nA== @@ -3900,6 +3900,14 @@ "@leafygreen-ui/hooks" "^7.7.8" "@leafygreen-ui/lib" "^10.4.3" +"@leafygreen-ui/portal@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@leafygreen-ui/portal/-/portal-5.0.1.tgz#a5b6962210bca1809cd2dc67ae4c767e755a0f34" + integrity sha512-SL+Kw2088aopilmzKOTfzWE4tVKyRyClr1nnOaX+xplQ+6gu22C+LDFL4cJZkkWyP8WlqAE+2s1C631W3uHbPg== + dependencies: + "@leafygreen-ui/hooks" "^8.0.0" + "@leafygreen-ui/lib" "^11.0.0" + "@leafygreen-ui/radio-box-group@12.0.1": version "12.0.1" resolved "https://registry.yarnpkg.com/@leafygreen-ui/radio-box-group/-/radio-box-group-12.0.1.tgz#64f44ad30d99958ccc18e2303269175c4cad715d" @@ -4179,19 +4187,19 @@ dependencies: "@leafygreen-ui/palette" "^4.0.7" -"@leafygreen-ui/tooltip@9.1.6": - version "9.1.6" - resolved "https://registry.yarnpkg.com/@leafygreen-ui/tooltip/-/tooltip-9.1.6.tgz#0a750a3d043a0049b5c74bd317aa026073e7a377" - integrity sha512-ROy8EqIqMPaZH4zuU7Abq2KrqOA0i/C+kFRXqdohkIeDHlO3j0t8NlcrhbWClbz1L1QUcCkj5G9qyvOKMobaJQ== +"@leafygreen-ui/tooltip@10.0.10": + version "10.0.10" + resolved "https://registry.yarnpkg.com/@leafygreen-ui/tooltip/-/tooltip-10.0.10.tgz#bebf502c7b8ef12fdb40a2a9bdcbafa1273b410b" + integrity sha512-DdEyUJUXBXOZhIpEg2N7TIgcj4tGNBmFJiakJ2iHr9dJPWxWnwvdl+J/LkHe87XUx+3aBLNtPQff+RSAmxAUgA== dependencies: - "@leafygreen-ui/emotion" "^4.0.3" - "@leafygreen-ui/hooks" "^7.5.0" - "@leafygreen-ui/icon" "^11.12.5" - "@leafygreen-ui/lib" "^10.2.2" - "@leafygreen-ui/palette" "^4.0.0" - "@leafygreen-ui/popover" "^11.0.4" - "@leafygreen-ui/tokens" "^2.0.1" - "@leafygreen-ui/typography" "^16.1.0" + "@leafygreen-ui/emotion" "^4.0.7" + "@leafygreen-ui/hooks" "^8.0.0" + "@leafygreen-ui/icon" "^11.23.0" + "@leafygreen-ui/lib" "^11.0.0" + "@leafygreen-ui/palette" "^4.0.7" + "@leafygreen-ui/popover" "^11.0.17" + "@leafygreen-ui/tokens" "^2.2.0" + "@leafygreen-ui/typography" "^17.0.0" lodash "^4.17.21" polished "^4.2.2"