@datagouv/components-next 1.0.2-dev.7 → 1.0.2-dev.71

package/src/components/ResourceExplorer/ResourceExplorer.vue

@@ -2,6 +2,19 @@
   <div v-if="allResources.length || hasAnyResources">
     <div class="flex gap-6">
       <div class="flex-1 min-w-0">
+        <div
+          v-if="dataset.resources.total > 1"
+          class="md:hidden flex justify-end mb-3"
+        >
+          <BrandedButton
+            size="xs"
+            color="secondary"
+            :icon="RiListUnordered"
+            @click="mobileSidebarOpen = true"
+          >
+            {{ t('Ressources ({count})', { count: dataset.resources.total }) }}
+          </BrandedButton>
+        </div>
         <ResourceExplorerViewer
           v-if="selectedResource && allResources.length"
           :key="selectedResource.id"
@@ -30,17 +43,38 @@
           </BrandedButton>
         </div>
       </div>
+      <div class="hidden md:block">
+        <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>
+
+    <!-- Mobile sidebar panel -->
+    <dialog
+      ref="mobileSidebarDialog"
+      class="mobile-sidebar md:hidden fixed inset-0 m-0 ml-auto p-0 h-dvh max-h-dvh w-80 max-w-[85vw] bg-white shadow-lg overflow-y-auto overscroll-contain backdrop:bg-black/30"
+      @close="mobileSidebarOpen = false"
+      @click.self="closeMobileSidebar"
+    >
       <ResourceExplorerSidebar
         :resources="allResources"
         :selected-resource-id="selectedResource?.id ?? null"
-        :collapsed="sidebarCollapsed"
+        :collapsed="false"
         :search
         @select="selectResource"
         @load-more="loadMore"
-        @update:collapsed="sidebarCollapsed = $event"
+        @update:collapsed="closeMobileSidebar"
         @update:search="updateSearch($event)"
       />
-    </div>
+    </dialog>
   </div>
   <div
     v-else
@@ -73,6 +107,7 @@ 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 { RiListUnordered } from '@remixicon/vue'
 import BrandedButton from '../BrandedButton.vue'
 
 const props = withDefaults(defineProps<{
@@ -159,6 +194,22 @@ watch(searchDebounced, () => {
   }
 })
 
+// Separate useFetch for loadMore, initialized at setup time with immediate: false
+// so that it doesn't fetch until execute() is called from the event handler.
+const loadMoreType = ref<ResourceType>('main')
+const loadMorePage = ref(1)
+const loadMoreParams = computed(() => ({
+  type: loadMoreType.value,
+  page_size: PAGE_SIZE,
+  page: loadMorePage.value,
+  q: searchDebounced.value || undefined,
+}))
+const { data: loadMoreData, execute: executeLoadMore } = await useFetch<PaginatedArray<Resource>>(url, {
+  params: loadMoreParams,
+  immediate: false,
+  watch: false,
+})
+
 const loadMore = async (type: ResourceType) => {
   const index = RESOURCE_TYPE.indexOf(type)
   if (index === -1) return
@@ -166,17 +217,12 @@ const loadMore = async (type: ResourceType) => {
   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,
-    },
-  })
+  loadMoreType.value = type
+  loadMorePage.value = pageRef.value
+  await executeLoadMore()
 
-  if (data.value) {
-    extraRef.value = [...extraRef.value, ...data.value.data]
+  if (loadMoreData.value) {
+    extraRef.value = [...extraRef.value, ...loadMoreData.value.data]
   }
 }
 
@@ -200,6 +246,21 @@ const flatResources = computed(() =>
 
 // Fetch resource by ID if specified in URL (for SSR)
 const initialResourceId = resourceIdQuery.value
+const mobileSidebarOpen = ref(false)
+const mobileSidebarDialog = ref<HTMLDialogElement | null>(null)
+
+watch(mobileSidebarOpen, (open) => {
+  if (open) {
+    mobileSidebarDialog.value?.showModal()
+  }
+  else {
+    mobileSidebarDialog.value?.close()
+  }
+})
+
+function closeMobileSidebar() {
+  mobileSidebarOpen.value = false
+}
 const { data: fetchedResource } = initialResourceId
   ? await useFetch<Resource>(`/api/1/datasets/${props.dataset.id}/resources/${initialResourceId}/`)
   : { data: ref(null) }
@@ -227,6 +288,7 @@ 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 },
   })
@@ -241,3 +303,9 @@ watch(flatResources, () => {
   }
 })
 </script>
+
+<style>
+html:has(dialog.mobile-sidebar[open]) {
+  overflow: hidden;
+}
+</style>

package/src/components/ResourceExplorer/ResourceExplorerSidebar.vue

@@ -1,7 +1,7 @@
 <template>
   <aside
     v-if="!collapsed"
-    class="w-72 shrink-0 pl-4"
+    class="w-full md:w-72 shrink-0 p-4 md:pr-0"
   >
     <div class="flex items-center justify-between mb-3">
       <h3 class="text-sm font-bold uppercase mb-0">
@@ -32,7 +32,7 @@
       >
     </div>
 
-    <div class="space-y-4 overflow-y-auto">
+    <div class="space-y-4 overflow-y-auto md:max-h-[calc(100vh-14rem)]">
       <div
         v-for="group in resources"
         :key="group.type"

package/src/components/ResourceExplorer/ResourceExplorerViewer.vue

