ontimize-web-ngx 15.8.1 → 15.8.2

package/lib/components/table/extensions/header/table-header/o-table-header.component.d.ts

@@ -2,11 +2,13 @@ import type { OColumn } from "../../../column/o-column.class";
 import { OTableBase } from "../../../o-table-base.class";
 import { OMatSortHeader } from "../../sort/o-mat-sort-header";
 import type { OTableHeaderColumnFilterIconComponent } from "../table-header-column-filter-icon/o-table-header-column-filter-icon.component";
+import { OColumnValueFilter } from "../../../../../types/table/o-column-value-filter.type";
 import * as i0 from "@angular/core";
 export declare const DEFAULT_INPUTS_O_TABLE_HEADER: string[];
 export declare class OTableHeaderComponent {
     protected table: OTableBase;
     column: OColumn;
+    columnFilters: OColumnValueFilter[];
     resizable: boolean;
     protected _columnFilterIcon: OTableHeaderColumnFilterIconComponent;
     set columnFilterIcon(value: OTableHeaderColumnFilterIconComponent);
@@ -16,5 +18,5 @@ export declare class OTableHeaderComponent {
     setFilterIconHintVisible(visible: boolean): void;
     ngAfterViewInit(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<OTableHeaderComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<OTableHeaderComponent, "o-table-header", never, { "column": "column"; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<OTableHeaderComponent, "o-table-header", never, { "column": "column"; "columnFilters": "column-filters"; }, {}, never, never, false, never>;
 }

package/lib/components/table/extensions/header/table-header-column-filter-icon/o-table-header-column-filter-icon.component.d.ts

@@ -1,4 +1,4 @@
-import { OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { OColumnValueFilter } from '../../../../../types/table/o-column-value-filter.type';
 import type { OColumn } from '../../../column';
@@ -14,20 +14,25 @@ export declare class OTableHeaderColumnFilterIconComponent implements OnInit, On
     protected dialog: MatDialog;
     protected dialogService: DialogService;
     protected translateService: OTranslateService;
+    protected cd: ChangeDetectorRef;
     column: OColumn;
+    set columnFilters(filters: OColumnValueFilter[]);
+    get columnFilters(): OColumnValueFilter[];
+    private _columnFilters;
     isColumnFilterActive: BehaviorSubject<boolean>;
     filterIconHintVisible: BehaviorSubject<boolean>;
     indicatorNumber: BehaviorSubject<string>;
     private subscription;
     filterIconStateView: BehaviorSubject<STATEVIEW>;
-    constructor(table: OTableBase, dialog: MatDialog, dialogService: DialogService, translateService: OTranslateService);
+    constructor(table: OTableBase, dialog: MatDialog, dialogService: DialogService, translateService: OTranslateService, cd: ChangeDetectorRef);
     ngOnInit(): void;
     updateStateColumnFilter(): void;
+    private updateFilterIndicatorNumber;
     protected getColumnValueFilterByAttr(): OColumnValueFilter;
-    openColumnFilterDialog(event: any): void;
+    openColumnFilterDialog(event: Event): void;
     getFilterIndicatorNumbered(): string;
     setFilterIconHintVisible(visible: boolean): void;
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<OTableHeaderColumnFilterIconComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<OTableHeaderColumnFilterIconComponent, "o-table-header-column-filter-icon", never, { "column": "column"; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<OTableHeaderColumnFilterIconComponent, "o-table-header-column-filter-icon", never, { "column": "column"; "columnFilters": "column-filters"; }, {}, never, never, false, never>;
 }

package/lib/components/table/extensions/header/table-header-select-all/o-table-header-select-all.component.d.ts

@@ -15,5 +15,5 @@ export declare class OTableHeaderSelectAllComponent extends OTableHeaderComponen
     ngAfterViewInit(): void;
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<OTableHeaderSelectAllComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<OTableHeaderSelectAllComponent, "o-table-header-select-all", never, { "column": "column"; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<OTableHeaderSelectAllComponent, "o-table-header-select-all", never, { "column": "column"; "columnFilters": "column-filters"; }, {}, never, never, false, never>;
 }

package/lib/components/table/o-table.component.d.ts

@@ -96,6 +96,7 @@ export declare class OTableComponent extends AbstractOServiceComponent<OTableCom
     protected rowChangeSubscription: Subscription;
     refreshExpandableRowState: boolean;
     loadingService: OTableLoadingService;
+    protected subscriptionOnFilterChanges: any;
     set oMatSort(_sort: OMatSort);
     virtualScrollViewport: CdkVirtualScrollViewport;
     oTableGlobalConfig: OTableGlobalConfig;
@@ -171,8 +172,8 @@ export declare class OTableComponent extends AbstractOServiceComponent<OTableCom
     groupedColumnTypes: OGroupedColumnTypes[];
     rowClass: (rowData: any, rowIndex: number) => string | string[];
     protected _visibleColArray: string[];
-    get visibleColArray(): any[];
-    set visibleColArray(arg: any[]);
+    get visibleColArray(): string[];
+    set visibleColArray(arg: string[]);
     sortColArray: SQLOrder[];
     protected tabGroupContainer: MatTabGroup;
     protected tabContainer: MatTab;
@@ -243,6 +244,10 @@ export declare class OTableComponent extends AbstractOServiceComponent<OTableCom
     exportOptsTemplate: QueryList<OTableExportButtonComponent>;
     tableColumnSelectAllContentChild: OTableColumnSelectAllDirective;
     savedScrollPosition: number;
+    private readonly columnFiltersSubject;
+    protected columnFilters$: Observable<OColumnValueFilter[]>;
+    private readonly originalRegisteredColumns;
+    private originalNonHidableColumns;
     groupedColumnsArray: string[];
     updateScrolledState(): void;
     protected _isColumnFiltersActive: boolean;
@@ -254,6 +259,8 @@ export declare class OTableComponent extends AbstractOServiceComponent<OTableCom
     protected triggerSelectionEvents: boolean;
     tooltip: QueryList<MatTooltip>;
     constructor(injector: Injector, elRef: ElementRef, dialog: MatDialog, _viewContainerRef: ViewContainerRef, appRef: ApplicationRef, form: OFormComponent, scrollStrategy: OTableVirtualScrollStrategy);
+    private subscribeToFilterChanges;
+    private updateColumnFiltersSubject;
     private getInjectionTokenConfig;
     get state(): OTableComponentStateClass;
     ngOnInit(): void;
@@ -304,6 +311,7 @@ export declare class OTableComponent extends AbstractOServiceComponent<OTableCom
     registerTabListener(): void;
     protected insideTabBugWorkaround(): void;
     registerSortListener(): void;
+    get currentColumnFilters(): OColumnValueFilter[];
     protected handleSortChange(sortArray: any[]): void;
     setDatasource(): void;
     protected registerDataSourceListeners(): void;
@@ -402,7 +410,6 @@ export declare class OTableComponent extends AbstractOServiceComponent<OTableCom
     clearColumnFilters(triggerDatasourceUpdate?: boolean, columnsAttr?: string[]): void;
     isColumnFilterable(column: OColumn): boolean;
     isSearcheableColumn(column: OColumn): boolean;
-    isColumnFilterActive(column: OColumn): boolean;
     openColumnFilterDialog(column: OColumn, event: Event): void;
     storeFilterColumns(sortColumnFilter: OFilterColumn): void;
     getStartViewFilterColumn(column: OColumn): 'month' | 'year' | 'multi-year' | '';
@@ -443,8 +450,9 @@ export declare class OTableComponent extends AbstractOServiceComponent<OTableCom
     getTitleAlignClass(oCol: OColumn): string;
     getCellAlignClass(column: OColumn): string;
     getGroupHeaderCellAlignClass(column: string): string[];
-    protected addDefaultRowButtons(): void;
-    protected addButtonInRow(name: string): void;
+    addDefaultRowButtons(): void;
+    addButtonInRow(name: string): void;
+    private addNonHidableColumn;
     get headerHeight(): number;
     get toolBarHeight(): number;
     isDetailMode(): boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ontimize-web-ngx",
   "homepage": "https://github.com/OntimizeWeb/ontimize-web-ngx#readme",
-  "version": "15.8.1",
+  "version": "15.8.2",
   "description": "Ontimize Web framework using Angular 15",
   "bugs": "https://github.com/OntimizeWeb/ontimize-web-ngx/issues",
   "author": "Imatia S.L.",

package/theme.scss

@@ -47,6 +47,32 @@
   @include o-daterange-input-theme($theme-or-color-config);
   @include o-dual-list-selector-theme($theme-or-color-config);
   @include o-image-theme($theme-or-color-config);
+}@mixin o-app-header-theme($theme-or-color-config) {
+  $theme: map.get($theme-or-color-config, color);
+  $primary: map.get($theme, primary);
+  $accent: map.get($theme, accent);
+  $foreground: map.get($theme, foreground);
+
+  .o-app-header {
+    nav {
+      &.o-app-header-primary {
+        background-color: mat.get-color-from-palette($primary);
+      }
+
+      &.o-app-header-accent {
+        background-color: mat.get-color-from-palette($accent);
+      }
+
+      .menu-button {
+        background: transparent;
+      }
+    }
+
+    .o-user-info {
+      color: mat.get-color-from-palette($foreground, text);
+    }
+  }
+
 }@mixin o-app-sidenav-theme($theme-or-color-config) {
   $theme: map.get($theme-or-color-config, color);
   $primary: map.get($theme, primary);
@@ -123,32 +149,6 @@
       }
     }
   }
-}@mixin o-app-header-theme($theme-or-color-config) {
-  $theme: map.get($theme-or-color-config, color);
-  $primary: map.get($theme, primary);
-  $accent: map.get($theme, accent);
-  $foreground: map.get($theme, foreground);
-
-  .o-app-header {
-    nav {
-      &.o-app-header-primary {
-        background-color: mat.get-color-from-palette($primary);
-      }
-
-      &.o-app-header-accent {
-        background-color: mat.get-color-from-palette($accent);
-      }
-
-      .menu-button {
-        background: transparent;
-      }
-    }
-
-    .o-user-info {
-      color: mat.get-color-from-palette($foreground, text);
-    }
-  }
-
 }@mixin o-bar-menu-theme($theme-or-color-config) {
     $theme: map.get($theme-or-color-config, color);
     $primary: map.get($theme, primary);