jmapcloud-ng-core-types 2.0.18-qa.1 → 2.0.18-qa.11

package/all-enums.ts

@@ -2,7 +2,6 @@ import {
   JFATAL_ERROR_CONTEXTS,
   JGEOMETRY_UNITS,
   JLAYER_ATTRIBUTE_TYPES,
-  JLAYER_DYNAMIC_FILTER_OPERATORS,
   JLAYER_ELEMENT_TYPES,
   JLAYER_GEOMETRIES,
   JLAYER_LAYER_REQUEST_MODES,
@@ -103,25 +102,6 @@ export const ALL_LAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS: JLAYER_STYLE_R
   JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS.LOWER_OR_EQUALS_TO
 ]
 
-export const ALL_LAYER_DYNAMIC_FILTER_OPERATORS: JLAYER_DYNAMIC_FILTER_OPERATORS[] = [
-  JLAYER_DYNAMIC_FILTER_OPERATORS.EQUALS,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.NOT_EQUALS,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.GREATER_THAN,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.GREATER_OR_EQUALS_TO,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.LESS_THAN,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.LESS_OR_EQUALS_TO,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.CONTAINS,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.NOT_CONTAINS,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.IS_EMPTY,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.IS_NOT_EMPTY,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.IS_NULL,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.IS_NOT_NULL,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.IS_IN_RANGE,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.IS_NOT_IN_RANGE,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.LAST,
-  JLAYER_DYNAMIC_FILTER_OPERATORS.INTERVAL
-]
-
 export const ALL_LAYER_STYLE_LINE_CAP: JLAYER_STYLE_LINE_CAP[] = [JLAYER_STYLE_LINE_CAP.BUTT, JLAYER_STYLE_LINE_CAP.ROUND, JLAYER_STYLE_LINE_CAP.SQUARE]
 
 export const ALL_LAYER_STYLE_LINE_JOIN: JLAYER_STYLE_LINE_JOIN[] = [JLAYER_STYLE_LINE_JOIN.MITER, JLAYER_STYLE_LINE_JOIN.ROUND, JLAYER_STYLE_LINE_JOIN.BEVEL]

package/enums.ts

@@ -194,25 +194,6 @@ export enum JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS {
   NOT_IN = "NOT_IN"
 }
 