@@ -6,7 +6,7 @@
           <h3 class="m-0 flex items-baseline text-base font-bold leading-tight">
             <ResourceIcon
               :resource
-              class="size-3.5 mr-1"
+              class="size-3.5 mr-1 shrink-0 translate-y-px"
             />
             <span class="line-clamp-2">{{ resource.title || t('Fichier sans nom') }}</span>
           </h3>
@@ -14,9 +14,16 @@
             :label="t('Copier le lien')"
             :copied-label="t('Lien copié !')"
             :text="resourceExternalUrl"
+            class="hidden md:inline-flex"
           />
         </div>
-        <div class="text-gray-medium text-xs flex items-center gap-1">
+        <div class="text-gray-medium text-xs flex items-center gap-1 flex-wrap">
+          <SchemaBadge :resource />
+          <RiSubtractLine
+            v-if="resource.schema?.name || resource.schema?.url"
+            aria-hidden="true"
+            class="size-3 fill-gray-medium"
+          />
           <span>{{ t('mis à jour {date}', { date: formatRelativeIfRecentDate(resource.last_modified) }) }}</span>
           <RiSubtractLine
             aria-hidden="true"
@@ -128,14 +135,28 @@
                 :resource="resource"
                 :dataset="dataset"
               />
-              <SwaggerClient
+              <OpenApiViewer
                 v-else-if="hasOpenAPIPreview"
                 :url="resource.extras['apidocUrl'] as string"
               />
               <Preview
-                v-else
+                v-else-if="hasTabularData"
                 :resource="resource"
               />
+              <PreviewUnavailable v-else>
+                <!-- "File too large to download" is the only analysis:error value from hydra for now -->
+                <template v-if="resource.extras['analysis:error'] === 'File too large to download'">
+                  {{ t("Ce fichier est trop volumineux pour être analysé et prévisualisé. Téléchargez-le depuis l'onglet Téléchargements.") }}
+                </template>
+                <template v-else-if="resource.extras['analysis:parsing:error']">
+                  {{ t("L'analyse de ce fichier a rencontré une erreur, l'aperçu n'est pas disponible. Téléchargez-le depuis l'onglet Téléchargements.") }}
+                  <br>
+                  <span class="text-gray-medium text-xs">{{ resource.extras['analysis:parsing:error'] }}</span>
+                </template>
+                <template v-else>
+                  {{ t("Ce fichier ne peut pas être prévisualisé. Téléchargez-le depuis l'onglet Téléchargements.") }}
+                </template>
+              </PreviewUnavailable>
             </div>
             <div v-if="tab.key === 'description'">
               <MarkdownViewer
@@ -283,7 +304,7 @@
                 <p>{{ t("- Si le fichier est supprimé, l'API sera également supprimée.") }}</p>
                 <p>{{ t("Pour des usages pérennes, prévoyez que cette API dépend directement du fichier source.") }}</p>
               </div>
-              <Swagger
+              <OpenApiViewer
                 v-if="hasTabularData"
                 :url="`${config.tabularApiUrl}/api/resources/${resource.id}/swagger/`"
               />
@@ -298,12 +319,13 @@
 <script setup lang="ts">
 import { computed, defineAsyncComponent } from 'vue'
 import { RiDownloadLine, RiFileCopyLine, RiFileWarningLine, RiInformationLine, RiSubtractLine } from '@remixicon/vue'
+import PreviewUnavailable from '../ResourceAccordion/PreviewUnavailable.vue'
 import { toast } from 'vue-sonner'
 import BrandedButton from '../BrandedButton.vue'
 import CopyButton from '../CopyButton.vue'
 import MarkdownViewer from '../MarkdownViewer.vue'
 import ResourceIcon from '../ResourceAccordion/ResourceIcon.vue'
-import Swagger from '../ResourceAccordion/Swagger.client.vue'
+import OpenApiViewer from '../OpenApiViewer/OpenApiViewer.vue'
 import TabGroup from '../Tabs/TabGroup.vue'
 import TabList from '../Tabs/TabList.vue'
 import Tab from '../Tabs/Tab.vue'
@@ -313,9 +335,9 @@ import Tooltip from '../Tooltip.vue'
 import Preview from '../ResourceAccordion/Preview.vue'
 import DataStructure from '../ResourceAccordion/DataStructure.vue'
 import Metadata from '../ResourceAccordion/Metadata.vue'
+import SchemaBadge from '../ResourceAccordion/SchemaBadge.vue'
 import { filesize, summarize } from '../../functions/helpers'
-import { getResourceFormatIcon } from '../../functions/resources'
-import { getResourceExternalUrl, getResourceFilesize } from '../../functions/datasets'
+import { getResourceFormatIcon, getResourceExternalUrl, getResourceFilesize } from '../../functions/resources'
 import { trackEvent } from '../../functions/matomo'
 import { useComponentsConfig } from '../../config'
 import { useFormatDate } from '../../functions/dates'
@@ -342,9 +364,6 @@ const MapContainer = defineAsyncComponent(() =>
 const Pmtiles = defineAsyncComponent(() =>
   import('../ResourceAccordion/Pmtiles.client.vue'),
 )
-const SwaggerClient = defineAsyncComponent(() =>
-  import('../ResourceAccordion/Swagger.client.vue'),
-)
 
 const props = defineProps<{
   dataset: Dataset | DatasetV2