Merge remote-tracking branch 'origin/main' into repro_blog

adoptium · Aug 7, 2024 · 6cca140 · 6cca140
2 parents 9f3e900 + 2ddb87d
commit 6cca140
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 75 deletions.
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -30,7 +30,7 @@ jobs:
         results_file: results.sarif
         results_format: sarif
         publish_results: true
-    - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+    - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
       with:
         name: SARIF file
         path: results.sarif

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,11 +13,11 @@
     "@mdx-js/react": "^2.3.0",
     "@mui/lab": "^5.0.0-alpha.97",
     "@mui/material": "^5.16.6",
-    "@mui/x-data-grid": "^7.11.1",
-    "@mui/x-date-pickers": "^7.11.1",
+    "@mui/x-data-grid": "^7.12.0",
+    "@mui/x-date-pickers": "^7.12.0",
     "@popperjs/core": "^2.11.8",
     "@react-icons/all-files": "^4.1.0",
-    "axios": "^1.7.2",
+    "axios": "^1.7.3",
     "bootstrap": "^5.3.3",
     "date-fns": "^3.6.0",
     "flexsearch": "^0.7.43",
@@ -80,7 +80,7 @@
     "@vitejs/plugin-react": "^4.3.1",
     "@vitest/coverage-v8": "^2.0.5",
     "ajv": "^8.17.1",
-    "axios-mock-adapter": "^1.22.0",
+    "axios-mock-adapter": "^2.0.0",
     "babel-preset-gatsby": "^3.13.2",
     "gatsby-cli": "^5.12.4",
     "jest-canvas-mock": "^2.5.2",

