Merge branch 'main' into DEVPROD-4608

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");
     });

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",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "spruce",
-  "version": "3.0.221",
+  "version": "3.0.223",
   "private": true,
   "scripts": {
     "bootstrap-logkeeper": "./scripts/bootstrap-logkeeper.sh",
@@ -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",
@@ -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",

src/components/Table/BaseTable.tsx

@@ -217,7 +217,7 @@ const RenderableRow = <T extends LGRowData>({
           virtualRow={virtualRow}
         >
           {subRow.getVisibleCells().map((cell) => (
-            <Cell key={cell.id} style={cellPaddingStyle}>
+            <Cell key={cell.id}>
               {flexRender(cell.column.columnDef.cell, cell.getContext())}
             </Cell>
           ))}