Merge branch 'IQSS:develop' into develop

.github/workflows/accessibility.yml

@@ -1,6 +1,6 @@
 name: accessibility
 
-on: push
+on: [push, pull_request]
 
 jobs:
   interaction-and-accessibility:

.github/workflows/chromatic-design-system.yml

@@ -1,7 +1,7 @@
 name: 'Chromatic Design System '
 
 # Event for the workflow
-on: push
+on: [push, pull_request]
 
 # List of jobs
 jobs:

.github/workflows/chromatic.yml

@@ -1,7 +1,7 @@
 name: 'Chromatic'
 
 # Event for the workflow
-on: push
+on: [push, pull_request]
 
 # List of jobs
 jobs:

.github/workflows/lint.yml

@@ -1,6 +1,6 @@
 name: lint
 
-on: push
+on: [push, pull_request]
 
 jobs:
   lint:

.github/workflows/test.yml

@@ -1,6 +1,6 @@
 name: test
 
-on: push
+on: [push, pull_request]
 
 env:
   E2E_DATAVERSE_IMAGE_TAG: unstable

public/locales/en/uploadDatasetFiles.json

@@ -0,0 +1,3 @@
+{
+  "breadcrumbActionItem": "Upload Files"
+}

src/dataset/infrastructure/mappers/JSDatasetMapper.ts

@@ -71,7 +71,12 @@ export class JSDatasetMapper {
         jsDatasetFilesTotalOriginalDownloadSize,
         jsDatasetFilesTotalArchivalDownloadSize
       ),
-      JSDatasetMapper.toHierarchy(jsDataset.persistentId, version, jsDataset.isPartOf),
+      JSDatasetMapper.toHierarchy(
+        jsDataset.id,
+        jsDataset.persistentId,
+        version,
+        jsDataset.isPartOf
+      ),
       undefined, // TODO: get dataset thumbnail from js-dataverse https://github.com/IQSS/dataverse-frontend/issues/203
       privateUrl,
       requestedVersion
