@one-paragon/angular-utilities 2.0.0-beta.2 → 2.0.0-beta.4

package/src/table-builder/components/table-container-filter/filter-list/filter-list.component.ts

@@ -0,0 +1,44 @@
+import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core';
+import { TableStore } from '../../../classes/table-store';
+import { FilterInfo, isFilterInfo } from '../../../classes/filter-info';
+import { WrapperFilterStore } from '../table-wrapper-filter-store';
+import { MatButtonModule } from '@angular/material/button';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { MatIconModule } from '@angular/material/icon';
+import { FilterComponent } from '../../filter/filter.component';
+import { MatChipsModule } from '@angular/material/chips';
+import { KeyDisplayPipe } from '../../../pipes/key-display';
+import { FormatFilterTypePipe } from '../../../pipes/format-filter-type.pipe';
+import { FormatFilterValuePipe } from '../../../pipes/format-filter-value.pipe';
+
+@Component({
+  selector: 'lib-filter-list',
+  templateUrl: './filter-list.component.html',
+  styleUrls: ['../gen-filter-displayer/gen-filter-displayer.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+    imports: [
+    MatButtonModule, MatTooltipModule, MatIconModule, FilterComponent,
+    MatChipsModule, KeyDisplayPipe, FormatFilterTypePipe, FormatFilterValuePipe
+  ]
+})
+export class FilterChipsComponent {
+
+  tableState = inject(TableStore);
+  filterStore = inject(WrapperFilterStore);
+
+  $filters = computed(() =>
+    Object.values(this.tableState.$filters()).filter(f => isFilterInfo(f) && !f._isExternallyManaged) as FilterInfo[])
+  deleteByIndex(index: number) {
+    this.filterStore.deleteByIndex(index);
+  }
+
+  addFilter(filter:FilterInfo<any>){
+    this.filterStore.addFilter(filter);
+  }
+
+  clearAll() {
+      this.filterStore.clearAll();
+  }
+
+  $currentFilters = this.filterStore.$currentFilters;
+}

package/src/table-builder/components/table-container-filter/gen-filter-displayer/gen-filter-displayer.component.css

@@ -0,0 +1,42 @@
+.filter {
+    margin: 15px;
+    display: inline-block;
+}
+.filter-button {
+    color: cornflowerblue;
+    font-size: 22px;
+    font-weight: 700;
+}
+
+.cancel-button  {
+  margin-right: 30px;
+  font-weight: 700;
+}
+.filter-wrapper{
+  margin-top: 1em;
+  margin-bottom: 1em;
+  float: right;
+}
+.menu {
+    margin-bottom: 10px;
+    width: 109.1%;
+}
+
+.filter-labels {
+    color: cornflowerblue;
+    font-size: 17px;
+    font-weight: 600;
+}
+.float{
+  position: absolute;
+  width: fit-content;
+  z-index: 101;
+  top: 10px;
+  right: 180px;
+  max-width: 90vw;
+}
+.d-w{
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+}

package/src/table-builder/components/table-container-filter/gen-filter-displayer/gen-filter-displayer.component.html

@@ -0,0 +1,10 @@
+<button stop-propagation class="filter-button" mat-icon-button [matMenuTriggerFor]="menu" [matTooltip]="'Add Filter'">
+  <mat-icon class="filter-icon" color="primary">filter_list</mat-icon>
+</button>
+<mat-menu #menu="matMenu">
+  @for (md of $filterCols(); track md.key) {
+    <button (click)="addFilter(md)" mat-menu-item>
+      <span class="filter-labels">{{md.displayName || (md.key | spaceCase)}}</span>
+    </button>
+  }
+</mat-menu>

package/src/table-builder/components/table-container-filter/gen-filter-displayer/gen-filter-displayer.component.spec.ts

