Merge pull request #550 from IQSS/537-upgrade-to-v4-download-upload-a…

…rtifacts Upgrade to v4 download and upload artifacts
IQSS · Nov 25, 2024 · 02b04e5 · 02b04e5
2 parents 88d218a + f5159bf
commit 02b04e5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/.github/workflows/deploy-beta-testing.yml b/.github/workflows/deploy-beta-testing.yml
@@ -41,10 +41,11 @@ jobs:
       - name: Build with base path
         run: npm run build -- --base=/spa
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: built-site
           path: ./dist
+          include-hidden-files: true
 
   deploy-to-payara:
     needs: build
@@ -58,7 +59,7 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: built-site
           path: ./dist

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -61,10 +61,11 @@ jobs:
         if: ${{ github.event.inputs.infra_type == 'Payara' && github.event.inputs.basepath != '' }}
         run: npm run build -- --base=/${{ github.event.inputs.basepath }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: built-site
           path: ./dist
+          include-hidden-files: true
 
   deploy-to-s3:
     needs: build
@@ -84,7 +85,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install awscli
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: built-site
           path: ./dist
@@ -111,7 +112,7 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: built-site
           path: ./dist

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -143,7 +143,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Cypress screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots

diff --git a/tests/component/sections/dataset/Dataset.spec.tsx b/tests/component/sections/dataset/Dataset.spec.tsx
@@ -16,11 +16,13 @@ import { FileAccessOption, FileTag } from '../../../../src/files/domain/models/F
 import { AlertProvider } from '../../../../src/sections/alerts/AlertProvider'
 import { MetadataBlockInfoRepository } from '../../../../src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
 import { MetadataBlockInfoMother } from '../../metadata-block-info/domain/models/MetadataBlockInfoMother'
+import { CollectionRepository } from '@/collection/domain/repositories/CollectionRepository'
 
 const setAnonymizedView = () => {}
 const fileRepository: FileRepository = {} as FileRepository
 const datasetRepository: DatasetRepository = {} as DatasetRepository
 const metadataBlockInfoRepository: MetadataBlockInfoRepository = {} as MetadataBlockInfoRepository
+const collectionRepository: CollectionRepository = {} as CollectionRepository
 
 const TOTAL_FILES_COUNT = 200
 const allFiles = FilePreviewMother.createMany(TOTAL_FILES_COUNT)
@@ -93,6 +95,7 @@ describe('Dataset', () => {
         datasetRepository={datasetRepository}
         fileRepository={fileRepository}
         metadataBlockInfoRepository={metadataBlockInfoRepository}
+        collectionRepository={collectionRepository}
       />,
       testDataset
     )
@@ -109,6 +112,7 @@ describe('Dataset', () => {
         datasetRepository={datasetRepository}
         fileRepository={fileRepository}
         metadataBlockInfoRepository={metadataBlockInfoRepository}
+        collectionRepository={collectionRepository}
       />,
       emptyDataset
     )
@@ -124,6 +128,7 @@ describe('Dataset', () => {
         datasetRepository={datasetRepository}
         fileRepository={fileRepository}
         metadataBlockInfoRepository={metadataBlockInfoRepository}
+        collectionRepository={collectionRepository}
       />,
       dataset
     )
@@ -140,6 +145,7 @@ describe('Dataset', () => {
         datasetRepository={datasetRepository}
         fileRepository={fileRepository}
         metadataBlockInfoRepository={metadataBlockInfoRepository}
+        collectionRepository={collectionRepository}
       />,
       dataset
     )
@@ -155,6 +161,7 @@ describe('Dataset', () => {
         datasetRepository={datasetRepository}
         fileRepository={fileRepository}
         metadataBlockInfoRepository={metadataBlockInfoRepository}
+        collectionRepository={collectionRepository}
       />,
       testDataset
     )
@@ -171,6 +178,7 @@ describe('Dataset', () => {
         datasetRepository={datasetRepository}
         fileRepository={fileRepository}
         metadataBlockInfoRepository={metadataBlockInfoRepository}
+        collectionRepository={collectionRepository}
       />,
       testDataset
     )
@@ -190,6 +198,7 @@ describe('Dataset', () => {
         datasetRepository={datasetRepository}
         fileRepository={fileRepository}
         metadataBlockInfoRepository={metadataBlockInfoRepository}
+        collectionRepository={collectionRepository}
       />,
       testDataset
     )
@@ -212,6 +221,7 @@ describe('Dataset', () => {
         datasetRepository={datasetRepository}
         fileRepository={fileRepository}
         metadataBlockInfoRepository={metadataBlockInfoRepository}
+        collectionRepository={collectionRepository}
       />,
       testDatasetAnonymized
     )
@@ -229,6 +239,7 @@ describe('Dataset', () => {
         datasetRepository={datasetRepository}
         fileRepository={fileRepository}
         metadataBlockInfoRepository={metadataBlockInfoRepository}
+        collectionRepository={collectionRepository}
       />,
       testDataset
     )
@@ -245,6 +256,7 @@ describe('Dataset', () => {
         fileRepository={fileRepository}
         metadataBlockInfoRepository={metadataBlockInfoRepository}
         filesTabInfiniteScrollEnabled={true}
+        collectionRepository={collectionRepository}
       />,
       testDataset
     )
@@ -262,6 +274,7 @@ describe('Dataset', () => {
           datasetRepository={datasetRepository}
           fileRepository={fileRepository}
           metadataBlockInfoRepository={metadataBlockInfoRepository}
+          collectionRepository={collectionRepository}
           created={true}
         />
       </AlertProvider>,
@@ -281,6 +294,7 @@ describe('Dataset', () => {
           datasetRepository={datasetRepository}
           fileRepository={fileRepository}
           metadataBlockInfoRepository={metadataBlockInfoRepository}
+          collectionRepository={collectionRepository}
           metadataUpdated={true}
         />
       </AlertProvider>,