Merge branch 'main' into dependabot/npm_and_yarn/emotion-2800717715

evergreen-ci · Dec 27, 2024 · 83ce1ee · 83ce1ee
2 parents 1555188 + a6634f6
commit 83ce1ee
Show file tree

Hide file tree

Showing 80 changed files with 5,327 additions and 2,462 deletions.
diff --git a/apps/parsley/cypress/integration/ansiLogs/ansi_filtering.ts b/apps/parsley/cypress/integration/ansiLogs/ansi_filtering.ts
@@ -5,6 +5,7 @@ describe("Filtering", () => {
   describe("Applying filters", () => {
     describe("Basic filtering", () => {
       beforeEach(() => {
+        cy.resetDrawerState();
         cy.visit(logLink);
         cy.dataCy("paginated-virtual-list").should("be.visible");
       });
@@ -20,6 +21,13 @@ describe("Filtering", () => {
             .and("match", /log-row-(0|5|6|297)/);
         });
       });
+
+      it("does not corrupt filters that are large numbers", () => {
+        cy.addFilter("5553072873648668703");
+        cy.dataCy("log-row-0").should("be.visible").dblclick({ force: true });
+        cy.location("search").should("contain", "5553072873648668703");
+        cy.dataCy("filter-5553072873648668703").should("be.visible");
+      });
     });
 
     describe("Advanced filtering", () => {
@@ -206,7 +214,8 @@ describe("Filtering", () => {
       cy.dataCy(`filter-${filter}`).within(() => {
         cy.get(`[aria-label="Edit filter"]`).click();
       });
-      cy.dataCy("edit-filter-name").clear().type("running");
+      cy.dataCy("edit-filter-name").clear();
+      cy.dataCy("edit-filter-name").type("running");
       cy.contains("button", "Apply").click();
       cy.location("search").should("contain", "filters=100running");
       cy.get("[data-cy^='log-row-']")

diff --git a/apps/parsley/cypress/integration/resmokeLogs/resmoke_filtering.ts b/apps/parsley/cypress/integration/resmokeLogs/resmoke_filtering.ts
@@ -5,6 +5,7 @@ describe("Filtering", () => {
   describe("Applying filters", () => {
     describe("Basic filtering", () => {
       beforeEach(() => {
+        cy.resetDrawerState();
         cy.visit(logLink);
         cy.dataCy("paginated-virtual-list").should("be.visible");
       });
@@ -20,6 +21,13 @@ describe("Filtering", () => {
             .and("match", /log-row-(0|5|6|130)/);
         });
       });
+
+      it("does not corrupt filters that are large numbers", () => {
+        cy.addFilter("5553072873648668703");
+        cy.dataCy("log-row-0").should("be.visible").dblclick({ force: true });
+        cy.location("search").should("contain", "5553072873648668703");
+        cy.dataCy("filter-5553072873648668703").should("be.visible");
+      });
     });
 
     describe("Advanced filtering", () => {
@@ -206,7 +214,8 @@ describe("Filtering", () => {
       cy.dataCy(`filter-${filter}`).within(() => {
         cy.get(`[aria-label="Edit filter"]`).click();
       });
-      cy.dataCy("edit-filter-name").clear().type("session");
+      cy.dataCy("edit-filter-name").clear();
+      cy.dataCy("edit-filter-name").type("session");
       cy.contains("button", "Apply").click();
       cy.location("search").should("contain", "filters=100session");
       cy.get("[data-cy^='log-row-']")

diff --git a/apps/parsley/package.json b/apps/parsley/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parsley",
-  "version": "2.3.8",
+  "version": "2.3.10",
   "private": true,
   "type": "module",
   "scripts": {
@@ -62,14 +62,14 @@
     "@leafygreen-ui/segmented-control": "^8.2.13",
     "@leafygreen-ui/select": "^12.0.0",
     "@leafygreen-ui/side-nav": "^14.1.3",
-    "@leafygreen-ui/tabs": "^11.1.13",
+    "@leafygreen-ui/tabs": "^13.1.1",
     "@leafygreen-ui/text-input": "^13.0.2",
     "@leafygreen-ui/toast": "^6.1.27",
     "@leafygreen-ui/toggle": "^10.0.4",
     "@leafygreen-ui/tooltip": "^11.1.0",
     "@leafygreen-ui/typography": "^19.0.0",
-    "@sentry/react": "8.42.0",
-    "@sentry/types": "8.42.0",
+    "@sentry/react": "8.47.0",
+    "@sentry/types": "8.47.0",
     "ansi_up": "6.0.2",
     "graphql": "16.8.1",
     "html-react-parser": "3.0.6",
@@ -79,7 +79,7 @@
     "linkifyjs": "4.1.3",
     "lossless-json": "4.0.1",
     "pluralize": "8.0.0",
-    "query-string": "9.0.0",
+    "query-string": "9.1.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-dropzone": "14.2.3",
@@ -103,7 +103,7 @@
     "@storybook/testing-library": "0.2.2",
     "@styled/typescript-styled-plugin": "1.0.1",
     "@testing-library/jest-dom": "6.6.3",
-    "@testing-library/react": "16.0.1",
+    "@testing-library/react": "16.1.0",
     "@testing-library/user-event": "14.5.2",
     "@types/js-cookie": "3.0.6",
     "@types/lodash.debounce": "4.0.7",

diff --git a/apps/parsley/src/components/BookmarksBar/index.tsx b/apps/parsley/src/components/BookmarksBar/index.tsx
@@ -49,7 +49,11 @@ const BookmarksBar: React.FC<BookmarksBarProps> = ({
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   const lineNumbers = Array.from(
-    new Set([...bookmarks, shareLine ?? 0, failingLine ?? 0]),
+    new Set([
+      ...bookmarks,
+      ...(shareLine ? [shareLine] : []),
+      ...(failingLine ? [failingLine] : []),
+    ]),
   ).sort((a, b) => a - b);
 
   return (

diff --git a/apps/parsley/src/components/DetailsMenu/DetailsMenuCard/DetailsMenu.stories.tsx b/apps/parsley/src/components/DetailsMenu/DetailsMenuCard/DetailsMenu.stories.tsx
@@ -16,6 +16,9 @@ export default {
       </MockedProvider>
     ),
   ],
+  parameters: {
+    storyshots: { disable: true }, // FIXME: This story is disabled because the @leafygreen-ui/[email protected] package is generating inconsistent snapshots
+  },
 } satisfies CustomMeta<typeof DetailsMenu>;
 
 export const Default: CustomStoryObj<typeof DetailsMenu> = {