diff --git a/components/Breadcrumbs/BreadcrumbItem.vue b/components/Breadcrumbs/BreadcrumbItem.vue index 5ff96cbef..2e054e7e6 100644 --- a/components/Breadcrumbs/BreadcrumbItem.vue +++ b/components/Breadcrumbs/BreadcrumbItem.vue @@ -14,6 +14,7 @@ v-else class="fr-breadcrumb__link" :to + aria-current-value="false" > diff --git a/components/Explore/ExploreResourceView.vue b/components/Explore/ExploreResourceView.vue new file mode 100644 index 000000000..95c8c4ece --- /dev/null +++ b/components/Explore/ExploreResourceView.vue @@ -0,0 +1,217 @@ + + + diff --git a/datagouv-components/src/components/DatasetCard.vue b/datagouv-components/src/components/DatasetCard.vue index 2913102ba..7e539dd3e 100644 --- a/datagouv-components/src/components/DatasetCard.vue +++ b/datagouv-components/src/components/DatasetCard.vue @@ -106,10 +106,12 @@

- + + + diff --git a/datagouv-components/src/components/ResourceAccordion/DataStructure.vue b/datagouv-components/src/components/ResourceAccordion/DataStructure.vue index 827c7de32..967a3a4c8 100644 --- a/datagouv-components/src/components/ResourceAccordion/DataStructure.vue +++ b/datagouv-components/src/components/ResourceAccordion/DataStructure.vue @@ -49,45 +49,23 @@ diff --git a/datagouv-components/src/components/ResourceAccordion/Downloads.vue b/datagouv-components/src/components/ResourceAccordion/Downloads.vue new file mode 100644 index 000000000..0289155ef --- /dev/null +++ b/datagouv-components/src/components/ResourceAccordion/Downloads.vue @@ -0,0 +1,160 @@ + + + diff --git a/datagouv-components/src/components/ResourceAccordion/ResourceAccordion.vue b/datagouv-components/src/components/ResourceAccordion/ResourceAccordion.vue index 42c00ea19..468fb32f4 100644 --- a/datagouv-components/src/components/ResourceAccordion/ResourceAccordion.vue +++ b/datagouv-components/src/components/ResourceAccordion/ResourceAccordion.vue @@ -265,88 +265,10 @@
-
-
- {{ t("URL d'origine") }} -
-
- {{ t('Format original') }} -
-
- - - - - - - - - - - {{ t('Format {format}', { format: resource.format }) }} - {{ filesize(resourceFilesize) }} - - - -
- -
+
detectOgcService(props.resource)) const ogcWms = computed(() => ogcService.value === 'wms') -const generatedFormats = computed(() => { - const formats = GENERATED_FORMATS - .filter(format => `analysis:parsing:${format}_url` in props.resource.extras) - .map(format => ({ - url: props.resource.extras[`analysis:parsing:${format}_url`] as string, - size: props.resource.extras[`analysis:parsing:${format}_size`] as number | undefined, - format: format, - })) - if ('analysis:parsing:parsing_table' in props.resource.extras) { - formats.push({ - url: `${config.tabularApiUrl}/api/resources/${props.resource.id}/data/json/`, - size: undefined, - format: 'json', - }) - } - return formats -}) - const open = ref(props.expandedOnMount) const toggle = () => { open.value = !open.value @@ -540,7 +444,6 @@ const communityResource = computed(() => { const owner = computed(() => communityResource.value ? getOwnerName(communityResource.value) : null) const lastUpdate = props.resource.last_modified -const conversionsLastUpdate = computed(() => formatRelativeIfRecentDate(props.resource.extras['analysis:parsing:finished_at'] as string | undefined)) const availabilityChecked = props.resource.extras && 'check:available' in props.resource.extras const resourceFilesize = computed(() => getResourceFilesize(props.resource)) diff --git a/datagouv-components/src/components/ResourceExplorer/ResourceExplorer.vue b/datagouv-components/src/components/ResourceExplorer/ResourceExplorer.vue index b4cefabae..5e4417fd8 100644 --- a/datagouv-components/src/components/ResourceExplorer/ResourceExplorer.vue +++ b/datagouv-components/src/components/ResourceExplorer/ResourceExplorer.vue @@ -2,24 +2,13 @@
-
- - {{ t('Ressources ({count})', { count: dataset.resources.total }) }} - -
- - - - -
// Fetch resource by ID if specified in URL (for SSR) const initialResourceId = resourceIdQuery.value -const mobileSidebarOpen = ref(false) -const mobileSidebarDialog = ref(null) - -watch(mobileSidebarOpen, (open) => { - if (open) { - mobileSidebarDialog.value?.showModal() - } - else { - mobileSidebarDialog.value?.close() - } -}) - -function closeMobileSidebar() { - mobileSidebarOpen.value = false -} const { data: fetchedResource } = initialResourceId ? await useFetch(`/api/1/datasets/${props.dataset.id}/resources/${initialResourceId}/`) : { data: ref(null) } @@ -288,7 +242,6 @@ function updateSearch(newSearch: string) { const selectResource = (resource: Resource) => { selectedResource.value = resource - mobileSidebarOpen.value = false router.replace({ query: { ...router.currentRoute.value.query, resource_id: resource.id }, }) @@ -303,9 +256,3 @@ watch(flatResources, () => { } }) - - diff --git a/datagouv-components/src/components/ResourceExplorer/ResourceExplorerViewer.vue b/datagouv-components/src/components/ResourceExplorer/ResourceExplorerViewer.vue index 6f6f5f341..cd29bbdf8 100644 --- a/datagouv-components/src/components/ResourceExplorer/ResourceExplorerViewer.vue +++ b/datagouv-components/src/components/ResourceExplorer/ResourceExplorerViewer.vue @@ -2,7 +2,7 @@
-
+

{{ resource.title || t('Fichier sans nom') }}

+ - @@ -174,128 +180,10 @@
-
-
- {{ t("URL d'origine") }} -
-
- {{ t('Format original') }} -
-
- - - {{ resource.url }} - - - - - - - {{ t('Format {format}', { format: resource.format }) }} - {{ filesize(resourceFilesize) }} - - - -
- - -
+
@@ -318,7 +206,7 @@ diff --git a/datagouv-components/src/components/TabularExplorer/TabularExplorer.vue b/datagouv-components/src/components/TabularExplorer/TabularExplorer.vue index 93261c585..105d31766 100644 --- a/datagouv-components/src/components/TabularExplorer/TabularExplorer.vue +++ b/datagouv-components/src/components/TabularExplorer/TabularExplorer.vue @@ -1,164 +1,218 @@