@one-paragon/angular-utilities 1.2.18 → 1.3.0

package/src/table-builder/directives/resize-column.directive.ts

@@ -1,108 +0,0 @@
-import { Directive, OnInit, Renderer2, Input, ElementRef, booleanAttribute, inject } from "@angular/core";
-import { fromEvent } from "rxjs";
-import { filter, map, switchMap, takeUntil } from "rxjs/operators";
-import { defaultShareReplay } from "../../rxjs";
-import { TableStore } from "../classes/table-store";
-
-@Directive({
-  selector: "[resizeColumn]",
-  standalone: true
-})
-export class ResizeColumnDirective implements OnInit{
-  private renderer = inject(Renderer2);
-  private el = inject(ElementRef);
-  store = inject(TableStore);
-
-  @Input({ alias : 'resizeColumn', transform: booleanAttribute }) resizable: boolean | string = false;
-
-  @Input() key!: string;
-
-  ngOnInit(){
-    if (this.resizable){
-      const {table, columnHead} = this.getTableAndColumnHeadHtmlElements();
-      const resizer = this.createResizerSpanInColumnHead(columnHead);
-
-      const aggregateMouseEventsMapped$ = this.mouseDownThroughMouseUpEventMapper(resizer,columnHead,table)
-
-      const resizeColsData$ = aggregateMouseEventsMapped$.pipe(
-        filter(({mouseMove})=>!!mouseMove.buttons),
-        map( ({mouseDownData,mouseMove}) => {
-            const {newTableWidth,newColumnWidth}  = this.calculateNewWidths(mouseDownData,mouseMove)
-            return ({
-              key:this.key,
-              widthInPixel:newColumnWidth,
-              tableSize:newTableWidth,
-            })
-          }),
-        defaultShareReplay()
-      );
-
-      this.store.setUserDefinedWidth(resizeColsData$.pipe(
-        map(resizeData => ([{key: this.key, widthInPixel: resizeData.widthInPixel }]))
-      ));
-
-      this.store.setTableWidth(resizeColsData$.pipe(
-        map(resizeData => resizeData.tableSize )));
-    }
-
-  }
-
-  createResizerSpanInColumnHead(columnHead:HTMLElement){
-    const resizer = this.renderer.createElement("span");
-    this.renderer.addClass(resizer, "resize-holder");
-    resizer.style['cursor']='col-resize';
-    resizer.style['user-select']='none';
-    resizer.style['width']='10px';
-    resizer.style['height']='100%';
-    resizer.style['position']='absolute';
-    resizer.style['right']='0';
-    resizer.style['top']='0';
-    resizer.style['z-index']='1';
-    this.renderer.appendChild(columnHead, resizer);
-    return resizer;
-  }
-
-  getTableAndColumnHeadHtmlElements():{table:HTMLElement,columnHead:HTMLElement}{
-    const columnHead: HTMLElement = this.el.nativeElement;
-    const row = this.renderer.parentNode(columnHead);
-    const table = this.renderer.parentNode(row);
-    return ({table,columnHead})
-  }
-
-  mouseDownThroughMouseUpEventMapper(resizer:HTMLElement, columnHead:HTMLElement, table:HTMLElement){
-    return this.resizerMouseDownEventMapper(resizer,columnHead,table)
-    .pipe(
-      switchMap( mouseDownData => fromEvent<MouseEvent>(table, "mousemove").pipe(
-        map( mouseMove => ({mouseDownData, mouseMove})),
-        takeUntil(fromEvent<MouseEvent>(document, "mouseup"))
-      ) ),
-    )
-  }
-  resizerMouseDownEventMapper(resizer:HTMLElement, columnHead:HTMLElement, table:HTMLElement){
-    return fromEvent<MouseEvent>(resizer, "mousedown").pipe(
-      map(event => ({
-        startPageX: event.pageX,
-        startColumnWidth: this.getElementWidth(columnHead),
-        startTableWidth: this.getElementWidth(table),
-      }))
-    );
-  }
-
-  calculateNewWidths(mouseDownData: MouseDownData, mouseMove: MouseEvent):{newTableWidth:number,newColumnWidth:number}{
-    const change = (mouseMove.pageX - mouseDownData.startPageX );
-    let newColumnWidth = mouseDownData.startColumnWidth + change;
-    if(newColumnWidth < 1){
-      newColumnWidth = 1;
-    }
-    const columnChange = newColumnWidth - mouseDownData.startColumnWidth;
-    const newTableWidth = (mouseDownData.startTableWidth + columnChange);
-    return ({newTableWidth,newColumnWidth})
-  }
-  getElementWidth = (elem:HTMLElement) => (+(globalThis.getComputedStyle(elem).getPropertyValue('width').replace('px','')))
-
-}
-interface MouseDownData{
-  startPageX:number,
-  startColumnWidth:number,
-  startTableWidth:number,
-}

