@datagouv/components-next 1.0.2-dev.230 → 1.0.2-dev.231

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datagouv/components-next",
-  "version": "1.0.2-dev.230",
+  "version": "1.0.2-dev.231",
   "private": false,
   "type": "module",
   "engines": {
@@ -34,7 +34,7 @@
     "chart.js": "^4.5.1",
     "dompurify": "^3.4.15",
     "echarts": "^6.1.0",
-    "geopf-extensions-openlayers": "1.0.0-beta.11",
+    "geopf-extensions-openlayers": "1.0.0-beta.15",
     "leaflet": "^1.9.4",
     "maplibre-gl": "^5.24.0",
     "ofetch": "^1.5.1",

package/src/components/ResourceAccordion/EditButton.vue

@@ -4,8 +4,7 @@
     icon-only
     :icon="RiPencilLine"
     color="warning"
-    :disabled="!!disabledReason"
-    :title="disabledReason ?? t('Éditer le fichier')"
+    :title="t('Éditer le fichier')"
     data-testid="edit-button"
   />
 </template>
@@ -20,12 +19,10 @@ 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/MapContainer.client.vue

@@ -15,6 +15,15 @@ import PreviewUnavailable from './PreviewUnavailable.vue'
 import type { Resource } from '../../types/resources'
 import { useTranslation } from '../../composables/useTranslation'
 
+type WmsCapabilitiesLayer = { Name: string }
+
+type LayerImportInternals = {
+  _serviceUrlImportInput: HTMLInputElement
+  _formContainer: HTMLFormElement
+  _getCapResponseWMSLayers: Array<WmsCapabilitiesLayer> | null
+  _addGetCapWMSLayer: (layerInfo: WmsCapabilitiesLayer | undefined) => void
+}
+
 const props = defineProps<{ resource: Resource }>()
 
 const { t } = useTranslation()
@@ -38,7 +47,6 @@ async function displayMap() {
     import('ol/control/ScaleLine'),
     import('ol/layer/Tile'),
     import('ol/source/OSM'),
-    // @ts-expect-error no types provided
     import('geopf-extensions-openlayers'),
   ])
 
@@ -94,12 +102,16 @@ async function displayMap() {
   map.addControl(attributions)
 
   const layerImport = new LayerImport({
+    // @ts-expect-error `position` is handled by the base control but missing from the published types
     position: 'bottom-left',
     listable: true,
     layerTypes: ['WMS'],
   })
-  layerImport._serviceUrlImportInput.value = props.resource.url
-  layerImport._formContainer.dispatchEvent(new CustomEvent('submit', { cancelable: true }))
+  // LayerImport has no public API to load a service URL: we fill and submit its form,
+  // then add the resource's layer once the GetCapabilities response is parsed.
+  const layerImportInternals = layerImport as unknown as LayerImportInternals
+  layerImportInternals._serviceUrlImportInput.value = props.resource.url
+  layerImportInternals._formContainer.dispatchEvent(new CustomEvent('submit', { cancelable: true }))
 
   map.addControl(layerImport)
 
@@ -108,7 +120,7 @@ async function displayMap() {
   const waitTimeout = 500
   let retry = 20
   function showLayer() {
-    if (!layerImport._getCapResponseWMSLayers) {
+    if (!layerImportInternals._getCapResponseWMSLayers) {
       retry--
       if (retry > 0)
         setTimeout(showLayer, waitTimeout)
@@ -116,9 +128,8 @@ async function displayMap() {
         hasError.value = true
     }
     else {
-      // @ts-expect-error no typing from library
-      const layerInfo = layerImport._getCapResponseWMSLayers.filter(layer => layer.Name == props.resource.title)[0]
-      layerImport._addGetCapWMSLayer(layerInfo)
+      const layerInfo = layerImportInternals._getCapResponseWMSLayers.filter(layer => layer.Name == props.resource.title)[0]
+      layerImportInternals._addGetCapWMSLayer(layerInfo)
     }
   }
   setTimeout(showLayer, waitTimeout)

package/src/components/ResourceAccordion/ResourceAccordion.vue

@@ -173,7 +173,6 @@
             :dataset-id="dataset.id"
             :resource-id="resource.id"
             :is-community-resource="isCommunityResource"
-            :disabled-reason="editDisabledReason"
             size="xs"
           />
         </p>
@@ -328,7 +327,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, isGeopfSynced, isImagePreviewFormat, resolveResourceExternalUrl } from '../../functions/resources'
+import { getResourceFormatIcon, getResourceTitleId, detectOgcService, getResourceFilesize, isImagePreviewFormat, resolveResourceExternalUrl } from '../../functions/resources'
 import BrandedButton from '../BrandedButton.vue'
 import { useTranslation } from '../../composables/useTranslation'
 import { useHasTabularData } from '../../composables/useHasTabularData'
@@ -385,10 +384,6 @@ 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/functions/resources.ts

@@ -179,10 +179,6 @@ 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/types/resources.ts

@@ -12,11 +12,6 @@ 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
@@ -27,7 +22,6 @@ export type Resource = {
   extras: Record<string, unknown>
   metrics: { views: number }
   harvest: Harvest
-  geopf: GeopfResourceMetadata | null
   filesize: number | null
   filetype: ResourceFileType
   format: string