From 3cbf281ce84066fdd9cf563791f3622198d7c1c2 Mon Sep 17 00:00:00 2001 From: minnakt <47064971+minnakt@users.noreply.github.com> Date: Tue, 12 Mar 2024 14:50:26 -0400 Subject: [PATCH 1/8] DEVPROD-5282: Remove padding for nested table rows (#2300) --- src/components/Table/BaseTable.tsx | 2 +- .../__snapshots__/BaseTable.stories.storyshot | 159 ------------------ .../TaskDurationTable.stories.storyshot | 52 ------ 3 files changed, 1 insertion(+), 212 deletions(-) diff --git a/src/components/Table/BaseTable.tsx b/src/components/Table/BaseTable.tsx index e9e7df608c..80cebcfb1b 100644 --- a/src/components/Table/BaseTable.tsx +++ b/src/components/Table/BaseTable.tsx @@ -217,7 +217,7 @@ const RenderableRow = ({ virtualRow={virtualRow} > {subRow.getVisibleCells().map((cell) => ( - + {flexRender(cell.column.columnDef.cell, cell.getContext())} ))} diff --git a/src/components/Table/__snapshots__/BaseTable.stories.storyshot b/src/components/Table/__snapshots__/BaseTable.stories.storyshot index 6d6ab41b08..3496488175 100644 --- a/src/components/Table/__snapshots__/BaseTable.stories.storyshot +++ b/src/components/Table/__snapshots__/BaseTable.stories.storyshot @@ -7740,7 +7740,6 @@ exports[`Snapshot Tests BaseTable.stories LongContent 1`] = ` >
Date: Wed, 13 Mar 2024 15:39:11 -0400 Subject: [PATCH 2/8] spruce/v3.0.222 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c47d4e6c7b..8904f41c1e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "spruce", - "version": "3.0.221", + "version": "3.0.222", "private": true, "scripts": { "bootstrap-logkeeper": "./scripts/bootstrap-logkeeper.sh", From ede5134b5051082794fab6329327b9ad58183db4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:46:48 -0400 Subject: [PATCH 3/8] CHORE(NPM) - bump @types/pluralize from 0.0.29 to 0.0.33 (#2298) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8904f41c1e..9d0eb7a458 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,7 @@ "@types/lodash.throttle": "^4.1.9", "@types/new-relic-browser": "0.1212.2", "@types/node": "^16.11.47", - "@types/pluralize": "0.0.29", + "@types/pluralize": "0.0.33", "@types/prompts": "2.4.9", "@types/react": "18.2.0", "@types/react-dom": "18.2.0", diff --git a/yarn.lock b/yarn.lock index 1763853b5f..30d7b63076 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6066,10 +6066,10 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/pluralize@0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/pluralize/-/pluralize-0.0.29.tgz#6ffa33ed1fc8813c469b859681d09707eb40d03c" - integrity sha512-BYOID+l2Aco2nBik+iYS4SZX0Lf20KPILP5RGmM1IgzdwNdTs0eebiFriOPcej1sX9mLnSoiNte5zcFxssgpGA== +"@types/pluralize@0.0.33": + version "0.0.33" + resolved "https://registry.yarnpkg.com/@types/pluralize/-/pluralize-0.0.33.tgz#8ad9018368c584d268667dd9acd5b3b806e8c82a" + integrity sha512-JOqsl+ZoCpP4e8TDke9W79FDcSgPAR0l6pixx2JHkhnRjvShyYiAYw2LVsnA7K08Y6DeOnaU6ujmENO4os/cYg== "@types/pretty-hrtime@^1.0.0": version "1.0.1" From b01e5276747066110fe1a20e8e897dc07587669e Mon Sep 17 00:00:00 2001 From: Mohamed Khelif Date: Thu, 14 Mar 2024 15:55:25 -0400 Subject: [PATCH 4/8] DEVPROD-2920 Enable access settings page tests (#2228) --- cypress/integration/projectSettings/access.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cypress/integration/projectSettings/access.ts b/cypress/integration/projectSettings/access.ts index 506c04744c..581a43905d 100644 --- a/cypress/integration/projectSettings/access.ts +++ b/cypress/integration/projectSettings/access.ts @@ -6,7 +6,7 @@ import { } from "./constants"; import { clickSave } from "../../utils"; -xdescribe("Access page", () => { +describe("Access page", () => { const origin = getAccessRoute(projectUseRepoEnabled); beforeEach(() => { cy.visit(origin); @@ -29,6 +29,7 @@ xdescribe("Access page", () => { cy.validateToast("success", "Successfully updated project"); // Assert persistence cy.reload(); + cy.getInputByLabel("Username").as("usernameInput"); cy.get("@usernameInput").should("have.value", "admin").should("be.visible"); // Delete a username cy.dataCy("delete-item-button").should("be.visible").click(); @@ -50,10 +51,7 @@ xdescribe("Access page", () => { it("Submitting an invalid admin username produces an error toast", () => { cy.visit(getAccessRoute(project)); cy.contains("Add Username").click(); - cy.get("[aria-label='Username'") - .should("have.length", 4) - .first() - .type("mongodb_user"); + cy.getInputByLabel("Username").type("mongodb_user"); clickSave(); cy.validateToast( "error", From b4cbf1e2a1c5acaaf4b62d6099574181d0a7aff5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:23:31 -0400 Subject: [PATCH 5/8] CHORE(NPM) - bump follow-redirects from 1.15.4 to 1.15.6 (#2301) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 30d7b63076..b992b49b77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9681,9 +9681,9 @@ focus-trap@6.9.4, focus-trap@^6.9.4: tabbable "^5.3.3" follow-redirects@^1.0.0: - version "1.15.4" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" - integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== for-each@^0.3.3: version "0.3.3" From 8874fe4d7a959be145a57b2732607251434b502d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:39:57 -0400 Subject: [PATCH 6/8] CHORE(NPM) - bump @leafygreen-ui/loading-indicator from 2.0.6 to 2.0.8 (#2296) --- package.json | 2 +- yarn.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 9d0eb7a458..a61364a353 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "@leafygreen-ui/inline-definition": "6.0.14", "@leafygreen-ui/interaction-ring": "7.0.2", "@leafygreen-ui/leafygreen-provider": "3.1.11", - "@leafygreen-ui/loading-indicator": "2.0.6", + "@leafygreen-ui/loading-indicator": "2.0.8", "@leafygreen-ui/menu": "20.0.1", "@leafygreen-ui/modal": "16.0.3", "@leafygreen-ui/number-input": "1.0.18", diff --git a/yarn.lock b/yarn.lock index b992b49b77..9e038c50b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3701,17 +3701,17 @@ lodash "^4.17.21" prop-types "^15.7.2" -"@leafygreen-ui/loading-indicator@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@leafygreen-ui/loading-indicator/-/loading-indicator-2.0.6.tgz#95bc845e460c0e53ffbc8e1ae4bad081036aac22" - integrity sha512-UonmjKPSeQNCpPGR4hfrf6GYUY1bKBV30HTdegzNHBQMMXNUY+sxKQn8vJrvWTFQPVN032u9csiWTCrkMqUoew== +"@leafygreen-ui/loading-indicator@2.0.8": + version "2.0.8" + resolved "https://registry.yarnpkg.com/@leafygreen-ui/loading-indicator/-/loading-indicator-2.0.8.tgz#7731c8bf477021b7e7b2a39b8222779d89672aa3" + integrity sha512-A1poSfy9IenDSo0u3LORa4roBd5VWeq2IoURHdmuhQkhkoOCEr3EpDdj6t7q0fdISKKxuMj9G+L4CGHVw+AIbQ== dependencies: "@leafygreen-ui/emotion" "^4.0.7" - "@leafygreen-ui/lib" "^12.0.0" + "@leafygreen-ui/lib" "^13.2.1" "@leafygreen-ui/palette" "^4.0.7" - "@leafygreen-ui/tokens" "^2.1.4" - "@leafygreen-ui/typography" "^17.0.1" - react-lottie-player "^1.5.4" + "@leafygreen-ui/tokens" "^2.3.0" + "@leafygreen-ui/typography" "^18.0.0" + react-lottie-player "^1.5.6" "@leafygreen-ui/menu@20.0.1": version "20.0.1" @@ -4179,7 +4179,7 @@ lodash "^4.17.21" polished "^4.2.2" -"@leafygreen-ui/typography@17.0.1", "@leafygreen-ui/typography@^17.0.0", "@leafygreen-ui/typography@^17.0.1": +"@leafygreen-ui/typography@17.0.1", "@leafygreen-ui/typography@^17.0.0": version "17.0.1" resolved "https://registry.yarnpkg.com/@leafygreen-ui/typography/-/typography-17.0.1.tgz#11c52b4441e4f30f58f4bfe3a69cf8365fdc6a5e" integrity sha512-hsj92VPWODCSzajFDfM5kBTD5wXAQVt7ERnUX8DfdUal8h3XsWJYvluA3QdehvDv2xS2pQeBmcCS1vWFlB+rTA== @@ -13720,10 +13720,10 @@ react-keyed-flatten-children@^1.3.0: dependencies: react-is "^16.8.6" -react-lottie-player@^1.5.4: - version "1.5.4" - resolved "https://registry.yarnpkg.com/react-lottie-player/-/react-lottie-player-1.5.4.tgz#8205cc334d11b923d9bac78e1d19bcc0d475d751" - integrity sha512-eM0g11bAc4EJJuDDfCoNloaAYphfXlIpYnriOt4nRU66PpVmvKhajvP2aif4YflGY2ArAFXhWxs418YzdebK9w== +react-lottie-player@^1.5.6: + version "1.5.6" + resolved "https://registry.yarnpkg.com/react-lottie-player/-/react-lottie-player-1.5.6.tgz#13d43fb4b4506f25fe647ccde8cc0fcbe788bc1f" + integrity sha512-t0GdTYbml0Ihski8ZPx+1WjpjM/EQlTqTcuGm5yeZGJAgFXTmoqrHbSX8bcREIxrHjibWAyIWnLVUK/iHLcqAQ== dependencies: fast-deep-equal "^3.1.3" lottie-web "^5.7.6" From c73ee6f602cd1be4b228e3cfcbd2f12ee15a28cc Mon Sep 17 00:00:00 2001 From: Sophie Stadler Date: Fri, 15 Mar 2024 13:56:51 -0400 Subject: [PATCH 7/8] spruce/v3.0.223 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a61364a353..c9d66663ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "spruce", - "version": "3.0.222", + "version": "3.0.223", "private": true, "scripts": { "bootstrap-logkeeper": "./scripts/bootstrap-logkeeper.sh", From 9ab0877cd4360713dcb2563f2c91b9213627e5b3 Mon Sep 17 00:00:00 2001 From: Annie Black Date: Fri, 15 Mar 2024 16:26:00 -0400 Subject: [PATCH 8/8] DEVPROD-750 remove unused dispatcher option (#2295) --- cypress/integration/distroSettings/task_section.ts | 2 +- src/pages/distroSettings/tabs/TaskTab/getFormSchema.ts | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cypress/integration/distroSettings/task_section.ts b/cypress/integration/distroSettings/task_section.ts index f84a9bdd62..db30ec1711 100644 --- a/cypress/integration/distroSettings/task_section.ts +++ b/cypress/integration/distroSettings/task_section.ts @@ -68,7 +68,7 @@ describe("task section", () => { // Undo changes. cy.selectLGOption("Task Finder Version", "Legacy"); cy.selectLGOption("Task Planner Version", "Legacy"); - cy.selectLGOption("Task Dispatcher Version", /^Revised$/); + cy.selectLGOption("Task Dispatcher Version", "Revised with dependencies"); save(); cy.validateToast("success"); }); diff --git a/src/pages/distroSettings/tabs/TaskTab/getFormSchema.ts b/src/pages/distroSettings/tabs/TaskTab/getFormSchema.ts index b68c45d557..72d068bc9e 100644 --- a/src/pages/distroSettings/tabs/TaskTab/getFormSchema.ts +++ b/src/pages/distroSettings/tabs/TaskTab/getFormSchema.ts @@ -161,11 +161,6 @@ export const getFormSchema = ({ type: "string" as "string", title: "Task Dispatcher Version", oneOf: [ - { - type: "string" as "string", - title: "Revised", - enum: [DispatcherVersion.Revised], - }, { type: "string" as "string", title: "Revised with dependencies",