some bug fixes

Author: ChengShi-1

CHANGELOG.md

@@ -23,7 +23,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 - Add word-break to items text to prevent layout issues when long descriptions without spaces are entered. (#839)
 - Show toast notification when API token is copied to clipboard.
 - Dataset versions: (1) file changes should be `Access: Restricted` instead of `isResticted: true/false`; (2) logic of View Detail button. (#879)
-- File versions: (1) logic of linking to a file version; (2)If file not included, show textFile not included in this version. (#879)
+- File versions: (1) logic of linking to a file version; (2)If file not included, show text information "File not included in this version.". (#879)
 
 ### Removed
 

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

@@ -26,6 +26,11 @@ interface DatasetVersionsProps {
   isCurrentVersionDeaccessioned?: boolean
 }
 
+const isVersionDeaccessioned = (version: DatasetVersionSummaryInfo) =>
+  typeof version.summary === 'object' &&
+  version.summary !== null &&
+  'deaccessioned' in version.summary
+
 export function DatasetVersions({
   datasetRepository,
   datasetId,
@@ -61,12 +66,7 @@ export function DatasetVersions({
 
   const selectableVersions =
     datasetVersionSummaries &&
-    datasetVersionSummaries.filter((version) => {
-      const summary = version.summary
-      const isDeaccessioned =
-        typeof summary === 'object' && summary !== null && 'deaccessioned' in summary
-      return !isDeaccessioned
-    })
+    datasetVersionSummaries.filter((version) => !isVersionDeaccessioned(version))
   const isCheckBoxValid = (selectableVersions?.length ?? 0) > 2
 
   useEffect(() => {
@@ -111,11 +111,6 @@ export function DatasetVersions({
           </thead>
           <tbody>
             {datasetVersionSummaries?.map((dataset, index) => {
-              const isVersionDeaccessioned = (version: DatasetVersionSummaryInfo) =>
-                typeof version.summary === 'object' &&
-                version.summary !== null &&
-                'deaccessioned' in version.summary
-
               const findLastNonDeaccessionedPreviousVersion = () => {
                 for (let i = index + 1; i < datasetVersionSummaries.length; i++) {
                   const version = datasetVersionSummaries[i]
@@ -169,7 +164,7 @@ export function DatasetVersions({
                   <td>
                     <p style={{ display: 'flex', flexWrap: 'wrap', margin: 0, textAlign: 'left' }}>
                       <SummaryDescription summary={dataset.summary} />
-                      {showViewDetails && previousVersion && (
+                      {showViewDetails && (
                         <DatasetViewDetailButton
                           datasetRepository={datasetRepository}
                           oldVersionNumber={previousVersion.versionNumber}
@@ -258,7 +253,7 @@ export const SummaryDescription = ({
           </span>
         ) : (
           <span key={key}>
-            <strong>{key}</strong>: {key == 'Files' ? <strong>{value}</strong> : value};&nbsp;
+            <strong>{key}</strong>: {key === 'Files' ? <strong>{value}</strong> : value};&nbsp;
           </span>
         )
       )}

src/sections/file/file-version/FileVersion.module.scss

@@ -1,3 +1,5 @@
+@import 'node_modules/@iqss/dataverse-design-system/src/lib/assets/styles/design-tokens/colors.module';
+
 .file-versions-table {
   width: 100%;
   margin: auto;
@@ -16,3 +18,8 @@
     vertical-align: top;
   }
 }
+
+.no-summary-text {
+  font-style: italic;
+  color: $dv-subtext-color;
+}

src/sections/file/file-version/FileVersions.tsx

@@ -138,22 +138,24 @@ export const SummaryDescription = ({
     return <span style={{ fontStyle: 'italic' }}>{summaryText}</span>
   }
 
-  if (isNoVersions) {
-    return <span style={{ fontStyle: 'italic' }}>{t('fileVersion.noVersions')}</span>
-  }
-
-  if (!summary || !Object.entries(summary).length) {
-    return <span style={{ fontStyle: 'italic' }}>{t('fileVersion.noChange')}</span>
-  }
+  const deaccessionedReason = summaryText[t('fileVersion.deaccessionedReason')]
 
-  if (summaryText[t('fileVersion.deaccessionedReason')]) {
+  if (deaccessionedReason) {
     return (
       <span>
         {t('fileVersion.deaccessionedReason')}: {summaryText[t('fileVersion.deaccessionedReason')]}
       </span>
     )
   }
 
+  if (isNoVersions) {
+    return <span className={styles['no-summary-text']}>{t('fileVersion.noVersions')}</span>
+  }
+
+  if (!summary || !Object.entries(summary).length) {
+    return <span className={styles['no-summary-text']}>{t('fileVersion.noChange')}</span>
+  }
+
   const summaryTextParts = Object.entries(summaryText).map(([key, value], index) => {
     const content =
       key === 'file' ? (