set version: v0.2.7

afeefacode · Nov 14, 2024 · 9ba202e · 9ba202e
1 parent d84e29d
commit 9ba202e
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 20 deletions.
diff --git a/lib/es5/filter/ActionFilter.js b/lib/es5/filter/ActionFilter.js
@@ -3,12 +3,14 @@ export class ActionFilter {
     constructor(action, filter, name, json) {
         this._defaultValue = null;
         this._options = [];
+        this._multiple = false;
         this._requestFactory = null;
         this._filter = filter;
         this._name = name;
         this._defaultValue = filter.deserializeDefaultValue(json.default || null);
         this._hasDefaultValue = json.hasOwnProperty('default');
         this._options = json.options || [];
+        this._multiple = json.multiple || false;
         if (json.options_request) {
             this._requestFactory = () => {
                 const requestAction = action.getApi().getAction(json.options_request.resource, json.options_request.action);
@@ -47,6 +49,9 @@ export class ActionFilter {
         }
         return null;
     }
+    get multiple() {
+        return this._multiple;
+    }
     valueToQuery(value) {
         return this._filter.valueToQuery(value);
     }

diff --git a/lib/es5/list/ListViewFilter.js b/lib/es5/list/ListViewFilter.js
@@ -31,6 +31,9 @@ export class ListViewFilter {
     createOptionsRequest() {
         return this._filter.createOptionsRequest();
     }
+    get multiple() {
+        return this._filter.multiple;
+    }
     get value() {
         return this._value;
     }

diff --git a/lib/es5/list/ListViewFilterBag.js b/lib/es5/list/ListViewFilterBag.js
@@ -10,14 +10,4 @@ export class ListViewFilterBag extends Bag {
         }
         return filters;
     }
-    toActionFilterValueBag() {
-        const filters = {};
-        for (const [name, filter] of this.entries()) {
-            const value = filter.value;
-            if (value !== undefined) {
-                filters[name] = value;
-            }
-        }
-        return filters;
-    }
 }
diff --git a/lib/es5/list/ListViewModel.js b/lib/es5/list/ListViewModel.js
@@ -260,15 +260,14 @@ export class ListViewModel {
     getFiltersFromHistory() {
         if (this._historyKey) {
             if (filterHistory.hasFilters(this._historyKey)) {
-                const filters = filterHistory.getFilters(this._historyKey);
-                const historyFilters = {};
-                for (const [name, filter] of filters.entries()) {
+                const filters = {};
+                for (const [name, filter] of filterHistory.getFilters(this._historyKey).entries()) {
                     const value = filter.value;
                     if (value !== undefined) {
-                        historyFilters[name] = value;
+                        filters[name] = value;
                     }
                 }
-                return historyFilters;
+                return filters;
             }
         }
         return {};

diff --git a/lib/types/filter/ActionFilter.d.ts b/lib/types/filter/ActionFilter.d.ts
@@ -7,6 +7,7 @@ export type ActionFilterJSON = {
     default: ActionFilterValueType;
     options?: ActionFilterOption[];
     options_request?: ApiRequestJSON;
+    multiple?: boolean;
 };
 export type ActionFilterOption = {
     value: unknown;
@@ -18,6 +19,7 @@ export declare class ActionFilter {
     private _defaultValue;
     private _hasDefaultValue;
     private _options;
+    private _multiple;
     private _requestFactory;
     constructor(action: Action, filter: Filter, name: string, json: ActionFilterJSON);
     get type(): string;
@@ -29,6 +31,7 @@ export declare class ActionFilter {
     get options(): ActionFilterOption[];
     hasOptionsRequest(): boolean;
     createOptionsRequest(): ApiRequest | null;
+    get multiple(): boolean;
     valueToQuery(value: ActionFilterValueType): string | undefined;
     queryToValue(value: string): ActionFilterValueType | undefined;
     serializeValue(value: ActionFilterValueType): ActionFilterValueType;

diff --git a/lib/types/filter/ActionFilter.d.ts.map b/lib/types/filter/ActionFilter.d.ts.map
diff --git a/lib/types/list/ListViewFilter.d.ts b/lib/types/list/ListViewFilter.d.ts
@@ -16,6 +16,7 @@ export declare class ListViewFilter {
     get options(): unknown[];
     hasOptionsRequest(): boolean;
     createOptionsRequest(): ApiRequest | null;
+    get multiple(): boolean;
     get value(): ActionFilterValueType;
     set value(value: ActionFilterValueType);
     setInternalValue(value: ActionFilterValueType, dispatchChange?: boolean): boolean;

diff --git a/lib/types/list/ListViewFilter.d.ts.map b/lib/types/list/ListViewFilter.d.ts.map
diff --git a/lib/types/list/ListViewFilterBag.d.ts b/lib/types/list/ListViewFilterBag.d.ts
@@ -3,6 +3,5 @@ import { ActionFilterValueType } from '../filter/ActionFilter';
 import { ListViewFilter } from './ListViewFilter';
 export declare class ListViewFilterBag extends Bag<ListViewFilter> {
     serialize(): BagEntries<ActionFilterValueType>;
-    toActionFilterValueBag(): BagEntries<ActionFilterValueType>;
 }
 //# sourceMappingURL=ListViewFilterBag.d.ts.map
diff --git a/lib/types/list/ListViewFilterBag.d.ts.map b/lib/types/list/ListViewFilterBag.d.ts.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/api-resources-client",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "",
   "module": "lib/es5/index.js",
   "typings": "lib/types/index.d.ts",

diff --git a/src/filter/ActionFilter.ts b/src/filter/ActionFilter.ts
@@ -12,6 +12,7 @@ export type ActionFilterJSON = {
   default: ActionFilterValueType
   options?: ActionFilterOption[]
   options_request?: ApiRequestJSON
+  multiple?: boolean
 }
 
 type RequestFactory = (() => ApiRequest) | null
@@ -27,6 +28,7 @@ export class ActionFilter {
   private _defaultValue: ActionFilterValueType = null
   private _hasDefaultValue: boolean
   private _options: ActionFilterOption[] = []
+  private _multiple: boolean = false
   private _requestFactory: RequestFactory = null
 
   constructor (action: Action, filter: Filter, name: string, json: ActionFilterJSON) {
@@ -35,6 +37,7 @@ export class ActionFilter {
     this._defaultValue = filter.deserializeDefaultValue(json.default || null)
     this._hasDefaultValue = json.hasOwnProperty('default')
     this._options = json.options || []
+    this._multiple = json.multiple || false
 
     if (json.options_request) {
       this._requestFactory = (): ApiRequest => {
@@ -84,6 +87,10 @@ export class ActionFilter {
     return null
   }
 
+  public get multiple (): boolean {
+    return this._multiple
+  }
+
   public valueToQuery (value: ActionFilterValueType): string | undefined {
     return this._filter.valueToQuery(value)
   }

diff --git a/src/list/ListViewFilter.ts b/src/list/ListViewFilter.ts
@@ -49,6 +49,10 @@ export class ListViewFilter {
     return this._filter.createOptionsRequest()
   }
 
+  public get multiple (): boolean {
+    return this._filter.multiple
+  }
+
   public get value (): ActionFilterValueType {
     return this._value
   }