feat: migrate two files to typescript (#908)

InseeFr · Sep 2, 2024 · 2ed8252 · 2ed8252
1 parent 5a7ac4b
commit 2ed8252
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/src/packages/model/Dataset.ts b/src/packages/model/Dataset.ts
@@ -1,39 +1,40 @@
 import { ValidationState } from '../components';
 
-export type CatalogRecord = {
-	created: string;
-	updated: string;
-	contributor: string;
-};
-
 export type Dataset = {
 	accessRights: string;
 	accrualPeriodicity: string;
 	confidentialityStatus: string;
 	id?: string;
-	issued?: string;
 	catalogRecord: CatalogRecord;
-	creators: string[];
-	publisher: string;
-	wasGeneratedIRIs: string[];
-	themes: string[];
+	validationState: ValidationState;
+	observationNumber: number;
+	timeSeriesNumber: number;
 	linkedDocuments: string[];
 	keywords: {
 		lg1: string[];
 		lg2: string[];
 	};
-	statisticalUnit: string[];
-	dataStructure: string;
 	temporalCoverageDataType: string;
 	temporalCoverageStartDate: string;
 	temporalCoverageEndDate: string;
-	type: string;
 	temporalResolution: string;
 	spacialCoverage: string;
 	spacialTemporal: string;
 	spacialResolutions: string[];
-	observationNumber: number;
-	timeSeriesNumber: number;
+	creators: string[];
+	publisher: string;
+	wasGeneratedIRIs: string[];
+	themes: string[];
+	statisticalUnit: string[];
+	dataStructure: string;
+	issued?: string;
+	type: string;
+};
+export type CatalogRecord = {
+	created: string;
+	updated: string;
+	contributor: string;
+	catalogRecord: CatalogRecord;
 	validationState: ValidationState;
 };
 export type Distribution = {

diff --git a/src/packages/model/theme.ts b/src/packages/model/theme.ts
@@ -0,0 +1,5 @@
+export type Theme = {
+	label: string;
+	idConceptScheme: string;
+	uri: string;
+};
diff --git a/src/packages/modules-datasets/datasets/useThemes.tsx b/src/packages/modules-datasets/datasets/useThemes.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from '@tanstack/react-query';
-import { ThemesApi } from '../..//sdk';
-import { Theme } from '../../model/Theme';
+import { ThemesApi } from '../../sdk';
 import { Options } from '../../model/SelectOption';
+import { Theme } from '../../model/Theme';
 
 export const useThemes = () =>
 	useQuery<Options>({

diff --git a/src/packages/modules-datasets/datasets/view/menu.tsx b/src/packages/modules-datasets/datasets/view/menu.tsx
@@ -36,7 +36,11 @@ export const ViewMenu = ({
 			<ReturnButton action={() => goBack('/datasets')} />
 
 			{(isAdmin || hasDatasetRightsBasedOnStamp) && (
-				<ValidationButton object={dataset} callback={onPublish} />
+				<ValidationButton
+					object={dataset}
+					callback={onPublish}
+					disabled={false}
+				/>
 			)}
 			{(isAdmin ||
 				(hasDatasetRightsBasedOnStamp &&