@datagouv/components-next 0.2.0 → 1.0.0

package/src/components/ResourceAccordion/ResourceAccordion.vue

@@ -9,7 +9,7 @@
     >
       <div>
         <div class="flex items-center fr-mb-1v">
-          <h4
+          <h3
             :id="resourceTitleId"
             class="fr-m-0"
           >
@@ -43,7 +43,7 @@
               /></span>
               <span class="absolute inset-0 z-1" />
             </button>
-          </h4>
+          </h3>
           <CopyButton
             :label="t('Copier le lien')"
             :copied-label="t('Lien copié !')"
@@ -51,22 +51,33 @@
             class="z-2"
           />
         </div>
-        <div class="text-gray-medium subheaders-infos">
+        <div class="text-gray-medium subheaders-infos flex items-center gap-1">
           <SchemaBadge
             :resource
-            class="dash-after"
           />
-          <span class="fr-text--xs fr-mb-0 dash-after">{{ t('Mis à jour {date}', { date: formatRelativeIfRecentDate(lastUpdate) }) }}</span>
-          <span
-            v-if="resource.format"
-            class="fr-text--xs fr-mb-0 dash-after"
-          >
-            <span class="hidden show-on-small">{{ t("Format") }}</span>
-            {{ resource.format.trim().toLowerCase() }}
-            <span v-if="resourceFilesize">({{ filesize(resourceFilesize) }})</span>
-          </span>
+          <RiSubtractLine
+            v-if="resource.schema"
+            aria-hidden="true"
+            class="size-3 fill-gray-medium"
+          />
+          <span class="text-xs mb-0">{{ t('Mis à jour {date}', { date: formatRelativeIfRecentDate(lastUpdate) }) }}</span>
+          <RiSubtractLine
+            aria-hidden="true"
+            class="size-3 fill-gray-medium"
+          />
+          <template v-if="resource.format">
+            <span class="text-xs mb-0">
+              <span class="hidden sm:inline">{{ t("Format") }}</span>
+              {{ resource.format.trim().toLowerCase() }}
+              <span v-if="resourceFilesize">({{ filesize(resourceFilesize) }})</span>
+            </span>
+            <RiSubtractLine
+              aria-hidden="true"
+              class="size-3 fill-gray-medium"
+            />
+          </template>
           <span
-            class="inline-flex items-center fr-text--xs fr-mb-0"
+            class="inline-flex items-center text-xs mb-0"
             :aria-label="t('{n} téléchargements', resource.metrics.views)"
           >
             <span class="fr-icon-download-line fr-icon--xs fr-mr-1v" />
@@ -132,14 +143,15 @@
             rel="ugc nofollow noopener"
             :title="downloadButtonTitle"
             download
-            class="relative text-transform-uppercase matomo_download z-2"
+            class="relative matomo_download z-2"
             :icon="unavailable ? RiFileWarningLine : RiDownloadLine"
             size="xs"
+            color="secondary"
             :aria-describedby="resourceTitleId"
             external
             @click="trackEvent('Jeux de données', 'Télécharger un fichier', 'Bouton : télécharger un fichier')"
           >
-            <span class="sr-only">{{ t('Télécharger le fichier au format ') }}</span>{{ format }}
+            {{ t('Télécharger') }}
           </BrandedButton>
         </p>
         <p
@@ -358,7 +370,7 @@
 
 <script setup lang="ts">
 import { ref, computed, defineAsyncComponent } from 'vue'
-import { RiDownloadLine, RiFileCopyLine, RiFileWarningLine } from '@remixicon/vue'
+import { RiDownloadLine, RiFileCopyLine, RiFileWarningLine, RiSubtractLine } from '@remixicon/vue'
 import OrganizationNameWithCertificate from '../OrganizationNameWithCertificate.vue'
 import { filesize, summarize } from '../../functions/helpers'
 import { useFormatDate } from '../../functions/dates'
