chore: file alocations tweaks

src/collection/domain/models/CollectionItemsQueryParams.ts

@@ -0,0 +1,7 @@
+export enum CollectionItemsQueryParams {
+  SORT = 'sort',
+  ORDER = 'order',
+  START = 'start',
+  TYPES = 'types',
+  FILTER_QUERIES = 'fqs'
+}

src/collection/domain/models/CollectionSearchCriteria.tsx → src/collection/domain/models/CollectionSearchCriteria.ts

@@ -1,5 +1,16 @@
 import { type CollectionItemType } from './CollectionItemType'
-import { FilterQuery, OrderType, SortType } from './GetCollectionItemsQueryParams'
+
+export enum SortType {
+  NAME = 'name',
+  DATE = 'date'
+}
+
+export enum OrderType {
+  ASC = 'asc',
+  DESC = 'desc'
+}
+
+export type FilterQuery = `${string}:${string}`
 
 export class CollectionSearchCriteria {
   constructor(

src/index.tsx

@@ -8,13 +8,13 @@ import { AppLoader } from './sections/shared/layout/app-loader/AppLoader'
 
 const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement)
 root.render(
-  // <React.StrictMode>
-  <React.Suspense fallback={<AppLoader fullViewport />}>
-    <LoadingProvider>
-      <ThemeProvider>
-        <App />
-      </ThemeProvider>
-    </LoadingProvider>
-  </React.Suspense>
-  // </React.StrictMode>
+  <React.StrictMode>
+    <React.Suspense fallback={<AppLoader fullViewport />}>
+      <LoadingProvider>
+        <ThemeProvider>
+          <App />
+        </ThemeProvider>
+      </LoadingProvider>
+    </React.Suspense>
+  </React.StrictMode>
 )

src/sections/collection/CollectionHelper.ts

@@ -1,8 +1,6 @@
-import {
-  FilterQuery,
-  GetCollectionItemsQueryParams
-} from '@/collection/domain/models/GetCollectionItemsQueryParams'
-import { CollectionItemType } from '../../collection/domain/models/CollectionItemType'
+import { CollectionItemsQueryParams } from '@/collection/domain/models/CollectionItemsQueryParams'
+import { FilterQuery } from '@/collection/domain/models/CollectionSearchCriteria'
+import { CollectionItemType } from '@/collection/domain/models/CollectionItemType'
 import { QueryParamKey } from '../Route.enum'
 
 export class CollectionHelper {
@@ -15,7 +13,7 @@ export class CollectionHelper {
       ? decodeURIComponent(searchParams.get(QueryParamKey.QUERY) as string)
       : undefined
 
-    const typesParam = searchParams.get(GetCollectionItemsQueryParams.TYPES) ?? undefined
+    const typesParam = searchParams.get(CollectionItemsQueryParams.TYPES) ?? undefined
 
     const typesQuery = typesParam
       ?.split(',')
@@ -24,7 +22,7 @@ export class CollectionHelper {
         Object.values(CollectionItemType).includes(type as CollectionItemType)
       ) as CollectionItemType[]
 
-    const filtersParam = searchParams.get(GetCollectionItemsQueryParams.FILTER_QUERIES) ?? undefined
+    const filtersParam = searchParams.get(CollectionItemsQueryParams.FILTER_QUERIES) ?? undefined
 
     const filtersQuery: FilterQuery[] | undefined = filtersParam
       ? (filtersParam

src/sections/collection/collection-items-panel/CollectionItemsPanel.tsx

@@ -3,12 +3,12 @@ import { useSearchParams } from 'react-router-dom'
 import { Stack } from '@iqss/dataverse-design-system'
 import { CollectionRepository } from '@/collection/domain/repositories/CollectionRepository'
 import { CollectionItemsPaginationInfo } from '@/collection/domain/models/CollectionItemsPaginationInfo'
-import { CollectionSearchCriteria } from '@/collection/domain/models/CollectionSearchCriteria'
-import { CollectionItemType } from '@/collection/domain/models/CollectionItemType'
 import {
-  FilterQuery,
-  GetCollectionItemsQueryParams
-} from '@/collection/domain/models/GetCollectionItemsQueryParams'
+  CollectionSearchCriteria,
+  FilterQuery
+} from '@/collection/domain/models/CollectionSearchCriteria'
+import { CollectionItemType } from '@/collection/domain/models/CollectionItemType'
+import { CollectionItemsQueryParams } from '@/collection/domain/models/CollectionItemsQueryParams'
 import { useGetAccumulatedItems } from './useGetAccumulatedItems'
 import { UseCollectionQueryParamsReturnType } from '../useGetCollectionQueryParams'
 import { useLoadMoreOnPopStateEvent } from './useLoadMoreOnPopStateEvent'
@@ -45,8 +45,6 @@ interface CollectionItemsPanelProps {
  * Every time a load of items is triggered, the pagination info is updated and the URL is updated with the new query params so it can be shared and the user can navigate back and forward in the browser.
  */
 
-// TODO:ME - Fix Tests
-
 export const CollectionItemsPanel = ({
   collectionId,
   collectionRepository,
@@ -118,7 +116,7 @@ export const CollectionItemsPanel = ({
       // Update the URL with the search value ,keep other querys and include all item types always
       setSearchParams((currentSearchParams) => {
         currentSearchParams.set(
-          GetCollectionItemsQueryParams.TYPES,
+          CollectionItemsQueryParams.TYPES,
           [CollectionItemType.COLLECTION, CollectionItemType.DATASET, CollectionItemType.FILE].join(
             ','
           )
@@ -159,9 +157,9 @@ export const CollectionItemsPanel = ({
     const resetPaginationInfo = new CollectionItemsPaginationInfo()
     setPaginationInfo(resetPaginationInfo)
 
-    // Update the URL with the new item types, keep other querys and include the search value if exists
+    // Update the URL with the new item types, keep other querys
     setSearchParams((currentSearchParams) => {
-      currentSearchParams.set(GetCollectionItemsQueryParams.TYPES, newItemsTypes.join(','))
+      currentSearchParams.set(CollectionItemsQueryParams.TYPES, newItemsTypes.join(','))
 
       return currentSearchParams
     })
@@ -205,7 +203,7 @@ export const CollectionItemsPanel = ({
     // Update the URL with the new facets, keep other querys and include the search value if exists
     setSearchParams((currentSearchParams) => {
       currentSearchParams.set(
-        GetCollectionItemsQueryParams.FILTER_QUERIES,
+        CollectionItemsQueryParams.FILTER_QUERIES,
         newFilterQueriesWithFacetValueEncoded.join(',')
       )
 

src/sections/collection/collection-items-panel/filter-panel/FilterPanel.tsx

@@ -5,7 +5,7 @@ import { FunnelFill } from 'react-bootstrap-icons'
 import { CollectionItemType } from '@/collection/domain/models/CollectionItemType'
 import { ItemTypeChange, TypeFilters } from './type-filters/TypeFilters'
 import { CollectionItemsFacet } from '@/collection/domain/models/CollectionItemSubset'
-import { FilterQuery } from '@/collection/domain/models/GetCollectionItemsQueryParams'
+import { FilterQuery } from '@/collection/domain/models/CollectionSearchCriteria'
 import { FacetsFilters } from './facets-filters/FacetsFilters'
 import { RemoveAddFacetFilter } from './facets-filters/FacetFilterGroup'
 import styles from './FilterPanel.module.scss'

src/sections/collection/collection-items-panel/filter-panel/facets-filters/FacetFilterGroup.tsx

@@ -4,7 +4,7 @@ import cn from 'classnames'
 import { Button, Col, Row } from '@iqss/dataverse-design-system'
 import { X as CloseIcon } from 'react-bootstrap-icons'
 import { CollectionItemsFacet } from '@/collection/domain/models/CollectionItemSubset'
-import { FilterQuery } from '@/collection/domain/models/GetCollectionItemsQueryParams'
+import { FilterQuery } from '@/collection/domain/models/CollectionSearchCriteria'
 import styles from './FacetsFilters.module.scss'
 
 const FACETS_PER_VIEW = 5

src/sections/collection/collection-items-panel/filter-panel/facets-filters/FacetsFilters.tsx

@@ -1,9 +1,9 @@
+import Skeleton, { SkeletonTheme } from 'react-loading-skeleton'
 import { Stack } from '@iqss/dataverse-design-system'
 import { CollectionItemsFacet } from '@/collection/domain/models/CollectionItemSubset'
-import { FilterQuery } from '@/collection/domain/models/GetCollectionItemsQueryParams'
+import { FilterQuery } from '@/collection/domain/models/CollectionSearchCriteria'
 import { FacetFilterGroup, RemoveAddFacetFilter } from './FacetFilterGroup'
 import styles from './FacetsFilters.module.scss'
-import Skeleton, { SkeletonTheme } from 'react-loading-skeleton'
 
 interface FacetsFiltersProps {
   facets: CollectionItemsFacet[]

src/sections/collection/collection-items-panel/items-list/ItemsList.tsx

@@ -5,7 +5,7 @@ import cn from 'classnames'
 import { type CollectionItem } from '@/collection/domain/models/CollectionItemSubset'
 import { CollectionItemsPaginationInfo } from '@/collection/domain/models/CollectionItemsPaginationInfo'
 import { CollectionItemType } from '@/collection/domain/models/CollectionItemType'
-import { FilterQuery } from '@/collection/domain/models/GetCollectionItemsQueryParams'
+import { FilterQuery } from '@/collection/domain/models/CollectionSearchCriteria'
 import { PaginationResultsInfo } from '@/sections/shared/pagination/PaginationResultsInfo'
 import { NO_COLLECTION_ITEMS } from '../useGetAccumulatedItems'
 import { ErrorItemsMessage } from './ErrorItemsMessage'

src/sections/collection/collection-items-panel/items-list/file-card/FileCard.module.scss

@@ -47,6 +47,7 @@
     max-width: 64px;
     height: 48px;
     max-height: 48px;
+    object-fit: contain;
     vertical-align: top;
   }
 

src/sections/collection/collection-items-panel/selected-facets/SelectedFacets.tsx

@@ -1,7 +1,7 @@
 import { useTranslation } from 'react-i18next'
 import { Button } from '@iqss/dataverse-design-system'
 import { X as CloseIcon } from 'react-bootstrap-icons'
-import { FilterQuery } from '@/collection/domain/models/GetCollectionItemsQueryParams'
+import { FilterQuery } from '@/collection/domain/models/CollectionSearchCriteria'
 import styles from './SelectedFacets.module.scss'
 
 interface SelectedFacetsProps {

src/sections/collection/useGetCollectionQueryParams.ts

@@ -1,6 +1,6 @@
 import { useSearchParams } from 'react-router-dom'
 import { CollectionItemType } from '@/collection/domain/models/CollectionItemType'
-import { FilterQuery } from '@/collection/domain/models/GetCollectionItemsQueryParams'
+import { FilterQuery } from '@/collection/domain/models/CollectionSearchCriteria'
 import { CollectionHelper } from './CollectionHelper'
 
 export interface UseCollectionQueryParamsReturnType {

src/sections/homepage/search-input/SearchInput.tsx

@@ -4,7 +4,7 @@ import { Form, CloseButton } from '@iqss/dataverse-design-system'
 import { Search as SearchIcon } from 'react-bootstrap-icons'
 import { QueryParamKey, Route } from '../../Route.enum'
 import { CollectionItemType } from '../../../collection/domain/models/CollectionItemType'
-import { GetCollectionItemsQueryParams } from '@/collection/domain/models/GetCollectionItemsQueryParams'
+import { CollectionItemsQueryParams } from '@/collection/domain/models/CollectionItemsQueryParams'
 import styles from './SearchInput.module.scss'
 
 export const SearchInput = () => {
@@ -28,7 +28,7 @@ export const SearchInput = () => {
     const searchParams = new URLSearchParams()
     searchParams.set(QueryParamKey.QUERY, encodedSearchValue)
     searchParams.set(
-      GetCollectionItemsQueryParams.TYPES,
+      CollectionItemsQueryParams.TYPES,
       [CollectionItemType.COLLECTION, CollectionItemType.DATASET, CollectionItemType.FILE].join(',')
     )
 

tests/component/sections/collection/CollectionHelper.spec.tsx

@@ -1,4 +1,4 @@
-import { GetCollectionItemsQueryParams } from '@/collection/domain/models/GetCollectionItemsQueryParams'
+import { CollectionItemsQueryParams } from '@/collection/domain/models/CollectionItemsQueryParams'
 import { CollectionHelper } from '@/sections/collection/CollectionHelper'
 import { QueryParamKey } from '@/sections/Route.enum'
 import { CollectionItemType } from '@iqss/dataverse-client-javascript'
@@ -11,12 +11,12 @@ describe('CollectionHelper', () => {
   it('define collection query params correctly when all query params are in the url', () => {
     const searchParams = new URLSearchParams({
       [QueryParamKey.QUERY]: QUERY_VALUE,
-      [GetCollectionItemsQueryParams.TYPES]: [
+      [CollectionItemsQueryParams.TYPES]: [
         CollectionItemType.COLLECTION,
         CollectionItemType.DATASET
       ].join(','),
       [QueryParamKey.PAGE]: PAGE_NUMBER.toString(),
-      [GetCollectionItemsQueryParams.FILTER_QUERIES]: [
+      [CollectionItemsQueryParams.FILTER_QUERIES]: [
         'someFilter:someValue',
         'otherFilter:otherValue'
       ].join(',')
@@ -51,7 +51,7 @@ describe('CollectionHelper', () => {
 
   it('define collection query params correctly when only types query param is in the url', () => {
     const searchParams = new URLSearchParams({
-      [GetCollectionItemsQueryParams.TYPES]: [
+      [CollectionItemsQueryParams.TYPES]: [
         CollectionItemType.COLLECTION,
         CollectionItemType.DATASET
       ].join(',')

tests/e2e-integration/e2e/sections/collection/CollectionItemsPanel.spec.ts

@@ -1,6 +1,6 @@
 import { CollectionItem } from '@/collection/domain/models/CollectionItemSubset'
 import { CollectionItemType } from '@/collection/domain/models/CollectionItemType'
-import { GetCollectionItemsQueryParams } from '@/collection/domain/models/GetCollectionItemsQueryParams'
+import { CollectionItemsQueryParams } from '@/collection/domain/models/CollectionItemsQueryParams'
 import { QueryParamKey } from '@/sections/Route.enum'
 import { DatasetHelper } from '@tests/e2e-integration/shared/datasets/DatasetHelper'
 import { FileHelper } from '@tests/e2e-integration/shared/files/FileHelper'
@@ -100,7 +100,7 @@ describe('Collection Items Panel', () => {
         cy.findAllByTestId('file-card').should('have.length', filesInResponse.length)
 
       const firstExpectedURL = new URLSearchParams({
-        [GetCollectionItemsQueryParams.TYPES]: [
+        [CollectionItemsQueryParams.TYPES]: [
           CollectionItemType.COLLECTION,
           CollectionItemType.DATASET,
           CollectionItemType.FILE
@@ -132,7 +132,7 @@ describe('Collection Items Panel', () => {
         cy.findAllByTestId('file-card').should('have.length', filesInResponse.length)
 
       const secondExpectedURL = new URLSearchParams({
-        [GetCollectionItemsQueryParams.TYPES]: [
+        [CollectionItemsQueryParams.TYPES]: [
           CollectionItemType.COLLECTION,
           CollectionItemType.DATASET,
           CollectionItemType.FILE
@@ -166,7 +166,7 @@ describe('Collection Items Panel', () => {
         cy.findAllByTestId('file-card').should('have.length', filesInResponse.length)
 
       const thirdExpectedURL = new URLSearchParams({
-        [GetCollectionItemsQueryParams.TYPES]: [
+        [CollectionItemsQueryParams.TYPES]: [
           CollectionItemType.COLLECTION,
           CollectionItemType.DATASET,
           CollectionItemType.FILE
@@ -199,7 +199,7 @@ describe('Collection Items Panel', () => {
         cy.findAllByTestId('file-card').should('have.length', filesInResponse.length)
 
       const fourthExpectedURL = new URLSearchParams({
-        [GetCollectionItemsQueryParams.TYPES]: [
+        [CollectionItemsQueryParams.TYPES]: [
           CollectionItemType.DATASET,
           CollectionItemType.FILE
         ].join(',')
@@ -230,7 +230,7 @@ describe('Collection Items Panel', () => {
         cy.findAllByTestId('file-card').should('have.length', filesInResponse.length)
 
       const fifthExpectedURL = new URLSearchParams({
-        [GetCollectionItemsQueryParams.TYPES]: [CollectionItemType.FILE].join(',')
+        [CollectionItemsQueryParams.TYPES]: [CollectionItemType.FILE].join(',')
       }).toString()
 
       cy.url().should('include', `/collections?${fifthExpectedURL}`)
@@ -258,7 +258,7 @@ describe('Collection Items Panel', () => {
         cy.findAllByTestId('file-card').should('have.length', filesInResponse.length)
 
       const fourthExpectedURL = new URLSearchParams({
-        [GetCollectionItemsQueryParams.TYPES]: [
+        [CollectionItemsQueryParams.TYPES]: [
           CollectionItemType.DATASET,
           CollectionItemType.FILE
         ].join(',')
@@ -289,11 +289,11 @@ describe('Collection Items Panel', () => {
         cy.findAllByTestId('file-card').should('have.length', filesInResponse.length)
 
       const expectedURL = new URLSearchParams({
-        [GetCollectionItemsQueryParams.TYPES]: [
+        [CollectionItemsQueryParams.TYPES]: [
           CollectionItemType.DATASET,
           CollectionItemType.FILE
         ].join(','),
-        [GetCollectionItemsQueryParams.FILTER_QUERIES]: [
+        [CollectionItemsQueryParams.FILTER_QUERIES]: [
           `authorName_ss:${encodeURIComponent('Finch, Fiona')}`
         ].join(',')
       }).toString()

tests/e2e-integration/e2e/sections/homepage/Homepage.spec.tsx

@@ -1,4 +1,4 @@
-import { GetCollectionItemsQueryParams } from '@/collection/domain/models/GetCollectionItemsQueryParams'
+import { CollectionItemsQueryParams } from '@/collection/domain/models/CollectionItemsQueryParams'
 import { CollectionItemType } from '../../../../../src/collection/domain/models/CollectionItemType'
 import { QueryParamKey } from '../../../../../src/sections/Route.enum'
 
@@ -14,7 +14,7 @@ describe('Homepage', () => {
     const searchParams = new URLSearchParams()
     searchParams.set(QueryParamKey.QUERY, encodedSearchValue)
     searchParams.set(
-      GetCollectionItemsQueryParams.TYPES,
+      CollectionItemsQueryParams.TYPES,
       [CollectionItemType.COLLECTION, CollectionItemType.DATASET, CollectionItemType.FILE].join(',')
     )