@datagouv/components-next 1.0.2-dev.66 → 1.0.2-dev.67

package/dist/{vue3-xml-viewer.common-DtXMtQDT.js → vue3-xml-viewer.common-S2fcy_RO.js}

@@ -1,4 +1,4 @@
-import { c as Ke } from "./main-BoFCVekJ.js";
+import { c as Ke } from "./main-vXPsdhWv.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.66",
+  "version": "1.0.2-dev.67",
   "private": false,
   "type": "module",
   "engines": {

package/src/components/Search/GlobalSearch.vue

@@ -356,7 +356,7 @@ import { RiBookShelfLine, RiBuilding2Line, RiCloseCircleLine, RiDatabase2Line, R
 import magnifyingGlassSrc from '../../../assets/illustrations/magnifying_glass.svg?url'
 import { useTranslation } from '../../composables/useTranslation'
 import { useDebouncedRef } from '../../composables/useDebouncedRef'
-import { forEachActiveCustomFilter, isCustomFilterActive, searchFilterContextKey, type CustomFilterEntry } from '../../composables/useSearchFilter'
+import { configKey, forEachActiveCustomFilter, isCustomFilterActive, searchFilterContextKey, type CustomFilterEntry } from '../../composables/useSearchFilter'
 import { useStableQueryParams } from '../../composables/useStableQueryParams'
 import { useComponentsConfig } from '../../config'
 import { useFetch } from '../../functions/api'
@@ -366,7 +366,7 @@ import type { Dataservice } from '../../types/dataservices'
 import type { Organization } from '../../types/organizations'
 import type { Reuse } from '../../types/reuses'
 import type { TopicV2 } from '../../types/topics'
-import type { GlobalSearchConfig, SearchResponseByClass, SearchType, SearchTypeConfig, SortOption, FacetItem } from '../../types/search'
+import type { GlobalSearchConfig, SearchResponseByClass, SearchType, SortOption, FacetItem } from '../../types/search'
 import { getDefaultGlobalSearchConfig } from '../../types/search'
 import BrandedButton from '../BrandedButton.vue'
 import LoadingBlock from '../LoadingBlock.vue'
@@ -406,8 +406,6 @@ const props = withDefaults(defineProps<{
   hideSearchInput: false,
 })
 
-const configKey = (c: SearchTypeConfig) => c.key ?? c.class
-
 // defineModel's default is static and can't depend on props, so we cast and initialize manually
 const currentType = defineModel<string>('type') as Ref<string>
 if (!currentType.value) currentType.value = configKey(props.config[0] ?? { class: 'datasets' })
@@ -742,7 +740,7 @@ const rssUrl = computed(() => {
 
   forEachActiveCustomFilter(customFilterRegistry, (apiParam, value) => {
     params.set(apiParam, value)
-  })
+  }, currentTypeConfig.value ? configKey(currentTypeConfig.value) : undefined)
 
   // Add sort if set
   if (sort.value) params.set('sort', sort.value)

package/src/composables/useSearchFilter.ts

@@ -1,11 +1,17 @@
 import { type InjectionKey, type Ref, inject, onMounted, onScopeDispose } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useRouteQuery } from '@vueuse/router'
+import type { SearchTypeConfig } from '../types/search'
+
+export function configKey(c: SearchTypeConfig): string {
+  return c.key ?? c.class
+}
 
 export interface CustomFilterEntry {
   apiParam: string
   ref: Ref<string | undefined>
   defaultValue: string | undefined
+  typeKeys?: string[] // undefined = applies to all types
 }
 
 export interface SearchFilterContext {
@@ -21,9 +27,11 @@ export function isCustomFilterActive(entry: CustomFilterEntry): boolean {
 export function forEachActiveCustomFilter(
   registry: Map<string, CustomFilterEntry>,
   apply: (apiParam: string, value: string) => void,
+  typeKey?: string,
 ): void {
   for (const entry of registry.values()) {
     if (!isCustomFilterActive(entry)) continue
+    if (typeKey && entry.typeKeys && !entry.typeKeys.includes(typeKey)) continue
     apply(entry.apiParam, String(entry.ref.value))
   }
 }
@@ -36,6 +44,8 @@ export interface UseSearchFilterOptions {
   apiParam?: string
   /** Default value when not present in URL. Defaults to undefined. */
   defaultValue?: string
+  /** One or more type config keys this filter applies to. Undefined means all types. */
+  typeKeys?: string | string[]
 }
 
 /**
@@ -68,7 +78,10 @@ export function useSearchFilter(
     )
   }
 
-  const { apiParam = urlParam, defaultValue = undefined } = options
+  const { apiParam = urlParam, defaultValue = undefined, typeKeys } = options
+  const normalizedTypeKeys = typeKeys
+    ? (Array.isArray(typeKeys) ? typeKeys : [typeKeys])
+    : undefined
 
   const route = useRoute()
   const router = useRouter()
@@ -77,7 +90,7 @@ export function useSearchFilter(
   // Register in onMounted to avoid SSR/hydration mismatch: the registry must be
   // empty during SSR so server and client produce the same initial HTML.
   onMounted(() => {
-    context.register(urlParam, { apiParam, ref: value, defaultValue })
+    context.register(urlParam, { apiParam, ref: value, defaultValue, typeKeys: normalizedTypeKeys })
   })
 
   onScopeDispose(() => {

package/src/composables/useStableQueryParams.ts

@@ -1,6 +1,6 @@
 import { computed, ref, watch, type Ref } from 'vue'
 import type { SearchTypeConfig } from '../types/search'
-import { forEachActiveCustomFilter, type CustomFilterEntry } from './useSearchFilter'
+import { configKey, forEachActiveCustomFilter, type CustomFilterEntry } from './useSearchFilter'
 
 type FilterRefs = Record<string, Ref<unknown>>
 
@@ -55,6 +55,9 @@ export function useStableQueryParams(options: StableQueryParamsOptions) {
     // 3.5. Apply custom filter values. Concatenate into an array on collision
     // so a custom filter mapped onto a built-in apiParam (e.g. theme → tag)
     // combines with an existing built-in value instead of overwriting it.
+    // Pass the current type key so filters scoped to specific types are excluded
+    // from background fetches for other types.
+    const currentTypeKey = typeConfig ? configKey(typeConfig) : undefined
     forEachActiveCustomFilter(customFilterRegistry, (apiParam, value) => {
       const existing = params[apiParam]
       if (existing === undefined) {
@@ -63,7 +66,7 @@ export function useStableQueryParams(options: StableQueryParamsOptions) {
       else {
         params[apiParam] = Array.isArray(existing) ? [...existing, value] : [existing, value]
       }
-    })
+    }, currentTypeKey)
 
     // 4. Always include q, sort (if valid for this type), page, page_size
     if (q.value) {