package/src/table-builder/directives/table-wrapper.directive.ts

@@ -1,14 +0,0 @@
-import { Directive, signal } from "@angular/core";
-import { TableCustomFilterDirective, TableFilterDirective } from "./tb-filter.directive";
-
-@Directive({
-  selector: '[tbWrapper]',
-  standalone: true,
-})
-export class TableWrapperDirective {
-  $registrations = signal([] as (TableCustomFilterDirective | TableFilterDirective)[]);
-
-  register(filter: TableCustomFilterDirective | TableFilterDirective) {
-    this.$registrations.update( registrations =>  [...registrations,filter] );
-  }
-}

package/src/table-builder/directives/tb-filter.directive.ts

@@ -1,382 +0,0 @@
-import { Directive, Input, Predicate, SimpleChanges, inject } from "@angular/core";
-import { BehaviorSubject, Observable, ReplaySubject, Subject, takeUntil, tap } from "rxjs";
-import { CustomFilter, FilterInfo } from "../classes/filter-info";
-import { v4 as uuid } from 'uuid';
-import { FilterType, FilterTypes } from "../enums/filterTypes";
-import { MatSlideToggle } from "@angular/material/slide-toggle";
-import { MatRadioButton } from "@angular/material/radio";
-import { MatButtonToggle } from '@angular/material/button-toggle';
-import { MatCheckbox } from "@angular/material/checkbox";
-import { FieldType } from "../interfaces/report-def";
-import { NgControl } from "@angular/forms";
-import { TableWrapperDirective } from "./table-wrapper.directive";
-import { MatOption } from "@angular/material/core";
-import { subscriber } from "../../rxjs";
-
-
-const inputs = [
-  'predicate: tbCustomFilter',
-  'filterId: filterId',
-];
-
-
-@Directive({
-  selector: ' '
-})
-export abstract class TableCustomFilterDirective<T = any> {
-  abstract filter$ : Observable<CustomFilter>;
-  filterId!: string;
-  savable = false;
-  used = false;
-  abstract active: boolean;
-  abstract reset(): void;
-}
-
-
-
-
-@Directive({
-  selector: "[tbFilter]",
-  standalone: true,
-}) export class TableFilterDirective {
-  protected model = inject(NgControl, { optional: true });
-  private wrapper = inject(TableWrapperDirective, { optional: true });
-  constructor() {
-    if(this.wrapper) {
-      this.wrapper.register(this);
-    }
-    if(this.model) {
-      subscriber(this.model!.valueChanges!, val => {
-        this.filterValue = val;
-        this.update();
-      })
-    }
-  }
-  reset() {
-    this.filterValue = undefined;
-  }
-  filter$ = new Subject<FilterInfo>;
-
-  @Input() filterType!: FilterType;
-  @Input() key!: string;
-  @Input() fieldType!: FieldType;
-  @Input() filterId!: string;
-  @Input() active = true;
-  @Input() filterValue: any = null;
-
-  setFilterValue(value: any) {
-    if(this.model) {
-      setTimeout(() => {
-        this.model!.reset(value);
-      }, 0);
-    } else {
-      this.filterValue = value;
-    }
-  }
-
-  used = false;
-  savable = false;
-  ready = false;
-
-  _userActive = true;
-  ngOnChanges(changes: SimpleChanges) {
-    this.update();
-  }
-
-  ngOnInit() {
-    if(!this.filterId) {
-      this.filterId = uuid();
-    } else {
-      this.savable = true;
-    }
-    this.ready = true;
-    this.update();
-  }
-
-  protected setFilter(filter: FilterInfo ) {
-    this.filter$.next(filter);
-  }
-
-  update() {
-    if (this.ready) {
-      this.setFilter(
-        {
-          filterId: this.filterId,
-          key: this.key,
-          filterType: this.filterType,
-          fieldType: this.fieldType,
-          filterValue: this.filterValue,
-          active: this.active && this.filterValue !== undefined,
-          _isExternallyManaged: true,
-        }
-      );
-
-    }
-  }
-}
-
-@Directive({
-  selector: '[tbFilterStringContains]',
-  providers: [{ provide: TableFilterDirective, useExisting: TableFilterStringContainsDirective }],
-  inputs: [
-    'key:tbFilterStringContains',
-    'filterValue:filterValue',
-    'filterId: filterId',
-    'active: active',
-  ],
-  standalone: true,
-}) export class TableFilterStringContainsDirective extends TableFilterDirective {
-  constructor() {
-    super();
-    this.filterType = FilterTypes.StringContains;
-    this.fieldType = FieldType.String;
-  }
-
-  override reset() {
-    if(this.model) {
-      this.model.reset();
-    }
-    super.reset();
-  }
-
-  override setFilter(filter: FilterInfo) {
-    filter.active = filter.filterValue && this._userActive;
-    super.setFilter(filter);
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if(changes['active']) {
-      this._userActive = changes['active'].currentValue;
-    }
-    super.ngOnChanges(changes);
-  }
-}
-
-@Directive({
-  selector: "[tbCustomFilter]",
-})
-export abstract class TableCustomFilterDirectiveBase<T = any> extends TableCustomFilterDirective<T> {
-
-  filter$! : Subject<CustomFilter>;
-  filter!: CustomFilter;
-
-  _predicate!: Predicate<T>;
-  @Input('tbCustomFilter') set predicate( val: Predicate<T> ) {
-    this._predicate = val;
-    this.update({predicate:val});
-  }
-
-  _active: boolean = false;
-  ready = false;
-
-  update(val: Partial<CustomFilter> ) {
-    if(this.ready) {
-      this.filter = {...this.filter,...val};
-      this.filter$.next(this.filter);
-    }
-  }
-
-  @Input() set active(val: boolean) {
-    if(this._active !== val) {
-      this._active = val;
-      this.update({active:val});
-    }
-  }
-  get active(): boolean {
-    return this._active;
-  }
-
-  ngOnInit() {
-    if(!this.filterId) {
-      this.filterId = uuid();
-    } else {
-      this.savable = true;
-    }
-
-    this.filter = {
-      filterType: FilterTypes.Custom,
-      filterId: this.filterId,
-      active: this._active,
-      predicate: this._predicate,
-    };
-    this.ready = true;
-    this.filter$ = new BehaviorSubject(this.filter);
-  }
-}
-
-@Directive()
-export abstract class TbSelectedFilterDirective<T = any>  extends TableCustomFilterDirectiveBase<T> {
-
-  protected wrapper = inject(TableWrapperDirective, { optional: true });
-  protected constructor(private change: Observable<any>, private isActive: () => boolean) {
-    super();
-    if(this.wrapper) {
-      this.wrapper.register(this);
-    }
-  }
-
-  reset() {
-    this.active = false;
-  }
-
-  destroySubject$ = new ReplaySubject<void>(1);
-  ngOnDestroy() {
-    this.destroySubject$.next();
-  }
-
-  ngOnInit(): void {
-    this._active = this.isActive();
-    super.ngOnInit();
-    this.change.pipe(takeUntil(this.destroySubject$)).subscribe( () => {
-      this.active = this.isActive();
-    });
-  }
-}
-
-// Checkbox
-@Directive({
-  selector: 'mat-checkbox[tbCustomFilter]',
-  inputs: [
-    ...inputs
-  ],
-  providers: [{ provide: TableCustomFilterDirective, useExisting: MatCheckboxTbFilterDirective }],
-  standalone: true,
-})
-export class MatCheckboxTbFilterDirective extends TbSelectedFilterDirective {
-  private matCheckbox = inject(MatCheckbox);
-
-
-  override set active(val: boolean) {
-    this.matCheckbox.checked = val;
-    super.active = val;
-  }
-  constructor() {
-    const matCheckbox = inject(MatCheckbox);
-    super(matCheckbox.change, () => matCheckbox.checked);
-    this.matCheckbox = matCheckbox;
-  }
-}
-
-
-@Directive({
-  selector: 'mat-slide-toggle[tbCustomFilter]',
-  inputs: [
-    ...inputs
-  ],
-  providers: [{ provide: TableCustomFilterDirective, useExisting: MatSlideToggleTbFilterDirective }],
-  standalone: true,
-})
-export class MatSlideToggleTbFilterDirective<T = any> extends TbSelectedFilterDirective<T> {
-  private matSlideToggle: MatSlideToggle;
-
-  override set active(val: boolean) {
-    this.matSlideToggle.checked = val;
-    super.active = val;
-  }
-  constructor() {
-    const matSlideToggle = inject(MatSlideToggle);
-
-    super(matSlideToggle.change, () => matSlideToggle.checked);
-    this.matSlideToggle = matSlideToggle;
-
-  }
-
-  ngOnInit(): void {
-    super.ngOnInit();
-  }
-}
-
-// Radio button
-@Directive({
-  selector: 'mat-radio-button[tbCustomFilter]',
-  inputs: ['predicate: tbCustomFilter'],
-  providers: [{ provide: TableCustomFilterDirective, useExisting: MatRadioButtonTbFilterDirective }],
-  standalone: true,
-})
-export class MatRadioButtonTbFilterDirective extends TbSelectedFilterDirective {
-  private matRadioButton: MatRadioButton;
-
-
-  override set active(val: boolean) {
-    this.matRadioButton.checked = val;
-    super.active = val;
-  }
-  constructor() {
-    const matRadioButton = inject(MatRadioButton);
-
-    super(matRadioButton.change, () => matRadioButton.checked);
-    this.matRadioButton = matRadioButton;
-  }
-
-  ngOnInit(): void {
-    super.ngOnInit();
-  }
-}
-
-// Option (select)
-@Directive({
-  selector: 'mat-option[tbCustomFilter]',
-  inputs: [
-    ...inputs
-  ],
-  providers: [{ provide: TableCustomFilterDirective, useExisting: MatOptionTbFilterDirective }],
-  standalone: true,
-})
-export class MatOptionTbFilterDirective extends TbSelectedFilterDirective {
-  private matOption: MatOption;
-
-
-  override set active(val: boolean) {
-    if(val) {
-      this.matOption.select();
-    } else {
-      this.matOption.deselect();
-    }
-    super.active = val;
-  }
-  constructor() {
-    const matOption = inject(MatOption);
-
-    super( matOption.onSelectionChange.pipe(tap( d => {
-      if(!matOption.value) {
-        matOption.value = uuid();
-      }
-    }
-
-    )), () => matOption.selected);
-    this.matOption = matOption;
-  }
-
-  ngOnInit(): void {
-    super.ngOnInit();
-  }
-}
-
-// Button toggle
-@Directive({
-  selector: 'mat-button-toggle[tbCustomFilter]',
-  inputs: [
-    ...inputs
-  ],
-  providers: [{ provide: TableCustomFilterDirective, useExisting: MatButtonToggleFilterDirective }],
-  standalone: true,
-})
-export class MatButtonToggleFilterDirective extends TbSelectedFilterDirective {
-  private matButtonToggle: MatButtonToggle;
-
-  override set active(val: boolean) {
-    this.matButtonToggle.checked = val;
-    super.active = val;
-  }
-  constructor() {
-    const matButtonToggle = inject(MatButtonToggle);
-
-    super(matButtonToggle.change, () => matButtonToggle.checked);
-    this.matButtonToggle = matButtonToggle;
-
-  }
-
-  ngOnInit(): void {
-    super.ngOnInit();
-  }
-}

