updates based on review suggestions

IQSS · Sep 3, 2024 · 89bf3e3 · 89bf3e3
1 parent 272d359
commit 89bf3e3
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 95 deletions.
diff --git a/src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts b/src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts
@@ -165,6 +165,8 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
           datasetDetails.jsDataset.versionInfo.state === DatasetVersionState.DRAFT &&
           datasetDetails.jsDataset.publicationDate !== undefined
         ) {
+          // If the dataset is a draft, but has a publication date, then we need the version
+          // numbers of the latest published version to show in the "Publish" button
           return this.getLatestPublishedVersionNumbers(datasetDetails)
         } else {
           return datasetDetails
@@ -214,10 +216,10 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
             canManageDatasetPermissions: true,
             canDeleteDatasetDraft: true,
             canViewUnpublishedDataset: true
-          },
-          [],
-          0,
-          0
+          }, // TODO Connect with JS dataset permissions for privateUrl when it is available in js-dataverse
+          [], // TODO Connect with JS dataset locks for privateUrl when it is available in js-dataverse
+          0, // TODO Connect with JS dataset filesTotalDownloadSize for privateUrl when it is available in js-dataverse
+          0 // TODO Connect with JS dataset filesTotalDownloadSize for privateUrl when it is available in js-dataverse
         )
       )
       .catch((error: ReadError) => {

diff --git a/...-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx b/...-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
@@ -26,7 +26,7 @@ export const InputLevelsTable = ({
       })}>
       <div className={styles['close-button-container']}>{closeButton}</div>
 
-      <Table>
+      <Table bordered={false}>
         <tbody>
           {Object.entries(blockMetadataInputLevelFields.metadataFields).map(([key, field]) => (
             <InputLevelFieldRow metadataField={field} disabled={disabled} key={key} />

diff --git a/src/sections/dataset/publish-dataset/PublishDatasetHelpText.module.scss b/src/sections/dataset/publish-dataset/PublishDatasetHelpText.module.scss
@@ -1,7 +1,6 @@
 @import "node_modules/@iqss/dataverse-design-system/src/lib/assets/styles/design-tokens/colors.module";
 
 .container {
-  margin: 10px;
   padding: 10px;
   background-color: $dv-info-box-color;
   border: 1px solid black;

diff --git a/src/sections/dataset/publish-dataset/PublishDatasetModal.tsx b/src/sections/dataset/publish-dataset/PublishDatasetModal.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Button, Modal } from '@iqss/dataverse-design-system'
+import { Button, Modal, Stack } from '@iqss/dataverse-design-system'
 import { Form } from '@iqss/dataverse-design-system'
 import type { DatasetRepository } from '../../../dataset/domain/repositories/DatasetRepository'
 import { VersionUpdateType } from '../../../dataset/domain/models/VersionUpdateType'
@@ -23,19 +23,19 @@ interface PublishDatasetModalProps {
   repository: DatasetRepository
   persistentId: string
   releasedVersionExists: boolean
-  nextMajorVersion: string | undefined
-  nextMinorVersion: string | undefined
   handleClose: () => void
+  nextMajorVersion?: string
+  nextMinorVersion?: string
 }
 
 export function PublishDatasetModal({
   show,
   repository,
   persistentId,
   releasedVersionExists,
+  handleClose,
   nextMajorVersion,
-  nextMinorVersion,
-  handleClose
+  nextMinorVersion
 }: PublishDatasetModalProps) {
   const { t } = useTranslation('dataset')
   const { user } = useSession()
@@ -64,57 +64,56 @@ export function PublishDatasetModal({
     )
     handleClose()
   }
-  if (releasedVersionExists && (!nextMajorVersion || !nextMinorVersion)) {
-    console.log('Error: nextMajorVersion or nextMinorVersion is missing')
-    return null
-  }
+
   return (
-    <Modal show={show} onHide={handleClose} size="lg">
+    <Modal show={show} onHide={handleClose} size="xl">
       <Modal.Header>
         <Modal.Title>Publish Dataset</Modal.Title>
       </Modal.Header>
       <Modal.Body>
-        <PublishDatasetHelpText releasedVersionExists={releasedVersionExists} />
-        <License
-          license={{
-            name: defaultLicense.name,
-            uri: defaultLicense.uri,
-            iconUri: defaultLicense.iconUri
-          }}
-        />
-        {releasedVersionExists && (
-          <>
-            <p>{t('publish.selectVersion')}</p>
-            <Form.RadioGroup title={'Update Version'}>
-              <Form.Group.Radio
-                defaultChecked
-                onClick={handleVersionUpdateTypeChange}
-                name="update-type"
-                label={t('publish.minorVersion') + ` (${nextMinorVersionString})`}
-                id="update-type-minor"
-                value={VersionUpdateType.MINOR}
-              />
-              <Form.Group.Radio
-                onClick={handleVersionUpdateTypeChange}
-                name="update-type"
-                label={t('publish.majorVersion') + ` (${nextMajorVersionString})`}
-                id="update-type-major"
-                value={VersionUpdateType.MAJOR}
-              />
-              {user?.superuser && (
+        <Stack direction="vertical">
+          <PublishDatasetHelpText releasedVersionExists={releasedVersionExists} />
+          <License
+            license={{
+              name: defaultLicense.name,
+              uri: defaultLicense.uri,
+              iconUri: defaultLicense.iconUri
+            }}
+          />
+          {releasedVersionExists && (
+            <>
+              <Form.Group.Text>{t('publish.selectVersion')}</Form.Group.Text>
+              <Form.RadioGroup title={'Update Version'}>
+                <Form.Group.Radio
+                  defaultChecked
+                  onClick={handleVersionUpdateTypeChange}
+                  name="update-type"
+                  label={t('publish.minorVersion') + ` (${nextMinorVersionString})`}
+                  id="update-type-minor"
+                  value={VersionUpdateType.MINOR}
+                />
                 <Form.Group.Radio
                   onClick={handleVersionUpdateTypeChange}
                   name="update-type"
-                  label={t('publish.updateCurrentVersion')}
-                  id="update-type-current"
-                  // TODO: Remove disabled when JSVersionUpdateType.UPDATE_CURRENT is available in js-dataverse
-                  disabled={true}
-                  value={VersionUpdateType.UPDATE_CURRENT}
+                  label={`${t('publish.majorVersion')} (${nextMajorVersionString})`}
+                  id="update-type-major"
+                  value={VersionUpdateType.MAJOR}
                 />
-              )}
-            </Form.RadioGroup>
-          </>
-        )}
+                {user?.superuser && (
+                  <Form.Group.Radio
+                    onClick={handleVersionUpdateTypeChange}
+                    name="update-type"
+                    label={t('publish.updateCurrentVersion')}
+                    id="update-type-current"
+                    // TODO: Remove disabled when JSVersionUpdateType.UPDATE_CURRENT is available in js-dataverse
+                    disabled={true}
+                    value={VersionUpdateType.UPDATE_CURRENT}
+                  />
+                )}
+              </Form.RadioGroup>
+            </>
+          )}
+        </Stack>
         <span className={styles.errorText}>
           {submissionStatus === SubmissionStatus.Errored &&
             `${t('publish.error')} ${publishError ? publishError : ''}`}

diff --git a/src/sections/dataset/publish-dataset/useGetVersionLabels.tsx b/src/sections/dataset/publish-dataset/useGetVersionLabels.tsx
diff --git a/src/stories/dataset/publish-dataset/PublishDatasetModal.stories.tsx b/src/stories/dataset/publish-dataset/PublishDatasetModal.stories.tsx
@@ -23,8 +23,6 @@ export const Default: Story = {
       repository={new DatasetMockRepository()}
       persistentId={'test'}
       releasedVersionExists={false}
-      nextMinorVersion={undefined}
-      nextMajorVersion={undefined}
       handleClose={() => {}}></PublishDatasetModal>
   )
 }

diff --git a/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx b/tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx
@@ -268,7 +268,7 @@ describe('Dataset', () => {
         })
     })
 
-    it.only('successfully loads the files tab with files', () => {
+    it('successfully loads the files tab with files', () => {
       cy.wrap(DatasetHelper.createWithFiles(FileHelper.createMany(3)), { timeout: 5000 })
         .its('persistentId')
         .then((persistentId: string) => {