Merge pull request #785 from IQSS/772-file-edit-tags-populated-the-categories-dropdown-with-results-from-api

File Edit Tags: populate the categories dropdown with results

Author: ofahimIQSS

package-lock.json

@@ -17,7 +17,7 @@
     "@dnd-kit/sortable": "8.0.0",
     "@dnd-kit/utilities": "3.2.2",
     "@faker-js/faker": "7.6.0",
-    "@iqss/dataverse-client-javascript": "2.0.0-alpha.53",
+    "@iqss/dataverse-client-javascript": "v2.0.0-pr344.5fd4982",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",

package.json

@@ -137,5 +137,6 @@
     "defaultFileUnrestrictError": "Something went wrong unrestricting the file. Try again later.",
     "requestAccessTooltipText": "If checked, users can request access to the restricted files in this dataset.",
     "termsOfAccessTooltipTex": "information on how and if users can access restricted files in this dataset."
-  }
+  },
+  "getCategoriesError": "Something went wrong fetching available categories. Try again later."
 }

public/locales/en/file.json

@@ -47,4 +47,5 @@ export interface DatasetRepository {
     includeMDC?: boolean
   ) => Promise<DatasetDownloadCount>
   deleteDatasetDraft: (datasetId: string | number) => Promise<void>
+  getAvailableCategories: (datasetId: string | number) => Promise<string[]>
 }

src/dataset/domain/repositories/DatasetRepository.ts

@@ -0,0 +1,8 @@
+import { DatasetRepository } from '../repositories/DatasetRepository'
+
+export async function getAvailableCategories(
+  datasetRepository: DatasetRepository,
+  datasetId: string | number
+): Promise<string[]> {
+  return datasetRepository.getAvailableCategories(datasetId)
+}

src/dataset/domain/useCases/getAvailableCategories.ts

@@ -31,7 +31,8 @@ import {
   DatasetDeaccessionDTO,
   getDatasetVersionsSummaries,
   getDatasetDownloadCount,
-  deleteDatasetDraft
+  deleteDatasetDraft,
+  getDatasetAvailableCategories
 } from '@iqss/dataverse-client-javascript'
 import { JSDatasetMapper } from '../mappers/JSDatasetMapper'
 import { DatasetPaginationInfo } from '../../domain/models/DatasetPaginationInfo'
@@ -375,6 +376,11 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
       throw error
     })
   }
+
+  getAvailableCategories(datasetId: string | number): Promise<string[]> {
+    return getDatasetAvailableCategories.execute(datasetId)
+  }
+
   /*
     TODO: This is a temporary solution as this use case doesn't exist in js-dataverse yet and the API should also return the file store type rather than name only.
     After https://github.com/IQSS/dataverse/issues/11695 is implemented, create a js-dataverse use case.

src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts

@@ -181,12 +181,14 @@ export function Dataset({
                         datasetVersion={dataset.version}
                         canUpdateDataset={canUpdateDataset}
                         key={dataset.version.publishingStatus}
+                        datasetRepository={datasetRepository}
                       />
                     ) : (
                       <DatasetFiles
                         filesRepository={fileRepository}
                         datasetPersistentId={dataset.persistentId}
                         datasetVersion={dataset.version}
+                        datasetRepository={datasetRepository}
                       />
                     )}
                   </div>

src/sections/dataset/Dataset.tsx

@@ -7,17 +7,20 @@ import { useFiles } from './useFiles'
 import { PaginationControls } from '../../shared/pagination/PaginationControls'
 import { DatasetVersion } from '../../../dataset/domain/models/Dataset'
 import { FilePaginationInfo } from '../../../files/domain/models/FilePaginationInfo'
+import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 
 interface DatasetFilesProps {
   filesRepository: FileRepository
   datasetPersistentId: string
   datasetVersion: DatasetVersion
+  datasetRepository: DatasetRepository
 }
 
 export function DatasetFiles({
   filesRepository,
   datasetPersistentId,
-  datasetVersion
+  datasetVersion,
+  datasetRepository
 }: DatasetFilesProps) {
   const [paginationInfo, setPaginationInfo] = useState<FilePaginationInfo>(new FilePaginationInfo())
   const [criteria, setCriteria] = useState<FileCriteria>(new FileCriteria())
@@ -44,6 +47,7 @@ export function DatasetFiles({
         paginationInfo={paginationInfo}
         filesTotalDownloadSize={filesTotalDownloadSize}
         criteria={criteria}
+        datasetRepository={datasetRepository}
       />
       <PaginationControls
         initialPaginationInfo={paginationInfo}

src/sections/dataset/dataset-files/DatasetFiles.tsx

@@ -14,11 +14,13 @@ import { FilesTableScrollable } from './files-table/FilesTableScrollable'
 import { FileCriteriaForm } from './file-criteria-form/FileCriteriaForm'
 import { FilesContext } from '@/sections/file/FilesContext'
 import styles from './DatasetFilesScrollable.module.scss'
+import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 
 interface DatasetFilesScrollableProps {
   filesRepository: FileRepository
   datasetPersistentId: string
   datasetVersion: DatasetVersion
+  datasetRepository: DatasetRepository
   canUpdateDataset?: boolean
 }
 
@@ -28,7 +30,8 @@ export function DatasetFilesScrollable({
   filesRepository,
   datasetPersistentId,
   datasetVersion,
-  canUpdateDataset
+  canUpdateDataset,
+  datasetRepository
 }: DatasetFilesScrollableProps) {
   const scrollableContainerRef = useRef<HTMLDivElement | null>(null)
   const criteriaContainerRef = useRef<HTMLDivElement | null>(null)
@@ -184,6 +187,7 @@ export function DatasetFilesScrollable({
             isEmptyFiles={isEmptyFiles}
             accumulatedCount={accumulatedCount}
             fileRepository={filesRepository}
+            datasetRepository={datasetRepository}
           />
         </FilesContext.Provider>
       </div>

src/sections/dataset/dataset-files/DatasetFilesScrollable.tsx

@@ -11,6 +11,7 @@ import { FileSelection } from './row-selection/useFileSelection'
 import { FileCriteria } from '../../../../files/domain/models/FileCriteria'
 import { FilePaginationInfo } from '../../../../files/domain/models/FilePaginationInfo'
 import { FileRepository } from '@/files/domain/repositories/FileRepository'
+import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 
 interface FilesTableProps {
   files: FilePreview[]
@@ -19,6 +20,7 @@ interface FilesTableProps {
   paginationInfo: FilePaginationInfo
   filesTotalDownloadSize: number
   criteria: FileCriteria
+  datasetRepository: DatasetRepository
 }
 
 export function FilesTable({
@@ -27,12 +29,14 @@ export function FilesTable({
   paginationInfo,
   filesTotalDownloadSize,
   fileRepository,
-  criteria
+  criteria,
+  datasetRepository
 }: FilesTableProps) {
   const { table, fileSelection, selectAllFiles, clearFileSelection } = useFilesTable(
     files,
     paginationInfo,
-    fileRepository
+    fileRepository,
+    datasetRepository
   )
 
   const [visitedPagination, setVisitedPagination] = useState<FilePaginationInfo>(paginationInfo)