fix: small changes

Author: ChengShi-1

src/sections/dataset/dataset-versions/DatasetVersions.tsx

@@ -45,7 +45,9 @@ export function DatasetVersions({ datasetRepository, datasetId }: DatasetVersion
     navigate(`${Route.DATASETS}?${searchParams.toString()}`)
   }
 
-  // If there's only 1 version, we don't show the "View Differences" button or the checkbox column
+  const isDeaccession = datasetVersionSummaries?.some(
+    (dataset) => dataset.summary === 'versionDeaccessioned'
+  )
   const showViewDifferenceButton = datasetVersionSummaries && datasetVersionSummaries.length < 2
 
   if (isLoading) {
@@ -79,15 +81,17 @@ export function DatasetVersions({ datasetRepository, datasetId }: DatasetVersion
             </tr>
           </thead>
           <tbody>
-            {datasetVersionSummaries?.map((dataset) => {
-              const previousDataset = datasetVersionSummaries.find((d) => d.id === dataset.id - 1)
+            {datasetVersionSummaries?.map((dataset, index) => {
+              const previousDataset =
+                index < datasetVersionSummaries.length - 1
+                  ? datasetVersionSummaries[index + 1]
+                  : null
               const summaryObject = generateDatasetVersionSummaryDescription(dataset.summary)
 
               return (
                 <tr key={dataset.id}>
-                  {!showViewDifferenceButton && (
+                  {!showViewDifferenceButton && !isDeaccession && (
                     <td>
-                      {/* TODO: If deaccession, disable the version checkbox*/}
                       <Form.Group.Checkbox
                         label=""
                         id={`dataset-${dataset.id}`}

src/sections/dataset/dataset-versions/generateSummaryDescription.tsx

@@ -53,19 +53,14 @@ export const generateDatasetVersionSummaryDescription = function (
 
       case 'Additional Citation Metadata': {
         const additionMetadataChanges: string[] = []
-        const fileSummary = value as FilesSummaryUpdates
-
-        if (fileSummary.added > 0) additionMetadataChanges.push(`${fileSummary.added} Added`)
-        if (fileSummary.removed > 0) additionMetadataChanges.push(`${fileSummary.removed} Removed`)
-        if (fileSummary.replaced > 0)
-          additionMetadataChanges.push(`${fileSummary.replaced} Replaced`)
-        if (fileSummary.changedFileMetaData > 0)
-          additionMetadataChanges.push(`${fileSummary.changedFileMetaData} Changed`)
-        if (fileSummary.changedVariableMetadata > 0)
-          additionMetadataChanges.push(
-            `Variable Metadata Changed: ${fileSummary.changedVariableMetadata}`
-          )
+        const AdditionalCitationMetadata = value as SummaryUpdates
 
+        if (AdditionalCitationMetadata.added > 0)
+          additionMetadataChanges.push(`${AdditionalCitationMetadata.added} Added`)
+        if (AdditionalCitationMetadata.deleted > 0)
+          additionMetadataChanges.push(`${AdditionalCitationMetadata.deleted} Removed`)
+        if (AdditionalCitationMetadata.changed > 0)
+          additionMetadataChanges.push(`${AdditionalCitationMetadata.changed} Changed`)
         if (additionMetadataChanges.length > 0) {
           descriptionObject[key] = additionMetadataChanges.join('; ')
         }

src/sections/dataset/dataset-versions/view-difference/DatasetVersionViewDifferenceButton.tsx

@@ -54,7 +54,7 @@ export function DatasetVersionViewDifferenceButton({
           handleClose={() => setShowModal(false)}
           isLoading={isLoading}
           errorHandling={error}
-          datasetVersionDifferences={selectedVersions.length < 2 ? undefined : differences}
+          datasetVersionDifferences={differences}
         />
       )}
     </div>

src/stories/dataset/dataset-versions/DatasetVersionsDiffModal.stories.tsx

@@ -24,6 +24,26 @@ export const Default: Story = {
   )
 }
 
-// export const Loading: Story = {
-//   render: () => <DatasetVersionsDetailModal />
-// }
+export const Loading: Story = {
+  render: () => (
+    <VersionDetailModal
+      show={true}
+      handleClose={() => {}}
+      isLoading={true}
+      errorHandling={null}
+      datasetVersionDifferences={versionsDiff}
+    />
+  )
+}
+
+export const Error: Story = {
+  render: () => (
+    <VersionDetailModal
+      show={true}
+      handleClose={() => {}}
+      isLoading={false}
+      errorHandling={'There was an error'}
+      datasetVersionDifferences={versionsDiff}
+    />
+  )
+}

tests/component/sections/dataset/dataset-versions/DatasetVersions.spec.tsx

@@ -89,7 +89,7 @@ describe('DatasetVersions', () => {
     })
   })
 
-  it('should render the dataset versions table without view differences button if only one version checked', () => {
+  it('should render the dataset versions table without view differences button if less than 2 versions being selected', () => {
     datasetsRepository.getDatasetVersionsSummaries = cy.stub().resolves(versionSummaryInfo)
 
     cy.findByTestId('dataset-versions-table').should('exist')
@@ -100,19 +100,25 @@ describe('DatasetVersions', () => {
     cy.contains('th', 'Published On').should('exist')
     cy.findAllByTestId('select-checkbox').first().should('exist').check().should('be.checked')
     cy.findByRole('button', { name: 'View Differences' }).should('not.exist')
+  })
+
+  it('should not show view detail buttons if there is only one version', () => {
+    datasetsRepository.getDatasetVersionsSummaries = cy.stub().resolves(versionSummaryInfo)
 
-    cy.findByText(/View Details/).should('not.exist')
+    cy.findByTestId('dataset-versions-table').should('exist')
+    cy.get('tr').eq(1).find('td').eq(2).findByText('View Details').should('exist').click()
   })
 
-  it('should open dataset versions modal', () => {
+
+  it('should open dataset versions detail modal', () => {
     datasetsRepository.getDatasetVersionsSummaries = cy.stub().resolves(versionSummaryInfo)
 
     cy.findByTestId('dataset-versions-table').should('exist')
     cy.get('tr').eq(1).find('td').eq(2).findByText('View Details').should('exist').click()
     cy.findByRole('dialog').should('exist')
   })
 
-  it('should close dataset versions modal', () => {
+  it('should close dataset versions detail modal', () => {
     datasetsRepository.getDatasetVersionsSummaries = cy.stub().resolves(versionSummaryInfo)
 
     cy.findByTestId('dataset-versions-table').should('exist')
@@ -202,10 +208,8 @@ describe('DatasetVersions generateDatasetVersionSummaryDescription', () => {
       },
       'Additional Citation Metadata': {
         added: 1,
-        removed: 1,
-        replaced: 1,
-        changedFileMetaData: 2,
-        changedVariableMetadata: 1
+        deleted: 1,
+        changed: 1
       }
     }
 
@@ -228,19 +232,11 @@ describe('DatasetVersions generateDatasetVersionSummaryDescription', () => {
       `${versionSummary['Additional Citation Metadata'].added} Added`
     )
     expect(result['Additional Citation Metadata']).to.include(
-      `${versionSummary['Additional Citation Metadata'].removed} Removed`
-    )
-    expect(result['Additional Citation Metadata']).to.include(
-      `${versionSummary['Additional Citation Metadata'].replaced} Replaced`
+      `${versionSummary['Additional Citation Metadata'].deleted} Removed`
     )
     expect(result['Additional Citation Metadata']).to.include(
-      `${versionSummary['Additional Citation Metadata'].changedFileMetaData} Changed`
+      `${versionSummary['Additional Citation Metadata'].changed} Changed`
     )
-    expect(result['Additional Citation Metadata']).to.include(
-      `Variable Metadata Changed: ${versionSummary['Additional Citation Metadata'].changedVariableMetadata}`
-    )
-
-    expect(result.termsAccessChanged).to.includes('Terms Access: Changed')
   })
 
   it('should handle DatasetVersionSummaryStringValues correctly', () => {