ontimize-web-ngx 15.5.5 → 15.5.6

package/lib/components/table/column/cell-renderer/o-base-table-cell-renderer.class.d.ts

@@ -1,7 +1,7 @@
 import { AfterContentInit, Injector, OnInit, PipeTransform, TemplateRef } from '@angular/core';
 import { OTableColumn } from '../../../../interfaces/o-table-column.interface';
 import { Expression } from '../../../../types/expression.type';
-import { OTableComponent } from '../../o-table.component';
+import type { OTableComponent } from '../../o-table.component';
 import * as i0 from "@angular/core";
 export declare const DEFAULT_INPUTS_O_BASE_TABLE_CELL_RENDERER: string[];
 export declare class OBaseTableCellRenderer implements OnInit, AfterContentInit {

package/lib/components/table/column/o-column.class.d.ts

@@ -5,7 +5,7 @@ import { Expression } from '../../../types/expression.type';
 import { OperatorFunction } from '../../../types/operation-function.type';
 import { OColumnAggregate } from '../../../types/table/o-column-aggregate.type';
 import { OColumnTooltip } from '../../../types/table/o-column-tooltip.type';
-import { OBaseTableCellRenderer } from './cell-renderer/o-base-table-cell-renderer.class';
+import type { OBaseTableCellRenderer } from './cell-renderer/o-base-table-cell-renderer.class';
 export declare class OColumn {
     attr: string;
     name: string;

package/lib/components/table/extensions/contextmenu/o-table-context-menu.component.d.ts

@@ -64,6 +64,8 @@ export declare class OTableContextMenuComponent implements AfterViewInit {
     delete(event: any): void;
     refresh(): void;
     filterByValue(): void;
+    private createColumnValueFilter;
+    private getSelectedValues;
     groupByColumn(dateType?: string): void;
     unGroupByColumn(): void;
     unGroupAll(): void;

package/lib/components/table/extensions/dialog/filter-by-column/o-table-filter-by-column-data-dialog.component.d.ts

@@ -12,9 +12,12 @@ import { TableFilterByColumnData, TableFilterByColumnDialogResult } from '../../
 import { OTableComponent } from '../../../o-table.component';
 import { OFilterColumn } from '../../header/table-columns-filter/columns/o-table-columns-filter-column.component';
 import type { OColumn } from '../../../column/o-column.class';
+import { OTableFilterByColumnService } from './o-table-filter-by-column.service';
+import { SelectionModel } from '@angular/cdk/collections';
 import * as i0 from "@angular/core";
 export declare class OTableFilterByColumnDataDialogComponent implements AfterViewInit {
     dialogRef: MatDialogRef<OTableFilterByColumnDataDialogComponent>;
+    private readonly filterService;
     acceptAction: TableFilterByColumnDialogResult;
     cancelAction: TableFilterByColumnDialogResult;
     clearAction: TableFilterByColumnDialogResult;
@@ -37,12 +40,14 @@ export declare class OTableFilterByColumnDataDialogComponent implements AfterVie
     filter: ElementRef;
     filterValueList: MatSelectionList;
     activeSortDirection: 'asc' | 'desc' | '';
-    sourceData: any;
+    sourceData: 'current-page' | 'all-data';
     queryByFilterColumnSubscription: any;
     table: OTableComponent;
     showFilterValuesOption: boolean;
     queryMethodName: string;
-    constructor(dialogRef: MatDialogRef<OTableFilterByColumnDataDialogComponent>, data: {
+    previousFilter: OColumnValueFilter;
+    selection: SelectionModel<TableFilterByColumnData>;
+    constructor(dialogRef: MatDialogRef<OTableFilterByColumnDataDialogComponent>, filterService: OTableFilterByColumnService, data: {
         column: OColumn;
         table: OTableComponent;
     });
@@ -54,13 +59,10 @@ export declare class OTableFilterByColumnDataDialogComponent implements AfterVie
     protected initializeDataList(filter?: OColumnValueFilter): void;
     protected initializeFilterEvent(): void;
     protected initializeCustomFilterValues(filter: OColumnValueFilter): void;
-    get selectedValues(): TableFilterByColumnData[];
     areAllSelected(): boolean;
     isIndeterminate(): boolean;
     onSelect(event: MatSelectionListChange): void;
     onSelectAllChange(event: MatCheckboxChange): void;
-    protected parseListData(filter: OColumnValueFilter): void;
-    private addIntoColumnData;
     getColumnValuesFilter(): OColumnValueFilter;
     clearValues(): void;
     onClickSortValues(): void;
@@ -77,8 +79,9 @@ export declare class OTableFilterByColumnDataDialogComponent implements AfterVie
     protected getTypedValue(control: UntypedFormControl): any;
     onChangeDataSource(event: MatRadioChange): void;
     private getData;
+    isSelected(item: TableFilterByColumnData): boolean;
     queryByFilterColumn(attr: string): Observable<ServiceResponse> | Observable<any>;
-    protected getColumnDataUsingRenderer(): any[];
+    compareOptions(): ((o1: TableFilterByColumnData, o2: TableFilterByColumnData) => boolean) | undefined;
     static ɵfac: i0.ɵɵFactoryDeclaration<OTableFilterByColumnDataDialogComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<OTableFilterByColumnDataDialogComponent, "o-table-filter-by-column-data-dialog", never, {}, {}, never, never, false, never>;
 }

package/lib/components/table/extensions/dialog/filter-by-column/o-table-filter-by-column.service.d.ts

@@ -0,0 +1,12 @@
+import { OColumnValueFilter } from '../../../../../types/table/o-column-value-filter.type';
+import { TableFilterByColumnData } from '../../../../../types/table/o-table-filter-by-column-data.type';
+import { OColumn } from '../../../column/o-column.class';
+import * as i0 from "@angular/core";
+export declare class OTableFilterByColumnService {
+    constructor();
+    getColumnDataUsingRenderer(column: OColumn, tableData: any[]): any[];
+    parseListData(filter: OColumnValueFilter, column: OColumn, tableData: any[], isPageable: boolean, sourceData: 'current-page' | 'all-data'): TableFilterByColumnData[];
+    applySelectedValuesToFilter(column: OColumn, tableData: any[], filter: OColumnValueFilter, selectedValues: TableFilterByColumnData[], sourceData: 'current-page' | 'all-data', isPageable: boolean, getComponentFilterFn: () => any): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<OTableFilterByColumnService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<OTableFilterByColumnService>;
+}

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

@@ -28,7 +28,7 @@ export declare class OTableColumnsFilterComponent implements OnInit, AfterConten
     getSortValueOfFilterColumn(attr: string): string;
     getStartViewValueOfFilterColumn(attr: string): string;
     getQueryMethodOfFilterColumn(attr: string): string;
-    getFilterValuesInData(attr: string): string;
+    getFilterValuesInData(attr: string): 'current-page' | 'all-data';
     getColumnComparisonValue(column: OColumn, val: any): any;
     set columns(arg: string);
     set columnsArray(arg: OFilterColumn[]);

package/lib/components/table/o-table-base.class.d.ts

@@ -120,4 +120,6 @@ export declare abstract class OTableBase {
     abstract setSelectedByKeys(keyValues: Array<any>): void;
     abstract setSelectedByMultipleKeys(keyValues: Array<Object>): void;
     abstract setSelectedByRowIds(rowIds: Array<number>): void;
+    abstract getSourceDataByFilterColumn(column: OColumn): 'current-page' | 'all-data';
+    abstract getValue(): any[];
 }

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

@@ -88,6 +88,7 @@ export declare class OTableComponent extends AbstractOServiceComponent<OTableCom
     }>;
     protected clickSubjectSubscription: Subscription;
     protected dbClickSubjectSubscription: Subscription;
+    protected rowChangeSubscription: Subscription;
     refreshExpandableRowState: boolean;
     set oMatSort(_sort: OMatSort);
     virtualScrollViewport: CdkVirtualScrollViewport;
@@ -484,6 +485,7 @@ export declare class OTableComponent extends AbstractOServiceComponent<OTableCom
     isDisableCheckbox(item: any): boolean;
     getService(): any;
     getSnackService(): SnackBarService;
+    getSourceDataByFilterColumn(column: OColumn): 'current-page' | 'all-data';
     static ɵfac: i0.ɵɵFactoryDeclaration<OTableComponent, [null, null, null, null, null, { optional: true; }, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<OTableComponent, "o-table", never, { "visibleColumns": "visible-columns"; "defaultVisibleColumns": "default-visible-columns"; "sortColumns": "sort-columns"; "quickFilterCallback": "quick-filter-function"; "deleteButton": "delete-button"; "refreshButton": "refresh-button"; "columnsVisibilityButton": "columns-visibility-button"; "exportButton": "export-button"; "showConfigurationOption": "show-configuration-option"; "showButtonsText": "show-buttons-text"; "selectAllCheckbox": "select-all-checkbox"; "paginationControls": "pagination-controls"; "fixedHeader": "fixed-header"; "showTitle": "show-title"; "editionMode": "edition-mode"; "selectionMode": "selection-mode"; "horizontalScroll": "horizontal-scroll"; "showPaginatorFirstLastButtons": "show-paginator-first-last-buttons"; "autoAlignTitles": "auto-align-titles"; "multipleSort": "multiple-sort"; "selectAllCheckboxVisible": "select-all-checkbox-visible"; "orderable": "orderable"; "resizable": "resizable"; "keepSelectedItems": "keep-selected-items"; "exportMode": "export-mode"; "exportServiceType": "export-service-type"; "autoAdjust": "auto-adjust"; "showFilterOption": "show-filter-option"; "visibleExportDialogButtons": "visible-export-dialog-buttons"; "rowClass": "row-class"; "filterColumnActiveByDefault": "filter-column-active-by-default"; "groupedColumns": "grouped-columns"; "groupable": "groupable"; "expandGroupsSameLevel": "expand-groups-same-level"; "collapseGroupedColumns": "collapse-grouped-columns"; "virtualScroll": "virtual-scroll"; "contextMenu": "context-menu"; "showExpandableIconFunction": "show-expandable-icon-function"; "showReportOnDemandOption": "show-report-on-demand-option"; "showChartsOnDemandOption": "show-charts-on-demand-option"; "showResetWidthOption": "show-reset-width-option"; "disableSelectionFunction": "disable-selection-function"; "nonHidableColumns": "non-hidable-columns"; "readOnly": "read-only"; "readOnlyConfiguration": "read-only-configuration"; "showNotificationOfReadOnly": "show-notification-of-read-only"; }, { "onRowSelected": "onRowSelected"; "onRowDeselected": "onRowDeselected"; "onRowDeleted": "onRowDeleted"; }, ["tableRowExpandable", "quickfilterContentChild", "tableColumnSelectAllContentChild", "contextMenuContentChild", "tableOptions", "tableButtons", "exportOptsTemplate"], ["o-table-button", "[o-table-toolbar][position=start]", "[o-table-toolbar][position=end]", "[o-table-toolbar]", "o-table-quickfilter", "o-table-option"], false, never>;
 }

package/lib/interfaces/o-table-column.interface.d.ts

@@ -1,6 +1,6 @@
 import { ViewContainerRef } from '@angular/core';
 import { AsyncValidatorFn, ValidatorFn } from '@angular/forms';
-import { OTableComponent } from '../components/table/o-table.component';
+import type { OTableComponent } from '../components/table/o-table.component';
 import { Expression } from '../types/expression.type';
 import { ErrorData } from '../types/error-data.type';
 export interface OTableColumn {

package/lib/types/table/o-column-value-filter.type.d.ts

@@ -1,3 +1,4 @@
+import { Expression } from "../expression.type";
 export declare enum ColumnValueFilterOperator {
     IN = 0,
     LESS_EQUAL = 1,
@@ -10,4 +11,6 @@ export type OColumnValueFilter = {
     operator: ColumnValueFilterOperator;
     values: any;
     availableValues: any[];
+    filterValuesInData: 'current-page' | 'all-data';
+    filterExpresion: Expression;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ontimize-web-ngx",
   "homepage": "https://github.com/OntimizeWeb/ontimize-web-ngx#readme",
-  "version": "15.5.5",
+  "version": "15.5.6",
   "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);