@@ -232,15 +237,16 @@ export class JSDatasetMapper {
   }
 
   static toHierarchy(
+    id: number,
     persistentId: string,
     version: DatasetVersion,
     jsUpwardHierarchyNode: JSUpwardHierarchyNode
   ): UpwardHierarchyNode {
     return new UpwardHierarchyNode(
       version.title,
       DvObjectType.DATASET,
+      id.toString(),
       persistentId,
-      undefined,
       version.number.toString(),
       JSUpwardHierarchyNodeMapper.toUpwardHierarchyNode(jsUpwardHierarchyNode)
     )

src/sections/layout/header/Header.tsx

@@ -1,4 +1,4 @@
-import logo from '../../../assets/logo.svg'
+import dataverse_logo from '../../../assets/dataverse_brand_icon.svg'
 import { useTranslation } from 'react-i18next'
 import { Navbar } from '@iqss/dataverse-design-system'
 import { Route } from '../../Route.enum'
@@ -25,7 +25,7 @@ export function Header() {
       brand={{
         title: t('brandTitle'),
         href: `/spa${Route.HOME}`,
-        logoImgSrc: logo
+        logoImgSrc: dataverse_logo
       }}>
       {user ? (
         <>

src/sections/shared/hierarchy/BreadcrumbsGenerator.tsx

@@ -3,16 +3,29 @@ import { UpwardHierarchyNode } from '../../../shared/hierarchy/domain/models/Upw
 import { LinkToPage } from '../link-to-page/LinkToPage'
 import { Route } from '../../Route.enum'
 
-interface BreadcrumbGeneratorProps {
-  hierarchy: UpwardHierarchyNode
-}
+type BreadcrumbGeneratorProps =
+  | {
+      hierarchy: UpwardHierarchyNode
+      withActionItem?: false
+      actionItemText?: never
+    }
+  | {
+      hierarchy: UpwardHierarchyNode
+      withActionItem: true
+      actionItemText: string
+    }
 
-export function BreadcrumbsGenerator({ hierarchy }: BreadcrumbGeneratorProps) {
+export function BreadcrumbsGenerator({
+  hierarchy,
+  withActionItem,
+  actionItemText
+}: BreadcrumbGeneratorProps) {
   const hierarchyArray = hierarchy.toArray()
+
   return (
     <Breadcrumb>
       {hierarchyArray.map((item, index) => {
-        const isLast = index === hierarchyArray.length - 1
+        const isLast = withActionItem ? false : index === hierarchyArray.length - 1
         const isFirst = index === 0
 
         if (isLast) {
@@ -49,6 +62,7 @@ export function BreadcrumbsGenerator({ hierarchy }: BreadcrumbGeneratorProps) {
           </Breadcrumb.Item>
         )
       })}
+      {withActionItem && <Breadcrumb.Item active>{actionItemText}</Breadcrumb.Item>}
     </Breadcrumb>
   )
 }

src/sections/upload-dataset-files/UploadDatasetFiles.tsx

@@ -1,4 +1,5 @@
 import { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
 import { FileRepository } from '../../files/domain/repositories/FileRepository'
 import { useLoading } from '../loading/LoadingContext'
 import { useDataset } from '../dataset/DatasetContext'
@@ -14,6 +15,7 @@ export const UploadDatasetFiles = ({
 }: UploadDatasetFilesProps) => {
   const { setIsLoading } = useLoading()
   const { dataset, isLoading } = useDataset()
+  const { t } = useTranslation('uploadDatasetFiles')
 
   useEffect(() => {
     setIsLoading(isLoading)
@@ -29,7 +31,11 @@ export const UploadDatasetFiles = ({
         <PageNotFound />
       ) : (
         <>
-          <BreadcrumbsGenerator hierarchy={dataset.hierarchy} />
+          <BreadcrumbsGenerator
+            hierarchy={dataset.hierarchy}
+            withActionItem
+            actionItemText={t('breadcrumbActionItem')}
+          />
           <article>
             <p>Metadata Files uploading goes here</p>
           </article>

tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts

@@ -177,8 +177,8 @@ const expectedDataset = {
   hierarchy: new UpwardHierarchyNode(
     "Darwin's Finches",
     DvObjectType.DATASET,
+    '505',
     'doi:10.5072/FK2/B4B2MJ',
-    undefined,
     '0.0',
     new UpwardHierarchyNode('Root', DvObjectType.COLLECTION, 'root')
   )
@@ -285,8 +285,8 @@ const expectedDatasetAlternateVersion = {
   hierarchy: new UpwardHierarchyNode(
     "Darwin's Finches",
     DvObjectType.DATASET,
+    '505',
     'doi:10.5072/FK2/B4B2MJ',
-    undefined,
     '0.0',
     new UpwardHierarchyNode('Root', DvObjectType.COLLECTION, 'root')
   )

tests/component/sections/shared/hierarchy/BreadcrumbsGenerator.spec.tsx

@@ -40,4 +40,23 @@ describe('BreadcrumbsGenerator', () => {
     cy.customMount(<BreadcrumbsGenerator hierarchy={root} />)
     cy.findByText('Root').should('have.class', 'active')
   })
+
+  it('shows the action item active when withActionItem is true', () => {
+    const root = UpwardHierarchyNodeMother.createCollection({
+      name: 'Root',
+      id: 'root'
+    })
+    const dataset = UpwardHierarchyNodeMother.createDataset({
+      name: 'Dataset',
+      parent: root,
+      version: '1.0',
+      persistentId: 'doi:10.5072/FK2/ABC123'
+    })
+
+    cy.customMount(
+      <BreadcrumbsGenerator hierarchy={dataset} withActionItem actionItemText="Action Item Text" />
+    )
+    cy.findByText('Action Item Text').should('exist').should('have.class', 'active')
+    cy.findByText('Dataset').should('exist').should('not.have.class', 'active')
+  })
 })

tests/component/sections/upload-dataset-files/UploadDatasetFiles.spec.tsx

@@ -5,22 +5,35 @@ import { Dataset as DatasetModel } from '../../../../src/dataset/domain/models/D
 import { ReactNode } from 'react'
 import { DatasetProvider } from '../../../../src/sections/dataset/DatasetProvider'
 import { UploadDatasetFiles } from '../../../../src/sections/upload-dataset-files/UploadDatasetFiles'
+import { LoadingProvider } from '../../../../src/sections/loading/LoadingProvider'
 
 const fileRepository: FileRepository = {} as FileRepository
 const datasetRepository: DatasetRepository = {} as DatasetRepository
 
-describe('Dataset', () => {
+describe('UploadDatasetFiles', () => {
   const mountWithDataset = (component: ReactNode, dataset: DatasetModel | undefined) => {
     const searchParams = { persistentId: 'some-persistent-id' }
     datasetRepository.getByPersistentId = cy.stub().resolves(dataset)
 
     cy.customMount(
-      <DatasetProvider repository={datasetRepository} searchParams={searchParams}>
-        {component}
-      </DatasetProvider>
+      <LoadingProvider>
+        <DatasetProvider repository={datasetRepository} searchParams={searchParams}>
+          {component}
+        </DatasetProvider>
+      </LoadingProvider>
     )
   }
 
+  it('renders the breadcrumbs', () => {
+    const testDataset = DatasetMother.create()
+
+    mountWithDataset(<UploadDatasetFiles fileRepository={fileRepository} />, testDataset)
+
+    cy.findByRole('link', { name: 'Root' }).should('exist')
+    cy.findByRole('link', { name: 'Dataset Title' }).should('exist')
+    cy.findByText('Upload Files').should('exist').should('have.class', 'active')
+  })
+
   it('renders skeleton while loading', () => {
     const testDataset = DatasetMother.create()
 
@@ -37,13 +50,4 @@ describe('Dataset', () => {
 
     cy.findByText('Page Not Found').should('exist')
   })
-
-  it('renders the breadcrumbs', () => {
-    const testDataset = DatasetMother.create()
-
-    mountWithDataset(<UploadDatasetFiles fileRepository={fileRepository} />, testDataset)
-
-    cy.findByText('Dataset Title').should('exist').should('have.class', 'active')
-    cy.findByRole('link', { name: 'Root' }).should('exist')
-  })
 })