-export enum JLAYER_DYNAMIC_FILTER_OPERATORS {
-  EQUALS = "EQUALS",
-  NOT_EQUALS = "NOT_EQUALS",
-  GREATER_THAN = "GREATER_THAN",
-  GREATER_OR_EQUALS_TO = "GREATER_OR_EQUALS_TO",
-  LESS_THAN = "LESS_THAN",
-  LESS_OR_EQUALS_TO = "LESS_OR_EQUALS_TO",
-  CONTAINS = "CONTAINS",
-  NOT_CONTAINS = "NOT_CONTAINS",
-  IS_EMPTY = "IS_EMPTY",
-  IS_NOT_EMPTY = "IS_NOT_EMPTY",
-  IS_NULL = "IS_NULL",
-  IS_NOT_NULL = "IS_NOT_NULL",
-  IS_IN_RANGE = "IS_IN_RANGE",
-  IS_NOT_IN_RANGE = "IS_NOT_IN_RANGE",
-  LAST = "LAST",
-  INTERVAL = "INTERVAL"
-}
-
 export enum JLAYER_STYLE_LINE_CAP {
   BUTT = "BUTT",
   ROUND = "ROUND",

package/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference path="./public/global-aliases.d.ts" />
+import type { JLocalDynamicFilter, JLocalDynamicFilterCreateParams, JLocalDynamicFilterUpdateParams } from "./public/jmap/dynamic-filter.d.ts"
 import { Feature, FeatureCollection, LineString, MultiLineString, Point, Polygon } from "geojson"
 import { JAttribute, JDataSource, JDataSourceType, JForm, JRelationship } from "jmapcloud-types"
 import type * as maplibregl from "maplibre-gl"
@@ -7,6 +8,8 @@ import { JDataSourceData, JDataSourceDataParams, JDataSourcePermissions } from "
 import type { JDrawEventModule, JDrawService } from "./public/jmap/draw.d.ts"
 import type { JCoreState, JMapLegendMode } from "./public/state.d.ts"
 
+export type { JLocalDynamicFilter, JLocalDynamicFilterCreateParams, JLocalDynamicFilterUpdateParams } from "./public/jmap/dynamic-filter.d.ts"
+export type { JMapContextDynamicFilters } from "./public/jmap/map-context.d.ts"
 export type { JCoreOptions } from "./public/jmap/startup-options.d.ts"
 export type {
   JCoreState,
@@ -343,11 +346,8 @@ export interface JLayerEventModule extends JEventModule {
     thematicAddition(listenerId: string, fn: (params: JAddMapThematicEventParams) => void): void
     thematicDeletion(listenerId: string, fn: (params: JLayerThematicEventParams) => void): void
     initialSearchApplied(listenerId: string, fn: (params: JLayerInitialSearchEventParams) => void): void
-    dynamicFilterSet(listenerId: string, fn: (params: JLayerDynamicFilterSetParams) => void): void
+    dynamicFiltersChange(listenerId: string, fn: (params: JLayerEventParams) => void): void
     dynamicFilterActivationChange(listenerId: string, fn: (params: JLayerDynamicFilterActivationParams) => void): void
-    dynamicFilterConditionCreated(listenerId: string, fn: (params: JLayerDynamicFilterConditionCreated) => void): void
-    dynamicFilterConditionUpdated(listenerId: string, fn: (params: JLayerDynamicFilterConditionUpdated) => void): void
-    dynamicFilterConditionsRemoved(listenerId: string, fn: (params: JLayerDynamicFilterConditionsRemoved) => void): void
   }
 }
 
@@ -727,6 +727,7 @@ export interface JDataSourceService {
 }
 
 export interface JTableService {
+  DynamicFilter: JDynamicFilterService
   getTables(): JTable[]
   getTableData(tableId: JId, params: JTableDataParams): Promise<JTableData>
   getById(tableId: JId): JTable
@@ -734,6 +735,7 @@ export interface JTableService {
   updateRow(tableId: JId, rowId: number, row: { [key: string]: any }): Promise<void>
   deleteRow(tableId: JId, rowId: number): Promise<void>
   getDataSourceAttributes(tableId: JId): Promise<JAttribute[]>
+  /** @deprecated Use DynamicFilter.setIsActive instead. */
   setDynamicFilterActive(tableId: JId, filterId: string, isActive: boolean): void
 }
 
@@ -833,49 +835,13 @@ export interface JServerService {
   getAllIdentityProvidersById(): JServerIdentityProviderById
 }
 
-export interface JDynamicLayerFilterService {
-  // TODO JMAP8-3266 :  create new service
-}
-export interface JDynamicTableFilterService {
-  // TODO JMAP8-3266 :  create new service
-}
-
-// TODO JMAP8-3266 :  refactor this
 export interface JDynamicFilterService {
-  // isAvailable(layerId: JId): boolean
-  // isActive(layerId: JId): boolean
-  setIsActive(layerId: JId, filterId: string, isActive: boolean): void
-  // setIsActive(layerId: JId, isActive: boolean): void
-  // getByLayerId(layerId: JId): JDynamicFilter
-  // getAllOperators(): JLAYER_DYNAMIC_FILTER_OPERATORS[]
-  // getAllMultipleValuesOperators(): JLAYER_DYNAMIC_FILTER_OPERATORS[]
-  // getAllTwoValuesOperators(): JLAYER_DYNAMIC_FILTER_OPERATORS[]
-  // getOperatorsForAttributeType(attributeType: JLAYER_ATTRIBUTE_TYPES): JLAYER_DYNAMIC_FILTER_OPERATORS[]
-  // getConditionError(condition: JDynamicFilterCondition): string | undefined
-  // isConditionValid(condition: JDynamicFilterCondition): boolean
-  // existSimilarCondition(condition: JDynamicFilterCondition, isUpdate?: boolean): boolean
-  // set(params: JDynamicFilterSetParams[]): void
-  // createCondition(condition: JDynamicFilterCondition): number
-  // updateCondition(condition: JDynamicFilterCondition): void
-  // removeConditions(layerId: JId, conditionsIds: number[]): void
-  // isNoValueOperator(operator: JLAYER_DYNAMIC_FILTER_OPERATORS): boolean
-  // isMultipleValuesOperator(operator: JLAYER_DYNAMIC_FILTER_OPERATORS): boolean
-  // isTwoValuesOperator(operator: JLAYER_DYNAMIC_FILTER_OPERATORS): boolean
-  // getConditionValueError(
-  //   operator: JLAYER_DYNAMIC_FILTER_OPERATORS,
-  //   attributeType: JLAYER_ATTRIBUTE_TYPES,
-  //   value?: any
-  // ): string | undefined
-  // isConditionValueValid(
-  //   operator: JLAYER_DYNAMIC_FILTER_OPERATORS,
-  //   attributeType: JLAYER_ATTRIBUTE_TYPES,
-  //   value?: any
-  // ): boolean
-  // canAttributeTypeAcceptMultipleValuesOperators(attributeType: JLAYER_ATTRIBUTE_TYPES): boolean
-  // canAttributeTypeAcceptTwoValuesOperators(attributeType: JLAYER_ATTRIBUTE_TYPES): boolean
-  // getIsBetweenValuesError(attributeType: JLAYER_ATTRIBUTE_TYPES, value1: any, value2: any): string | undefined
-  // getNowValue(): string
-  // getAllLastOperatorUnits(): string[]
+  create(resourceId: JId, params: JLocalDynamicFilterCreateParams): string
+  getAll(resourceId: JId): JLocalDynamicFilter[]
+  getById(resourceId: JId, filterId: string): JLocalDynamicFilter
+  update(resourceId: JId, filterId: string, update: JLocalDynamicFilterUpdateParams): void
+  remove(resourceId: JId, filterId: string): void
+  setIsActive(resourceId: JId, filterId: string, isActive: boolean): void
 }
 
 // MISC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmapcloud-ng-core-types",
-  "version": "2.0.18-qa.1",
+  "version": "2.0.18-qa.11",
   "description": "JMap Cloud specific version of JMap Cloud NG Core types and interfaces",
   "main": "index.js",
   "types": "ambient.d.ts",

package/public/core.d.ts

@@ -1,3 +1,4 @@
+import type { JLocalDynamicFilter, JLocalDynamicFilterCreateParams, JLocalDynamicFilterUpdateParams } from "./jmap/dynamic-filter.d.ts"
 import { JAttribute, JDataSource, JRelationship } from "jmapcloud-types"
 import type { Action, Store } from "redux"
 import type { JRequestConfig } from "./jmap/ajax.d.ts"
@@ -39,10 +40,6 @@ import type {
   JLayerAddThematicParams,
   JLayerAttribute,
   JLayerDynamicFilterActivationParams,
-  JLayerDynamicFilterConditionCreated,
-  JLayerDynamicFilterConditionUpdated,
-  JLayerDynamicFilterConditionsRemoved,
-  JLayerDynamicFilterSetParams,
   JLayerEventChangeParams,
   JLayerEventParams,
   JLayerEventSelectabilityParams,
@@ -1394,522 +1391,106 @@ export namespace JMap {
     /**
      *  **JMap.Layer.DynamicFilter**
      *
-     * Methods used to manage dynamic filters for a layer.
+     * Manages dynamic filters for a layer in the current session. Changes are held locally and
+     * are included when a map context is saved; they do not update server filter definitions.
+     * These methods support vector layers with attributes, not group layers.
      */
     namespace DynamicFilter {
-      // TODO JMAP8-3266 :  remove this
-      // /**
-      //  * **JMap.Layer.DynamicFilter.isAvailable**
-      //  *
-      //  * Returns true if the layer support dynamic filter.
-      //  *
-      //  * For example raster layers don't support dynamic filter.
-      //  *
-      //  * @param layerId The JMap layer id
-      //  * @example
-      //  * ```ts
-      //  * // returns true if layer id=5 support dynamic filter, else false
-      //  * JMap.Layer.DynamicFilter.isAvailable(5)
-      //  * ```
-      //  */
-      // function isAvailable(layerId: JId): boolean
-      // /**
-      //  * **JMap.Layer.DynamicFilter.isActive**
-      //  *
-      //  * Returns true if the layer has a dynamic filter, and its filter is active.
-      //  *
-      //  * Doesn't throw if the given layer doesn't support dynamic filter.
-      //  *
-      //  * @param layerId The JMap layer id
-      //  * @example
-      //  * ```ts
-      //  * // returns true if layer has dynamic filter, and filter is active
-      //  * JMap.Layer.DynamicFilter.isActive(5)
-      //  * ```
-      //  */
-      // function isActive(layerId: JId): boolean
-      // /**
-      /* **JMap.Layer.DynamicFilter.setIsActive**
-       *
-       * Activate or deactivate a dynamic layer filter for a given JMap layer id
-       *
-       * @throws Error if layer is not found
-       * @param layerId The JMap layer id
-       * @param filterId The JMap dynamic layer filter id
-       * @param isActive The new status of the filter
+      /**
+       * **JMap.Layer.DynamicFilter.create**
+       *
+       * Creates a session filter. It is active by default unless `params.active` is false.
+       *
+       * @param layerId The layer ID
+       * @param params A non-empty name and a parsed filter condition, with optional activation
+       * @returns The new filter's UUID v4
+       * @throws If the layer is missing or unsupported, or the filter parameters are invalid
+       * @example
+       * ```ts
+       * const filterId = JMap.Layer.DynamicFilter.create(layerId, {
+       *   name: "Large cities",
+       *   filter: { id: "condition-1", op: ">", args: [{ property: "population" }, 5000] }
+       * })
+       * ```
+       */
+      function create(layerId: JId, params: JLocalDynamicFilterCreateParams): string
+      /**
+       * **JMap.Layer.DynamicFilter.getAll**
+       *
+       * Returns copies of all filters for the layer, including loaded and session-created filters.
+       * Changing a returned object does not change the session filter.
+       *
+       * @param layerId The layer ID
+       * @returns The layer's session filters
+       * @throws If the layer is missing or unsupported
+       * @example
+       * ```ts
+       * const filters = JMap.Layer.DynamicFilter.getAll(layerId)
+       * ```
+       */
+      function getAll(layerId: JId): JLocalDynamicFilter[]
+      /**
+       * **JMap.Layer.DynamicFilter.getById**
+       *
+       * Returns a copy of one session filter. Changing the returned object does not change the filter.
+       *
+       * @param layerId The layer ID
+       * @param filterId The filter ID
+       * @returns The session filter
+       * @throws If the layer is missing or unsupported, or the filter is not found
+       * @example
+       * ```ts
+       * const filter = JMap.Layer.DynamicFilter.getById(layerId, filterId)
+       * ```
+       */
+      function getById(layerId: JId, filterId: string): JLocalDynamicFilter
+      /**
+       * **JMap.Layer.DynamicFilter.update**
+       *
+       * Changes a filter's localized name, parsed condition, or activation in this session.
+       * The filter ID and owning layer cannot be changed. Updated conditions immediately refresh
+       * map filtering.
+       *
+       * @param layerId The layer ID
+       * @param filterId The filter ID
+       * @param update The fields to change: `name`, `filter`, or `active`
+       * @throws If the layer or filter is missing, the layer is unsupported, or the update is invalid
+       * @example
+       * ```ts
+       * JMap.Layer.DynamicFilter.update(layerId, filterId, { name: "Very large cities" })
+       * ```
+       */
+      function update(layerId: JId, filterId: string, update: JLocalDynamicFilterUpdateParams): void
+      /**
+       * **JMap.Layer.DynamicFilter.remove**
+       *
+       * Removes a filter from this session and refreshes map filtering. This also works for a
+       * definition loaded from the server, but does not delete that server definition.
+       *
+       * @param layerId The layer ID
+       * @param filterId The filter ID
+       * @throws If the layer or filter is missing, or the layer is unsupported
        * @example
        * ```ts
-       * // activate the dynamic filter for layer id=layer-guid and filter id=filter-guid
-       * JMap.Layer.DynamicFilter.setIsActive("layer-guid", "filter-guid", true)
+       * JMap.Layer.DynamicFilter.remove(layerId, filterId)
+       * ```
+       */
+      function remove(layerId: JId, filterId: string): void
+      /**
+       * **JMap.Layer.DynamicFilter.setIsActive**
+       *
+       * Activates or deactivates a session filter and refreshes map filtering.
+       *
+       * @param layerId The layer ID
+       * @param filterId The filter ID
+       * @param isActive Whether the filter should be active
+       * @throws If the layer or filter is missing, the layer is unsupported, or `isActive` is invalid
+       * @example
+       * ```ts
+       * JMap.Layer.DynamicFilter.setIsActive(layerId, filterId, false)
        * ```
        */
       function setIsActive(layerId: JId, filterId: string, isActive: boolean): void
-      // /**
-      //  * **JMap.Layer.DynamicFilter.getByLayerId**
-      //  *
-      //  * Returns the dynamic filter of a given layer id
-      //  *
-      //  * @throws Error if layer is not found
-      //  * @param layerId The JMap layer id
-      //  * @example
-      //  * ```ts
-      //  * // returns the filter of layer id=3
-      //  * const filter = JMap.Layer.DynamicFilter.getByLayerId(3)
-      //  * console.log(filter)
-      //  * ```
-      //  */
-      // function getByLayerId(layerId: JId): JDynamicFilter
-      // /**
-      //  * **JMap.Layer.DynamicFilter.getAllOperators**
-      //  *
-      //  * Returns the list of all availables operators
-      //  *
-      //  * @example
-      //  * ```ts
-      //  * // returns the list of all available operators
-      //  * const allOperators = JMap.Layer.DynamicFilter.getAllOperators()
-      //  * console.log(allOperators)
-      //  * ```
-      //  */
-      // function getAllOperators(): JLAYER_DYNAMIC_FILTER_OPERATORS[]
-      // /**
-      //  * **JMap.Layer.DynamicFilter.getAllMultipleValuesOperators**
-      //  *
-      //  * Returns the list of all operators that require an array values.
-      //  *
-      //  * Warning: EQUALS, NOT_EQUALS are operators that takes an array of values, they act like "IN" or "NOT IN".
-      //  *
-      //  * @example
-      //  * ```ts
-      //  * // returns the list of all operators that require two values
-      //  * const allMultipleValuesOperators = JMap.Layer.DynamicFilter.getAllMultipleValuesOperators()
-      //  * console.log(allMultipleValuesOperators)
-      //  * ```
-      //  */
-      // function getAllMultipleValuesOperators(): JLAYER_DYNAMIC_FILTER_OPERATORS[]
-      // /**
-      //  * **JMap.Layer.DynamicFilter.getAllTwoValuesOperators**
-      //  *
-      //  * Returns the list of all operators that require two values (ex: IS_IN_RANGE, IS_NOT_IN_RANGE)
-      //  *
-      //  * @example
-      //  * ```ts
-      //  * // returns the list of all operators that require two values
-      //  * const allTwoValuesOperators = JMap.Layer.DynamicFilter.getAllTwoValuesOperators()
-      //  * console.log(allTwoValuesOperators)
-      //  * ```
-      //  */
-      // function getAllTwoValuesOperators(): JLAYER_DYNAMIC_FILTER_OPERATORS[]
-      // /**
-      //  * **JMap.Layer.DynamicFilter.getOperatorsForAttributeType**
-      //  *
-      //  * Returns list of all operators available for a given attribute type.
-      //  *
-      //  * @example
-      //  * ```ts
-      //  * // returns the list of all operators that require two values
-      //  * const operators = JMap.Layer.DynamicFilter.getOperatorsForAttributeType("number")
-      //  * console.log("Available operators for attribute type:", operators)
-      //  * ```
-      //  */
-      // function getOperatorsForAttributeType(attributeType: JLAYER_ATTRIBUTE_TYPES): JLAYER_DYNAMIC_FILTER_OPERATORS[]
-      // /**
-      //  * **JMap.Layer.DynamicFilter.getConditionError**
-      //  *
-      //  * Returns a string error (human readable) if the condition is not correct.
-      //  *
-      //  * If correct returns undefined.
-      //  *
-      //  * It doesn't check the id of the condition.
-      //  *
-      //  * @param condition The condition to verify
-      //  * @example
-      //  * ```ts
-      //  * // returns a string error if the condition is not correct
-      //  * const error = JMap.Layer.DynamicFilter.getConditionError({
-      //  *  layerId: 3,
-      //  *  attributeName: "City",
-      //  *  filterOperator: "EQUALS",
-      //  *  value: "Montreal"
-      //  * })
-      //  * console.log("Error:", error)
-      //  * ```
-      //  */
-      // function getConditionError(condition: JDynamicFilterCondition): string | undefined
-      // /**
-      //  * **JMap.Layer.DynamicFilter.existSimilarCondition**
-      //  *
-      //  * Returns true if the condition already exist for the layer.
-      //  *
-      //  * It doesn't check the id of the condition, only the values.
-      //  *
-      //  * @throws if condition is not correct
-      //  * @param condition The condition to verify
-      //  * @param isUpdate tell if the check is for a creation or an update
-      //  * @example
-      //  * ```ts
-      //  * // log in console a message if this condition already exist
-      //  * if (!JMap.Layer.DynamicFilter.existSimilarCondition(myCondition)) {
-      //  *  console.log("Same condition values already exist")
-      //  * }
-      //  * ```
-      //  */
-      // function existSimilarCondition(condition: JDynamicFilterCondition, isUpdate?: boolean): boolean
-      // /**
-      //  * **JMap.Layer.DynamicFilter.isConditionValid**
-      //  *
-      //  * Returns a string error (human readable) if the condition is not correct.
-      //  *
-      //  * If correct returns undefined.
-      //  *
-      //  * It doesn't check the id of the condition.
-      //  *
-      //  * @param condition The condition to verify
-      //  * @example
-      //  * ```ts
-      //  * // log in console a message if the condition is not valid
-      //  * if (!JMap.Layer.DynamicFilter.isConditionValid(myCondition)) {
-      //  *  console.log("Condition is not valid")
-      //  * }
-      //  * ```
-      //  */
-      // function isConditionValid(condition: JDynamicFilterCondition): boolean
-      // /**
-      //  * **JMap.Layer.DynamicFilter.set**
-      //  *
-      //  * Set multiple layer's dynamic filters at once.
-      //  *
-      //  * If some conditions where already set, will destroy them and replace it with the new given conditions.
-      //  *
-      //  * @param params the parameters
-      //  * @throws if invalid params
-      //  * @example
-      //  * ```ts
-      //  * // set layer's id=3 dynamic filter
-      //  * JMap.Layer.DynamicFilter.set([{
-      //  *   layerId: 3,
-      //  *   conditions: [{
-      //  *     layerId: 3,
-      //  *     attributeName: "name",
-      //  *     filterOperator: "EQUALS",
-      //  *     value: ["Ottawa"]
-      //  *   }]
-      //  * }])
-      //  * ```
-      //  */
-      // function set(params: JDynamicFilterSetParams[]): void
-      // /**
-      //  * **JMap.Layer.DynamicFilter.createCondition**
-      //  *
-      //  * Add a new condition for a JMap Layer dynamic filter.
-      //  *
-      //  * Returns the new conditon id, and set the id in the object passed in parameter
-      //  *
-      //  * @throws Error if invalid condition
-      //  * @param condition The dynamic filter condition to create
-      //  * @example
-      //  * ```ts
-      //  * const newCondition = {
-      //  *  layerId: 3,
-      //  *  attributeName: "city"
-      //  *  filterOperator: "EQUALS"
-      //  *  value: ["Paris", "Ottawa"]
-      //  * }
-      //  * JMap.Layer.DynamicFilter.createCondition(newCondition)
-      //  * console.log(`New condition id="${newCondition.id}" created`)
-      //  * ```
-      //  */
-      // function createCondition(condition: JDynamicFilterCondition): number
-      // /**
-      //  * **JMap.Layer.DynamicFilter.updateCondition**
-      //  *
-      //  * Update an existing condition, for a JMap Layer dynamic filter.
-      //  *
-      //  * @throws Error if invalid or not found condition
-      //  * @param condition The dynamic filter condition to update
-      //  * @example
-      //  * ```ts
-      //  * const condition = getCondition()
-      //  * condition.value = 3
-      //  * JMap.Layer.DynamicFilter.updateCondition(condition)
-      //  * console.log(`Condition new value is 3`)
-      //  * ```
-      //  */
-      // function updateCondition(condition: JDynamicFilterCondition): void
-      // /**
-      //  * **JMap.Layer.DynamicFilter.removeConditions**
-      //  *
-      //  * Remove conditions for a given layer id and condition ids.
-      //  *
-      //  * @throws Error if JMap layer not found, if invalid array of id
-      //  * @param layerId The JMap layer id
-      //  * @param conditionsIds The dynamic filter condition ids
-      //  * @example
-      //  * ```ts
-      //  * // for layer id=3, remove 2 conditions (id 2 and 12)
-      //  * JMap.Layer.DynamicFilter.removeConditions(3, [2, 12])
-      //  * ```
-      //  */
-      // function removeConditions(layerId: JId, conditionsIds: number[]): void
-      // /**
-      //  * **JMap.Layer.DynamicFilter.isNoValueOperator**
-      //  *
-      //  * Returns true if the operator doesn't require any value.
-      //  *
-      //  * This function is safe, it throws nothing.
-      //  *
-      //  * @param operator The operator to check
-      //  * @example
-      //  * ```ts
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.isNoValueOperator("IS_IN_RANGE")
-      //  *
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.isNoValueOperator("EQUALS")
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.isNoValueOperator("IS_EMPTY")
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.isNoValueOperator("IS_NOT_NULL")
-      //  * ```
-      //  */
-      // function isNoValueOperator(operator: JLAYER_DYNAMIC_FILTER_OPERATORS): boolean
-      // /**
-      //  * **JMap.Layer.DynamicFilter.isMultipleValuesOperator**
-      //  *
-      //  * Returns true if the operator requires a value that is an array.
-      //  *
-      //  * This function is safe, it throws nothing.
-      //  *
-      //  * @param operator The operator to check
-      //  * @example
-      //  * ```ts
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.isMultipleValuesOperator("EQUALS")
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.isMultipleValuesOperator("NOT_EQUALS")
-      //  *
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.isMultipleValuesOperator("CONTAINS")
-      //  *
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.isMultipleValuesOperator("IS_IN_RANGE")
-      //  * ```
-      //  */
-      // function isMultipleValuesOperator(operator: JLAYER_DYNAMIC_FILTER_OPERATORS): boolean
-      // /**
-      //  * **JMap.Layer.DynamicFilter.isTwoValuesOperator**
-      //  *
-      //  * Returns true if the operator require two values.
-      //  *
-      //  * This function is safe, it throws nothing.
-      //  *
-      //  * @param operator The operator to check
-      //  * @example
-      //  * ```ts
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.isTwoValuesOperator("IS_IN_RANGE")
-      //  *
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.isTwoValuesOperator("EQUALS")
-      //  * ```
-      //  */
-      // function isTwoValuesOperator(operator: JLAYER_DYNAMIC_FILTER_OPERATORS): boolean
-      // /**
-      //  * **JMap.Layer.DynamicFilter.getConditionValueError**
-      //  *
-      //  * Returns an error if value is not correct.
-      //  *
-      //  * This function is safe, it throws nothing.
-      //  *
-      //  * @param operator The operator to check
-      //  * @param attributeType The attribute type
-      //  * @param value the value, an array of value for IS_IN_RANGE operator
-      //  * @example
-      //  * ```ts
-      //  * // returns an error
-      //  * const error = JMap.Layer.DynamicFilter.getConditionValueError("IS_IN_RANGE", "date", date1)
-      //  *
-      //  * // if date1 and date2 are not date objects, or date1 >= date2, returns an error
-      //  * const error = JMap.Layer.DynamicFilter.getConditionValueError("IS_IN_RANGE", "date", [date1, date2])
-      //  *
-      //  * // returns an error value must be an array for EQUALS operator
-      //  * const error = JMap.Layer.DynamicFilter.getConditionValueError("EQUALS", "string", ["Montreal"])
-      //  *
-      //  * // no error, returns undefined
-      //  * const error = JMap.Layer.DynamicFilter.getConditionValueError("EQUALS", "string", ["Montreal"])
-      //  *
-      //  * // no error, returns undefined
-      //  * const error = JMap.Layer.DynamicFilter.getConditionValueError("EQUALS", "string", [""])
-      //  *
-      //  * // returns an error
-      //  * const error = JMap.Layer.DynamicFilter.getConditionValueError("EQUALS", "string", undefined)
-      //  *
-      //  * // returns an error
-      //  * const error = JMap.Layer.DynamicFilter.getConditionValueError("IS_EMPTY", "string")
-      //  *
-      //  * // no error, returns undefined
-      //  * const error = JMap.Layer.DynamicFilter.getConditionValueError("EQUALS", "number", "test")
-      //  *
-      //  * // no error, returns undefined
-      //  * const error = JMap.Layer.DynamicFilter.getConditionValueError("EQUALS", "number", 22)
-      //  * ```
-      //  */
-      // function getConditionValueError(
-      //   operator: JLAYER_DYNAMIC_FILTER_OPERATORS,
-      //   attributeType: JLAYER_ATTRIBUTE_TYPES,
-      //   value?: any
-      // ): string | undefined
-      // /**
-      //  * **JMap.Layer.DynamicFilter.isConditionValueValid**
-      //  *
-      //  * Returns true if the condition value is valid.
-      //  *
-      //  * This function is safe, it throws nothing.
-      //  *
-      //  * @param operator The operator to check
-      //  * @param attributeType The attribute type
-      //  * @param value the value, an array of value for IS_IN_RANGE operator
-      //  * @example
-      //  * ```ts
-      //  * // if date1 is Date object, returns false
-      //  * JMap.Layer.DynamicFilter.isConditionValueValid("IS_IN_RANGE", "date", date1)
-      //  *
-      //  * // if date1 and date2 are Date objects, returns true
-      //  * JMap.Layer.DynamicFilter.isConditionValueValid("IS_IN_RANGE", "date", [date1, date2])
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.isConditionValueValid("EQUALS", "string", "Montreal")
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.isConditionValueValid("EQUALS", "string", "")
-      //  *
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.isConditionValueValid("EQUALS", "string", undefined)
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.isConditionValueValid("IS_EMPTY", "string")
-      //  *
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.isConditionValueValid("EQUALS", "number", "test")
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.isConditionValueValid("EQUALS", "number", 22)
-      //  * ```
-      //  */
-      // function isConditionValueValid(
-      //   operator: JLAYER_DYNAMIC_FILTER_OPERATORS,
-      //   attributeType: JLAYER_ATTRIBUTE_TYPES,
-      //   value?: any
-      // ): boolean
-      // /**
-      //  * **JMap.Layer.DynamicFilter.canAttributeTypeAcceptMultipleValuesOperators**
-      //  *
-      //  * Returns true if the attribute type accept multiple value operator ("EQUALS" or "NOT_EQUALS" for example).
-      //  *
-      //  * This function is safe, it throws nothing.
-      //  *
-      //  * @param attributeType The attribute type
-      //  * @example
-      //  * ```ts
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.canAttributeTypeAcceptMultipleValuesOperators("string")
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.canAttributeTypeAcceptMultipleValuesOperators("number")
-      //  *
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.canAttributeTypeAcceptMultipleValuesOperators("date")
-      //  *
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.canAttributeTypeAcceptMultipleValuesOperators("datetime")
-      //  *
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.canAttributeTypeAcceptMultipleValuesOperators("boolean")
-      //  * ```
-      //  */
-      // function canAttributeTypeAcceptMultipleValuesOperators(attributeType: JLAYER_ATTRIBUTE_TYPES): boolean
-      // /**
-      //  * **JMap.Layer.DynamicFilter.canAttributeTypeAcceptTwoValuesOperators**
-      //  *
-      //  * Returns true if the attribute type accept two value operator ("IS_IN_RANGE").
-      //  *
-      //  * This function is safe, it throws nothing.
-      //  *
-      //  * @param attributeType The attribute type
-      //  * @example
-      //  * ```ts
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.canAttributeTypeAcceptTwoValuesOperators("string")
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.canAttributeTypeAcceptTwoValuesOperators("date")
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.canAttributeTypeAcceptTwoValuesOperators("datetime")
-      //  *
-      //  * // returns true
-      //  * JMap.Layer.DynamicFilter.canAttributeTypeAcceptTwoValuesOperators("number")
-      //  *
-      //  * // returns false
-      //  * JMap.Layer.DynamicFilter.canAttributeTypeAcceptTwoValuesOperators("boolean")
-      //  * ```
-      //  */
-      // function canAttributeTypeAcceptTwoValuesOperators(attributeType: JLAYER_ATTRIBUTE_TYPES): boolean
-      // /**
-      //  * **JMap.Layer.DynamicFilter.getIsBetweenValuesError**
-      //  *
-      //  * Returns true if the attribute type accept two value operator ("IS_IN_RANGE").
-      //  *
-      //  * This function is safe, it throws nothing.
-      //  *
-      //  * @param attributeType The attribute type
-      //  * @example
-      //  * ```ts
-      //  * // returns an error
-      //  * const error = JMap.Layer.DynamicFilter.getIsBetweenValuesError("number", 4, 2)
-      //  *
-      //  * // returns no error
-      //  * const error = JMap.Layer.DynamicFilter.getIsBetweenValuesError("number", 2, 4)
-      //  * ```
-      //  */
-      // function getIsBetweenValuesError(
-      //   attributeType: JLAYER_ATTRIBUTE_TYPES,
-      //   value1: any,
-      //   value2: any
-      // ): string | undefined
-      // /**
-      //  * **JMap.Layer.DynamicFilter.getNowValue**
-      //  *
-      //  * Returns the now value, used for date.
-      //  *
-      //  * @example
-      //  * ```ts
-      //  * const nowValue = JMap.Layer.DynamicFilter.getNowValue()
-      //  * console.log(`Now value is '${nowValue}'`) // display "Now value is 'Now'"
-      //  * ```
-      //  */
-      // function getNowValue(): string
-      // /**
-      //  * **JMap.Layer.DynamicFilter.getAllLastOperatorUnits**
-      //  *
-      //  * Returns list of all "LAST" operator available units:
-      //  *  - "mi": minutes
-      //  *  - "h": hours
-      //  *  - "d": days
-      //  *  - "w": weeks
-      //  *  - "mo": months
-      //  *  - "y": years
-      //  *
-      //  * @example
-      //  * ```ts
-      //  * const allUnits = JMap.Layer.DynamicFilter.getAllLastOperatorUnits()
-      //  * console.log(`All unit for 'LAST' operator are: ${allUnits.join(", ")}`)
-      //  * ```
-      //  */
-      // function getAllLastOperatorUnits(): string[]
     }
     /**
      * **JMap.Layer.getLayerTree**
@@ -8616,25 +8197,8 @@ export namespace JMap {
          * ```
          */
         function initialSearchApplied(listenerId: string, fn: (params: JLayerInitialSearchEventParams) => void): void
-        /**
-         * ***JMap.Event.Layer.on.dynamicFilterSet***
-         *
-         * This event is triggered when some dynamic filters are set.
-         *
-         * Could happen when a map context is applied, or when layer dynamic filters are set via the API.
-         *
-         * @param listenerId Your listener id (must be unique for all layer events)
-         * @param fn Your listener function
-         * @example
-         * ```ts
-         * // Each time some layer dynamic filters have been set
-         * JMap.Event.Layer.on.dynamicFilterSet(
-         *    "custom-layer-dynamic-filter-set",
-         *    params => console.info("Some dynamic filters have been set", params)
-         * )
-         * ```
-         */
-        function dynamicFilterSet(listenerId: string, fn: (params: JLayerDynamicFilterSetParams) => void): void
+        /** Fires after local filter creation, updates, deletion or activation. */
+        function dynamicFiltersChange(listenerId: string, fn: (params: JLayerEventParams) => void): void
         /**
          * ***JMap.Event.Layer.on.dynamicFilterActivationChange***
          *
@@ -8654,63 +8218,6 @@ export namespace JMap {
          * ```
          */
         function dynamicFilterActivationChange(listenerId: string, fn: (params: JLayerDynamicFilterActivationParams) => void): void
-        /**
-         * ***JMap.Event.Layer.on.dynamicFilterConditionCreated***
-         *
-         * This event is triggered when a condition is created on a layer dynamic filter.
-         *
-         * @param listenerId Your listener id (must be unique for all layer events)
-         * @param fn Your listener function
-         * @example
-         * ```ts
-         * // Each time a condition is created on a layer dynamic filter, will display a message in the console
-         * JMap.Event.Layer.on.dynamicFilterConditionCreated(
-         *    "custom-layer-dynamic-filter-condition-created",
-         *    params => {
-         *      console.info(`Condition added on layer id=${params.layerId}'s dynamic filter`, params.filter, params.condition)
-         *    }
-         * )
-         * ```
-         */
-        function dynamicFilterConditionCreated(listenerId: string, fn: (params: JLayerDynamicFilterConditionCreated) => void): void
-        /**
-         * ***JMap.Event.Layer.on.dynamicFilterConditionUpdated***
-         *
-         * This event is triggered when a condition is updated on a layer dynamic filter.
-         *
-         * @param listenerId Your listener id (must be unique for all layer events)
-         * @param fn Your listener function
-         * @example
-         * ```ts
-         * // Each time a condition is updated on a layer dynamic filter, will display a message in the console
-         * JMap.Event.Layer.on.dynamicFilterConditionUpdated(
-         *    "custom-layer-dynamic-filter-condition-updated",
-         *    params => {
-         *      console.info(`Condition updated on layer id=${params.layerId}'s dynamic filter`, params.filter, params.condition)
-         *    }
-         * )
-         * ```
-         */
-        function dynamicFilterConditionUpdated(listenerId: string, fn: (params: JLayerDynamicFilterConditionUpdated) => void): void
-        /**
-         * ***JMap.Event.Layer.on.dynamicFilterConditionsRemoved***
-         *
-         * This event is triggered when a condition is removed on a layer dynamic filter.
-         *
-         * @param listenerId Your listener id (must be unique for all layer events)
-         * @param fn Your listener function
-         * @example
-         * ```ts
-         * // Each time one or more conditions are removed for a layer dynamic filter, will display a message in the console
-         * JMap.Event.Layer.on.dynamicFilterConditionsRemoved(
-         *    "custom-layer-dynamic-filter-conditions-removed",
-         *    params => {
-         *      console.info(`Condition(s) removed on layer id=${params.layerId}'s dynamic filter`, params.filter, params.conditionIds)
-         *    }
-         * )
-         * ```
-         */
-        function dynamicFilterConditionsRemoved(listenerId: string, fn: (params: JLayerDynamicFilterConditionsRemoved) => void): void
       }
       /**
        * ***JMap.Event.Layer.activate***
@@ -11798,21 +11305,121 @@ export namespace JMap {
      * ```
      **/
     function getDataSourceAttributes(tableId: JId): Promise<JAttribute[]>
+    /**
+     * **JMap.Table.DynamicFilter**
+     *
+     * Manages table dynamic filters in the current session. Changes are included when a map
+     * context is saved; they do not update server filter definitions.
+     */
+    namespace DynamicFilter {
+      /**
+       * **JMap.Table.DynamicFilter.create**
+       *
+       * Creates a table filter in the current session. It is active by default unless
+       * `params.active` is false. The server filter definition is not changed.
+       *
+       * @param tableId The table ID
+       * @param params A non-empty name and a parsed filter condition, with optional activation
+       * @returns The new filter's UUID v4
+       * @throws If the table is missing or the filter parameters are invalid
+       * @example
+       * ```ts
+       * const filterId = JMap.Table.DynamicFilter.create(tableId, {
+       *   name: "Large cities",
+       *   filter: { id: "condition-1", op: ">", args: [{ property: "population" }, 5000] }
+       * })
+       * ```
+       */
+      function create(tableId: JId, params: JLocalDynamicFilterCreateParams): string
+      /**
+       * **JMap.Table.DynamicFilter.getAll**
+       *
+       * Returns copies of all filters for the table, including loaded and session-created filters.
+       * Changing a returned object does not change the session filter.
+       *
+       * @param tableId The table ID
+       * @returns The table's session filters
+       * @throws If the table is missing
+       * @example
+       * ```ts
+       * const filters = JMap.Table.DynamicFilter.getAll(tableId)
+       * ```
+       */
+      function getAll(tableId: JId): JLocalDynamicFilter[]
+      /**
+       * **JMap.Table.DynamicFilter.getById**
+       *
+       * Returns a copy of one session filter. Changing the returned object does not change the filter.
+       *
+       * @param tableId The table ID
+       * @param filterId The filter ID
+       * @returns The session filter
+       * @throws If the table or filter is missing
+       * @example
+       * ```ts
+       * const filter = JMap.Table.DynamicFilter.getById(tableId, filterId)
+       * ```
+       */
+      function getById(tableId: JId, filterId: string): JLocalDynamicFilter
+      /**
+       * **JMap.Table.DynamicFilter.update**
+       *
+       * Changes a filter's localized name, parsed condition, or activation in this session.
+       * The filter ID and owning table cannot be changed. Active filters are applied to table
+       * data requests.
+       *
+       * @param tableId The table ID
+       * @param filterId The filter ID
+       * @param update The fields to change: `name`, `filter`, or `active`
+       * @throws If the table or filter is missing, or the update is invalid
+       * @example
+       * ```ts
+       * JMap.Table.DynamicFilter.update(tableId, filterId, { name: "Very large cities" })
+       * ```
+       */
+      function update(tableId: JId, filterId: string, update: JLocalDynamicFilterUpdateParams): void
+      /**
+       * **JMap.Table.DynamicFilter.remove**
+       *
+       * Removes a filter from this session. This also works for a definition loaded from the
+       * server, but does not delete that server definition.
+       *
+       * @param tableId The table ID
+       * @param filterId The filter ID
+       * @throws If the table or filter is missing
+       * @example
+       * ```ts
+       * JMap.Table.DynamicFilter.remove(tableId, filterId)
+       * ```
+       */
+      function remove(tableId: JId, filterId: string): void
+      /**
+       * **JMap.Table.DynamicFilter.setIsActive**
+       *
+       * Activates or deactivates a session filter for table data requests.
+       *
+       * @param tableId The table ID
+       * @param filterId The filter ID
+       * @param isActive Whether the filter should be active
+       * @throws If the table or filter is missing, or `isActive` is invalid
+       * @example
+       * ```ts
+       * JMap.Table.DynamicFilter.setIsActive(tableId, filterId, false)
+       * ```
+       */
+      function setIsActive(tableId: JId, filterId: string, isActive: boolean): void
+    }
     /**
      * **JMap.Table.setDynamicFilterActive**
      *
-     * Set a particular dynamic filter active property, for a given table.
+     * Activates or deactivates a session filter for table data requests.
      *
-     * @param tableId the table id
-     * @param filterId the filter id
-     * @param isActive active or not
-     * @throws if tableId not valid or dataSource not found
-     * @example
-     * ```ts
-     * // Returns datasource attributes, for table id="be4552e1-d89d-48ec-a417-7b99d14b4d7b" and filter id="dec4ae45-2274-419e-8b2f-bd6bd6a1d6d3"
-     * JMap.Table.setDynamicFilterActive("be4552e1-d89d-48ec-a417-7b99d14b4d7b", "dec4ae45-2274-419e-8b2f-bd6bd6a1d6d3", true)
-     * ```
-     **/
+     * @deprecated Use {@link JMap.Table.DynamicFilter.setIsActive} instead. This method logs a deprecation warning.
+     * @param tableId The table ID
+     * @param filterId The filter ID
+     * @param isActive Whether the filter should be active
+     * @throws If the table or filter is missing, or `isActive` is invalid
+     */
     function setDynamicFilterActive(tableId: JId, filterId: string, isActive: boolean): void
   }
 }

package/public/global-aliases.d.ts

@@ -6,6 +6,7 @@ import type * as ajax from "./jmap/ajax"
 import type * as attachment from "./jmap/attachment"
 import type * as datasource from "./jmap/datasource"
 import type * as date from "./jmap/date"
+import type * as dynamicfilter from "./jmap/dynamic-filter"
 import type * as extension from "./jmap/extension"
 import type * as features from "./jmap/features"
 import type * as form from "./jmap/form"
@@ -46,6 +47,9 @@ declare global {
   /** @internal */ type JTIME_UNITS = date.JTIME_UNITS
   /** @internal */ const JTIME_UNITS: typeof date.JTIME_UNITS
   /** @internal */ type JDateFormatParams = date.JDateFormatParams
+  /** @internal */ type JLocalDynamicFilter = dynamicfilter.JLocalDynamicFilter
+  /** @internal */ type JLocalDynamicFilterCreateParams = dynamicfilter.JLocalDynamicFilterCreateParams
+  /** @internal */ type JLocalDynamicFilterUpdateParams = dynamicfilter.JLocalDynamicFilterUpdateParams
   /** @internal */ type JExtensionEventParams = extension.JExtensionEventParams
   /** @internal */ type JExtensionServerOverride = extension.JExtensionServerOverride
   /** @internal */ type JCoreServerExtensionInfo = extension.JCoreServerExtensionInfo
@@ -127,8 +131,6 @@ declare global {
   /** @internal */ const JLAYER_STYLE_ARROW_TYPES: typeof layer.JLAYER_STYLE_ARROW_TYPES
   /** @internal */ type JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS = layer.JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS
   /** @internal */ const JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS: typeof layer.JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS
-  /** @internal */ type JLAYER_DYNAMIC_FILTER_OPERATORS = layer.JLAYER_DYNAMIC_FILTER_OPERATORS
-  /** @internal */ const JLAYER_DYNAMIC_FILTER_OPERATORS: typeof layer.JLAYER_DYNAMIC_FILTER_OPERATORS
   /** @internal */ type JLAYER_STYLE_LINE_CAP = layer.JLAYER_STYLE_LINE_CAP
   /** @internal */ const JLAYER_STYLE_LINE_CAP: typeof layer.JLAYER_STYLE_LINE_CAP
   /** @internal */ type JLAYER_STYLE_LINE_JOIN = layer.JLAYER_STYLE_LINE_JOIN
@@ -154,19 +156,12 @@ declare global {
   /** @internal */ type JLayerThematicEventParams = layer.JLayerThematicEventParams
   /** @internal */ type JAddMapThematicEventParams = layer.JAddMapThematicEventParams
   /** @internal */ type JLayerInitialSearchEventParams = layer.JLayerInitialSearchEventParams
-  /** @internal */ type JLayerDynamicFilterSetParams = layer.JLayerDynamicFilterSetParams
   /** @internal */ type JLayerDynamicFilterActivationParams = layer.JLayerDynamicFilterActivationParams
-  /** @internal */ type JLayerDynamicFilterConditionCreated = layer.JLayerDynamicFilterConditionCreated
-  /** @internal */ type JLayerDynamicFilterConditionUpdated = layer.JLayerDynamicFilterConditionUpdated
-  /** @internal */ type JLayerDynamicFilterConditionsRemoved = layer.JLayerDynamicFilterConditionsRemoved
   /** @internal */ type JMapEventLoadedParams = layer.JMapEventLoadedParams
   /** @internal */ type JLayerGeometry = layer.JLayerGeometry
   /** @internal */ type JLayerPermissions = layer.JLayerPermissions
   /** @internal */ type JLayerGroup = layer.JLayerGroup
   /** @internal */ type JLayer = layer.JLayer
-  /** @internal */ type JDynamicFilter = layer.JDynamicFilter
-  /** @internal */ type JDynamicFilterCondition = layer.JDynamicFilterCondition
-  /** @internal */ type JDynamicFilterSetParams = layer.JDynamicFilterSetParams
   /** @internal */ type JLayerForm = layer.JLayerForm
   /** @internal */ type JLayerAttribute = layer.JLayerAttribute
   /** @internal */ type JLayerTreeElement = layer.JLayerTreeElement
@@ -219,6 +214,7 @@ declare global {
   /** @internal */ const JMAP_CONTEXT_SORT_BY_DIRECTIONS: typeof mapcontext.JMAP_CONTEXT_SORT_BY_DIRECTIONS
   /** @internal */ type JMapContextEditResponse = mapcontext.JMapContextEditResponse
   /** @internal */ type JMapContextMetaData = mapcontext.JMapContextMetaData
+  /** @internal */ type JMapContextDynamicFilters = mapcontext.JMapContextDynamicFilters
   /** @internal */ type JMapContextData = mapcontext.JMapContextData
   /** @internal */ type JMapContextDataLayerElement = mapcontext.JMapContextDataLayerElement
   /** @internal */ type JMapContextDataLayer = mapcontext.JMapContextDataLayer

package/public/jmap/dynamic-filter.d.ts

@@ -0,0 +1,21 @@
+import type { JAnyFilterCondition } from "jmapcloud-types"
+
+/** A browser-session filter. Loaded definitions and user-created filters have the same local CRUD semantics. */
+export interface JLocalDynamicFilter {
+  id: string
+  resourceId: string
+  /** The localized name displayed in this NG session. */
+  name: string
+  filter: JAnyFilterCondition
+  active: boolean
+}
+
+export interface JLocalDynamicFilterCreateParams {
+  name: string
+  filter: JAnyFilterCondition
+  /** Defaults to true. */
+  active?: boolean
+}
+
+/** Identity and resource ownership cannot be updated. */
+export type JLocalDynamicFilterUpdateParams = Partial<Pick<JLocalDynamicFilter, "name" | "filter" | "active">>

package/public/jmap/layer.d.ts

@@ -1,4 +1,5 @@
-import type { JAnyFilterCondition, JAttribute, JDynamicFilterGraphQL, UserMetadata } from "jmapcloud-types"
+import type { JLocalDynamicFilter } from "./dynamic-filter.d.ts"
+import type { JAnyFilterCondition, JAttribute, UserMetadata } from "jmapcloud-types"
 import type { JBoundaryBox } from "./geometry.d.ts"
 import type { JId } from "./main.d.ts"
 import type { JMapMouseOver } from "./mouseover.d.ts"
@@ -101,26 +102,6 @@ export enum JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS {
   NOT_IN = "NOT_IN" // This operator does not yet exist in JMC
 }
 
-// ALL_LAYER_DYNAMIC_FILTER_OPERATORS in all-enum.ts
-export enum JLAYER_DYNAMIC_FILTER_OPERATORS {
-  EQUALS = "EQUALS",
-  NOT_EQUALS = "NOT_EQUALS",
-  GREATER_THAN = "GREATER_THAN",
-  GREATER_OR_EQUALS_TO = "GREATER_OR_EQUALS_TO",
-  LESS_THAN = "LESS_THAN",
-  LESS_OR_EQUALS_TO = "LESS_OR_EQUALS_TO",
-  CONTAINS = "CONTAINS",
-  NOT_CONTAINS = "NOT_CONTAINS",
-  IS_EMPTY = "IS_EMPTY",
-  IS_NOT_EMPTY = "IS_NOT_EMPTY",
-  IS_NULL = "IS_NULL",
-  IS_NOT_NULL = "IS_NOT_NULL",
-  IS_IN_RANGE = "IS_IN_RANGE",
-  IS_NOT_IN_RANGE = "IS_NOT_IN_RANGE",
-  LAST = "LAST",
-  INTERVAL = "INTERVAL"
-}
-
 // ALL_LAYER_STYLE_LINE_CAP in all-enum.ts
 export enum JLAYER_STYLE_LINE_CAP {
   BUTT = "BUTT",
@@ -239,25 +220,8 @@ export interface JLayerInitialSearchEventParams extends JLayerEventParams {
   features: GeoJSON.Feature[]
 }
 
-export interface JLayerDynamicFilterSetParams {
-  filters: JDynamicFilter[]
-}
-
-export interface JLayerDynamicFilterActivationParams extends JLayerEventParams {}
-
-export interface JLayerDynamicFilterConditionCreated extends JLayerEventParams {
-  filter: JDynamicFilter
-  condition: JDynamicFilterCondition
-}
-
-export interface JLayerDynamicFilterConditionUpdated extends JLayerEventParams {
-  filter: JDynamicFilter
-  condition: JDynamicFilterCondition
-}
-
-export interface JLayerDynamicFilterConditionsRemoved extends JLayerEventParams {
-  filter: JDynamicFilter
-  conditionIds: number[]
+export interface JLayerDynamicFilterActivationParams extends JLayerEventParams {
+  isActivation: boolean
 }
 
 export interface JMapEventLoadedParams {
@@ -298,7 +262,6 @@ export interface JLayer extends JLayerTreeElement {
   minimumZoom: number | undefined
   maximumZoom: number | undefined
   styleRules: JLayerStyleRule[]
-  defaultStyleRule: JLayerStyleRule | undefined
   thematics: JLayerThematic[]
   extent: JBoundaryBox | null
   permissions: JLayerPermissions
@@ -313,38 +276,12 @@ export interface JLayer extends JLayerTreeElement {
   spatialDataSourceOrganizationId: string
   spatialDataSourceAttributes: JAttribute[] | null
   selectionStyleId: string
-  // dynamicFilter: JDynamicFilter
-  // TODO JMAP8-3266 : use a localized type instad of a graphQL one
-  dynamicFilters: JDynamicFilterGraphQL[]
+  dynamicFilters: JLocalDynamicFilter[]
   allowClientSideEditing: boolean
   includeInLegend: boolean
   baseFilter?: JAnyFilterCondition
 }
 
-// TODO JMAP8-3266 : remove this and children
-export interface JDynamicFilter {
-  layerId: JId
-  isAvailable: boolean // false means no dynamic filter for layer, ex: IMAGE layers
-  isActive: boolean
-  intervalOperatorDisabled: boolean // true if layer has less than 2 date attributes
-  conditions: JDynamicFilterCondition[]
-}
-
-export interface JDynamicFilterCondition {
-  layerId: JId
-  id: number
-  attributeName: string
-  endAttributeName?: string // used for INTERVAL operator
-  filterOperator: JLAYER_DYNAMIC_FILTER_OPERATORS
-  value: any | any[] // 2 items array for between
-}
-
-export interface JDynamicFilterSetParams {
-  layerId: JId
-  conditions: JDynamicFilterCondition[]
-  isActive?: boolean
-}
-
 export interface JLayerForm {
   id: JId
   name: string
@@ -441,7 +378,6 @@ export interface JLayerStyleRule {
   id: string
   layerId: string
   active: boolean
-  defaultRule: boolean
   name: string
   conditions: JLayerStyleRuleCondition[]
 }
@@ -541,7 +477,7 @@ export interface JLayerTextStyle extends JLayerBaseStyle {
   italic: boolean
 }
 
-export type JLayerUserStyleRule = Omit<JLayerStyleRule, "defaultRule">
+export type JLayerUserStyleRule = JLayerStyleRule
 
 export type JLayerAddThematicParams = {
   layerId: JId

package/public/jmap/map-context.d.ts

@@ -1,5 +1,5 @@
 import type { JLocation } from "./geometry.d.ts"
-import type { JDynamicFilterCondition } from "./layer.d.ts"
+import type { JLocalDynamicFilter } from "./dynamic-filter.d.ts"
 import type { JId } from "./main.d.ts"
 import type { JMapSelection } from "./map.d.ts"
 export {}
@@ -41,7 +41,14 @@ export interface JMapContextMetaData {
   thumbnailUrl?: string
 }
 
+/** Complete local filter lists, keyed by layer/table ID. Empty lists preserve deletions. */
+export interface JMapContextDynamicFilters {
+  layers: Record<string, JLocalDynamicFilter[]>
+  tables: Record<string, JLocalDynamicFilter[]>
+}
+
 export interface JMapContextData {
+  dynamicFilters: JMapContextDynamicFilters
   layerElements: JMapContextDataLayerElement[]
   mapCenter: JLocation
   mapZoom: number
@@ -64,9 +71,6 @@ export interface JMapContextDataLayerElement {
 export interface JMapContextDataLayer extends JMapContextDataLayerElement {
   selectable: boolean
   thematics: JMapContextDataThematic[]
-  // TODO JMAP8-3266 :  replace this with new dynamic filters
-  dynamicFilterConditions: JDynamicFilterCondition[]
-  dynamicFilterIsActive: boolean
   // Defined only when layer transparency has been explicitly overridden
   transparency?: number
 }

package/public/jmap/table.d.ts

@@ -1,4 +1,5 @@
-import type { JAnyFilterCondition, JAttribute, AttributeType, JDynamicFilterGraphQL } from "jmapcloud-types"
+import type { JLocalDynamicFilter } from "./dynamic-filter.d.ts"
+import type { JAnyFilterCondition, JAttribute, AttributeType } from "jmapcloud-types"
 import type { JLocaleTranslation } from "./language.d.ts"
 export {}
 // ALL_TABLE_ATTRIBUTE_TYPES in all-enum.ts
@@ -28,8 +29,7 @@ export interface JTable {
   allowClientSideEditing: boolean
   permissions: JTablePermissions
   baseFilter?: JAnyFilterCondition
-  // TODO JMAP8-3266 : use a localized type instad of a graphQL one
-  dynamicFilters: JDynamicFilterGraphQL[]
+  dynamicFilters: JLocalDynamicFilter[]
 }
 
 export interface JTableAttribute {