package/src/table-builder/enums/filterTypes.ts

@@ -1,40 +0,0 @@
-
-export const FilterTypes = {
-    NumberEquals: 'Equals',
-    NumberNotEqual: 'Does Not Equal',
-    NumberGreaterThan: 'Greater Than',
-    NumberLessThan: 'Less Than',
-    NumberBetween: 'Between',
-    StringEquals: 'Equals',
-    StringContains: 'Contains',
-    StringDoesNotContain: 'Does Not Contain',
-    StringStartWith: 'Start With',
-    StringEndsWith: 'Ends With',
-    DateIsOn: 'Is on',
-    DateIsNotOn: 'Is Not On',
-    DateOnOrAfter: 'On or After',
-    DateOnOrBefore: 'On or Before',
-    DateBetween: 'Between',
-    DateTimeIsAt: 'Is At',
-    DateTimeIsNotAt: 'Is Not At',
-    DateTimeAtOrAfter: 'At or After',
-    DateTimeAtOrBefore: 'At or Before',
-    DateTimeBetween: 'Between',
-    BooleanEquals: 'Is',
-    IsNull: 'Is Blank',
-    Or: 'Or',
-    And: 'And',
-    In: 'In',
-    Custom: 'Custom',
-} as const;
-
-export type FilterType = typeof FilterTypes[keyof typeof FilterTypes];
-
-export type SubFilterTypes<T extends typeof FilterTypes[keyof typeof FilterTypes]>  = T;
-
-export type StringFilterTypes = SubFilterTypes<'Equals' | 'Contains' | 'Does Not Contain' | 'Start With' | 'Ends With' | 'Is Blank' | 'In'>;
-export type NumberFilterTypes = SubFilterTypes<'Equals' | 'Does Not Equal' | 'Greater Than' | 'Less Than' | 'Between' | 'Is Blank' | 'In'>;
-export type DateFilterTypes = SubFilterTypes<'Is on' | 'Is Not On' | 'On or After' | 'On or Before' | 'Between' | 'Is Blank'>;
-export type DateTimeFilterTypes = SubFilterTypes<'Is At' | 'Is Not At' | 'At or After' | 'At or Before' | 'Between' | DateFilterTypes>;
-export type BooleanFilterTypes = SubFilterTypes<'Is' | 'Is Blank'>;
-export type EnumFilterTypes = SubFilterTypes<'In' | 'Is Blank'>;