diff --git a/src/components/AdoptiumNews/index.tsx b/src/components/AdoptiumNews/index.tsx
@@ -10,8 +10,8 @@ const adoptiumNews = {
     body: "Be a part of the first-ever Adoptium Summit on September, 10.<br/>Connect with peers to exchange knowledge on Temurin, AQAvit and other Adoptium's projects.<br/><callToActionLink>Register here</callToActionLink>", 
     callToActionLink: 'https://www.eclipse.org/events/2024/adoptium-summit/', 
     date: new Date('2024-09-10'),
-    startDisplayAt: new Date('2024-05-15'),
-    stopDisplayAfter: new Date('2024-06-30'),
+    startDisplayAt: new Date('2024-08-01'),
+    stopDisplayAfter: new Date('2024-09-09'),
 }
 
 const eventDateOptions = { 

diff --git a/src/components/ReleaseNotesRender/__tests__/__snapshots__/ReleaseNotesRender.test.tsx.snap b/src/components/ReleaseNotesRender/__tests__/__snapshots__/ReleaseNotesRender.test.tsx.snap
@@ -83,7 +83,7 @@ exports[`ReleaseNotesRender component > should render correctly 1`] = `
         </p>
         <div
           aria-label="Release Notes"
-          class="MuiDataGrid-root MuiDataGrid-autoHeight MuiDataGrid-root--densityStandard MuiDataGrid-withBorderColor css-qa3o5s-MuiDataGrid-root"
+          class="MuiDataGrid-root MuiDataGrid-autoHeight MuiDataGrid-root--densityStandard MuiDataGrid-withBorderColor css-ybnjbb-MuiDataGrid-root"
           style="--DataGrid-width: 0px; --DataGrid-hasScrollX: 1; --DataGrid-hasScrollY: 0; --DataGrid-scrollbarSize: 0px; --DataGrid-rowWidth: 1300px; --DataGrid-columnsTotalWidth: 1300px; --DataGrid-leftPinnedWidth: 0px; --DataGrid-rightPinnedWidth: 0px; --DataGrid-headerHeight: 56px; --DataGrid-headersTotalHeight: 56px; --DataGrid-topContainerHeight: 56px; --DataGrid-bottomContainerHeight: 0px; --height: 52px;"
         >
           <div
@@ -146,10 +146,9 @@ exports[`ReleaseNotesRender component > should render correctly 1`] = `
               class="MuiDataGrid-virtualScroller css-1793420-MuiDataGrid-virtualScroller"
               role="presentation"
               style="overflow-x: hidden; overflow-y: hidden;"
-              tabindex="-1"
             >
               <div
-                class="MuiDataGrid-topContainer MuiDataGrid-container--top css-1oudwrl"
+                class="MuiDataGrid-topContainer MuiDataGrid-container--top css-2sp4oa"
                 role="presentation"
               >
                 <div
@@ -158,7 +157,7 @@ exports[`ReleaseNotesRender component > should render correctly 1`] = `
                 >
                   <div
                     aria-rowindex="1"
-                    class="css-yrdy0g-MuiDataGrid-columnHeaderRow"
+                    class="MuiDataGrid-row--borderBottom css-yrdy0g-MuiDataGrid-columnHeaderRow"
                     role="row"
                   >
                     <div
@@ -791,6 +790,7 @@ exports[`ReleaseNotesRender component > should render correctly 1`] = `
               />
             </div>
             <div
+              aria-hidden="true"
               class="MuiDataGrid-scrollbar MuiDataGrid-scrollbar--horizontal css-1rtad1"
               tabindex="-1"
             >
@@ -804,7 +804,7 @@ exports[`ReleaseNotesRender component > should render correctly 1`] = `
           >
             <div />
             <div
-              class="MuiTablePagination-root css-rtrcn9-MuiTablePagination-root"
+              class="MuiTablePagination-root css-16mfp94-MuiTablePagination-root"
             >
               <div
                 class="MuiToolbar-root MuiToolbar-gutters MuiToolbar-regular MuiTablePagination-toolbar css-78c6dr-MuiToolbar-root-MuiTablePagination-toolbar"

diff --git a/src/pages/temurin/__tests__/__snapshots__/release-notes.test.tsx.snap b/src/pages/temurin/__tests__/__snapshots__/release-notes.test.tsx.snap
@@ -33,7 +33,7 @@ exports[`Temurin Release Notes page > renders correctly 1`] = `
           </p>
           <div
             aria-label="Release Notes"
-            class="MuiDataGrid-root MuiDataGrid-autoHeight MuiDataGrid-root--densityStandard MuiDataGrid-withBorderColor css-qa3o5s-MuiDataGrid-root"
+            class="MuiDataGrid-root MuiDataGrid-autoHeight MuiDataGrid-root--densityStandard MuiDataGrid-withBorderColor css-ybnjbb-MuiDataGrid-root"
             style="--DataGrid-width: 0px; --DataGrid-hasScrollX: 1; --DataGrid-hasScrollY: 0; --DataGrid-scrollbarSize: 0px; --DataGrid-rowWidth: 1300px; --DataGrid-columnsTotalWidth: 1300px; --DataGrid-leftPinnedWidth: 0px; --DataGrid-rightPinnedWidth: 0px; --DataGrid-headerHeight: 56px; --DataGrid-headersTotalHeight: 56px; --DataGrid-topContainerHeight: 56px; --DataGrid-bottomContainerHeight: 0px; --height: 52px;"
           >
             <div
@@ -96,10 +96,9 @@ exports[`Temurin Release Notes page > renders correctly 1`] = `
                 class="MuiDataGrid-virtualScroller css-1793420-MuiDataGrid-virtualScroller"
                 role="presentation"
                 style="overflow-x: hidden; overflow-y: hidden;"
-                tabindex="-1"
               >
                 <div
-                  class="MuiDataGrid-topContainer MuiDataGrid-container--top css-1oudwrl"
+                  class="MuiDataGrid-topContainer MuiDataGrid-container--top css-2sp4oa"
                   role="presentation"
                 >
                   <div
@@ -108,7 +107,7 @@ exports[`Temurin Release Notes page > renders correctly 1`] = `
                   >
                     <div
                       aria-rowindex="1"
-                      class="css-yrdy0g-MuiDataGrid-columnHeaderRow"
+                      class="MuiDataGrid-row--borderBottom css-yrdy0g-MuiDataGrid-columnHeaderRow"
                       role="row"
                     >
                       <div
@@ -651,6 +650,7 @@ exports[`Temurin Release Notes page > renders correctly 1`] = `
                 />
               </div>
               <div
+                aria-hidden="true"
                 class="MuiDataGrid-scrollbar MuiDataGrid-scrollbar--horizontal css-1rtad1"
                 tabindex="-1"
               >
@@ -664,7 +664,7 @@ exports[`Temurin Release Notes page > renders correctly 1`] = `
             >
               <div />
               <div
-                class="MuiTablePagination-root css-rtrcn9-MuiTablePagination-root"
+                class="MuiTablePagination-root css-16mfp94-MuiTablePagination-root"
               >
                 <div
                   class="MuiToolbar-root MuiToolbar-gutters MuiToolbar-regular MuiTablePagination-toolbar css-78c6dr-MuiToolbar-root-MuiTablePagination-toolbar"