@@ -595,9 +607,7 @@ article {
   article header .subheaders-infos .hidden.show-on-small {
     display: inline !important;
   }
-  article header .dash-after::after {
-    content: ''
-  } */
+ */
 
   /* article .fr-pl-4v fr-pr-4v {
     padding: 0.75rem !important;

package/src/components/ResourceAccordion/ResourceIcon.vue

@@ -2,6 +2,7 @@
   <component
     :is="(resource.format ? getResourceFormatIcon(resource.format) : null) || File"
     class="text-gray-800 shrink-0"
+    aria-hidden="true"
   />
 </template>
 

package/src/components/ResourceAccordion/SchemaBadge.vue

@@ -9,12 +9,12 @@
     >
       <RiInformationLine class="size-4" />
       <template #toggletip="{ close }">
-        <div class="flex justify-between border-bottom">
+        <div class="flex justify-between border-b">
           <h5 class="fr-text--sm fr-my-0 fr-p-2v">{{ t("Schéma de données") }}</h5>
           <button
             type="button"
             :title="t('Fermer')"
-            class="border-left close-button flex items-center justify-center"
+            class="border-l close-button flex items-center justify-center"
             @click="close"
           >&times;</button>
         </div>

package/src/components/ResourceExplorer/ResourceExplorer.vue

@@ -0,0 +1,243 @@
+<template>
+  <div v-if="allResources.length || hasAnyResources">
+    <div class="flex gap-6">
+      <div class="flex-1 min-w-0">
+        <ResourceExplorerViewer
+          v-if="selectedResource && allResources.length"
+          :key="selectedResource.id"
+          :dataset
+          :resource="selectedResource"
+        />
+        <div
+          v-else-if="search"
+          class="flex flex-col items-center py-12"
+        >
+          <slot name="no-results-image">
+            <img
+              :src="noResultsImage"
+              class="h-20"
+              alt=""
+            >
+          </slot>
+          <p class="fr-text--bold fr-my-3v">
+            {{ t('Pas de résultats pour « {q} »', { q: search }) }}
+          </p>
+          <BrandedButton
+            color="primary"
+            @click="updateSearch('')"
+          >
+            {{ t('Réinitialiser la recherche') }}
+          </BrandedButton>
+        </div>
+      </div>
+      <ResourceExplorerSidebar
+        :resources="allResources"
+        :selected-resource-id="selectedResource?.id ?? null"
+        :collapsed="sidebarCollapsed"
+        :search
+        @select="selectResource"
+        @load-more="loadMore"
+        @update:collapsed="sidebarCollapsed = $event"
+        @update:search="updateSearch($event)"
+      />
+    </div>
+  </div>
+  <div
+    v-else
+    class="flex flex-col items-center py-12"
+  >
+    <slot name="empty-image">
+      <img
+        :src="noResultsImage"
+        class="h-20"
+        alt=""
+      >
+    </slot>
+    <p class="fr-text--bold fr-my-3v">
+      {{ t('Ce jeu de données ne contient aucune ressource.') }}
+    </p>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch, type Ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { useRouteQuery } from '@vueuse/router'
+import { useComponentsConfig } from '../../config'
+import { useTranslation } from '../../composables/useTranslation'
+import { useDebouncedRef } from '../../composables/useDebouncedRef'
+import { useFetch } from '../../functions/api'
+import { RESOURCE_TYPE } from '../../functions/resources'
+import type { PaginatedArray } from '../../types/api'
+import type { DatasetV2 } from '../../types/datasets'
+import type { Resource, ResourceGroup, ResourceType } from '../../types/resources'
+import ResourceExplorerSidebar from './ResourceExplorerSidebar.vue'
+import ResourceExplorerViewer from './ResourceExplorerViewer.vue'
+import BrandedButton from '../BrandedButton.vue'
+
+const props = withDefaults(defineProps<{
+  dataset: DatasetV2
+  noResultsImage?: string
+}>(), {
+  noResultsImage: '',
+})
+
+const { t } = useTranslation()
+const router = useRouter()
+const config = useComponentsConfig()
+
+const sidebarCollapsed = ref(false)
+const search = ref('')
+const { debounced: searchDebounced, flush } = useDebouncedRef(search, config.searchDebounce ?? 300)
+
+const PAGE_SIZE = 10
+const url = computed(() => `/api/2/datasets/${props.dataset.id}/resources/`)
+
+// Resource ID from URL query
+const resourceIdQuery = useRouteQuery<string | undefined>('resource_id')
+
+// Fetch resources for each type
+const mainParams = computed(() => ({
+  type: 'main' as const,
+  page_size: PAGE_SIZE,
+  q: searchDebounced.value || undefined,
+}))
+const documentationParams = computed(() => ({
+  type: 'documentation' as const,
+  page_size: PAGE_SIZE,
+  q: searchDebounced.value || undefined,
+}))
+const updateParams = computed(() => ({
+  type: 'update' as const,
+  page_size: PAGE_SIZE,
+  q: searchDebounced.value || undefined,
+}))
+const apiParams = computed(() => ({
+  type: 'api' as const,
+  page_size: PAGE_SIZE,
+  q: searchDebounced.value || undefined,
+}))
+const codeParams = computed(() => ({
+  type: 'code' as const,
+  page_size: PAGE_SIZE,
+  q: searchDebounced.value || undefined,
+}))
+const otherParams = computed(() => ({
+  type: 'other' as const,
+  page_size: PAGE_SIZE,
+  q: searchDebounced.value || undefined,
+}))
+
+const { data: mainData, status: mainStatus } = await useFetch<PaginatedArray<Resource>>(url, { params: mainParams })
+const { data: documentationData, status: documentationStatus } = await useFetch<PaginatedArray<Resource>>(url, { params: documentationParams, server: false })
+const { data: updateData, status: updateStatus } = await useFetch<PaginatedArray<Resource>>(url, { params: updateParams, server: false })
+const { data: apiData, status: apiStatus } = await useFetch<PaginatedArray<Resource>>(url, { params: apiParams, server: false })
+const { data: codeData, status: codeStatus } = await useFetch<PaginatedArray<Resource>>(url, { params: codeParams, server: false })
+const { data: otherData, status: otherStatus } = await useFetch<PaginatedArray<Resource>>(url, { params: otherParams, server: false })
+
+const rawResourcesByTypes = [
+  { data: mainData, status: mainStatus },
+  { data: documentationData, status: documentationStatus },
+  { data: updateData, status: updateStatus },
+  { data: apiData, status: apiStatus },
+  { data: codeData, status: codeStatus },
+  { data: otherData, status: otherStatus },
+]
+
+// Evaluated once at setup (before any search) — never changes afterwards
+const hasAnyResources = computed(() => {
+  return props.dataset.resources.total > 0
+})
+
+const extraResourcesByType: Ref<Resource[]>[] = RESOURCE_TYPE.map(() => ref<Resource[]>([]))
+const pageByType: Ref<number>[] = RESOURCE_TYPE.map(() => ref(1))
+
+watch(searchDebounced, () => {
+  for (let i = 0; i < RESOURCE_TYPE.length; i++) {
+    extraResourcesByType[i]!.value = []
+    pageByType[i]!.value = 1
+  }
+})
+
+const loadMore = async (type: ResourceType) => {
+  const index = RESOURCE_TYPE.indexOf(type)
+  if (index === -1) return
+  const pageRef = pageByType[index]!
+  const extraRef = extraResourcesByType[index]!
+  pageRef.value++
+
+  const { data } = await useFetch<PaginatedArray<Resource>>(url, {
+    params: {
+      type,
+      page_size: PAGE_SIZE,
+      page: pageRef.value,
+      q: searchDebounced.value || undefined,
+    },
+  })
+
+  if (data.value) {
+    extraRef.value = [...extraRef.value, ...data.value.data]
+  }
+}
+
+const allResources = computed<ResourceGroup[]>(() => {
+  return RESOURCE_TYPE
+    .map((type, index) => {
+      const rawData = rawResourcesByTypes[index]!
+      const extraData = extraResourcesByType[index]!
+      return {
+        type: type as ResourceType,
+        total: rawData.data.value?.total ?? 0,
+        items: [...(rawData.data.value?.data ?? []), ...extraData.value],
+      }
+    })
+    .filter(group => group.items.length > 0)
+})
+
+const flatResources = computed(() =>
+  allResources.value.flatMap(g => g.items),
+)
+
+// Fetch resource by ID if specified in URL (for SSR)
+const initialResourceId = resourceIdQuery.value
+const { data: fetchedResource } = initialResourceId
+  ? await useFetch<Resource>(`/api/1/datasets/${props.dataset.id}/resources/${initialResourceId}/`)
+  : { data: ref(null) }
+
+// Initial selection (synchronous for SSR hydration)
+function getInitialResource(): Resource | null {
+  const resourceId = resourceIdQuery.value
+  if (resourceId) {
+    // First check in already loaded resources
+    const existing = flatResources.value.find(r => r.id === resourceId)
+    if (existing) return existing
+    // Use fetched resource if available
+    if (fetchedResource.value) return fetchedResource.value
+  }
+  // Default to first resource
+  return flatResources.value[0] ?? null
+}
+
+const selectedResource = ref<Resource | null>(getInitialResource())
+
+function updateSearch(newSearch: string) {
+  search.value = newSearch
+  flush()
+}
+
+const selectResource = (resource: Resource) => {
+  selectedResource.value = resource
+  router.replace({
+    query: { ...router.currentRoute.value.query, resource_id: resource.id },
+  })
+}
+
+// Update selection when resources change (e.g., after client-side fetch completes)
+watch(flatResources, () => {
+  if (selectedResource.value) return
+  const firstResource = flatResources.value[0]
+  if (firstResource) {
+    selectedResource.value = firstResource
+  }
+})
+</script>

package/src/components/ResourceExplorer/ResourceExplorerSidebar.vue

@@ -0,0 +1,116 @@
+<template>
+  <aside
+    v-if="!collapsed"
+    class="w-72 shrink-0 pl-4"
+  >
+    <div class="flex items-center justify-between mb-3">
+      <h3 class="text-sm font-bold uppercase mb-0">
+        {{ t('Ressources') }}
+      </h3>
+      <button
+        type="button"
+        :title="t('Masquer le panneau')"
+        class="p-1 hover:bg-gray-100 rounded"
+        @click="$emit('update:collapsed', true)"
+      >
+        <RiArrowRightSLine class="size-5" />
+      </button>
+    </div>
+
+    <div class="mb-3">
+      <label
+        :for="searchId"
+        class="sr-only"
+      >{{ t('Rechercher') }}</label>
+      <input
+        :id="searchId"
+        :value="search"
+        type="search"
+        class="w-full border border-gray-default rounded px-2.5 py-1.5 text-sm"
+        :placeholder="t('Rechercher')"
+        @input="$emit('update:search', ($event.target as HTMLInputElement).value)"
+      >
+    </div>
+
+    <div class="space-y-4 overflow-y-auto">
+      <div
+        v-for="group in resources"
+        :key="group.type"
+      >
+        <div class="text-xs text-gray-plain font-bold uppercase mb-1.5 border-b border-gray-default pb-1">
+          {{ getResourceLabel(group.type, group.total) }}
+        </div>
+        <ul class="list-none p-0 m-0 space-y-0.5">
+          <li
+            v-for="resource in group.items"
+            :key="resource.id"
+          >
+            <button
+              type="button"
+              class="w-full text-left px-2 py-1.5 rounded text-sm flex items-center gap-1.5 hover:bg-gray-100"
+              :class="{
+                'font-bold bg-blue-50': resource.id === selectedResourceId,
+              }"
+              @click="$emit('select', resource)"
+            >
+              <ResourceIcon
+                :resource
+                class="size-3.5 shrink-0"
+              />
+              <span class="truncate">{{ resource.title || t('Fichier sans nom') }}</span>
+            </button>
+          </li>
+        </ul>
+        <button
+          v-if="group.items.length < group.total"
+          type="button"
+          class="w-full text-left px-2 py-1.5 text-sm text-blue-default hover:underline"
+          @click="$emit('load-more', group.type)"
+        >
+          {{ t('Charger plus…') }}
+        </button>
+      </div>
+    </div>
+  </aside>
+
+  <div
+    v-else
+    class="shrink-0 flex items-start pt-1"
+  >
+    <button
+      type="button"
+      :title="t('Afficher le panneau des ressources')"
+      class="p-1 hover:bg-gray-100 rounded border border-gray-default"
+      @click="$emit('update:collapsed', false)"
+    >
+      <RiArrowLeftSLine class="size-5" />
+    </button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useId } from 'vue'
+import { RiArrowRightSLine, RiArrowLeftSLine } from '@remixicon/vue'
+import ResourceIcon from '../ResourceAccordion/ResourceIcon.vue'
+import { getResourceLabel } from '../../functions/resources'
+import { useTranslation } from '../../composables/useTranslation'
+import type { Resource, ResourceGroup, ResourceType } from '../../types/resources'
+
+const { t } = useTranslation()
+
+defineProps<{
+  resources: ResourceGroup[]
+  selectedResourceId: string | null
+  collapsed: boolean
+  search: string
+}>()
+
+defineEmits<{
+  'select': [resource: Resource]
+  'load-more': [type: ResourceType]
+  'update:collapsed': [value: boolean]
+  'update:search': [value: string]
+}>()
+
+const searchId = useId()
+</script>