package/src/table-builder/functions/boolean-filter-function.ts

@@ -1,12 +0,0 @@
-import { FilterFunc, FilterFuncs, FilterInfo } from '../classes/filter-info';
-import { BooleanFilterTypes, FilterTypes } from '../enums/filterTypes';
-import { isNull } from './null-filter-function';
-
-const  booleanEqualsFunc : FilterFunc<boolean> = (filterInfo:FilterInfo) => (val): boolean  => {
-    return filterInfo.filterValue === val;
-}
-
-export const BooleanFilterFuncs: FilterFuncs<BooleanFilterTypes> = {
-     [FilterTypes.BooleanEquals]: booleanEqualsFunc,
-     [FilterTypes.IsNull]: isNull,
-};

package/src/table-builder/functions/date-filter-function.ts

@@ -1,68 +0,0 @@
-import { FilterFunc, FilterFuncs, FilterInfo, Range } from '../classes/filter-info';
-import { DateFilterTypes, DateTimeFilterTypes, FilterTypes } from '../enums/filterTypes';
-import { FieldType } from '../interfaces/report-def';
-import { isNull } from './null-filter-function';
-
-
-const dateIsOnFunc:FilterFunc<Date> = (filterInfo:FilterInfo) => {
-  const isOnVal = new Date( filterInfo.filterValue).getTime();
-  const clean = filterInfo.fieldType === FieldType.Date ? (a,b) => b : cleanDateTime
-  return ((val)=>clean(filterInfo,val).getTime()  === isOnVal);
-}
-
-const dateIsNotOnFunc:FilterFunc<Date> = (filterInfo:FilterInfo) => {
-  const isNotOnVal = new Date( filterInfo.filterValue).getTime();
-  const clean = filterInfo.fieldType === FieldType.Date ? (a,b) => b : cleanDateTime
-  return ((val)=>clean(filterInfo,val).getTime()  !== isNotOnVal);
-}
-
-const dateIsOnOrAfterFunc:FilterFunc<Date> = (filterInfo:FilterInfo) => {
-  const afterVal = new Date( filterInfo.filterValue).getTime();
-  const clean = filterInfo.fieldType === FieldType.Date ? (a,b) => b : cleanDateTime
-  return ((val)=>clean(filterInfo,val).getTime()  >= afterVal);
-}
-
-const dateIsOnOrBeforeFunc:FilterFunc<Date> = (filterInfo:FilterInfo) => {
-  const beforeVal = new Date( filterInfo.filterValue).getTime();
-  const clean = filterInfo.fieldType === FieldType.Date ? (a,b) => b : cleanDateTime
-  return ((val)=>clean(filterInfo,val).getTime()  <= beforeVal);
-}
-
-const dateBetweenFunc:FilterFunc<Range<Date>,Date> = (filterInfo:FilterInfo) => {
-  const startVal = new Date(filterInfo.filterValue.Start);
-  const endVal = new Date(filterInfo.filterValue.End);
-  const clean = filterInfo.fieldType === FieldType.Date ? (a,b) => b : cleanDateTime
-  return (
-    (val)=> {
-      const cleanedVal = clean(filterInfo, val);
-      return cleanedVal>=startVal && cleanedVal <= endVal;
-    });
-}
-
-const cleanDateTime = (filterInfo:FilterInfo, val: Date) => {
-  if(!!DateFilterFuncs[filterInfo.filterType]){
-    const d = new Date(val);
-    d.setHours(0,0,0,0);
-    return d;
-  }
-  return val;
-}
-
-export const DateFilterFuncs: FilterFuncs<DateFilterTypes> = {
-    [FilterTypes.DateIsOn]: dateIsOnFunc,
-    [FilterTypes.DateIsNotOn]: dateIsNotOnFunc,
-    [FilterTypes.DateOnOrAfter]: dateIsOnOrAfterFunc,
-    [FilterTypes.DateOnOrBefore]: dateIsOnOrBeforeFunc,
-    [FilterTypes.DateBetween]: dateBetweenFunc,
-    [FilterTypes.IsNull]: isNull,
-};
-
-export const DateTimeFilterFuncs: FilterFuncs<DateTimeFilterTypes> = {
-  ...DateFilterFuncs,
-  [FilterTypes.DateTimeIsAt]: dateIsOnFunc,
-  [FilterTypes.DateTimeIsNotAt]: dateIsNotOnFunc,
-  [FilterTypes.DateTimeAtOrAfter]: dateIsOnOrAfterFunc,
-  [FilterTypes.DateTimeAtOrBefore]: dateIsOnOrBeforeFunc,
-  [FilterTypes.DateTimeBetween]: dateBetweenFunc,
-  [FilterTypes.IsNull]: isNull,
-};

