Conflict solving errors fix

Author: jp-tosca

src/dataset/domain/models/DatasetType.ts

@@ -5,4 +5,4 @@ export interface DatasetType {
   linkedMetadataBlocks?: string[]
   availableLicenses?: string[]
   description?: string
-}
+}

src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts

@@ -66,7 +66,6 @@ import { AxiosResponse } from 'axios'
 import { JSDataverseReadErrorHandler } from '@/shared/helpers/JSDataverseReadErrorHandler'
 import { CollectionSummary } from '@/collection/domain/models/CollectionSummary'
 import { DatasetUploadLimits } from '@/dataset/domain/models/DatasetUploadLimits'
-import { DatasetType } from '@/dataset/domain/models/DatasetType'
 
 const includeDeaccessioned = true
 
@@ -332,8 +331,8 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
   }
 
   create(
-    dataset: DatasetDTO, 
-    collectionId: string, 
+    dataset: DatasetDTO,
+    collectionId: string,
     datasetType?: string
   ): Promise<{ persistentId: string }> {
     return createDataset

src/sections/create-dataset/CreateDataset.tsx

@@ -41,14 +41,16 @@ export function CreateDataset({
   const { isModalOpen, hideModal } = useNotImplementedModal()
   const { setIsLoading } = useLoading()
   const [selectedTemplate, setSelectedTemplate] = useState<Template | null>(null)
-  const [selectedDatasetType, setSelectedDatasetType] = useState<DatasetType | null>(null)
+  const [selectedType, setSelectedType] = useState<DatasetType | null>(null)
 
   const { collection, isLoading: isLoadingCollection } = useCollection(
     collectionRepository,
     collectionId
   )
 
-  const { datasetTypes, isLoading: isLoadingDatasetTypes } = useGetAvailableDatasetTypes({ datasetRepository })
+  const { datasetTypes, isLoading: isLoadingDatasetTypes } = useGetAvailableDatasetTypes({
+    datasetRepository
+  })
 
   const { collectionUserPermissions, isLoading: isLoadingCollectionUserPermissions } =
     useGetCollectionUserPermissions({
@@ -77,9 +79,9 @@ export function CreateDataset({
   }
 
   const isLoadingData =
-    isLoadingCollectionUserPermissions || 
-    isLoadingCollection || 
-    isLoadingDatasetTemplates || 
+    isLoadingCollectionUserPermissions ||
+    isLoadingCollection ||
+    isLoadingDatasetTemplates ||
     isLoadingDatasetTypes
 
   useEffect(() => {
@@ -166,7 +168,7 @@ export function CreateDataset({
           datasetRepository={datasetRepository}
           metadataBlockInfoRepository={metadataBlockInfoRepository}
           datasetTemplate={selectedTemplate ?? undefined}
-          datasetTypeName={selectedType ? selectedType.name : undefined}          
+          datasetTypeName={selectedType ? selectedType.name : undefined}
           key={formKey}
         />
       </section>