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

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

@@ -1,4 +1,4 @@
-import { g as Ke } from "./main-HU94LBny.js";
+import { g as Ke } from "./main-BzR7HPLe.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.223",
   "private": false,
   "type": "module",
   "engines": {

package/src/functions/charts.ts

@@ -1,9 +1,9 @@
-import type { Chart, ChartForm, ChartForApi, Filter, ColumnDefinition } from '../types/visualizations'
+import type { Chart, ChartForm, ChartForApi, GenericFilter, ColumnDefinition } from '../types/visualizations'
 import type { ColumnType, TabularProfile } from '../components/TabularExplorer/types'
 import { resolveColumnType } from './tabular'
 
 export function toChartForm(chart: Chart) {
-  const seriesFilter = chart.series[0]?.filters as Filter | null
+  const seriesFilter: GenericFilter | null = chart.series[0]?.filters ?? null
 
   return {
     title: chart.title,

package/src/functions/tabular.ts

@@ -257,15 +257,16 @@ const FALSY_VALUES = ['false', '0', 'non', 'no']
 
 // `encodeURIComponent` leaves `.`, `(` and `)` as-is, but they are the operator
 // separator and the delimiters of the API's `or(...)` grammar: a search value
-// containing one makes the parser reject the whole query with a 400. Wrapping
-// the value in double quotes (as the API README suggests) does not work here —
-// the API keeps them as part of the searched string and returns no result. It
-// does percent-decode the value after parsing, so encoding them is enough.
-function encodeConditionValue(value: string): string {
+// containing one makes the parser reject the whole query with a 400.
+// The API percent-decodes the query string once before running the grammar
+// parser, then percent-decodes the parsed value: grammar-significant characters
+// must therefore be sent double-encoded (`%252E`) so the first decode leaves
+// them escaped (`%2E`) for the parser to unquote after parsing.
+export function encodeConditionValue(value: string): string {
   return encodeURIComponent(value)
-    .replace(/\./g, '%2E')
-    .replace(/\(/g, '%28')
-    .replace(/\)/g, '%29')
+    .replace(/\./g, '%252E')
+    .replace(/\(/g, '%2528')
+    .replace(/\)/g, '%2529')
 }
 
 // A decimal literal, not `Number()`: the API compares against a number column,

package/src/functions/tabularApi.ts

@@ -1,6 +1,7 @@
 import { ofetch } from 'ofetch'
 import { useComponentsConfig, type PluginConfig } from '../config'
-import type { GenericFilter } from '../types/visualizations'
+import { encodeConditionValue } from './tabular'
+import type { AndFilters, Filter, GenericFilter, OrFilters } from '../types/visualizations'
 import type { SortConfig, TabularProfileResponse } from '../components/TabularExplorer/types'
 
 export type { SortConfig }
@@ -56,41 +57,67 @@ export async function fetchTabularData(config: PluginConfig, options: FetchTabul
   return await ofetch<TabularDataResponse>(url)
 }
 
-function buildFilterQuery(filters: GenericFilter): string {
+/**
+ * Serialize a filter tree into tabular-api query params.
+ * - `Filter` → `column__condition=value` (ANDed with the other params)
+ * - root `AndFilters` → one param per child; `OrFilters` children become `or=(...)` params
+ * - root `OrFilters` → a single `or=(...)` param, with `AndFilters` children nested as `and(...)`
+ * (nested-condition grammar: `.` instead of `=`, no value for isnull/isnotnull)
+ */
+export function buildFilterQuery(filters: GenericFilter): string {
   const params: Array<string> = []
-  if ('filters' in filters) {
-    for (const filter of filters.filters) {
-      if ('filters' in filter) {
-        params.push(buildFilterQuery(filter))
+  if (filters._cls === 'Filter') {
+    const param = serializeParam(filters)
+    if (param) params.push(param)
+  }
+  else if (filters._cls === 'AndFilters') {
+    for (const child of filters.filters) {
+      if (child._cls === 'Filter') {
+        const param = serializeParam(child)
+        if (param) params.push(param)
       }
       else {
-        if (filter.condition === 'is_null') {
-          params.push(`${encodeURIComponent(filter.column)}__isnull`)
-        }
-        else if (filter.condition === 'is_not_null') {
-          params.push(`${encodeURIComponent(filter.column)}__isnotnull`)
-        }
-        else if (filter.value !== null && filter.value !== undefined && filter.value !== '') {
-          params.push(`${encodeURIComponent(filter.column)}__${encodeURIComponent(filter.condition)}=${encodeURIComponent(filter.value)}`)
-        }
+        // child is an OrFilters group: serializeGroup returns `or(...)`, the param is `or=(...)`
+        const nested = serializeGroup(child)
+        if (nested) params.push(`or=${nested.slice(2)}`)
       }
     }
   }
   else {
-    const filter = filters
-    if (filter.condition === 'is_null') {
-      params.push(`${encodeURIComponent(filter.column)}__isnull`)
-    }
-    else if (filter.condition === 'is_not_null') {
-      params.push(`${encodeURIComponent(filter.column)}__isnotnull`)
-    }
-    else if (filter.value !== null && filter.value !== undefined && filter.value !== '') {
-      params.push(`${encodeURIComponent(filter.column)}__${encodeURIComponent(filter.condition)}=${encodeURIComponent(filter.value)}`)
-    }
+    const nested = serializeGroup(filters)
+    if (nested) params.push(`or=${nested.slice(2)}`)
   }
   return params.join('&')
 }
 
+/** `column__condition=value` param for a top-level (ANDed) filter, null when empty */
+function serializeParam(filter: Filter): string | null {
+  const column = encodeURIComponent(filter.column)
+  if (filter.condition === 'is_null') return `${column}__isnull`
+  if (filter.condition === 'is_not_null') return `${column}__isnotnull`
+  if (filter.value === null || filter.value === undefined || filter.value === '') return null
+  return `${column}__${encodeURIComponent(filter.condition)}=${encodeURIComponent(filter.value)}`
+}
+
+/** `column__condition.value` condition for the `or(...)` / `and(...)` grammar, null when empty */
+function serializeCondition(filter: Filter): string | null {
+  const column = encodeURIComponent(filter.column)
+  if (filter.condition === 'is_null') return `${column}__isnull`
+  if (filter.condition === 'is_not_null') return `${column}__isnotnull`
+  if (filter.value === null || filter.value === undefined || filter.value === '') return null
+  return `${column}__${encodeURIComponent(filter.condition)}.${encodeConditionValue(filter.value)}`
+}
+
+/** `or(a,b,...)` / `and(a,b,...)` for the nested-condition grammar, null when empty */
+function serializeGroup(group: AndFilters | OrFilters): string | null {
+  const operator = group._cls === 'OrFilters' ? 'or' : 'and'
+  const conditions = group.filters
+    .map(child => ('filters' in child ? serializeGroup(child) : serializeCondition(child)))
+    .filter((condition): condition is string => condition !== null)
+  if (conditions.length === 0) return null
+  return `${operator}(${conditions.join(',')})`
+}
+
 /**
  * Call Tabular-api to get table content
  */

package/src/main.ts

@@ -23,7 +23,7 @@ import type { Site } from './types/site'
 import type { Weight, WellType } from './types/ui'
 import type { User, UserReference } from './types/users'
 import type { Report, ReportSubject, ReportReason } from './types/reports'
-import type { Chart, ChartForm, ChartForApi, FilterCondition, Filter, AndFilters, GenericFilter, XAxisType, XAxisSortBy, SortDirection, XAxis, XAxisForm, UnitPosition, YAxis, DataSeriesType, DataSeries, DataSeriesForm, CombinedSort, ColumnDefinition, ColumnsDefinition } from './types/visualizations'
+import type { Chart, ChartForm, ChartForApi, FilterCondition, Filter, AndFilters, OrFilters, GenericFilter, XAxisType, XAxisSortBy, SortDirection, XAxis, XAxisForm, UnitPosition, YAxis, DataSeriesType, DataSeries, DataSeriesForm, CombinedSort, ColumnDefinition, ColumnsDefinition } from './types/visualizations'
 import type { ColumnFilters, ColumnType, TabularRow } from './components/TabularExplorer/types'
 import type { GlobalSearchConfig, SearchType, SearchTypeConfig, SortOption, HiddenFilter, BuiltInFilterKey, DatasetSearchConfig, DatasetSearchFilters, DataserviceSearchConfig, DataserviceSearchFilters, ReuseSearchConfig, ReuseSearchFilters, OrganizationSearchConfig, OrganizationSearchFilters, TopicSearchConfig, TopicSearchFilters } from './types/search'
 import { getDefaultDatasetConfig, getDefaultDataserviceConfig, getDefaultReuseConfig, getDefaultOrganizationConfig, getDefaultTopicConfig, getDefaultGlobalSearchConfig, defaultDatasetSortOptions, defaultDataserviceSortOptions, defaultReuseSortOptions, defaultOrganizationSortOptions } from './types/search'
@@ -272,6 +272,7 @@ export type {
   FilterCondition,
   Filter,
   AndFilters,
+  OrFilters,
   GenericFilter,
   XAxisType,
   XAxisSortBy,

package/src/types/visualizations.ts

@@ -12,10 +12,15 @@ export type Filter = {
 
 export type AndFilters = {
   _cls: 'AndFilters'
+  filters: Array<Filter | OrFilters>
+}
+
+export type OrFilters = {
+  _cls: 'OrFilters'
   filters: Array<Filter | AndFilters>
 }
 
-export type GenericFilter = Filter | AndFilters
+export type GenericFilter = Filter | AndFilters | OrFilters
 
 export type XAxisType = 'discrete' | 'continuous'