package/src/table-builder/functions/download-data.ts

@@ -1,11 +0,0 @@
-export function downloadData(data: string, filename: string, mimeType: string) {
-  const url = URL.createObjectURL(new Blob([data], { type: mimeType }));
-  const downloadLink = document.createElement('a');
-  downloadLink.download = filename;
-  downloadLink.href = url;
-  downloadLink.style.display = 'none';
-  document.body.appendChild(downloadLink);
-  downloadLink.click();
-  document.body.removeChild(downloadLink);
-  URL.revokeObjectURL(url);
-}

package/src/table-builder/functions/null-filter-function.ts

@@ -1,9 +0,0 @@
-import { FilterFunc, FilterInfo } from '../classes/filter-info';
-
-export const isNull:FilterFunc<boolean,any> = (filterInfo:FilterInfo) => {
-  const func = filterInfo.filterValue ?
-    (val: any) => val == null || val === ''
-    :
-    (val: any) => val != null && val !== '';
-    return func;
-}

package/src/table-builder/functions/number-filter-function.ts

@@ -1,41 +0,0 @@
-import { Range, FilterFunc, FilterInfo, FilterFuncs } from '../classes/filter-info';
-import { FilterTypes, NumberFilterTypes } from '../enums/filterTypes';
-import { isNull } from './null-filter-function';
-
-type NumberFilterFunc = FilterFunc<number>
-
-const numberEqalsFunc:NumberFilterFunc = (filterInfo : FilterInfo<number>) => (val: number): boolean  =>{
-    return  val === filterInfo.filterValue;
-}
-
-const numberNotEqualFunc:NumberFilterFunc= (filterInfo : FilterInfo<number>) => (val: number): boolean  =>{
-  return val !== filterInfo.filterValue;
-}
-
-const  numberGreaterThanFunc:NumberFilterFunc= (filterInfo : FilterInfo<number>) => (val: number): boolean  => {
-    return val > filterInfo.filterValue;
-}
-
-const numberLessThanFunc:NumberFilterFunc= (filterInfo : FilterInfo<number>) => (val: number): boolean  => {
-    return val < filterInfo.filterValue;
-}
-
-const  numberBetweenFunc:FilterFunc<Range<number>,number> = (filterInfo : FilterInfo) => {
-  const startVal = Number(filterInfo.filterValue.Start);
-  const endVal = Number(filterInfo.filterValue.End);
-  return ((val)=>(val > startVal) && (val < endVal));
-}
-
-export const multipleNumberValuesEqualsFunc:FilterFunc<number[],number> = (filterInfo:FilterInfo) => {
-  return ((val)=>filterInfo.filterValue.some((value: any) => val === value));
-}
-
-export const NumberFilterFuncs: FilterFuncs<NumberFilterTypes> = {
-    [FilterTypes.NumberEquals]: numberEqalsFunc,
-    [FilterTypes.NumberNotEqual]: numberNotEqualFunc,
-    [FilterTypes.NumberGreaterThan]: numberGreaterThanFunc,
-    [FilterTypes.NumberLessThan]: numberLessThanFunc,
-    [FilterTypes.NumberBetween]: numberBetweenFunc,
-    [FilterTypes.IsNull]: isNull,
-    [FilterTypes.In]: multipleNumberValuesEqualsFunc,
-};