ados-rcm 1.0.329 → 1.0.331

package/dist/AModule/AComponents/ATable/ATable.d.ts

@@ -5,6 +5,7 @@ import { IItem } from '../../AUtils/objF';
 import { IABaseProps } from '../ABase/ABase';
 import { Resources } from '../AResource/AResource';
 import { TActionRef, TIdx, TPromisable } from '../ATypes/ATypes';
+import { IDateRange } from '../ADatePicker/ADateRangePicker';
 export interface IATableTHProps<T extends IItem> {
     /**
      * defKey : TIdx
@@ -109,7 +110,7 @@ export type TATableDefs<T extends IItem> = {
     [key: TIdx]: IATableDef<T>;
 };
 export type TATableFilterType = 'String' | 'Select' | 'Date' | 'DateRange';
-export interface IATableFilter<T extends IItem> {
+export interface IATableFilter<T extends IItem, K extends IItem = any> {
     String: {
         /**
          * type : 'String'
@@ -117,12 +118,6 @@ export interface IATableFilter<T extends IItem> {
          * Description : type of the String filter
          */
         type: 'String';
-        /**
-         * defKey? : keyof T | ''
-         *
-         * Description : defKey of the String filter
-         */
-        defKey: keyof T | '';
         /**
          * value : string = ''
          *
@@ -130,11 +125,17 @@ export interface IATableFilter<T extends IItem> {
          */
         value?: string;
         /**
-         * predicate? : (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['String']) => any
+         * paramKey? : keyof K
+         *
+         * Description : paramKey of the filter. if not provided, it will use the key of the filter. This is used when to make apiParams using tableF.getFilterParams()
+         */
+        paramKey?: keyof K;
+        /**
+         * predicate? : (item: T, defs: TATableDefs<T>, filterKey: keyof T | string, filter: IATableFilter<T>['String']) => any
          *
          * Description : predicate of the String filter
          */
-        predicate?: (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['String']) => any;
+        predicate?: (item: T, defs: TATableDefs<T>, filterKey: keyof T | string, filter: IATableFilter<T>['String']) => any;
         /**
          * placeholder? : string
          *
@@ -155,18 +156,18 @@ export interface IATableFilter<T extends IItem> {
          * Description : type of the Select filter
          */
         type: 'Select';
-        /**
-         * defKey : keyof T | ''
-         *
-         * Description : defKey of the Select filter
-         */
-        defKey: keyof T | '';
         /**
          * value : string | number | null = null
          *
          * Description : values of the Select filter
          */
         value?: string | number | null;
+        /**
+         * paramKey? : keyof K
+         *
+         * Description : paramKey of the filter. if not provided, it will use the key of the filter. This is used when to make apiParams using tableF.getFilterParams()
+         */
+        paramKey?: keyof K;
         /**
          * options :
          *
@@ -188,11 +189,11 @@ export interface IATableFilter<T extends IItem> {
             option: string | number | null;
         }) => React.ReactNode;
         /**
-         * predicate? : (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['Select']) => any
+         * predicate? : (item: T, defs: TATableDefs<T>, filterKey: keyof T | string, filter: IATableFilter<T>['Select']) => any
          *
          * Description : predicate of the Select filter. if not provided, it will have default predicate.
          */
-        predicate?: (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['Select']) => any;
+        predicate?: (item: T, defs: TATableDefs<T>, filterKey: keyof T | string, filter: IATableFilter<T>['Select']) => any;
     };
     Date: {
         /**
@@ -201,18 +202,18 @@ export interface IATableFilter<T extends IItem> {
          * Description : type of the Date filter
          */
         type: 'Date';
-        /**
-         * defKey : keyof T | ''
-         *
-         * Description : defKey of the Date filter
-         */
-        defKey: keyof T;
         /**
          * value : Date = new Date()
          *
          * Description : value of the Date filter
          */
         value?: Date;
+        /**
+         * paramKey? : keyof K
+         *
+         * Description : paramKey of the filter. if not provided, it will use the key of the filter. This is used when to make apiParams using tableF.getFilterParams()
+         */
+        paramKey?: keyof K;
         /**
          * minDate? : Date
          *
@@ -226,11 +227,11 @@ export interface IATableFilter<T extends IItem> {
          */
         maxDate?: Date;
         /**
-         * predicate? : (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['Date']) => any
+         * predicate? : (item: T, defs: TATableDefs<T>, filterKey: keyof T, filter: IATableFilter<T>['Date']) => any
          *
          * Description : predicate of the Date filter. if not provided, it will have default predicate.
          */
-        predicate?: (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['Date']) => any;
+        predicate?: (item: T, defs: TATableDefs<T>, filterKey: keyof T, filter: IATableFilter<T>['Date']) => any;
     };
     DateRange: {
         /**
@@ -240,23 +241,23 @@ export interface IATableFilter<T extends IItem> {
          */
         type: 'DateRange';
         /**
-         * defKey : keyof T | ''
+         * value : IDateRange
          *
-         * Description : defKey of the DateRange filter
+         * Description : value of the DateRange filter
          */
-        defKey: keyof T | '';
+        value?: IDateRange;
         /**
-         * sDate : Date = new Date()
+         * sParamKey : keyof K
          *
-         * Description : sDate of the DateRange filter
+         * Description : paramKey of the filter.value.sDate. This is used when to make apiParams using tableF.getFilterParams()
          */
-        sDate?: Date;
+        sParamKey: keyof K;
         /**
-         * eDate : Date = new Date()
+         * eParamKey : keyof K
          *
-         * Description : eDate of the DateRange filter
+         * Description : paramKey of the filter.value.eDate. This is used when to make apiParams using tableF.getFilterParams()
          */
-        eDate?: Date;
+        eParamKey: keyof K;
         /**
          * minDate? : Date
          *
@@ -270,33 +271,18 @@ export interface IATableFilter<T extends IItem> {
          */
         maxDate?: Date;
         /**
-         * predicate? : (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['DateRange']) => any
+         * predicate? : (item: T, defs: TATableDefs<T>, filterKey: keyof T | string, filter: IATableFilter<T>['DateRange']) => any
          *
          * Description : predicate of the DateRange filter. if not provided, it will have default predicate.
          */
-        predicate?: (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['DateRange']) => any;
+        predicate?: (item: T, defs: TATableDefs<T>, filterKey: keyof T, filter: IATableFilter<T>['DateRange']) => any;
     };
 }
