Use APIv2 for datasets

components/Datasets/AdminUpdateDatasetPage.vue

@@ -73,7 +73,7 @@
 
 <script setup lang="ts">
 import { BrandedButton } from '@datagouv/components-next'
-import type { Dataset, Frequency, License } from '@datagouv/components-next'
+import type { DatasetV2, Frequency, License } from '@datagouv/components-next'
 import { RiArchiveLine, RiDeleteBin6Line } from '@remixicon/vue'
 import DescribeDataset from '~/components/Datasets/DescribeDataset.vue'
 import type { DatasetForm, EnrichedLicense, SpatialGranularity } from '~/types/types'
@@ -112,8 +112,8 @@ const licenses = computed(() => {
 })
 const { data: granularities } = await useAPI<Array<SpatialGranularity>>('/api/1/spatial/granularities/', { lazy: true })
 
-const url = computed(() => `/api/1/datasets/${route.params.id}`)
-const { data: dataset, refresh } = await useAPI<Dataset>(url)
+const url = computed(() => `/api/2/datasets/${route.params.id}`)
+const { data: dataset, refresh } = await useAPI<DatasetV2>(url)
 const datasetForm = ref<DatasetForm | null>(null)
 const harvested = ref(false)
 watchEffect(() => {

components/DatasetsSelect.vue

@@ -103,7 +103,7 @@ import SearchableSelect from '~/components/SearchableSelect.vue'
 import type { DatasetSuggest } from '~/types/types'
 
 const sortableRootRef = useTemplateRef('sortableRoot')
-const datasetsById = ref<Record<string, Dataset>>({})
+const datasetsById = ref<Record<string, Dataset | DatasetV2>>({})
 
 const selectedDatasetsSuggest = defineModel<Array<Dataset | DatasetV2 | DatasetSuggest>>({ required: true })
 const datasetUrl = ref('')
@@ -130,7 +130,7 @@ watchEffect(async () => {
       datasetsById.value[dataset.id] = dataset
     }
     else {
-      datasetsById.value[dataset.id] = await $api<Dataset>(`/api/1/datasets/${dataset.id}/`)
+      datasetsById.value[dataset.id] = await $api<Dataset>(`/api/2/datasets/${dataset.id}/`)
     }
   }
 })