@@ -0,0 +1,85 @@
+import { firstValueFrom, of } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { TestBed, ComponentFixture, ComponentFixtureAutoDetect, tick, fakeAsync, flush } from '@angular/core/testing';
+import { GenFilterDisplayerComponent } from './gen-filter-displayer.component';
+import { SpaceCasePipe } from '../../../../utilities/pipes/space-case.pipes';
+import { FilterComponent } from '../../filter/filter.component';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { FieldType } from '../../../interfaces/report-def';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { DateFilterComponent } from '../../date-filter/date-filter.component';
+import { TableBuilderModule } from '../../../table-builder.module';
+import { StoreModule } from '@ngrx/store';
+import { EffectsModule } from '@ngrx/effects';
+import { TableStore } from '../../../classes/table-store';
+import { WrapperFilterStore } from '../table-wrapper-filter-store';
+
+
+function getMetaData() {
+  return of([
+    {
+      key: 'name',
+      displayName: 'first name',
+      fieldType: FieldType.String,
+      additional: {},
+      order: 1
+    },
+    {
+      key: 'last',
+      displayName: 'last name',
+      fieldType: FieldType.String,
+      additional: {},
+      order: 2
+    }
+  ]);
+}
+
+describe('generic filter displayer', () => {
+  let fixture: ComponentFixture<GenFilterDisplayerComponent>;
+  let component: GenFilterDisplayerComponent;
+
+  const clickFilter = (idx: number) => {
+    const btn = fixture.debugElement.query(By.css('.filter-button')).nativeElement;
+
+    btn.click();
+    const menu = fixture.debugElement.queryAll(By.css('.mat-menu-item'));
+    menu[idx].nativeElement.click();
+  };
+  beforeEach(() => {
+
+    TestBed.configureTestingModule({
+      declarations: [
+        GenFilterDisplayerComponent,
+        SpaceCasePipe,
+        FilterComponent,
+        DateFilterComponent,
+      ],
+      providers: [TableStore, WrapperFilterStore,
+      { provide: ComponentFixtureAutoDetect, useValue: true }
+      ],
+      imports: [
+        NoopAnimationsModule,
+        CommonModule,
+        FormsModule,
+        TableBuilderModule.forRoot({ defaultTableSettings: { } }),
+        StoreModule.forRoot({}),
+        EffectsModule.forRoot([])]
+    })
+      .compileComponents();
+    fixture = TestBed.createComponent(GenFilterDisplayerComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should get the generic filter displayer component', () => {
+    expect(component).toBeDefined();
+  });
+
+  it('should be able to create a filter',  async () => {
+    clickFilter(0);
+    const filter = await firstValueFrom(fixture.componentInstance.filterStore.state$.pipe(map(x => x.filterInfo)));
+    expect(filter.length).toBe(1);
+  });
+
+});

package/src/table-builder/components/table-container-filter/gen-filter-displayer/gen-filter-displayer.component.ts

@@ -0,0 +1,32 @@
+import { Component, ChangeDetectionStrategy, inject, computed } from '@angular/core';
+import { MetaData, FieldType } from '../../../interfaces/report-def';
+import { TableStore } from '../../../classes/table-store';
+import { WrapperFilterStore } from '../table-wrapper-filter-store';
+import { MatButtonModule } from '@angular/material/button';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { SpaceCasePipe, StopPropagationDirective } from '../../../../utilities';
+import { MatIconModule } from '@angular/material/icon';
+
+@Component({
+    selector: 'tb-filter-displayer',
+    templateUrl: './gen-filter-displayer.component.html',
+    styleUrls: ['./gen-filter-displayer.component.css'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+        imports: [
+      MatButtonModule, MatMenuModule, MatTooltipModule, StopPropagationDirective, MatIconModule,
+      SpaceCasePipe
+    ]
+})
+export class GenFilterDisplayerComponent {
+  protected tableState = inject(TableStore);
+  protected filterStore = inject(WrapperFilterStore);
+  $filterCols = computed(() => {
+    const mds = this.tableState.$metaDataArray();
+    return mds.filter(m => m.fieldType !== FieldType.Hidden && m.fieldType !== FieldType.NotMapped && !m.noFilter);
+  });
+
+  addFilter(metaData: MetaData) {
+    this.filterStore.addFilter({key: metaData.key, fieldType: metaData.fieldType});
+  }
+}

package/src/table-builder/components/table-container-filter/table-wrapper-filter-store.ts

@@ -0,0 +1,23 @@
+import { Injectable } from "@angular/core";
+import { ComponentStore } from "@ngrx/component-store";
+import { map } from "rxjs/operators";
+import { PartialFilter } from "../../classes/filter-info";
+@Injectable()
+export class WrapperFilterStore  extends ComponentStore<{filterInfo:PartialFilter[]}>{
+  constructor(){
+    super({filterInfo:[]});
+  }
+
+  clearAll = this.updater(()=>({filterInfo:[]}));
+  deleteByIndex = this.updater((state,index:number)=>{
+    const arr = [...state.filterInfo];
+    arr.splice(index, 1);
+    return {filterInfo:arr};
+  });
+
+  $currentFilters = this.selectSignal(state => state.filterInfo);
+
+  addFilter = this.updater((state,filter:PartialFilter)=>{
+    return ({...state,filterInfo:[...state.filterInfo,filter]});
+  })
+}

package/src/table-builder/directives/custom-cell-directive.ts

@@ -0,0 +1,58 @@
+import { Directive, TemplateRef, inject, input, computed, signal } from '@angular/core';
+import { CdkColumnDef } from '@angular/cdk/table';
+import { CustomCellMeta, FieldType, SortDef } from '../interfaces/report-def';
+import { TableBuilder } from '../classes/table-builder';
+
+interface CustomCellContext<T> {
+  $implicit: T,
+  element: T,
+}
+// here is how to use it
+// <generic-table [report]="report">
+//     <p *customCell="'column1'; let element = element" [class.makeMeRed]="element?.port">If Port, i will be red</p>
+//     <p *customCell="'column2'">I am custom cell two </p>
+// </generic-table>
+@Directive({
+    selector: '[customCell]',
+    })
+export class CustomCellDirective<T = any> {
+    private templateRef = inject<TemplateRef<any>>(TemplateRef, { optional: true });
+    public columnDef = inject(CdkColumnDef, { optional: true });
+    $customCell = input.required<string>({alias: 'customCell'});
+    $displayName = input<string | undefined>(undefined, {alias: 'displayName'});
+    $preSort = input<SortDef | undefined>(undefined, {alias: 'preSort'});
+    $templateRef = input<TemplateRef<any> | undefined>(this.templateRef || undefined, {alias: 'templateRef'});
+    $customCellOrder = input<number | undefined>(undefined, {alias: 'customCellOrder'});
+    $customCellWidth = input<string | undefined>(undefined, {alias: 'customCellWidth'});
+    /**
+     * for type safety, this is a reference to the table builder instance.
+     */
+    $customCellTableRef = input<TableBuilder<T> | undefined>(undefined, {alias: 'customCellTableRef'});
+    /**
+     * true if column not mapped to a property in the data source. Default is false.
+     */
+    $customCellNotMapped = input<boolean>(false, {alias: 'customCellNotMapped'});
+    $metaData = computed((): CustomCellMeta | undefined => {
+      const c= this.$customCell();
+      if(!c) return;
+      return ({
+        key: this.$customCell(),
+        displayName: this.$displayName(),
+        preSort: this.$preSort(),
+        fieldType: this.$customCellNotMapped() ? FieldType.NotMapped : FieldType.Unknown,
+        order: this.$customCellOrder(),
+        width: this.$customCellWidth(),
+        customCell: true,
+        noExport: true,
+      }) 
+    });
+    $inited = signal(false);
+
+    ngOnInit(){
+      this.$inited.set(true);
+    }
+
+    static ngTemplateContextGuard<T>(dir: CustomCellDirective<T>, ctx: any): ctx is CustomCellContext<T> {
+      return true;
+    }
+}

package/{table-builder/directives/index.d.ts → src/table-builder/directives/index.ts}

@@ -1,5 +1,6 @@
-export * from './custom-cell-directive';
-export * from './multi-sort.directive';
-export * from './resize-column.directive';
-export * from './table-wrapper.directive';
-export * from './tb-filter.directive';
+export * from './custom-cell-directive';
+export * from './multi-sort.directive';
+export * from './resize-column.directive';
+export * from './table-wrapper.directive';
+export * from './tb-filter.directive';
+

package/src/table-builder/directives/multi-sort.directive.spec.ts

@@ -0,0 +1,124 @@
+import { MultiSortDirective } from './multi-sort.directive';
+import { Sort, MatSortable } from '@angular/material/sort';
+import { FieldType } from '../interfaces/report-def';
+import { TableBuilderConfigToken } from '../classes/TableBuilderConfig';
+import { DatePipe } from '@angular/common';
+import { TestBed } from '@angular/core/testing';
+import { StoreModule } from '@ngrx/store';
+import { storageStateReducer } from '../ngrx/reducer';
+import { TableStore } from '../classes/table-store';
+
+describe('MultiSortDirective', () => {
+
+    let directive: MultiSortDirective;
+    let rules: Sort[];
+
+    const data = [
+      {
+        name: 'Joe',
+        age: 10,
+        balance: 25
+      },
+      {
+        name: 'Jane',
+        age: 20,
+        balance: 35
+      }
+    ];
+    const metaData =  [
+      {
+        key: 'name',
+        fieldType: FieldType.String,
+        additional: {},
+        order : 1
+      },
+      {
+        key: 'age',
+        fieldType: FieldType.Number,
+        additional: {},
+        order : 2
+      },
+      {
+        key: 'balance',
+        fieldType: FieldType.Number,
+        additional: {},
+        order : 3
+      }
+    ];
+
+    const initialState = {fullTableState: {
+      'test-id': {
+        metaData,
+        hiddenKeys: [],
+        pageSize: 10,
+        initialized : true ,
+        filters: [],
+        sorted : [],
+      }
+    }};
+
+    beforeEach(() => {
+      TestBed.resetTestingModule ();
+      rules = [];
+      TestBed.configureTestingModule({
+        declarations: [],
+        providers: [
+         { provide : TableBuilderConfigToken , useValue: {defaultTableState: { }}},
+         DatePipe,
+         TableStore
+        ],
+        imports: [
+          StoreModule.forRoot({'fullTableState': storageStateReducer}),
+        ],
+        teardown: {destroyAfterEach: true}
+      })
+      .compileComponents();
+
+      const store = TestBed.inject(TableStore);
+     // stateManager.upda ..tableId = 'test-id';
+     // stateManager.initializeState();
+      directive = new MultiSortDirective(store);
+
+        rules = [
+            { active: 'a', direction: 'asc' },
+            { active: 'b', direction: 'asc' },
+            { active: 'c', direction: 'asc' },
+        ];
+
+        [...rules].reverse().forEach( rule =>  store.setSort( {key:rule.active, direction: rule.direction} ));
+        directive.ngOnInit();
+    });
+
+    describe('Initializing Rules',  () => {
+
+        it('should inititialize the rules', () => {
+            expect(directive.rules).toEqual(rules);
+        });
+    });
+
+    describe('Updating the rules', () => {
+        it('should add new rule to begining of rules array', () => {
+            const originalLength = directive.rules.length;
+            const sort: MatSortable = { id: 'd', start: 'asc', disableClear: false };
+            directive.sort(sort);
+            expect(directive.rules.length).toBe(originalLength + 1, 'updated rules length should be one larger than original');
+            expect(directive.rules[0].active).toBe(sort.id);
+        });
+
+        it('should remove old rule for the column of new rule and replace it with new rule', () => {
+            const originalLength = directive.rules.length;
+            const sort: MatSortable = { id: 'a', start: 'asc', disableClear: false };
+            directive.sort(sort);
+            expect(directive.rules.length).toBe(originalLength, 'updated rules length should be same as original');
+            expect(directive.rules[0].direction).toBe('desc');
+        });
+
+        it('should remove old rule without replacing it if new rule for that column has no direction', () => {
+            const originalLength = directive.rules.length;
+            const sort: MatSortable = { id: 'a', start: 'asc', disableClear: false };
+            directive.sort({...sort});
+            directive.sort({...sort});
+            expect(directive.rules.length).toBe(originalLength - 1, 'updated rules length should be one smaller than original');
+        });
+    });
+});

package/src/table-builder/directives/multi-sort.directive.ts

@@ -0,0 +1,50 @@
+import { Directive, OnInit, OnDestroy, inject } from '@angular/core';
+import { MatSort, Sort, SortDirection } from '@angular/material/sort';
+import { distinctUntilChanged, distinctUntilKeyChanged, map, tap } from 'rxjs/operators';
+import { TableStore } from '../classes/table-store';
+
+@Directive({
+  selector: '[multiSort]',
+  exportAs: 'multiSort',
+  inputs: ['disabled: matSortDisabled'],
+  providers: [
+    { provide: MatSort, useExisting: MultiSortDirective }
+  ],
+  })
+export class MultiSortDirective extends MatSort implements OnInit, OnDestroy {
+  private state = inject(TableStore);
+
+
+  constructor() {
+    super();
+    this.state.setSort(this.sortChange.pipe(
+      distinctUntilChanged((f,s) => f.active === s.active && f.direction === s.direction),
+       map(sc => ({ key: sc.active, direction: sc.direction }))));
+    this.state.on(
+      this.state.sort$,
+      (rules) => {
+        const topRule = { active: rules[0]?.active || '', direction: rules[0]?.direction || '' as SortDirection};
+        const topActiveChanged = topRule.active !== this.active || '';
+        const topDirectionChanged = topRule.direction !== this.direction || '';
+        if(topActiveChanged || topDirectionChanged){
+          this.active = topRule.active;
+          this.direction = topRule.direction;
+          this.sortChange.emit(topRule);
+        }
+      }
+    );
+  }
+
+}
+
+export function sortsAreSame(a: Sort[], b: Sort[]) {
+  if (a.length !== b.length) {
+    return false;
+  }
+  for (let i = 0; i < a.length; i++) {
+    if (a[i].active !== b[i].active || a[i].direction !== b[i].direction) {
+      return false;
+    } 
+  }
+  return true;
+}

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

@@ -0,0 +1,107 @@
+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]",
+  })
+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

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