-export type TATableSomeFilter<T extends IItem> = IATableFilter<T>[TATableFilterType];
-export type TATableFilteration<T extends IItem> = {
-    /**
-     * type : 'And' | 'Or'
-     *
-     * Description : type of the filteration
-     */
-    type: 'And' | 'Or';
-    /**
-     * style? : React.CSSProperties
-     *
-     * Description : width of the String filter
-     */
-    style?: React.CSSProperties;
-    /**
-     * filters : TATableSomeFilter<T>[]
-     *
-     * Description : filters of the filteration
-     */
-    filters: TATableSomeFilter<T>[];
+export type TATableSomeFilter<T extends IItem, K extends IItem = any> = IATableFilter<T, K>[TATableFilterType];
+export type TATableFilteration<T extends IItem, K extends IItem = any> = {
+    [key in keyof T]?: TATableSomeFilter<T, K>;
+} & {
+    [key: string]: TATableSomeFilter<T, K>;
 };
 export type TATableSortF<T extends IItem> = (a: T, b: T) => number;
 export interface IATableSortation<T extends IItem> {
@@ -339,7 +325,7 @@ export interface IATablePagination {
      */
     pageRange: number;
 }
-export interface IATableState<T extends IItem> {
+export interface IATableState<T extends IItem, K extends IItem = any> {
     /**
      * entireItems? : T[]
      *
@@ -347,11 +333,11 @@ export interface IATableState<T extends IItem> {
      */
     entireItems?: T[];
     /**
-     * filteration : TATableFilteration<T>
+     * filteration : TATableFilteration<T, K>
      *
      * Description : filteration of the state
      */
-    filteration: TATableFilteration<T>;
+    filteration: TATableFilteration<T, K>;
     /**
      * pagination : IATablePagination
      *

package/dist/AModule/AUtils/objF.d.ts

@@ -14,9 +14,11 @@ export declare const objF: {
     stringify: (value: any, indent?: number | string) => string;
     keys: <T_2 extends IObject>(obj: T_2) => (keyof T_2)[];
     values: <T_3 extends IObject>(obj: T_3) => T_3[keyof T_3][];
-    hasKey: <T_4 extends IObject>(obj: T_4, key: string | number | symbol) => key is keyof T_4;
-    map: <T_5 extends IObject, U>(obj: T_5, fn: (keyValue: [keyof T_5, T_5[keyof T_5]], idx: number) => U) => U[];
-    some: <T_6 extends IObject>(obj: T_6, fn: (key: keyof T_6, value: T_6[keyof T_6]) => any) => boolean;
-    find: <T_7 extends IObject>(obj: T_7, fn: (key: keyof T_7, value: T_7[keyof T_7]) => any) => [string, any] | undefined;
+    entries: <T_4 extends IObject>(obj: T_4) => [keyof T_4, T_4[keyof T_4]][];
+    forEach: <T_5 extends IObject, P extends keyof T_5>(obj: T_5, fn: (key: P, value: T_5[P]) => any) => void;
+    hasKey: <T_6 extends IObject>(obj: T_6, key: string | number | symbol) => key is keyof T_6;
+    map: <T_7 extends IObject, U>(obj: T_7, fn: (keyValue: [keyof T_7, T_7[keyof T_7]], idx: number) => U) => U[];
+    some: <T_8 extends IObject>(obj: T_8, fn: (key: keyof T_8, value: T_8[keyof T_8]) => any) => boolean;
+    find: <T_9 extends IObject>(obj: T_9, fn: (key: keyof T_9, value: T_9[keyof T_9]) => any) => [string, any] | undefined;
     isReactNode: (value: any) => value is React.ReactNode;
 };

package/dist/AModule/AUtils/tableF.d.ts

@@ -4,6 +4,9 @@ type TDefaultPredicate = {
     [key in TATableFilterType]: IATableFilter<any>[key]['predicate'];
 };
 export declare const defaultPredicate: TDefaultPredicate;
+type TKeyValuePairs<K> = {
+    [P in keyof K]?: K[P];
+};
 /**
  * tableF : table functions
  */
@@ -17,5 +20,7 @@ export declare const tableF: {
         rangedPages: number[];
     };
     downloadCsv: <T_3 extends IItem>(name: string, items: T_3[], defs: TATableDefs<T_3>) => void;
+    getSingleFilterValue: <T_4 extends IItem>(filteration: TATableFilteration<T_4>) => string | undefined;
+    getKeyValueFilterValue: <T_5 extends IItem, K extends IItem = any>(filteration: TATableFilteration<T_5, K>) => TKeyValuePairs<K>;
 };
 export {};