From 017b15fc61963807c187f4a1458789cd704ec4af Mon Sep 17 00:00:00 2001
From: Xavier FACQ <xavierfacq@users.noreply.github.com>
Date: Wed, 27 Nov 2024 23:23:43 +0100
Subject: [PATCH] Correctly display checksum and buttons (#3259)

* [issue-3221] Pb when checksum is not available

* Change all calls

* Improve codecov

* Set text = Not available

* Remove unused import

* Fix dowload table presentation / deal with sha265sum and sha256sum

* update snapshots

* update snapshots 2
---
 src/__fixtures__/hooks.tsx                    |  8 ++--
 .../MarketplaceDownloadTable.test.tsx         |  6 ++-
 .../MarketplaceDownloadTable.test.tsx.snap    | 32 +++++++-------
 .../MarketplaceDownloadTable/index.tsx        | 10 ++---
 .../TemurinDownloadTable.test.tsx.snap        | 42 +++++++++----------
 src/components/TemurinDownloadTable/index.tsx |  6 +--
 .../fetchLatestTemurin.test.tsx.snap          |  4 +-
 src/hooks/fetchMarketplace.tsx                |  4 ++
 .../__snapshots__/download.test.tsx.snap      |  4 +-
 src/pages/__tests__/download.test.tsx         |  4 +-
 10 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/src/__fixtures__/hooks.tsx b/src/__fixtures__/hooks.tsx
index 7d977955d..e76992f62 100644
--- a/src/__fixtures__/hooks.tsx
+++ b/src/__fixtures__/hooks.tsx
@@ -55,7 +55,7 @@ export const createRandomMarketplaceRelease = (installer, id): MarketplaceReleas
     package: {
       name: 'name_mock.tar.gz',
       link: new URL('https://link_mock'),
-      sha265sum: `sha265sum_mock${id}`,
+      sha256sum: `sha256sum_mock${id}`,
       sha256sum_link: new URL('https://sha256sum_link_mock'),
       signature_link: new URL('https://signature_link_mock'),
     },
@@ -64,7 +64,7 @@ export const createRandomMarketplaceRelease = (installer, id): MarketplaceReleas
           {
             name: 'installer_name_mock.msi',
             link: new URL('https://installer_link_mock'),
-            sha265sum: 'installer_sha265sum_mock',
+            sha256sum: 'installer_sha256sum_mock',
             sha256sum_link: new URL('https://installer_sha256sum_link_mock'),
             signature_link: new URL('https://installer_signature_link_mock'),
           },
@@ -109,7 +109,7 @@ export const mockLatestTemurin = (installer): LatestTemurin => ({
       package: {
         name: 'name_mock.tar.gz',
         link: new URL('https://link_mock'),
-        checksum: 'sha265sum_mock',
+        checksum: 'sha256sum_mock',
         checksum_link: new URL('https://sha256sum_link_mock'),
         metadata_link: new URL('https://metadata_link_mock'),
         signature_link: new URL('https://signature_link_mock'),
@@ -121,7 +121,7 @@ export const mockLatestTemurin = (installer): LatestTemurin => ({
         {
           name: 'installer_name_mock.msi',
           link: new URL('https://installer_link_mock'),
-          checksum: 'installer_sha265sum_mock',
+          checksum: 'installer_sha256sum_mock',
           checksum_link: new URL('https://installer_sha256sum_link_mock'),
           metadata_link: new URL('https://installer_metadata_link_mock'),
           signature_link: new URL('https://installer_signature_link_mock'),
diff --git a/src/components/MarketplaceDownloadTable/__tests__/MarketplaceDownloadTable.test.tsx b/src/components/MarketplaceDownloadTable/__tests__/MarketplaceDownloadTable.test.tsx
index 53fac7592..9ac3c7026 100644
--- a/src/components/MarketplaceDownloadTable/__tests__/MarketplaceDownloadTable.test.tsx
+++ b/src/components/MarketplaceDownloadTable/__tests__/MarketplaceDownloadTable.test.tsx
@@ -60,6 +60,10 @@ describe('MarketplaceDownloadTable component', () => {
     ];
 
     // erase checksum
+    releases[0].binary.package.sha256sum = undefined;
+    releases[0].binary.installer[0].sha256sum = undefined;
+
+    // Name of previous typo to be removed when vendors update their code to fix the typo
     releases[0].binary.package.sha265sum = undefined;
     releases[0].binary.installer[0].sha265sum = undefined;
 
@@ -71,4 +75,4 @@ describe('MarketplaceDownloadTable component', () => {
 
     expect(container).toMatchSnapshot();
   });
-});
\ No newline at end of file
+});
diff --git a/src/components/MarketplaceDownloadTable/__tests__/__snapshots__/MarketplaceDownloadTable.test.tsx.snap b/src/components/MarketplaceDownloadTable/__tests__/__snapshots__/MarketplaceDownloadTable.test.tsx.snap
index b6910d3de..09500f970 100644
--- a/src/components/MarketplaceDownloadTable/__tests__/__snapshots__/MarketplaceDownloadTable.test.tsx.snap
+++ b/src/components/MarketplaceDownloadTable/__tests__/__snapshots__/MarketplaceDownloadTable.test.tsx.snap
@@ -122,14 +122,14 @@ exports[`MarketplaceDownloadTable component > renders correctly - Without checks
           class="align-middle"
         >
           <table
-            class="table parent mb-0 w-auto"
+            class="table parent mb-0 w-100"
           >
             <tbody
               class="table-light"
             >
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
@@ -142,7 +142,7 @@ exports[`MarketplaceDownloadTable component > renders correctly - Without checks
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -170,7 +170,7 @@ exports[`MarketplaceDownloadTable component > renders correctly - Without checks
               </tr>
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
@@ -183,7 +183,7 @@ exports[`MarketplaceDownloadTable component > renders correctly - Without checks
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -394,21 +394,21 @@ exports[`MarketplaceDownloadTable component > renders correctly 1`] = `
           class="align-middle"
         >
           <table
-            class="table parent mb-0 w-auto"
+            class="table parent mb-0 w-100"
           >
             <tbody
               class="table-light"
             >
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
                       <tr>
                         <td>
                           <a
-                            data-bs-checksum="sha265sum_mock1"
+                            data-bs-checksum="sha256sum_mock1"
                             data-bs-target="#checksumModal"
                             data-bs-toggle="modal"
                             href=""
@@ -422,7 +422,7 @@ exports[`MarketplaceDownloadTable component > renders correctly 1`] = `
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -526,21 +526,21 @@ exports[`MarketplaceDownloadTable component > renders correctly 1`] = `
           class="align-middle"
         >
           <table
-            class="table parent mb-0 w-auto"
+            class="table parent mb-0 w-100"
           >
             <tbody
               class="table-light"
             >
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
                       <tr>
                         <td>
                           <a
-                            data-bs-checksum="installer_sha265sum_mock"
+                            data-bs-checksum="installer_sha256sum_mock"
                             data-bs-target="#checksumModal"
                             data-bs-toggle="modal"
                             href=""
@@ -554,7 +554,7 @@ exports[`MarketplaceDownloadTable component > renders correctly 1`] = `
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -582,14 +582,14 @@ exports[`MarketplaceDownloadTable component > renders correctly 1`] = `
               </tr>
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
                       <tr>
                         <td>
                           <a
-                            data-bs-checksum="sha265sum_mock2"
+                            data-bs-checksum="sha256sum_mock2"
                             data-bs-target="#checksumModal"
                             data-bs-toggle="modal"
                             href=""
@@ -603,7 +603,7 @@ exports[`MarketplaceDownloadTable component > renders correctly 1`] = `
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
diff --git a/src/components/MarketplaceDownloadTable/index.tsx b/src/components/MarketplaceDownloadTable/index.tsx
index fb43b83c9..a701e224a 100644
--- a/src/components/MarketplaceDownloadTable/index.tsx
+++ b/src/components/MarketplaceDownloadTable/index.tsx
@@ -55,11 +55,11 @@ const DownloadTable = ({results}) => {
                                     {pkg.binary.architecture}
                                 </td>
                                 <td className="align-middle">
-                                    <table className="table parent mb-0 w-auto">
+                                    <table className="table parent mb-0 w-100">
                                         <tbody className="table-light">
                                             {pkg.binary.installer && (
                                                 <BinaryTable
-                                                    checksum={pkg.binary.installer[0].sha265sum}
+                                                    checksum={pkg.binary.installer[0].sha256sum||pkg.binary.installer[0].sha265sum}
                                                     filename={pkg.binary.installer[0].name}
                                                     link={pkg.binary.installer[0].link}
                                                     os={pkg.binary.os}
@@ -70,7 +70,7 @@ const DownloadTable = ({results}) => {
                                                 />
                                             )}
                                             <BinaryTable
-                                                checksum={pkg.binary.package.sha265sum}
+                                                checksum={pkg.binary.package.sha256sum||pkg.binary.package.sha265sum}
                                                 filename={pkg.binary.package.name}
                                                 link={pkg.binary.package.link}
                                                 os={pkg.binary.os}
@@ -108,7 +108,7 @@ interface DownloadProps {
 const BinaryTable = ({ checksum, link, filename, os, arch, pkgType, javaVersion, vendor }: DownloadProps): null | JSX.Element => {
     return (
         <tr key={checksum}>
-            <td className="align-middle text-center">
+            <td className="align-middle text-center w-50">
                 <table><tbody>
                 <tr>
                     <td>
@@ -120,7 +120,7 @@ const BinaryTable = ({ checksum, link, filename, os, arch, pkgType, javaVersion,
                 </tr>
                 </tbody></table>
             </td>
-            <td className="align-middle">
+            <td className="align-middle w-50">
                 <Link to="/download" state={{ link: link, checksum: checksum, os: os, arch: arch, pkg_type: pkgType, java_version: javaVersion, vendor: vendor }} className="btn btn-primary" style={{width: "6em"}}>
                     <FaDownload /> {fetchExtension(filename)}
                 </Link>
diff --git a/src/components/TemurinDownloadTable/__tests__/__snapshots__/TemurinDownloadTable.test.tsx.snap b/src/components/TemurinDownloadTable/__tests__/__snapshots__/TemurinDownloadTable.test.tsx.snap
index c8dee94fe..de4d82503 100644
--- a/src/components/TemurinDownloadTable/__tests__/__snapshots__/TemurinDownloadTable.test.tsx.snap
+++ b/src/components/TemurinDownloadTable/__tests__/__snapshots__/TemurinDownloadTable.test.tsx.snap
@@ -85,14 +85,14 @@ exports[`TemurinDownloadTable component > renders correctly - Without checksum 1
           class="align-middle"
         >
           <table
-            class="table parent mb-0 w-auto"
+            class="table parent mb-0 w-100"
           >
             <tbody
               class="table-light"
             >
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
@@ -123,7 +123,7 @@ exports[`TemurinDownloadTable component > renders correctly - Without checksum 1
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -151,7 +151,7 @@ exports[`TemurinDownloadTable component > renders correctly - Without checksum 1
               </tr>
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
@@ -173,7 +173,7 @@ exports[`TemurinDownloadTable component > renders correctly - Without checksum 1
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -373,14 +373,14 @@ exports[`TemurinDownloadTable component > renders correctly - with source 1`] =
           class="align-middle"
         >
           <table
-            class="table parent mb-0 w-auto"
+            class="table parent mb-0 w-100"
           >
             <tbody
               class="table-light"
             >
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
@@ -411,7 +411,7 @@ exports[`TemurinDownloadTable component > renders correctly - with source 1`] =
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -516,14 +516,14 @@ exports[`TemurinDownloadTable component > renders correctly - with source 1`] =
           class="align-middle"
         >
           <table
-            class="table parent mb-0 w-auto"
+            class="table parent mb-0 w-100"
           >
             <tbody
               class="table-light"
             >
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
@@ -554,7 +554,7 @@ exports[`TemurinDownloadTable component > renders correctly - with source 1`] =
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -582,7 +582,7 @@ exports[`TemurinDownloadTable component > renders correctly - with source 1`] =
               </tr>
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
@@ -613,7 +613,7 @@ exports[`TemurinDownloadTable component > renders correctly - with source 1`] =
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -733,14 +733,14 @@ exports[`TemurinDownloadTable component > renders correctly 1`] = `
           class="align-middle"
         >
           <table
-            class="table parent mb-0 w-auto"
+            class="table parent mb-0 w-100"
           >
             <tbody
               class="table-light"
             >
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
@@ -771,7 +771,7 @@ exports[`TemurinDownloadTable component > renders correctly 1`] = `
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -876,14 +876,14 @@ exports[`TemurinDownloadTable component > renders correctly 1`] = `
           class="align-middle"
         >
           <table
-            class="table parent mb-0 w-auto"
+            class="table parent mb-0 w-100"
           >
             <tbody
               class="table-light"
             >
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
@@ -914,7 +914,7 @@ exports[`TemurinDownloadTable component > renders correctly 1`] = `
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
@@ -942,7 +942,7 @@ exports[`TemurinDownloadTable component > renders correctly 1`] = `
               </tr>
               <tr>
                 <td
-                  class="align-middle text-center"
+                  class="align-middle text-center w-50"
                 >
                   <table>
                     <tbody>
@@ -973,7 +973,7 @@ exports[`TemurinDownloadTable component > renders correctly 1`] = `
                   </table>
                 </td>
                 <td
-                  class="align-middle"
+                  class="align-middle w-50"
                 >
                   <a
                     class="btn btn-primary"
diff --git a/src/components/TemurinDownloadTable/index.tsx b/src/components/TemurinDownloadTable/index.tsx
index 44a4dc51e..27f3ad13f 100644
--- a/src/components/TemurinDownloadTable/index.tsx
+++ b/src/components/TemurinDownloadTable/index.tsx
@@ -56,7 +56,7 @@ const TemurinDownloadTable = ({results}) => {
                                 <td className="align-middle w-20">{capitalize(pkg.os)}</td>
                                 <td className="align-middle w-20">{pkg.architecture === 'x32' ? 'x86' : pkg.architecture}</td>
                                 <td className="align-middle">
-                                    <table className="table parent mb-0 w-auto">
+                                    <table className="table parent mb-0 w-100">
                                         {pkg.binaries.map(
                                             (binary, i): string | JSX.Element =>
                                                 binary && (
@@ -105,7 +105,7 @@ export default TemurinDownloadTable;
 const BinaryTable = ({ checksum, link, extension, type, size, os, arch, version }) => {
     return (
         <tr>
-            <td className="align-middle text-center">
+            <td className="align-middle text-center w-50">
                 <table><tbody>
                 <tr>
                     <td>
@@ -125,7 +125,7 @@ const BinaryTable = ({ checksum, link, extension, type, size, os, arch, version
 
                 </tbody></table>
             </td>
-            <td className="align-middle">
+            <td className="align-middle w-50">
                 <Link to="/download" state={{ link: link, checksum: checksum, os: os, arch: arch, pkg_type: type, java_version: version }} className="btn btn-primary" style={{width: "6em"}}>
                     <FaDownload /> {extension}
                 </Link>
diff --git a/src/hooks/__tests__/__snapshots__/fetchLatestTemurin.test.tsx.snap b/src/hooks/__tests__/__snapshots__/fetchLatestTemurin.test.tsx.snap
index 97b4427b1..d8744cd00 100644
--- a/src/hooks/__tests__/__snapshots__/fetchLatestTemurin.test.tsx.snap
+++ b/src/hooks/__tests__/__snapshots__/fetchLatestTemurin.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`fetchLatestForOS > binary URL is set correctly 1`] = `
 {
-  "checksum": "sha265sum_mock",
+  "checksum": "sha256sum_mock",
   "link": "https://link_mock/",
   "release_name": "release_name_mock",
 }
@@ -10,7 +10,7 @@ exports[`fetchLatestForOS > binary URL is set correctly 1`] = `
 
 exports[`fetchLatestForOS > installer is returned if available 1`] = `
 {
-  "checksum": "installer_sha265sum_mock",
+  "checksum": "installer_sha256sum_mock",
   "link": "https://installer_link_mock/",
   "release_name": "release_name_mock",
 }
diff --git a/src/hooks/fetchMarketplace.tsx b/src/hooks/fetchMarketplace.tsx
index 2d211fd1a..ba6a78185 100644
--- a/src/hooks/fetchMarketplace.tsx
+++ b/src/hooks/fetchMarketplace.tsx
@@ -69,14 +69,18 @@ export interface MarketplaceRelease {
         package: {
             name: string;
             link: URL;
+            // Name of previous typo to be removed when vendors update their code to fix the typo
             sha265sum: string;
+            sha256sum: string;
             sha256sum_link: URL;
             signature_link: URL;
         }
         installer?: [{
             name: string;
             link: URL;
+            // Name of previous typo to be removed when vendors update their code to fix the typo
             sha265sum: string;
+            sha256sum: string;
             sha256sum_link: URL;
             signature_link: URL;
         }]
diff --git a/src/pages/__tests__/__snapshots__/download.test.tsx.snap b/src/pages/__tests__/__snapshots__/download.test.tsx.snap
index c0069364a..1ebd65da7 100644
--- a/src/pages/__tests__/__snapshots__/download.test.tsx.snap
+++ b/src/pages/__tests__/__snapshots__/download.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`Download page > renders correctly - vendor 1`] = `
         >
           <a
             class="btn btn-lg btn-outline-dark m-2"
-            data-bs-checksum="sha265sum_mock"
+            data-bs-checksum="sha256sum_mock"
             data-bs-target="#checksumModal"
             data-bs-toggle="modal"
             href=""
@@ -300,7 +300,7 @@ exports[`Download page > renders correctly 1`] = `
         >
           <a
             class="btn btn-lg btn-outline-dark m-2"
-            data-bs-checksum="sha265sum_mock"
+            data-bs-checksum="sha256sum_mock"
             data-bs-target="#checksumModal"
             data-bs-toggle="modal"
             href=""
diff --git a/src/pages/__tests__/download.test.tsx b/src/pages/__tests__/download.test.tsx
index b56f51742..a1860c9db 100644
--- a/src/pages/__tests__/download.test.tsx
+++ b/src/pages/__tests__/download.test.tsx
@@ -7,7 +7,7 @@ import Download, { Head } from '../download';
 const location = {
   state: {
     link: 'https://fake-download.tar.gz',
-    checksum: 'sha265sum_mock',
+    checksum: 'sha256sum_mock',
     os: 'linux',
     arch: 'x64',
     type: 'jdk',
@@ -44,7 +44,7 @@ describe('Download page', () => {
     const location = {
       state: {
         link: 'https://fake-download.tar.gz',
-        checksum: 'sha265sum_mock',
+        checksum: 'sha256sum_mock',
         os: 'linux',
         arch: 'x64',
         java_version: '1.0.0',