Merge branch 'develop' into 636-show-dataset-metrics

Author: g-saracca

public/locales/en/notFoundPage.json

@@ -0,0 +1,5 @@
+{
+  "statusNumberNotFound": "404",
+  "message": "We can't find the <1>{{type}}</1> you're looking for.\n Sorry for the inconvenience.",
+  "backToHomepage": "Back to {{brandName}} Homepage"
+}

public/locales/en/shared.json

@@ -1,4 +1,8 @@
 {
+  "collection": "Collection",
+  "dataset": "Dataset",
+  "file": "File",
+  "page": "Page",
   "asterisksIndicateRequiredFields": "Asterisks indicate required fields",
   "remove": "Remove",
   "add": "Add",
@@ -20,10 +24,6 @@
     "heading": "Page Number Not Found",
     "message": "The page number you requested does not exist. Please try a different page number."
   },
-  "pageNotFound": {
-    "heading": "Page Not Found",
-    "message": "The page you are looking for was not found."
-  },
   "pagination": {
     "results_one": "1 {{item}}",
     "results_other": "{{start}} to {{end}} of {{formattedCount}} {{item}}s",

src/dataset/domain/models/Dataset.ts

@@ -401,6 +401,7 @@ export class Dataset {
   constructor(
     public readonly persistentId: string,
     public readonly version: DatasetVersion,
+    public readonly internalVersionNumber: number,
     public readonly alerts: Alert[],
     public readonly summaryFields: DatasetMetadataBlock[],
     public readonly termsOfUse: DatasetTermsOfUse,
@@ -496,6 +497,7 @@ export class Dataset {
     constructor(
       public readonly persistentId: string,
       public readonly version: DatasetVersion,
+      public readonly internalVersionNumber: number,
       public readonly summaryFields: DatasetMetadataBlock[],
       public readonly termsOfUse: DatasetTermsOfUse,
       public readonly metadataBlocks: DatasetMetadataBlocks,
@@ -565,6 +567,7 @@ export class Dataset {
       return new Dataset(
         this.persistentId,
         this.version,
+        this.internalVersionNumber,
         this.alerts,
         this.summaryFields,
         this.termsOfUse,

src/dataset/domain/repositories/DatasetRepository.ts

@@ -23,7 +23,11 @@ export interface DatasetRepository {
   ) => Promise<DatasetVersionDiff>
 
   create: (dataset: DatasetDTO, collectionId: string) => Promise<{ persistentId: string }>
-  updateMetadata: (datasetId: string | number, datasetDTO: DatasetDTO) => Promise<void>
+  updateMetadata: (
+    datasetId: string | number,
+    datasetDTO: DatasetDTO,
+    internalVersionNumber: number
+  ) => Promise<void>
   deaccession: (
     datasetId: string | number,
     version: string,

src/dataset/domain/useCases/updateDatasetMetadata.ts

@@ -4,9 +4,12 @@ import { DatasetDTO } from './DTOs/DatasetDTO'
 export function updateDatasetMetadata(
   datasetRepository: DatasetRepository,
   datasetId: string | number,
-  updatedDataset: DatasetDTO
+  updatedDataset: DatasetDTO,
+  internalVersionNumber: number
 ): Promise<void> {
-  return datasetRepository.updateMetadata(datasetId, updatedDataset).catch((error: Error) => {
-    throw new Error(error.message)
-  })
+  return datasetRepository
+    .updateMetadata(datasetId, updatedDataset, internalVersionNumber)
+    .catch((error: Error) => {
+      throw new Error(error.message)
+    })
 }

src/dataset/infrastructure/mappers/JSDatasetMapper.ts

@@ -61,6 +61,7 @@ export class JSDatasetMapper {
     return new Dataset.Builder(
       jsDataset.persistentId,
       version,
+      jsDataset.internalVersionNumber,
       JSDatasetMapper.toSummaryFields(jsDataset.metadataBlocks, jsDatasetSummaryFieldsNames),
       jsDataset.termsOfUse,
       JSDatasetMapper.toMetadataBlocks(

src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts

@@ -319,9 +319,13 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
     })
   }
 
-  updateMetadata(datasetId: string | number, updatedDataset: DatasetDTO): Promise<void> {
+  updateMetadata(
+    datasetId: string | number,
+    updatedDataset: DatasetDTO,
+    internalVersionNumber: number
+  ): Promise<void> {
     return updateDataset
-      .execute(datasetId, DatasetDTOMapper.toJSDatasetDTO(updatedDataset))
+      .execute(datasetId, DatasetDTOMapper.toJSDatasetDTO(updatedDataset), internalVersionNumber)
       .catch((error: WriteError) => {
         throw new Error(error.message)
       })

src/router/routes.tsx

@@ -1,5 +1,5 @@
 import { lazy, Suspense } from 'react'
-import { RouteObject } from 'react-router-dom'
+import { Navigate, RouteObject } from 'react-router-dom'
 import { Route } from '../sections/Route.enum'
 import { Layout } from '../sections/layout/Layout'
 import { ErrorPage } from '../sections/error-page/ErrorPage'
@@ -92,6 +92,12 @@ const FeaturedItemPage = lazy(() =>
   }))
 )
 
+const NotFoundPage = lazy(() =>
+  import('../sections/not-found-page/NotFoundPageFactory').then(({ NotFoundPageFactory }) => ({
+    default: () => NotFoundPageFactory.create()
+  }))
+)
+
 export const routes: RouteObject[] = [
   {
     path: '/',
@@ -229,6 +235,15 @@ export const routes: RouteObject[] = [
             errorElement: <ErrorPage />
           }
         ]
+      },
+      // 🕵️‍♂️ Not found page, if the path doesn't match any route we redirect to not found page.
+      {
+        path: Route.NOT_FOUND_PAGE,
+        element: <NotFoundPage />
+      },
+      {
+        path: '*',
+        element: <Navigate to={Route.NOT_FOUND_PAGE} replace />
       }
     ]
   }

src/sections/Route.enum.ts

@@ -15,7 +15,8 @@ export enum Route {
   EDIT_COLLECTION = '/collections/:collectionId/edit',
   ACCOUNT = '/account',
   EDIT_COLLECTION_FEATURED_ITEMS = '/collections/:collectionId/edit-featured-items',
-  FEATURED_ITEM = '/featured-item/:parentCollectionId/:featuredItemId'
+  FEATURED_ITEM = '/featured-item/:parentCollectionId/:featuredItemId',
+  NOT_FOUND_PAGE = '/404'
 }
 
 export const RouteWithParams = {

src/sections/collection/Collection.tsx

@@ -11,7 +11,6 @@ import AddDataActionsButton from '../shared/add-data-actions/AddDataActionsButto
 import { CollectionItemsPanel } from './collection-items-panel/CollectionItemsPanel'
 import { CollectionInfo } from './CollectionInfo'
 import { CollectionSkeleton } from './CollectionSkeleton'
-import { PageNotFound } from '../page-not-found/PageNotFound'
 import { CreatedAlert } from './CreatedAlert'
 import { PublishCollectionButton } from './publish-collection/PublishCollectionButton'
 import { ShareCollectionButton } from './share-collection-button/ShareCollectionButton'
@@ -20,8 +19,9 @@ import { EditCollectionDropdown } from './edit-collection-dropdown/EditCollectio
 import { FeaturedItems } from './featured-items/FeaturedItems'
 import { Route } from '../Route.enum'
 import { CollectionHelper } from './CollectionHelper'
-import styles from './Collection.module.scss'
 import { ContactRepository } from '@/contact/domain/repositories/ContactRepository'
+import { NotFoundPage } from '../not-found-page/NotFoundPage'
+import styles from './Collection.module.scss'
 
 interface CollectionProps {
   collectionRepository: CollectionRepository
@@ -72,7 +72,7 @@ export function Collection({
   }
 
   if (!isLoadingCollection && !collection) {
-    return <PageNotFound />
+    return <NotFoundPage dvObjectNotFoundType="collection" />
   }
 
   return (