@@ -149,7 +149,7 @@ const loadDatasetByLink = async () => {
   }
   const id = matches[1]
   try {
-    const dataset = await $api<Dataset>(`/api/1/datasets/${id}/`)
+    const dataset = await $api<DatasetV2>(`/api/2/datasets/${id}/`)
     if (selectedDatasetsSuggest.value.find(suggest => suggest.id === dataset.id)) {
       datasetUrlError.value = t('The dataset is already present in the list.')
       return

design-system/BannerNotif.vue

@@ -53,9 +53,9 @@
 </template>
 
 <script setup lang="ts">
-import { BrandedButton, type Dataset, type User } from '@datagouv/components-next'
+import { BrandedButton, type DatasetV2, type User } from '@datagouv/components-next'
 import { RiCheckLine, RiCloseLine, RiSendPlaneLine } from '@remixicon/vue'
 
 const { data: user } = await useAPI<User>(`/api/1/users/antonin-garrone`)
-const { data: dataset } = await useAPI<Dataset>(`/api/1/datasets/base-sirene-des-entreprises-et-de-leurs-etablissements-siren-siret`)
+const { data: dataset } = await useAPI<DatasetV2>(`/api/2/datasets/base-sirene-des-entreprises-et-de-leurs-etablissements-siren-siret`)
 </script>

pages/beta/admin/datasets/[id].vue

@@ -96,8 +96,7 @@
 </template>
 
 <script setup lang="ts">
-import { BrandedButton, DatasetQualityTooltipContent } from '@datagouv/components-next'
-import { DatasetQualityScore, summarize, type Dataset } from '@datagouv/components-next'
+import { BrandedButton, DatasetQualityTooltipContent, type DatasetV2, DatasetQualityScore, summarize } from '@datagouv/components-next'
 import { RiDownloadLine, RiEyeLine, RiInformationLine, RiLineChartLine, RiPriceTag3Line } from '@remixicon/vue'
 import AdminBreadcrumb from '~/components/Breadcrumbs/AdminBreadcrumb.vue'
 import BreadcrumbItem from '~/components/Breadcrumbs/BreadcrumbItem.vue'
@@ -108,7 +107,7 @@ const { t } = useI18n()
 const { currentOrganization } = useCurrentOwned()
 
 const route = useRoute()
-const url = computed(() => `/api/1/datasets/${route.params.id}`)
-const { data: dataset } = await useAPI<Dataset>(url)
+const url = computed(() => `/api/2/datasets/${route.params.id}`)
+const { data: dataset } = await useAPI<DatasetV2>(url)
 watchEffect(() => console.log(dataset.value))
 </script>

pages/beta/admin/datasets/[id]/discussions.vue

@@ -3,10 +3,10 @@
 </template>
 
 <script setup lang="ts">
-import type { Dataset } from '@datagouv/components-next'
+import type { DatasetV2 } from '@datagouv/components-next'
 import DiscussionsPage from '~/components/Discussions/DiscussionsPage.vue'
 
 defineProps<{
-  dataset: Dataset
+  dataset: DatasetV2
 }>()
 </script>

pages/beta/admin/datasets/[id]/files.vue

@@ -3,10 +3,10 @@
 </template>
 
 <script setup lang="ts">
-import type { Dataset } from '@datagouv/components-next'
+import type { DatasetV2 } from '@datagouv/components-next'
 import AdminDatasetResourcesPage from '~/components/Datasets/AdminDatasetResourcesPage.vue'
 
 defineProps<{
-  dataset: Dataset
+  dataset: DatasetV2
 }>()
 </script>

pages/beta/admin/datasets/[id]/index.vue

@@ -3,10 +3,10 @@
 </template>
 
 <script setup lang="ts">
-import type { Dataset } from '@datagouv/components-next'
+import type { DatasetV2 } from '@datagouv/components-next'
 import AdminUpdateDatasetPage from '~/components/Datasets/AdminUpdateDatasetPage.vue'
 
 defineProps<{
-  dataset: Dataset
+  dataset: DatasetV2
 }>()
 </script>

pages/design.vue

@@ -110,7 +110,7 @@
 </template>
 
 <script setup lang="ts">
-import { DatasetCard, DatasetQuality, ReadMore, ResourceAccordion, SimpleBanner, type Dataset } from '@datagouv/components-next'
+import { DatasetCard, DatasetQuality, ReadMore, ResourceAccordion, SimpleBanner, type DatasetV2 } from '@datagouv/components-next'
 import DatasetSearchPage from '~/components/Datasets/SearchPage.vue'
 import AdminBadge from '~/design-system/AdminBadge.vue'
 import BannerAction from '~/design-system/BannerAction.vue'
@@ -120,5 +120,5 @@ import BrandedButton from '~/design-system/BrandedButton.vue'
 import OrganizationNameWithCertificate from '~/design-system/OrganizationNameWithCertificate.vue'
 import SearchInput from '~/design-system/SearchInput.vue'
 
-const { data: dataset } = await useAPI<Dataset>('/api/1/datasets/repertoire-national-des-elus-1')
+const { data: dataset } = await useAPI<DatasetV2>('/api/2/datasets/repertoire-national-des-elus-1')
 </script>

types/discussions.ts

@@ -1,4 +1,4 @@
-import type { Dataservice, Dataset, Reuse, User } from '@datagouv/components-next'
+import type { Dataservice, Dataset, DatasetV2, Reuse, User } from '@datagouv/components-next'
 import type { Post } from './posts'
 
 export type DiscussionSortedBy = 'title' | 'created' | 'closed'
@@ -16,7 +16,7 @@ export type Comment = { content: string, posted_by: User, posted_on: string, spa
 
 export type Discussion = Array<Comment>
 
-export type DiscussionSubjectTypes = Dataservice | Dataset | Reuse | Post
+export type DiscussionSubjectTypes = Dataservice | Dataset | DatasetV2 | Reuse | Post
 
 export type DiscussionSubject = {
   class: 'Dataservice' | 'Dataset' | 'Reuse' | 'Post' | 'Topic' | 'Organization'

utils/datasets.ts

@@ -36,7 +36,7 @@ export function getDatasetAdminUrl(dataset: Dataset | DatasetV2): string {
   return `/beta/admin/datasets/${dataset.id}`
 }
 
-export function toForm(dataset: Dataset, licenses: Array<License>, frequencies: Array<Frequency>, zones: Array<SpatialZone>, granularities: Array<SpatialGranularity>): DatasetForm {
+export function toForm(dataset: Dataset | DatasetV2, licenses: Array<License>, frequencies: Array<Frequency>, zones: Array<SpatialZone>, granularities: Array<SpatialGranularity>): DatasetForm {
   return {
     owned: dataset.organization ? { organization: dataset.organization, owner: null } : { owner: dataset.owner, organization: null },
     title: dataset.title,

utils/discussions.ts

@@ -1,4 +1,4 @@
-import type { Dataservice, Dataset, Reuse } from '@datagouv/components-next'
+import type { Dataservice, DatasetV2, Reuse } from '@datagouv/components-next'
 import { RiArticleLine, RiDatabase2Line, RiLineChartLine, RiTerminalLine } from '@remixicon/vue'
 import type { $Fetch } from 'ofetch'
 import type { DiscussionSubject, DiscussionSubjectTypes } from '~/types/discussions'
@@ -8,7 +8,7 @@ export async function getSubject(api: $Fetch, subject: DiscussionSubject): Promi
     case 'Dataservice':
       return await api<Dataservice>(`/api/1/dataservices/${subject.id}`)
     case 'Dataset':
-      return await api<Dataset>(`/api/1/datasets/${subject.id}`)
+      return await api<DatasetV2>(`/api/2/datasets/${subject.id}`)
     case 'Reuse':
       return await api<Reuse>(`/api/1/reuses/${subject.id}`)
     default: