@datagouv/components-next 1.0.2-dev.221 → 1.0.2-dev.222

package/dist/{vue3-xml-viewer.common-C1QomD0e.js → vue3-xml-viewer.common-Dux7EzjM.js}

@@ -1,4 +1,4 @@
-import { g as Ke } from "./main-HU94LBny.js";
+import { g as Ke } from "./main-DAxkqaSe.js";
 import We from "vue";
 function Fe(I, K) {
   for (var V = 0; V < K.length; V++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datagouv/components-next",
-  "version": "1.0.2-dev.221",
+  "version": "1.0.2-dev.222",
   "private": false,
   "type": "module",
   "engines": {

package/src/components/ResourceAccordion/EditButton.vue

@@ -4,7 +4,8 @@
     icon-only
     :icon="RiPencilLine"
     color="warning"
-    :title="t('Éditer le fichier')"
+    :disabled="!!disabledReason"
+    :title="disabledReason ?? t('Éditer le fichier')"
     data-testid="edit-button"
   />
 </template>
@@ -19,10 +20,12 @@ type Props = {
   datasetId: string
   isCommunityResource?: boolean
   resourceId: string
+  disabledReason?: string | null
 }
 
 const props = withDefaults(defineProps<Props>(), {
   isCommunityResource: false,
+  disabledReason: null,
 })
 
 const { t } = useTranslation()

package/src/components/ResourceAccordion/ResourceAccordion.vue

@@ -173,6 +173,7 @@
             :dataset-id="dataset.id"
             :resource-id="resource.id"
             :is-community-resource="isCommunityResource"
+            :disabled-reason="editDisabledReason"
             size="xs"
           />
         </p>
@@ -327,7 +328,7 @@ import { trackEvent } from '../../functions/matomo'
 import CopyButton from '../CopyButton.vue'
 import { useComponentsConfig } from '../../config'
 import { getOwnerName } from '../../functions/owned'
-import { getResourceFormatIcon, getResourceTitleId, detectOgcService, getResourceFilesize, isImagePreviewFormat, resolveResourceExternalUrl } from '../../functions/resources'
+import { getResourceFormatIcon, getResourceTitleId, detectOgcService, getResourceFilesize, isGeopfSynced, isImagePreviewFormat, resolveResourceExternalUrl } from '../../functions/resources'
 import BrandedButton from '../BrandedButton.vue'
 import { useTranslation } from '../../composables/useTranslation'
 import { useHasTabularData } from '../../composables/useHasTabularData'
@@ -384,6 +385,10 @@ const hasPmtiles = computed(() => {
   return props.resource.extras['analysis:parsing:pmtiles_url'] || props.resource.format === 'pmtiles'
 })
 
+const editDisabledReason = computed(() => {
+  return isGeopfSynced(props.resource) ? t('Vous ne pouvez pas modifier cette ressource car elle est synchronisée avec cartes.gouv.fr') : null
+})
+
 const hasDatafairPreview = computed(() => {
   // Checks if there are the corresponding extras for a datafair preview.
   // Limited only to datasets published by certified organizations since it will load an iframe.

package/src/components/TabularExplorer/TabularCellPopover.vue

@@ -80,7 +80,7 @@ import {
 } from '@remixicon/vue'
 import { toast } from 'vue-sonner'
 import { useTranslation } from '../../composables/useTranslation'
-import { buildCellValueFilter, buildTypeConfig } from '../../functions/tabular'
+import { buildTypeConfig, toIsoDay } from '../../functions/tabular'
 import ClientOnly from '../ClientOnly.vue'
 import type { ColumnType, ColumnFilters } from './types'
 
@@ -128,10 +128,36 @@ function close() {
 
 function filterByValue() {
   if (!cell.value) return
+  const val = String(cell.value.value ?? '')
   const col = cell.value.column
-  filters.value = {
-    ...filters.value,
-    [col]: buildCellValueFilter(cell.value.columnType, cell.value.value, filters.value[col] ?? {}),
+  const existing = filters.value[col] ?? {}
+  // A date goes through the same `date` filter the column panel writes, so the
+  // calendar opens on the day that was clicked instead of on an empty month.
+  if (cell.value.columnType === 'date') {
+    const day = toIsoDay(cell.value.value)
+    if (day) {
+      filters.value = { ...filters.value, [col]: { ...existing, date: { operator: 'is', start: day } } }
+    }
+    // An empty cell has no day to select: filtering on the missing values is
+    // what "this value" means there, and the panel shows it as such.
+    else if (cell.value.value == null || cell.value.value === '') {
+      filters.value = { ...filters.value, [col]: { ...existing, null: 'only' } }
+    }
+  }
+  else if (cell.value.columnType === 'categorical' || cell.value.columnType === 'text' || cell.value.columnType === 'year') {
+    const current = existing.in ?? []
+    if (!current.includes(val)) {
+      filters.value = { ...filters.value, [col]: { ...existing, in: [...current, val] } }
+    }
+  }
+  else if (cell.value.columnType === 'number') {
+    const num = Number(cell.value.value)
+    if (Number.isFinite(num)) {
+      filters.value = { ...filters.value, [col]: { ...existing, min: num, max: num } }
+    }
+  }
+  else if (cell.value.columnType === 'boolean') {
+    filters.value = { ...filters.value, [col]: { ...existing, exact: val } }
   }
   close()
 }

package/src/functions/resources.ts

@@ -179,6 +179,10 @@ export function getResourceExternalUrl(dataset: Dataset | DatasetV2 | Omit<Datas
   return `${dataset.page}${isCommunityResource(resource) ? '/community-resources' : ''}?resource_id=${resource.id}`
 }
 
+export function isGeopfSynced(resource: Resource | CommunityResource): boolean {
+  return resource.geopf?.push_status != null || typeof resource.geopf?.offering_id === 'string'
+}
+
 export function resolveResourceExternalUrl<R extends Resource | CommunityResource>(
   dataset: Dataset | DatasetV2 | Omit<Dataset, 'resources' | 'community_resources'>,
   resource: R,

package/src/functions/tabular.ts

@@ -93,39 +93,6 @@ export function buildDateFilterParams(column: string, filter: DateFilter): Recor
   return params
 }
 
-/**
- * The filter "filter by this value" sets on a column for the cell that was
- * clicked, merged into the filters already set on that column.
- *
- * An empty cell holds no value to match on: whatever the column type, filtering
- * on the missing values is what "this value" means there — and it is the filter
- * the column panel offers for them.
- */
-export function buildCellValueFilter(columnType: ColumnType, value: unknown, existing: ColumnFilters): ColumnFilters {
-  if (value == null || value === '') return { ...existing, null: 'only' }
-  switch (columnType) {
-    // A date goes through the same `date` filter the column panel writes, so the
-    // calendar opens on the day that was clicked instead of on an empty month.
-    case 'date': {
-      const day = toIsoDay(value)
-      return day ? { ...existing, date: { operator: 'is', start: day } } : existing
-    }
-    case 'number': {
-      const num = Number(value)
-      return Number.isFinite(num) ? { ...existing, min: num, max: num } : existing
-    }
-    case 'boolean':
-      return { ...existing, exact: String(value) }
-    case 'categorical':
-    case 'text':
-    case 'year': {
-      const val = String(value)
-      const selected = existing.in ?? []
-      return selected.includes(val) ? existing : { ...existing, in: [...selected, val] }
-    }
-  }
-}
-
 export type TypeDisplay = {
   icon: Component
   label: string

package/src/types/resources.ts

@@ -12,6 +12,11 @@ export type FileResourceFileType = 'file'
 
 export type ResourceFileType = RemoteResourceFileType | FileResourceFileType
 
+export type GeopfResourceMetadata = {
+  push_status?: 'pending' | 'done' | 'error' | 'timeout' | null
+  offering_id?: string | null
+}
+
 export type Resource = {
   id: string
   title: string
@@ -22,6 +27,7 @@ export type Resource = {
   extras: Record<string, unknown>
   metrics: { views: number }
   harvest: Harvest
+  geopf: GeopfResourceMetadata | null
   filesize: number | null
   filetype: ResourceFileType
   format: string