From 7d95d06836f216193458c97240b887ec38f3b8f8 Mon Sep 17 00:00:00 2001 From: Cheng Shi Date: Wed, 11 Dec 2024 15:31:53 -0500 Subject: [PATCH 1/6] feat: add tags(hardcoded) --- .../domain/models/FileItemTypePreview.ts | 5 ++++ .../mappers/JSFileItemTypePreviewMapper.ts | 9 ++++++- .../items-list/dataset-card/DatasetCard.tsx | 1 + .../items-list/file-card/FileCardInfo.tsx | 15 ++++++++++-- .../file/file-labels/FileLabels.module.scss | 1 + .../models/FileItemTypePreviewMother.ts | 9 +++++++ .../files/domain/models/FileLabelMother.ts | 11 +++++++++ .../file-card/FileCard.spec.tsx | 24 +++++++++++++++++++ 8 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 tests/component/files/domain/models/FileLabelMother.ts diff --git a/src/files/domain/models/FileItemTypePreview.ts b/src/files/domain/models/FileItemTypePreview.ts index 3c129bfdf..59923468f 100644 --- a/src/files/domain/models/FileItemTypePreview.ts +++ b/src/files/domain/models/FileItemTypePreview.ts @@ -1,5 +1,6 @@ import { CollectionItemType } from '../../../collection/domain/models/CollectionItemType' import { PublicationStatus } from '../../../shared/core/domain/models/PublicationStatus' +import { FileLabel } from './FileMetadata' export interface FileItemTypePreview { type: CollectionItemType.FILE @@ -21,6 +22,10 @@ export interface FileItemTypePreview { datasetCitation: string publicationStatuses: PublicationStatus[] releaseOrCreateDate: Date + // TODO: Add more properties as needed + tags?: FileLabel[] + variablesCount?: number + observationsCount?: number } export interface FilePreviewChecksum { diff --git a/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts b/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts index e3ae4dea3..113cb4b47 100644 --- a/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts +++ b/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts @@ -1,5 +1,6 @@ import { FilePreview as JSFilePreview } from '@iqss/dataverse-client-javascript' import { FileItemTypePreview } from '../../domain/models/FileItemTypePreview' +import { FileLabelType } from '@/files/domain/models/FileMetadata' export class JSFileItemTypePreviewMapper { static toFileItemTypePreview(jsFilePreview: JSFilePreview): FileItemTypePreview { @@ -22,7 +23,13 @@ export class JSFileItemTypePreviewMapper { datasetPersistentId: jsFilePreview.datasetPersistentId, datasetCitation: jsFilePreview.datasetCitation, publicationStatuses: jsFilePreview.publicationStatuses, - releaseOrCreateDate: jsFilePreview.releaseOrCreateDate + releaseOrCreateDate: jsFilePreview.releaseOrCreateDate, + tags: [ + { type: FileLabelType.CATEGORY, value: 'mock-CATEGORY' }, + { type: FileLabelType.TAG, value: 'mock-TAG' } + ], + variablesCount: 12, + observationsCount: 6 } } } diff --git a/src/sections/collection/collection-items-panel/items-list/dataset-card/DatasetCard.tsx b/src/sections/collection/collection-items-panel/items-list/dataset-card/DatasetCard.tsx index 12bf17bf6..574afa32f 100644 --- a/src/sections/collection/collection-items-panel/items-list/dataset-card/DatasetCard.tsx +++ b/src/sections/collection/collection-items-panel/items-list/dataset-card/DatasetCard.tsx @@ -21,6 +21,7 @@ export function DatasetCard({ datasetPreview }: DatasetCardProps) { version={datasetPreview.version} thumbnail={datasetPreview.thumbnail} /> + {/* TODO: remove the hardcoded thumbnail once the real one could get */} @@ -38,15 +41,23 @@ export function FileCardInfo({ filePreview }: FileCardInfoProps) {
{filePreview.fileType} - {`- ${bytesFormatted}`} + {`- ${bytesFormatted}`}{' '} + {/*TODO: filePreview.fileType is tabular file, then show variables and observations */} + {filePreview.fileType === 'Tab-Delimited' && ( + {`- ${variablesCount} variables, ${observationsCount} observations`} + )} {filePreview.checksum && ( {`- ${filePreview.checksum.type}:`} + )}
-

{filePreview.description}

+
+ +
+ {filePreview.description &&

{filePreview.description}

} ) diff --git a/src/sections/file/file-labels/FileLabels.module.scss b/src/sections/file/file-labels/FileLabels.module.scss index 0fe9630bf..e21db111a 100644 --- a/src/sections/file/file-labels/FileLabels.module.scss +++ b/src/sections/file/file-labels/FileLabels.module.scss @@ -1,3 +1,4 @@ .container > * { margin-right: 0.5em; + font-size: 12px; } diff --git a/tests/component/files/domain/models/FileItemTypePreviewMother.ts b/tests/component/files/domain/models/FileItemTypePreviewMother.ts index 0752acc2c..7b3092b0c 100644 --- a/tests/component/files/domain/models/FileItemTypePreviewMother.ts +++ b/tests/component/files/domain/models/FileItemTypePreviewMother.ts @@ -2,7 +2,9 @@ import { faker } from '@faker-js/faker' import { CollectionItemType } from '@/collection/domain/models/CollectionItemType' import { FileItemTypePreview } from '@/files/domain/models/FileItemTypePreview' import { PublicationStatus } from '@/shared/core/domain/models/PublicationStatus' +import { FileLabelType } from '@/files/domain/models/FileMetadata' import { FakerHelper } from '../../../shared/FakerHelper' +import { FileLabelMother } from './FileMetadataMother' export class FileItemTypePreviewMother { static create(props?: Partial): FileItemTypePreview { @@ -29,6 +31,13 @@ export class FileItemTypePreviewMother { datasetCitation: faker.lorem.paragraph(), publicationStatuses: [PublicationStatus.Published], releaseOrCreateDate: faker.date.past(), + // TODO: Add more properties as needed + tags: [ + FileLabelMother.create({ type: FileLabelType.TAG }), + FileLabelMother.create({ type: FileLabelType.CATEGORY }) + ], + variablesCount: faker.datatype.number(), + observationsCount: faker.datatype.number(), ...props } } diff --git a/tests/component/files/domain/models/FileLabelMother.ts b/tests/component/files/domain/models/FileLabelMother.ts new file mode 100644 index 000000000..91b0fb772 --- /dev/null +++ b/tests/component/files/domain/models/FileLabelMother.ts @@ -0,0 +1,11 @@ +import { faker } from '@faker-js/faker' +import { FileLabel, FileLabelType } from '@/files/domain/models/FileMetadata' + +export class FileLabelMother { + static create(props?: Partial): FileLabel { + return { + type: props?.type ?? FileLabelType.CATEGORY, + value: props?.value ?? faker.lorem.word() + } + } +} diff --git a/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx b/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx index 8ad4ca5e2..dd32b8b44 100644 --- a/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx +++ b/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx @@ -4,6 +4,7 @@ import { DateHelper } from '@/shared/helpers/DateHelper' import { FileCardHelper } from '@/sections/collection/collection-items-panel/items-list/file-card/FileCardHelper' describe('FileCard', () => { + beforeEach(() => {}) it('should render the card', () => { const filePreview = FileItemTypePreviewMother.create() cy.customMount() @@ -14,5 +15,28 @@ describe('FileCard', () => { cy.contains(FileCardHelper.formatBytesToCompactNumber(filePreview.sizeInBytes)).should('exist') filePreview.description && cy.findByText(filePreview.description).should('exist') filePreview.datasetName && cy.findByText(filePreview.datasetName).should('exist') + filePreview.tags && + filePreview.tags.forEach((tag) => { + cy.findByText(tag.value).should('exist') + }) + }) + + it('should render the card if file is tabular', () => { + const filePreview = FileItemTypePreviewMother.create({ fileType: 'Tab-Delimited' }) + // TODO: Change the fileType: 'Tab-Delimited' to all tabular types + cy.customMount() + + cy.contains(DateHelper.toDisplayFormat(filePreview.releaseOrCreateDate)).should('exist') + cy.contains(filePreview.fileType).should('exist') + filePreview.checksum?.type && cy.contains(filePreview.checksum?.type).should('exist') + cy.contains(FileCardHelper.formatBytesToCompactNumber(filePreview.sizeInBytes)).should('exist') + filePreview.description && cy.findByText(filePreview.description).should('exist') + filePreview.datasetName && cy.findByText(filePreview.datasetName).should('exist') + filePreview.tags && + filePreview.tags.forEach((tag) => { + cy.findByText(tag.value).should('exist') + }) + filePreview.variablesCount && cy.contains(filePreview.variablesCount).should('exist') + filePreview.observationsCount && cy.contains(filePreview.observationsCount).should('exist') }) }) From 3d8ba4648f79e69b6d3525a84d2a990a75781260 Mon Sep 17 00:00:00 2001 From: Cheng Shi Date: Thu, 9 Jan 2025 15:01:36 -0500 Subject: [PATCH 2/6] feat: add new fields for tabular data in terms of the js-dataverse --- package-lock.json | 8 +++---- package.json | 2 +- .../domain/models/FileItemTypePreview.ts | 7 +++--- src/files/domain/models/FileMetadata.ts | 4 ++-- .../mappers/JSFileItemTypePreviewMapper.ts | 22 ++++++++++++++----- .../mappers/JSFileMetadataMapper.ts | 4 ++-- .../items-list/file-card/FileCardInfo.tsx | 6 ++--- .../file-info-data/FileTabularData.tsx | 4 ++-- .../file/file-metadata/FileMetadata.tsx | 4 ++-- .../models/FileItemTypePreviewMother.ts | 7 +++--- .../files/domain/models/FileMetadataMother.ts | 4 ++-- .../file-card/FileCard.spec.tsx | 4 ++-- .../file-info-data/FileTabularData.spec.tsx | 4 ++-- .../file/file-metadata/FileMetadata.spec.tsx | 2 +- .../files/FileJSDataverseRepository.spec.ts | 12 +++++----- 15 files changed, 53 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 713da3164..8e801f4ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "dependencies": { "@faker-js/faker": "7.6.0", - "@iqss/dataverse-client-javascript": "2.0.0-alpha.11", + "@iqss/dataverse-client-javascript": "2.0.0-pr234.4321ffd", "@iqss/dataverse-design-system": "*", "@istanbuljs/nyc-config-typescript": "1.0.2", "@tanstack/react-table": "8.9.2", @@ -3674,9 +3674,9 @@ }, "node_modules/@iqss/dataverse-client-javascript": { "name": "@IQSS/dataverse-client-javascript", - "version": "2.0.0-alpha.11", - "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-alpha.11/77723d5bcef1f38f1dcfa0fd195d2edc2baa7ed9", - "integrity": "sha512-KKgrCeKT9tplhRUxjzgaI2fg8X6OfH2DAnFzDdcFQpoJejwBH4BSbp4d58zG7WxrjRI+sP0Iw5A1o8fsc9TOqw==", + "version": "2.0.0-pr234.4321ffd", + "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-pr234.4321ffd/37e1fd41eafde95dfb0994d625f6052a04a67c60", + "integrity": "sha512-pQmSvB3YufhJ8xLEfUiSeNpsbDCdWxB/8A20OwqKnq0gina2xtpzFT6ws//kv6xE3jlMFpRjVM7o+A+MMv+H1A==", "license": "MIT", "dependencies": { "@types/node": "^18.15.11", diff --git a/package.json b/package.json index c74c8e142..7b0316b0e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@faker-js/faker": "7.6.0", - "@iqss/dataverse-client-javascript": "2.0.0-alpha.11", + "@iqss/dataverse-client-javascript": "2.0.0-pr234.4321ffd", "@iqss/dataverse-design-system": "*", "@istanbuljs/nyc-config-typescript": "1.0.2", "@tanstack/react-table": "8.9.2", diff --git a/src/files/domain/models/FileItemTypePreview.ts b/src/files/domain/models/FileItemTypePreview.ts index 59923468f..ba8ac40d5 100644 --- a/src/files/domain/models/FileItemTypePreview.ts +++ b/src/files/domain/models/FileItemTypePreview.ts @@ -22,10 +22,11 @@ export interface FileItemTypePreview { datasetCitation: string publicationStatuses: PublicationStatus[] releaseOrCreateDate: Date - // TODO: Add more properties as needed + variables?: number + observations?: number + restricted: boolean + canDownloadFile: boolean tags?: FileLabel[] - variablesCount?: number - observationsCount?: number } export interface FilePreviewChecksum { diff --git a/src/files/domain/models/FileMetadata.ts b/src/files/domain/models/FileMetadata.ts index 1d4629e6d..5e656b433 100644 --- a/src/files/domain/models/FileMetadata.ts +++ b/src/files/domain/models/FileMetadata.ts @@ -99,8 +99,8 @@ export class FileEmbargo { } export interface FileTabularData { - variablesCount: number - observationsCount: number + variables: number + observations: number unf?: string } diff --git a/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts b/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts index 113cb4b47..2804d1c5d 100644 --- a/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts +++ b/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts @@ -1,9 +1,20 @@ import { FilePreview as JSFilePreview } from '@iqss/dataverse-client-javascript' import { FileItemTypePreview } from '../../domain/models/FileItemTypePreview' import { FileLabelType } from '@/files/domain/models/FileMetadata' +import { FileLabel } from '@/files/domain/models/FileMetadata' export class JSFileItemTypePreviewMapper { static toFileItemTypePreview(jsFilePreview: JSFilePreview): FileItemTypePreview { + const tabularTagsAsLabels: FileLabel[] = (jsFilePreview.tabularTags || []).map((tag) => ({ + type: FileLabelType.TAG, + value: tag + })) + + const categoriesAsLabels: FileLabel[] = (jsFilePreview.categories || []).map((category) => ({ + type: FileLabelType.CATEGORY, + value: category + })) + return { type: jsFilePreview.type, id: jsFilePreview.fileId, @@ -24,12 +35,11 @@ export class JSFileItemTypePreviewMapper { datasetCitation: jsFilePreview.datasetCitation, publicationStatuses: jsFilePreview.publicationStatuses, releaseOrCreateDate: jsFilePreview.releaseOrCreateDate, - tags: [ - { type: FileLabelType.CATEGORY, value: 'mock-CATEGORY' }, - { type: FileLabelType.TAG, value: 'mock-TAG' } - ], - variablesCount: 12, - observationsCount: 6 + tags: [...categoriesAsLabels, ...tabularTagsAsLabels] as FileLabel[], + variables: jsFilePreview.variables, + observations: jsFilePreview.observations, + restricted: jsFilePreview.restricted, + canDownloadFile: jsFilePreview.canDownloadFile } } } diff --git a/src/files/infrastructure/mappers/JSFileMetadataMapper.ts b/src/files/infrastructure/mappers/JSFileMetadataMapper.ts index 5d4557824..e08f4bf19 100644 --- a/src/files/infrastructure/mappers/JSFileMetadataMapper.ts +++ b/src/files/infrastructure/mappers/JSFileMetadataMapper.ts @@ -124,8 +124,8 @@ export class JSFileMetadataMapper { static toFileTabularData(jsTabularData: JSFileTabularData[]): FileTabularData { return { - variablesCount: jsTabularData[0].varQuantity ?? 0, - observationsCount: jsTabularData[0].caseQuantity ?? 0, + variables: jsTabularData[0].varQuantity ?? 0, + observations: jsTabularData[0].caseQuantity ?? 0, unf: jsTabularData[0].UNF } } diff --git a/src/sections/collection/collection-items-panel/items-list/file-card/FileCardInfo.tsx b/src/sections/collection/collection-items-panel/items-list/file-card/FileCardInfo.tsx index fc96e811a..8c95e0165 100644 --- a/src/sections/collection/collection-items-panel/items-list/file-card/FileCardInfo.tsx +++ b/src/sections/collection/collection-items-panel/items-list/file-card/FileCardInfo.tsx @@ -16,8 +16,8 @@ interface FileCardInfoProps { export function FileCardInfo({ filePreview }: FileCardInfoProps) { const bytesFormatted = FileCardHelper.formatBytesToCompactNumber(filePreview.sizeInBytes) - const variablesCount = filePreview.variablesCount || 0 - const observationsCount = filePreview.observationsCount || 0 + const variables = filePreview.variables || 0 + const observations = filePreview.observations || 0 return (
@@ -44,7 +44,7 @@ export function FileCardInfo({ filePreview }: FileCardInfoProps) { {`- ${bytesFormatted}`}{' '} {/*TODO: filePreview.fileType is tabular file, then show variables and observations */} {filePreview.fileType === 'Tab-Delimited' && ( - {`- ${variablesCount} variables, ${observationsCount} observations`} + {`- ${variables} variables, ${observations} observations`} )} {filePreview.checksum && ( diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTabularData.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTabularData.tsx index 19e854db7..a59ea82c5 100644 --- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTabularData.tsx +++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTabularData.tsx @@ -13,8 +13,8 @@ export function FileTabularData({ } return (
- {tabularData.variablesCount} {t('table.tabularData.variables')},{' '} - {tabularData.observationsCount} {t('table.tabularData.observations')}{' '} + {tabularData.variables} {t('table.tabularData.variables')}, {tabularData.observations}{' '} + {t('table.tabularData.observations')}{' '} {tabularData.unf && }
) diff --git a/src/sections/file/file-metadata/FileMetadata.tsx b/src/sections/file/file-metadata/FileMetadata.tsx index 1c95782f8..935d1fdf7 100644 --- a/src/sections/file/file-metadata/FileMetadata.tsx +++ b/src/sections/file/file-metadata/FileMetadata.tsx @@ -157,13 +157,13 @@ export function FileMetadata({ {t('metadata.fields.variables')} - {metadata.tabularData.variablesCount} + {metadata.tabularData.variables} {t('metadata.fields.observations')} - {metadata.tabularData.observationsCount} + {metadata.tabularData.observations} )} diff --git a/tests/component/files/domain/models/FileItemTypePreviewMother.ts b/tests/component/files/domain/models/FileItemTypePreviewMother.ts index 7b3092b0c..873da1aac 100644 --- a/tests/component/files/domain/models/FileItemTypePreviewMother.ts +++ b/tests/component/files/domain/models/FileItemTypePreviewMother.ts @@ -31,13 +31,14 @@ export class FileItemTypePreviewMother { datasetCitation: faker.lorem.paragraph(), publicationStatuses: [PublicationStatus.Published], releaseOrCreateDate: faker.date.past(), - // TODO: Add more properties as needed tags: [ FileLabelMother.create({ type: FileLabelType.TAG }), FileLabelMother.create({ type: FileLabelType.CATEGORY }) ], - variablesCount: faker.datatype.number(), - observationsCount: faker.datatype.number(), + restricted: faker.datatype.boolean(), + canDownloadFile: faker.datatype.boolean(), + observations: faker.datatype.number(), + variables: faker.datatype.number(), ...props } } diff --git a/tests/component/files/domain/models/FileMetadataMother.ts b/tests/component/files/domain/models/FileMetadataMother.ts index b943a2160..82257978d 100644 --- a/tests/component/files/domain/models/FileMetadataMother.ts +++ b/tests/component/files/domain/models/FileMetadataMother.ts @@ -58,8 +58,8 @@ export class FileTypeMother { export class FileTabularDataMother { static create(props?: Partial): FileTabularData { return { - variablesCount: faker.datatype.number(100), - observationsCount: faker.datatype.number(100), + variables: faker.datatype.number(100), + observations: faker.datatype.number(100), unf: `UNF:6:xXw6cIZnwHWvmRdwhYCQZA==`, ...props } diff --git a/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx b/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx index dd32b8b44..5c99f7034 100644 --- a/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx +++ b/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx @@ -36,7 +36,7 @@ describe('FileCard', () => { filePreview.tags.forEach((tag) => { cy.findByText(tag.value).should('exist') }) - filePreview.variablesCount && cy.contains(filePreview.variablesCount).should('exist') - filePreview.observationsCount && cy.contains(filePreview.observationsCount).should('exist') + filePreview.variables && cy.contains(filePreview.variables).should('exist') + filePreview.observations && cy.contains(filePreview.observations).should('exist') }) }) diff --git a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileTabularData.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileTabularData.spec.tsx index f30b9386d..e501e5fff 100644 --- a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileTabularData.spec.tsx +++ b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileTabularData.spec.tsx @@ -4,8 +4,8 @@ import styles from '../../../../../../../../../src/sections/dataset/dataset-file describe('FileTabularData', () => { it('renders the tabular data and CopyToClipboardButton when tabularData is provided', () => { const tabularData = { - variablesCount: 10, - observationsCount: 100, + variables: 10, + observations: 100, unf: 'UNF:6:xXw6cIZnwHWvmRdwhYCQZA==' } cy.customMount() diff --git a/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx b/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx index d845be11e..256926532 100644 --- a/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx +++ b/tests/component/sections/file/file-metadata/FileMetadata.spec.tsx @@ -385,7 +385,7 @@ describe('FileMetadata', () => { it('renders the tabular data if it exists', () => { const metadataWithTabularData = FileMetadataMother.create({ - tabularData: FileTabularDataMother.create({ variablesCount: 123, observationsCount: 321 }) + tabularData: FileTabularDataMother.create({ variables: 123, observations: 321 }) }) cy.customMount( { .getAllByDatasetPersistentId(dataset.persistentId, dataset.version) .then((files) => { const expectedTabularData = { - variablesCount: 7, - observationsCount: 10 + variables: 7, + observations: 10 } files.forEach((file) => { - expect(file.metadata.tabularData?.variablesCount).to.deep.equal( - expectedTabularData.variablesCount + expect(file.metadata.tabularData?.variables).to.deep.equal( + expectedTabularData.variables ) - expect(file.metadata.tabularData?.observationsCount).to.deep.equal( - expectedTabularData.observationsCount + expect(file.metadata.tabularData?.observations).to.deep.equal( + expectedTabularData.observations ) expect(file.metadata.tabularData?.unf).to.not.be.undefined }) From 75942f5dddb5728201ac37fdd9c0de23d29b8c16 Mon Sep 17 00:00:00 2001 From: Cheng Shi Date: Thu, 9 Jan 2025 16:59:57 -0500 Subject: [PATCH 3/6] chore: remove some comments --- .../items-list/dataset-card/DatasetCard.tsx | 1 - .../items-list/file-card/FileCardInfo.tsx | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/sections/collection/collection-items-panel/items-list/dataset-card/DatasetCard.tsx b/src/sections/collection/collection-items-panel/items-list/dataset-card/DatasetCard.tsx index 574afa32f..12bf17bf6 100644 --- a/src/sections/collection/collection-items-panel/items-list/dataset-card/DatasetCard.tsx +++ b/src/sections/collection/collection-items-panel/items-list/dataset-card/DatasetCard.tsx @@ -21,7 +21,6 @@ export function DatasetCard({ datasetPreview }: DatasetCardProps) { version={datasetPreview.version} thumbnail={datasetPreview.thumbnail} /> - {/* TODO: remove the hardcoded thumbnail once the real one could get */} {filePreview.fileType} {`- ${bytesFormatted}`}{' '} - {/*TODO: filePreview.fileType is tabular file, then show variables and observations */} {filePreview.fileType === 'Tab-Delimited' && ( {`- ${variables} variables, ${observations} observations`} )} {filePreview.checksum && ( {`- ${filePreview.checksum.type}:`} - )} From 76963ce59360f77d11b75e6835c46ef18a33e787 Mon Sep 17 00:00:00 2001 From: Cheng Shi Date: Fri, 10 Jan 2025 10:43:35 -0500 Subject: [PATCH 4/6] chore: remove restrict fields and some comments --- src/files/domain/models/FileItemTypePreview.ts | 2 -- .../infrastructure/mappers/JSFileItemTypePreviewMapper.ts | 4 +--- .../files/domain/models/FileItemTypePreviewMother.ts | 2 -- .../collection-items-panel/file-card/FileCard.spec.tsx | 2 -- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/files/domain/models/FileItemTypePreview.ts b/src/files/domain/models/FileItemTypePreview.ts index ba8ac40d5..1ebc0056e 100644 --- a/src/files/domain/models/FileItemTypePreview.ts +++ b/src/files/domain/models/FileItemTypePreview.ts @@ -24,8 +24,6 @@ export interface FileItemTypePreview { releaseOrCreateDate: Date variables?: number observations?: number - restricted: boolean - canDownloadFile: boolean tags?: FileLabel[] } diff --git a/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts b/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts index 2804d1c5d..0b6a8cfdb 100644 --- a/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts +++ b/src/files/infrastructure/mappers/JSFileItemTypePreviewMapper.ts @@ -37,9 +37,7 @@ export class JSFileItemTypePreviewMapper { releaseOrCreateDate: jsFilePreview.releaseOrCreateDate, tags: [...categoriesAsLabels, ...tabularTagsAsLabels] as FileLabel[], variables: jsFilePreview.variables, - observations: jsFilePreview.observations, - restricted: jsFilePreview.restricted, - canDownloadFile: jsFilePreview.canDownloadFile + observations: jsFilePreview.observations } } } diff --git a/tests/component/files/domain/models/FileItemTypePreviewMother.ts b/tests/component/files/domain/models/FileItemTypePreviewMother.ts index 873da1aac..442064c00 100644 --- a/tests/component/files/domain/models/FileItemTypePreviewMother.ts +++ b/tests/component/files/domain/models/FileItemTypePreviewMother.ts @@ -35,8 +35,6 @@ export class FileItemTypePreviewMother { FileLabelMother.create({ type: FileLabelType.TAG }), FileLabelMother.create({ type: FileLabelType.CATEGORY }) ], - restricted: faker.datatype.boolean(), - canDownloadFile: faker.datatype.boolean(), observations: faker.datatype.number(), variables: faker.datatype.number(), ...props diff --git a/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx b/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx index 5c99f7034..7f926bd39 100644 --- a/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx +++ b/tests/component/sections/collection/collection-items-panel/file-card/FileCard.spec.tsx @@ -4,7 +4,6 @@ import { DateHelper } from '@/shared/helpers/DateHelper' import { FileCardHelper } from '@/sections/collection/collection-items-panel/items-list/file-card/FileCardHelper' describe('FileCard', () => { - beforeEach(() => {}) it('should render the card', () => { const filePreview = FileItemTypePreviewMother.create() cy.customMount() @@ -23,7 +22,6 @@ describe('FileCard', () => { it('should render the card if file is tabular', () => { const filePreview = FileItemTypePreviewMother.create({ fileType: 'Tab-Delimited' }) - // TODO: Change the fileType: 'Tab-Delimited' to all tabular types cy.customMount() cy.contains(DateHelper.toDisplayFormat(filePreview.releaseOrCreateDate)).should('exist') From f1edaf75fa203f083305a910282ad73f86bebd33 Mon Sep 17 00:00:00 2001 From: Cheng Shi Date: Wed, 15 Jan 2025 09:36:35 -0500 Subject: [PATCH 5/6] feat: update package.json --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e801f4ce..39e3377e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "dependencies": { "@faker-js/faker": "7.6.0", - "@iqss/dataverse-client-javascript": "2.0.0-pr234.4321ffd", + "@iqss/dataverse-client-javascript": "2.0.0-alpha.13", "@iqss/dataverse-design-system": "*", "@istanbuljs/nyc-config-typescript": "1.0.2", "@tanstack/react-table": "8.9.2", @@ -3674,9 +3674,9 @@ }, "node_modules/@iqss/dataverse-client-javascript": { "name": "@IQSS/dataverse-client-javascript", - "version": "2.0.0-pr234.4321ffd", - "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-pr234.4321ffd/37e1fd41eafde95dfb0994d625f6052a04a67c60", - "integrity": "sha512-pQmSvB3YufhJ8xLEfUiSeNpsbDCdWxB/8A20OwqKnq0gina2xtpzFT6ws//kv6xE3jlMFpRjVM7o+A+MMv+H1A==", + "version": "2.0.0-alpha.13", + "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-alpha.13/99f81ce18bdd855a54cd79520367516c28b262b8", + "integrity": "sha512-Giv/g1+6bFUTiVcwnzrJhdhWhyMd6gcXLnArN36kxAPrhoR0adRjUa8bevE41Vb5lASw56UoVF17XS/G9Uhj7A==", "license": "MIT", "dependencies": { "@types/node": "^18.15.11", diff --git a/package.json b/package.json index 7b0316b0e..a373e4161 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@faker-js/faker": "7.6.0", - "@iqss/dataverse-client-javascript": "2.0.0-pr234.4321ffd", + "@iqss/dataverse-client-javascript": "2.0.0-alpha.13", "@iqss/dataverse-design-system": "*", "@istanbuljs/nyc-config-typescript": "1.0.2", "@tanstack/react-table": "8.9.2", From f72c2c0f515ebe8ecf068dad7eeab614123cf8de Mon Sep 17 00:00:00 2001 From: Cheng Shi <91049239+ChengShi-1@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:54:03 -0500 Subject: [PATCH 6/6] Update the space in FileCardInfo.tsx Co-authored-by: Ellen Kraffmiller --- .../items-list/file-card/FileCardInfo.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sections/collection/collection-items-panel/items-list/file-card/FileCardInfo.tsx b/src/sections/collection/collection-items-panel/items-list/file-card/FileCardInfo.tsx index 4cf0e739c..ea4c5da66 100644 --- a/src/sections/collection/collection-items-panel/items-list/file-card/FileCardInfo.tsx +++ b/src/sections/collection/collection-items-panel/items-list/file-card/FileCardInfo.tsx @@ -41,7 +41,7 @@ export function FileCardInfo({ filePreview }: FileCardInfoProps) {
{filePreview.fileType} - {`- ${bytesFormatted}`}{' '} + {`- ${bytesFormatted}`} {filePreview.fileType === 'Tab-Delimited' && ( {`- ${variables} variables, ${observations} observations`} )}