From cb29172e635147760843dfb37eeca6f613c891fd Mon Sep 17 00:00:00 2001
From: Cheng Shi <cks5520psu@gmail.com>
Date: Fri, 1 Nov 2024 23:36:08 -0400
Subject: [PATCH 01/10] fix: change the hard-coded part and format of date

---
 .../file-info-cell/file-info-data/FileDate.tsx      |  7 ++++---
 src/sections/file/file-embargo/FileEmbargoDate.tsx  |  8 +++++---
 src/sections/file/file-metadata/FileMetadata.tsx    | 13 +++++++------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
index b160cfe86..b79d8a6a8 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
@@ -2,14 +2,15 @@ import { FileDate as FileDateModel } from '../../../../../../../files/domain/mod
 import { useTranslation } from 'react-i18next'
 import { DateHelper } from '../../../../../../../shared/helpers/DateHelper'
 
-// TODO: use time tag with dateTime attr https://developer.mozilla.org/en-US/docs/Web/HTML/Element/time
-
 export function FileDate({ date }: { date: FileDateModel }) {
   const { t } = useTranslation('files')
   return (
     <div>
       <span>
-        {t(`table.date.${date.type}`)} {DateHelper.toDisplayFormat(date.date)}
+        <time>
+          {t(`table.date.${date.type}`)}
+          {DateHelper.toDisplayFormat(date.date)}
+        </time>
       </span>
     </div>
   )
diff --git a/src/sections/file/file-embargo/FileEmbargoDate.tsx b/src/sections/file/file-embargo/FileEmbargoDate.tsx
index 6a238851c..d2a36965a 100644
--- a/src/sections/file/file-embargo/FileEmbargoDate.tsx
+++ b/src/sections/file/file-embargo/FileEmbargoDate.tsx
@@ -26,9 +26,11 @@ export function FileEmbargoDate({
     <div>
       <span>
         {t(embargoTypeOfDate(embargo.isActive, datasetPublishingStatus))}{' '}
-        {format === 'YYYY-MM-DD'
-          ? DateHelper.toDisplayFormatYYYYMMDD(embargo.dateAvailable)
-          : DateHelper.toDisplayFormat(embargo.dateAvailable)}
+        <time>
+          {format === 'YYYY-MM-DD'
+            ? DateHelper.toISO8601Format(embargo.dateAvailable)
+            : DateHelper.toDisplayFormat(embargo.dateAvailable)}
+        </time>
       </span>
     </div>
   )
diff --git a/src/sections/file/file-metadata/FileMetadata.tsx b/src/sections/file/file-metadata/FileMetadata.tsx
index 88f079926..4ecd9edf5 100644
--- a/src/sections/file/file-metadata/FileMetadata.tsx
+++ b/src/sections/file/file-metadata/FileMetadata.tsx
@@ -97,16 +97,18 @@ export function FileMetadata({
             <Col sm={3}>
               <strong>{t('metadata.fields.depositDate')}</strong>
             </Col>
-            {/* TODO: use time tag with dateTime attr https://developer.mozilla.org/en-US/docs/Web/HTML/Element/time */}
-            <Col>{DateHelper.toDisplayFormatYYYYMMDD(metadata.depositDate)}</Col>
+            <Col>
+              <time>{DateHelper.toISO8601Format(metadata.depositDate)}</time>
+            </Col>
           </Row>
           {metadata.publicationDate && (
             <Row className={styles.row}>
               <Col sm={3}>
                 <strong>{t('metadata.fields.metadataReleaseDate')}</strong>
               </Col>
-              {/* TODO: use time tag with dateTime attr https://developer.mozilla.org/en-US/docs/Web/HTML/Element/time */}
-              <Col>{DateHelper.toDisplayFormatYYYYMMDD(metadata.publicationDate)}</Col>
+              <Col>
+                <time>{DateHelper.toISO8601Format(metadata.publicationDate)}</time>
+              </Col>
             </Row>
           )}
           {(metadata.publicationDate || metadata.embargo) && (
@@ -114,7 +116,6 @@ export function FileMetadata({
               <Col sm={3}>
                 <strong>{t('metadata.fields.publicationDate')}</strong>
               </Col>
-              {/* TODO: use time tag with dateTime attr https://developer.mozilla.org/en-US/docs/Web/HTML/Element/time */}
               <Col>
                 {metadata.embargo ? (
                   <FileEmbargoDate
@@ -123,7 +124,7 @@ export function FileMetadata({
                     format="YYYY-MM-DD"
                   />
                 ) : (
-                  DateHelper.toDisplayFormatYYYYMMDD(metadata.publicationDate)
+                  <time>{DateHelper.toISO8601Format(metadata.depositDate)}</time>
                 )}
               </Col>
             </Row>

From 1b827c0deff13d3c6f6f5f49c9fc4ca4947abcd4 Mon Sep 17 00:00:00 2001
From: Cheng Shi <cks5520psu@gmail.com>
Date: Sat, 2 Nov 2024 11:21:06 -0400
Subject: [PATCH 02/10] test: change the testcases to match new changes

---
 .../file-info-data/FileDate.tsx               |  5 +-
 .../file/file-embargo/FileEmbargoDate.tsx     |  6 +-
 .../file-embargo/FileEmbargoDate.spec.tsx     | 23 +++----
 .../file/file-metadata/FileMetadata.spec.tsx  | 28 ++++----
 .../e2e/sections/dataset/Dataset.spec.tsx     | 66 +++++++------------
 5 files changed, 53 insertions(+), 75 deletions(-)

diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
index b79d8a6a8..1aa10a0a3 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
@@ -7,10 +7,7 @@ export function FileDate({ date }: { date: FileDateModel }) {
   return (
     <div>
       <span>
-        <time>
-          {t(`table.date.${date.type}`)}
-          {DateHelper.toDisplayFormat(date.date)}
-        </time>
+        {t(`table.date.${date.type}`)} <time>{DateHelper.toDisplayFormat(date.date)}</time>
       </span>
     </div>
   )
diff --git a/src/sections/file/file-embargo/FileEmbargoDate.tsx b/src/sections/file/file-embargo/FileEmbargoDate.tsx
index d2a36965a..6bbbcc818 100644
--- a/src/sections/file/file-embargo/FileEmbargoDate.tsx
+++ b/src/sections/file/file-embargo/FileEmbargoDate.tsx
@@ -12,7 +12,7 @@ interface FileEmbargoDateProps {
 export function FileEmbargoDate({
   embargo,
   datasetPublishingStatus,
-  format = 'short'
+  format = 'YYYY-MM-DD'
 }: FileEmbargoDateProps) {
   const { t } = useTranslation('files')
 
@@ -20,13 +20,11 @@ export function FileEmbargoDate({
     return <></>
   }
 
-  // TODO: use time tag with dateTime attr https://developer.mozilla.org/en-US/docs/Web/HTML/Element/time
-
   return (
     <div>
       <span>
         {t(embargoTypeOfDate(embargo.isActive, datasetPublishingStatus))}{' '}
-        <time>
+        <time data-testid="embargo-date">
           {format === 'YYYY-MM-DD'
             ? DateHelper.toISO8601Format(embargo.dateAvailable)
             : DateHelper.toDisplayFormat(embargo.dateAvailable)}
diff --git a/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx b/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx
index 9809c32d9..3aa0a704b 100644
--- a/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx
+++ b/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx
@@ -16,7 +16,8 @@ describe('FileEmbargoDate', () => {
         day: 'numeric'
       }
     )
-    cy.findByText(`Embargoed until ` + dateString).should('exist')
+    cy.findByText(`Embargoed until`).should('exist')
+    cy.get('time').should('have.text', dateString)
   })
 
   it('renders the until embargo date when embargo is not active and the file is not released', () => {
@@ -33,7 +34,8 @@ describe('FileEmbargoDate', () => {
         day: 'numeric'
       }
     )
-    cy.findByText(`Was embargoed until ` + dateString).should('exist')
+    cy.findByText(`Was embargoed until`).should('exist')
+    cy.get('time').should('have.text', dateString)
   })
 
   it('renders the draft until embargo date when embargo is active and the file is not released', () => {
@@ -50,7 +52,8 @@ describe('FileEmbargoDate', () => {
         day: 'numeric'
       }
     )
-    cy.findByText(`Draft: will be embargoed until ` + dateString).should('exist')
+    cy.findByText(`Draft: will be embargoed until`).should('exist')
+    cy.get('time').should('have.text', dateString)
   })
 
   it('renders an empty fragment when embargo is undefined', () => {
@@ -58,7 +61,6 @@ describe('FileEmbargoDate', () => {
     const status = DatasetPublishingStatus.RELEASED
 
     cy.customMount(<FileEmbargoDate embargo={embargo} datasetPublishingStatus={status} />)
-
     cy.findByText(/Draft: will be embargoed until/).should('not.exist')
     cy.findByText(/Embargoed until/).should('not.exist')
     cy.findByText(/Was embargoed until/).should('not.exist')
@@ -68,17 +70,12 @@ describe('FileEmbargoDate', () => {
     const embargoDate = new Date('2123-09-18')
     const embargo = FileEmbargoMother.create({ dateAvailable: embargoDate })
     const status = DatasetPublishingStatus.RELEASED
+
     cy.customMount(
       <FileEmbargoDate embargo={embargo} datasetPublishingStatus={status} format="YYYY-MM-DD" />
     )
-    const dateString = embargoDate.toLocaleDateString(
-      Intl.DateTimeFormat().resolvedOptions().locale,
-      {
-        year: 'numeric',
-        month: '2-digit',
-        day: '2-digit'
-      }
-    )
-    cy.findByText(`Embargoed until ` + dateString).should('exist')
+    const dateString = embargoDate.toISOString().split('T')[0]
+    cy.findByText(`Embargoed until`).should('exist')
+    cy.get('time').should('have.text', dateString)
   })
 })
diff --git a/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx b/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx
index 7e2e09a1e..e6b32ed57 100644
--- a/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx
+++ b/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx
@@ -216,7 +216,7 @@ describe('FileMetadata', () => {
     )
 
     cy.findByText('Deposit Date').should('exist')
-    cy.findByText(DateHelper.toDisplayFormatYYYYMMDD(file.metadata.depositDate)).should('exist')
+    cy.findByText(DateHelper.toISO8601Format(file.metadata.depositDate)).should('exist')
   })
 
   it('renders the file Metadata Release Date', () => {
@@ -231,9 +231,11 @@ describe('FileMetadata', () => {
     )
 
     cy.findByText('Metadata Release Date').should('exist')
-    cy.findAllByText(
-      DateHelper.toDisplayFormatYYYYMMDD(metadataWithPublicationDate.publicationDate)
-    ).should('exist')
+    if (metadataWithPublicationDate.publicationDate) {
+      cy.findAllByText(
+        DateHelper.toISO8601Format(metadataWithPublicationDate.publicationDate)
+      ).should('exist')
+    }
   })
 
   it('does not render the file Metadata Release Date if the publication date does not exist', () => {
@@ -262,9 +264,11 @@ describe('FileMetadata', () => {
     )
 
     cy.findByText('Publication Date').should('exist')
-    cy.findAllByText(
-      DateHelper.toDisplayFormatYYYYMMDD(metadataWithPublicationDate.publicationDate)
-    ).should('exist')
+    if (metadataWithPublicationDate.publicationDate) {
+      cy.findAllByText(
+        DateHelper.toISO8601Format(metadataWithPublicationDate.publicationDate)
+      ).should('exist')
+    }
   })
 
   it('renders the file Publication Date with embargo', () => {
@@ -280,11 +284,11 @@ describe('FileMetadata', () => {
     )
 
     cy.findByText('Publication Date').should('exist')
-    cy.findByText(
-      `Embargoed until ${DateHelper.toDisplayFormatYYYYMMDD(
-        metadataWithPublicationDateEmbargoed.embargo?.dateAvailable
-      )}`
-    ).should('exist')
+    if (metadataWithPublicationDateEmbargoed.publicationDate) {
+      cy.findAllByText(
+        DateHelper.toISO8601Format(metadataWithPublicationDateEmbargoed.publicationDate)
+      ).should('exist')
+    }
   })
 
   it('does not render the file Publication Date if the publication date and embargo do not exist', () => {
diff --git a/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx b/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
index d78bcae85..dba8ef5d7 100644
--- a/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
+++ b/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
@@ -478,57 +478,39 @@ describe('Dataset', () => {
     })
 
     it('loads the embargoed files', () => {
-      cy.window().then((win) => {
-        // Get the browser's locale from the window object
-        const browserLocale = win.navigator.language
-
-        // Create a moment object in UTC and set the time to 12 AM (midnight)
-        const utcDate = moment.utc().startOf('day')
-
-        // Add 100 years to the UTC date
-        utcDate.add(100, 'years')
-        const dateString = utcDate.format('YYYY-MM-DD')
-
-        // Use the browser's locale to format the date using Intl.DateTimeFormat
-        const options: Intl.DateTimeFormatOptions = {
-          year: 'numeric',
-          month: 'short',
-          day: 'numeric'
-        }
-        const expectedDate = new Intl.DateTimeFormat(browserLocale, options).format(
-          utcDate.toDate()
-        )
+      const utcDate = moment.utc().startOf('day').add(100, 'years')
+      const expectedDate = utcDate.toISOString().split('T')[0]
 
-        cy.wrap(
-          DatasetHelper.createWithFiles(FileHelper.createMany(1)).then((dataset) =>
-            DatasetHelper.embargoFiles(
-              dataset.persistentId,
-              [dataset.files ? dataset.files[0].id : 0],
-              dateString
-            )
+      cy.wrap(
+        DatasetHelper.createWithFiles(FileHelper.createMany(1)).then((dataset) =>
+          DatasetHelper.embargoFiles(
+            dataset.persistentId,
+            [dataset.files ? dataset.files[0].id : 0],
+            expectedDate
           )
         )
-          .its('persistentId')
-          .then((persistentId: string) => {
-            cy.wait(1500) // Wait for the files to be embargoed
+      )
+        .its('persistentId')
+        .then((persistentId: string) => {
+          cy.wait(1500) // Wait for the files to be embargoed
 
-            cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
+          cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
-            cy.wait(1500) // Wait for the files to be loaded
+          cy.wait(1500) // Wait for the files to be loaded
 
-            cy.findByText('Files').should('exist')
+          cy.findByText('Files').should('exist')
 
-            cy.findByText(/Deposited/).should('exist')
-            cy.findByText(`Draft: will be embargoed until ${expectedDate}`).should('exist')
+          cy.findByText(/Deposited/).should('exist')
+          cy.findByText(`Draft: will be embargoed until`).should('exist')
+          cy.findByTestId('embargo-date').should('have.text', expectedDate)
 
-            cy.get('#edit-files-menu').should('exist')
+          cy.get('#edit-files-menu').should('exist')
 
-            cy.findByRole('button', { name: 'Access File' }).as('accessButton')
-            cy.get('@accessButton').should('exist')
-            cy.get('@accessButton').click()
-            cy.findByText('Embargoed').should('exist')
-          })
-      })
+          cy.findByRole('button', { name: 'Access File' }).as('accessButton')
+          cy.get('@accessButton').should('exist')
+          cy.get('@accessButton').click()
+          cy.findByText('Embargoed').should('exist')
+        })
     })
 
     it('applies filters to the Files Table in the correct order', () => {

From 432f51a0f7ba7862a69d46a67f2b2132ccdfb0b2 Mon Sep 17 00:00:00 2001
From: Cheng Shi <cks5520psu@gmail.com>
Date: Sat, 2 Nov 2024 17:27:18 -0400
Subject: [PATCH 03/10] fix: some change on testcases

---
 .../file-info-data/FileDate.spec.tsx          |  3 +-
 .../file-embargo/FileEmbargoDate.spec.tsx     | 29 ++++---------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDate.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDate.spec.tsx
index 74b20f937..8bc1a95c8 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDate.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDate.spec.tsx
@@ -8,6 +8,7 @@ describe('FileDate', () => {
     const date = { type: FileDateType.PUBLISHED, date: fileDate }
     cy.customMount(<FileDate date={date} />)
     const dateString = DateHelper.toDisplayFormat(fileDate)
-    cy.findByText(`Published ` + dateString).should('exist')
+    cy.findByText(`Published`).should('exist')
+    cy.get('time').should('have.text', dateString)
   })
 })
diff --git a/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx b/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx
index 3aa0a704b..b4ec2c516 100644
--- a/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx
+++ b/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx
@@ -8,14 +8,7 @@ describe('FileEmbargoDate', () => {
     const embargo = FileEmbargoMother.create({ dateAvailable: embargoDate })
     const status = DatasetPublishingStatus.RELEASED
     cy.customMount(<FileEmbargoDate embargo={embargo} datasetPublishingStatus={status} />)
-    const dateString = embargoDate.toLocaleDateString(
-      Intl.DateTimeFormat().resolvedOptions().locale,
-      {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric'
-      }
-    )
+    const dateString = embargoDate.toISOString().split('T')[0]
     cy.findByText(`Embargoed until`).should('exist')
     cy.get('time').should('have.text', dateString)
   })
@@ -26,14 +19,8 @@ describe('FileEmbargoDate', () => {
     const status = DatasetPublishingStatus.RELEASED
 
     cy.customMount(<FileEmbargoDate embargo={embargo} datasetPublishingStatus={status} />)
-    const dateString = embargoDate.toLocaleDateString(
-      Intl.DateTimeFormat().resolvedOptions().locale,
-      {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric'
-      }
-    )
+    const dateString = embargoDate.toISOString().split('T')[0]
+
     cy.findByText(`Was embargoed until`).should('exist')
     cy.get('time').should('have.text', dateString)
   })
@@ -44,14 +31,8 @@ describe('FileEmbargoDate', () => {
     const status = DatasetPublishingStatus.DRAFT
 
     cy.customMount(<FileEmbargoDate embargo={embargo} datasetPublishingStatus={status} />)
-    const dateString = embargoDate.toLocaleDateString(
-      Intl.DateTimeFormat().resolvedOptions().locale,
-      {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric'
-      }
-    )
+    const dateString = embargoDate.toISOString().split('T')[0]
+
     cy.findByText(`Draft: will be embargoed until`).should('exist')
     cy.get('time').should('have.text', dateString)
   })

From 149d1cf91e5dfbc594ae660d4e30feb9def6792f Mon Sep 17 00:00:00 2001
From: Cheng Shi <cks5520psu@gmail.com>
Date: Sat, 2 Nov 2024 23:19:54 -0400
Subject: [PATCH 04/10] fix: one test

---
 .../sections/file/file-metadata/FileMetadata.spec.tsx          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx b/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx
index e6b32ed57..23b4dbe9a 100644
--- a/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx
+++ b/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx
@@ -214,9 +214,8 @@ describe('FileMetadata', () => {
         datasetPublishingStatus={file.datasetVersion.publishingStatus}
       />
     )
-
     cy.findByText('Deposit Date').should('exist')
-    cy.findByText(DateHelper.toISO8601Format(file.metadata.depositDate)).should('exist')
+    cy.get('time').contains(DateHelper.toISO8601Format(file.metadata.depositDate)).should('exist')
   })
 
   it('renders the file Metadata Release Date', () => {

From cda214e9d326d6a0b4c71b2a79c80969ed7b74fd Mon Sep 17 00:00:00 2001
From: Cheng Shi <cks5520psu@gmail.com>
Date: Mon, 4 Nov 2024 12:42:52 -0500
Subject: [PATCH 05/10] fix: change the deposit date to publication date due to
 wrongly copied

---
 src/sections/file/file-metadata/FileMetadata.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/sections/file/file-metadata/FileMetadata.tsx b/src/sections/file/file-metadata/FileMetadata.tsx
index 4ecd9edf5..ef94a4217 100644
--- a/src/sections/file/file-metadata/FileMetadata.tsx
+++ b/src/sections/file/file-metadata/FileMetadata.tsx
@@ -124,7 +124,9 @@ export function FileMetadata({
                     format="YYYY-MM-DD"
                   />
                 ) : (
-                  <time>{DateHelper.toISO8601Format(metadata.depositDate)}</time>
+                  metadata.publicationDate && (
+                    <time>DateHelper.toISO8601Format(metadata.publicationDate)</time>
+                  )
                 )}
               </Col>
             </Row>

From 21e7f0a515b1cdb2802048b541c80bc773c16aae Mon Sep 17 00:00:00 2001
From: Cheng Shi <cks5520psu@gmail.com>
Date: Mon, 4 Nov 2024 13:00:54 -0500
Subject: [PATCH 06/10] fix: change the deposit date to publication date due to
 wrongly copied

---
 src/sections/file/file-metadata/FileMetadata.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sections/file/file-metadata/FileMetadata.tsx b/src/sections/file/file-metadata/FileMetadata.tsx
index ef94a4217..cc16b2755 100644
--- a/src/sections/file/file-metadata/FileMetadata.tsx
+++ b/src/sections/file/file-metadata/FileMetadata.tsx
@@ -124,9 +124,10 @@ export function FileMetadata({
                     format="YYYY-MM-DD"
                   />
                 ) : (
-                  metadata.publicationDate && (
-                    <time>DateHelper.toISO8601Format(metadata.publicationDate)</time>
-                  )
+                  <time>
+                    {metadata.publicationDate &&
+                      DateHelper.toISO8601Format(metadata.publicationDate)}
+                  </time>
                 )}
               </Col>
             </Row>

From 1946b1c2c1a8cd414fb312b558e4b9a09c6d18f0 Mon Sep 17 00:00:00 2001
From: Cheng Shi <cks5520psu@gmail.com>
Date: Fri, 8 Nov 2024 10:26:34 -0500
Subject: [PATCH 07/10] fix: add dateTime attribute, and apply dateHelper to
 some tests

---
 .../file-info-data/FileDate.tsx               |  8 +++++--
 .../file/file-embargo/FileEmbargoDate.tsx     |  8 ++++++-
 .../file/file-metadata/FileMetadata.tsx       | 22 ++++++++++++-------
 .../file-embargo/FileEmbargoDate.spec.tsx     |  9 ++++----
 .../e2e/sections/dataset/Dataset.spec.tsx     |  5 +++--
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
index 1aa10a0a3..b0622d43e 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
@@ -1,13 +1,17 @@
-import { FileDate as FileDateModel } from '../../../../../../../files/domain/models/FileMetadata'
 import { useTranslation } from 'react-i18next'
+import { FileDate as FileDateModel } from '../../../../../../../files/domain/models/FileMetadata'
 import { DateHelper } from '../../../../../../../shared/helpers/DateHelper'
 
 export function FileDate({ date }: { date: FileDateModel }) {
   const { t } = useTranslation('files')
+
   return (
     <div>
       <span>
-        {t(`table.date.${date.type}`)} <time>{DateHelper.toDisplayFormat(date.date)}</time>
+        {t(`table.date.${date.type}`)}{' '}
+        <time dateTime={DateHelper.toDisplayFormat(date.date)}>
+          {DateHelper.toDisplayFormat(date.date)}
+        </time>
       </span>
     </div>
   )
diff --git a/src/sections/file/file-embargo/FileEmbargoDate.tsx b/src/sections/file/file-embargo/FileEmbargoDate.tsx
index 6bbbcc818..65294f11e 100644
--- a/src/sections/file/file-embargo/FileEmbargoDate.tsx
+++ b/src/sections/file/file-embargo/FileEmbargoDate.tsx
@@ -24,7 +24,13 @@ export function FileEmbargoDate({
     <div>
       <span>
         {t(embargoTypeOfDate(embargo.isActive, datasetPublishingStatus))}{' '}
-        <time data-testid="embargo-date">
+        <time
+          dateTime={
+            format === 'YYYY-MM-DD'
+              ? DateHelper.toISO8601Format(embargo.dateAvailable)
+              : DateHelper.toDisplayFormat(embargo.dateAvailable)
+          }
+          data-testid="embargo-date">
           {format === 'YYYY-MM-DD'
             ? DateHelper.toISO8601Format(embargo.dateAvailable)
             : DateHelper.toDisplayFormat(embargo.dateAvailable)}
diff --git a/src/sections/file/file-metadata/FileMetadata.tsx b/src/sections/file/file-metadata/FileMetadata.tsx
index cc16b2755..ab49dbe8a 100644
--- a/src/sections/file/file-metadata/FileMetadata.tsx
+++ b/src/sections/file/file-metadata/FileMetadata.tsx
@@ -1,14 +1,14 @@
+import { Trans, useTranslation } from 'react-i18next'
 import { Accordion, Col, Row } from '@iqss/dataverse-design-system'
 import { FilePreview } from '../file-preview/FilePreview'
 import { FileLabels } from '../file-labels/FileLabels'
-import styles from './FileMetadata.module.scss'
 import { DateHelper } from '../../../shared/helpers/DateHelper'
 import { FileEmbargoDate } from '../file-embargo/FileEmbargoDate'
 import { BASE_URL } from '../../../config'
-import { Trans, useTranslation } from 'react-i18next'
 import { FileMetadata as FileMetadataModel } from '../../../files/domain/models/FileMetadata'
 import { FilePermissions } from '../../../files/domain/models/FilePermissions'
 import { DatasetPublishingStatus } from '../../../dataset/domain/models/Dataset'
+import styles from './FileMetadata.module.scss'
 
 interface FileMetadataProps {
   name: string
@@ -24,6 +24,7 @@ export function FileMetadata({
   datasetPublishingStatus
 }: FileMetadataProps) {
   const { t } = useTranslation('file')
+
   return (
     <Accordion defaultActiveKey="0">
       <Accordion.Item eventKey="0">
@@ -98,7 +99,9 @@ export function FileMetadata({
               <strong>{t('metadata.fields.depositDate')}</strong>
             </Col>
             <Col>
-              <time>{DateHelper.toISO8601Format(metadata.depositDate)}</time>
+              <time dateTime={DateHelper.toISO8601Format(metadata.depositDate)}>
+                {DateHelper.toISO8601Format(metadata.depositDate)}
+              </time>
             </Col>
           </Row>
           {metadata.publicationDate && (
@@ -107,7 +110,9 @@ export function FileMetadata({
                 <strong>{t('metadata.fields.metadataReleaseDate')}</strong>
               </Col>
               <Col>
-                <time>{DateHelper.toISO8601Format(metadata.publicationDate)}</time>
+                <time dateTime={DateHelper.toISO8601Format(metadata.publicationDate)}>
+                  {DateHelper.toISO8601Format(metadata.publicationDate)}
+                </time>
               </Col>
             </Row>
           )}
@@ -124,10 +129,11 @@ export function FileMetadata({
                     format="YYYY-MM-DD"
                   />
                 ) : (
-                  <time>
-                    {metadata.publicationDate &&
-                      DateHelper.toISO8601Format(metadata.publicationDate)}
-                  </time>
+                  metadata.publicationDate && (
+                    <time dateTime={DateHelper.toISO8601Format(metadata.publicationDate)}>
+                      {DateHelper.toISO8601Format(metadata.publicationDate)}
+                    </time>
+                  )
                 )}
               </Col>
             </Row>
diff --git a/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx b/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx
index b4ec2c516..d093fbe20 100644
--- a/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx
+++ b/tests/component/sections/file/file-embargo/FileEmbargoDate.spec.tsx
@@ -1,6 +1,7 @@
 import { FileEmbargoDate } from '../../../../../src/sections/file/file-embargo/FileEmbargoDate'
 import { DatasetPublishingStatus } from '../../../../../src/dataset/domain/models/Dataset'
 import { FileEmbargoMother } from '../../../files/domain/models/FileMetadataMother'
+import { DateHelper } from '../../../../../src/shared/helpers/DateHelper'
 
 describe('FileEmbargoDate', () => {
   it('renders the embargo date when embargo exists', () => {
@@ -8,7 +9,7 @@ describe('FileEmbargoDate', () => {
     const embargo = FileEmbargoMother.create({ dateAvailable: embargoDate })
     const status = DatasetPublishingStatus.RELEASED
     cy.customMount(<FileEmbargoDate embargo={embargo} datasetPublishingStatus={status} />)
-    const dateString = embargoDate.toISOString().split('T')[0]
+    const dateString = DateHelper.toISO8601Format(embargoDate)
     cy.findByText(`Embargoed until`).should('exist')
     cy.get('time').should('have.text', dateString)
   })
@@ -19,7 +20,7 @@ describe('FileEmbargoDate', () => {
     const status = DatasetPublishingStatus.RELEASED
 
     cy.customMount(<FileEmbargoDate embargo={embargo} datasetPublishingStatus={status} />)
-    const dateString = embargoDate.toISOString().split('T')[0]
+    const dateString = DateHelper.toISO8601Format(embargoDate)
 
     cy.findByText(`Was embargoed until`).should('exist')
     cy.get('time').should('have.text', dateString)
@@ -31,7 +32,7 @@ describe('FileEmbargoDate', () => {
     const status = DatasetPublishingStatus.DRAFT
 
     cy.customMount(<FileEmbargoDate embargo={embargo} datasetPublishingStatus={status} />)
-    const dateString = embargoDate.toISOString().split('T')[0]
+    const dateString = DateHelper.toISO8601Format(embargoDate)
 
     cy.findByText(`Draft: will be embargoed until`).should('exist')
     cy.get('time').should('have.text', dateString)
@@ -55,7 +56,7 @@ describe('FileEmbargoDate', () => {
     cy.customMount(
       <FileEmbargoDate embargo={embargo} datasetPublishingStatus={status} format="YYYY-MM-DD" />
     )
-    const dateString = embargoDate.toISOString().split('T')[0]
+    const dateString = DateHelper.toISO8601Format(embargoDate)
     cy.findByText(`Embargoed until`).should('exist')
     cy.get('time').should('have.text', dateString)
   })
diff --git a/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx b/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
index dba8ef5d7..d0d64bd76 100644
--- a/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
+++ b/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
@@ -8,6 +8,7 @@ import { FileHelper } from '../../../shared/files/FileHelper'
 import moment from 'moment-timezone'
 import { CollectionHelper } from '../../../shared/collection/CollectionHelper'
 import { FILES_TAB_INFINITE_SCROLL_ENABLED } from '../../../../../src/sections/dataset/config'
+import { DateHelper } from '../../../../../src/shared/helpers/DateHelper'
 
 type Dataset = {
   datasetVersion: { metadataBlocks: { citation: { fields: { value: string }[] } } }
@@ -478,8 +479,8 @@ describe('Dataset', () => {
     })
 
     it('loads the embargoed files', () => {
-      const utcDate = moment.utc().startOf('day').add(100, 'years')
-      const expectedDate = utcDate.toISOString().split('T')[0]
+      const utcDate = moment.utc().startOf('day').add(100, 'years').toDate()
+      const expectedDate = DateHelper.toDisplayFormat(utcDate)
 
       cy.wrap(
         DatasetHelper.createWithFiles(FileHelper.createMany(1)).then((dataset) =>

From 54be2c6ecaf904ec058f4200a2291425b193c79b Mon Sep 17 00:00:00 2001
From: Cheng Shi <cks5520psu@gmail.com>
Date: Fri, 8 Nov 2024 11:39:51 -0500
Subject: [PATCH 08/10] fix: change utc time back to last ver. for passing the
 test

---
 tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx b/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
index d0d64bd76..fca290fe0 100644
--- a/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
+++ b/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
@@ -479,8 +479,8 @@ describe('Dataset', () => {
     })
 
     it('loads the embargoed files', () => {
-      const utcDate = moment.utc().startOf('day').add(100, 'years').toDate()
-      const expectedDate = DateHelper.toDisplayFormat(utcDate)
+      const utcDate = moment.utc().startOf('day').add(100, 'years')
+      const expectedDate = utcDate.toISOString().split('T')[0]
 
       cy.wrap(
         DatasetHelper.createWithFiles(FileHelper.createMany(1)).then((dataset) =>

From 3f0a1073f862481f2f36e7b991cacf32f69eff25 Mon Sep 17 00:00:00 2001
From: Cheng Shi <cks5520psu@gmail.com>
Date: Fri, 8 Nov 2024 12:27:56 -0500
Subject: [PATCH 09/10] chore: delete one line of import

---
 tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx b/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
index fca290fe0..dba8ef5d7 100644
--- a/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
+++ b/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
@@ -8,7 +8,6 @@ import { FileHelper } from '../../../shared/files/FileHelper'
 import moment from 'moment-timezone'
 import { CollectionHelper } from '../../../shared/collection/CollectionHelper'
 import { FILES_TAB_INFINITE_SCROLL_ENABLED } from '../../../../../src/sections/dataset/config'
-import { DateHelper } from '../../../../../src/shared/helpers/DateHelper'
 
 type Dataset = {
   datasetVersion: { metadataBlocks: { citation: { fields: { value: string }[] } } }

From b5c62f3e5b30dd6a7ebcd2528e9f164836988fb1 Mon Sep 17 00:00:00 2001
From: Cheng Shi <cks5520psu@gmail.com>
Date: Fri, 8 Nov 2024 16:55:21 -0500
Subject: [PATCH 10/10] fix: change datetime attribute to a machine-readable
 value

---
 .../file-info/file-info-cell/file-info-data/FileDate.tsx    | 2 +-
 src/sections/file/file-embargo/FileEmbargoDate.tsx          | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
index b0622d43e..299887b4f 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
@@ -9,7 +9,7 @@ export function FileDate({ date }: { date: FileDateModel }) {
     <div>
       <span>
         {t(`table.date.${date.type}`)}{' '}
-        <time dateTime={DateHelper.toDisplayFormat(date.date)}>
+        <time dateTime={DateHelper.toISO8601Format(date.date)}>
           {DateHelper.toDisplayFormat(date.date)}
         </time>
       </span>
diff --git a/src/sections/file/file-embargo/FileEmbargoDate.tsx b/src/sections/file/file-embargo/FileEmbargoDate.tsx
index 65294f11e..f8817a128 100644
--- a/src/sections/file/file-embargo/FileEmbargoDate.tsx
+++ b/src/sections/file/file-embargo/FileEmbargoDate.tsx
@@ -25,11 +25,7 @@ export function FileEmbargoDate({
       <span>
         {t(embargoTypeOfDate(embargo.isActive, datasetPublishingStatus))}{' '}
         <time
-          dateTime={
-            format === 'YYYY-MM-DD'
-              ? DateHelper.toISO8601Format(embargo.dateAvailable)
-              : DateHelper.toDisplayFormat(embargo.dateAvailable)
-          }
+          dateTime={DateHelper.toISO8601Format(embargo.dateAvailable)}
           data-testid="embargo-date">
           {format === 'YYYY-MM-DD'
             ? DateHelper.toISO8601Format(embargo.dateAvailable)