@datorama/core 21.4.0-rc.9 → 22.1.1-rc.1

package/lib/grid-v2/grid-controller/grid-controller.component.d.ts

@@ -17,7 +17,7 @@ import { GridAction, RowAction } from '../grid-toolbar/grid-toolbar.types';
 import { DatoTranslateService } from '../../services/translate.service';
 import { GridStorageAPI } from '../grid-settings';
 import { DatoHotkeys } from '../../hotkeys/hotkeys.service';
-import { DatoGridConditionalFilterChanged } from '../grid-filter/grid-filter.types';
+import { DatoGridExternalFilter } from '../grid-filter/grid-filter.types';
 export declare class DatoGridControllerComponent implements OnDestroy, AfterContentInit {
     gridService: GridService;
     gridQuery: GridQuery;
@@ -50,7 +50,8 @@ export declare class DatoGridControllerComponent implements OnDestroy, AfterCont
     _initializeGrid(agGrid: AgGridNg2, agGridEl: HTMLElement): void;
     private normalizeOptions;
     setGridRows<T>(data: T[]): void;
-    onFilterChanged(): Observable<DatoGridConditionalFilterChanged[]>;
+    setGridFilters(filters: DatoGridExternalFilter[]): void;
+    onFilterChanged(): Observable<DatoGridExternalFilter[]>;
     onSortChanged(): Observable<DatoGridSort>;
     private getGridIcons;
     private registerSettingsListeners;

package/lib/grid-v2/grid-filter/filter-validator.d.ts

@@ -8,16 +8,17 @@ export declare function validateNumberCondition(unparsedRowValue: any, { conditi
     condition: any;
     value: any;
     rangeEnd: any;
-}): boolean;
+}, filterKey?: string): boolean;
 export declare function validateDateCondition(rowValue: any, { condition, value, rangeEnd }: {
     condition: any;
     value: any;
     rangeEnd: any;
 }): boolean;
-export declare function validateCondition({ rowValue, filter, type }: {
+export declare function validateCondition({ rowValue, condition, type, filterKey }: {
     rowValue: any;
-    filter: any;
+    condition: any;
     type: any;
+    filterKey: any;
 }): boolean;
 export declare function validateFilter({ row, api }: {
     row: RowNode;

package/lib/grid-v2/grid-filter/grid-filter.types.d.ts

@@ -55,6 +55,7 @@ export declare type DatoGridFilterCondition = {
     value: StringOrNumber;
 };
 export declare type DatoGridFilter = {
+    colId?: string;
     byValue?: {
         condition: DatoFilterConditions.IN_LIST | DatoFilterConditions.NOT_IN_LIST;
         values: StringOrNumber[];
@@ -68,9 +69,9 @@ export declare type DatoGridConditionalFilter = {
     operator: OperatorTypes;
     conditions: (DatoGridFilterCondition | DatoGridRangeFilterCondition)[];
 };
-export declare type DatoGridConditionalFilterChanged = {
+export declare type DatoGridExternalFilter = {
     field: string;
-    filter: DatoGridConditionalFilter;
+    filter: DatoGridFilter;
     pivotFieldsMap?: HashMap<string>;
 };
 export declare type DatoGridFiltersMap = HashMap<DatoGridFilter>;

package/lib/grid-v2/grid-store/grid.query.d.ts

@@ -7,7 +7,7 @@ import { DatoGridApi } from '../grid-controller/grid-controller.types';
 import { AgGridNg2 } from 'ag-grid-angular';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import { DatoGridAlignment, DatoGridDataChangedEvent, DatoGridOptions, DatoGridSort, GridRowsSelectionData } from '../grid/grid-v2.types';
-import { DatoGridConditionalFilterChanged, DatoGridFiltersMap } from '../grid-filter/grid-filter.types';
+import { DatoGridExternalFilter, DatoGridFiltersMap } from '../grid-filter/grid-filter.types';
 import { HashMap } from '../../utils/types';
 export declare class GridQuery extends Query<GridStoreState> implements OnDestroy {
     protected store: GridStore;
@@ -42,7 +42,7 @@ export declare class GridQuery extends Query<GridStoreState> implements OnDestro
     getSelectedRowNodes(onlyFirstRow: false): RowNode[];
     getFilter(): DatoGridFiltersMap;
     selectFilter(): Observable<DatoGridFiltersMap>;
-    filterChanged(): Observable<DatoGridConditionalFilterChanged[]>;
+    filterChanged(): Observable<DatoGridExternalFilter[]>;
     getSearchTerm(): string;
     selectSearchTerm(): Observable<string>;
     waitForGrid(): Observable<boolean>;
@@ -56,5 +56,6 @@ export declare class GridQuery extends Query<GridStoreState> implements OnDestro
     getAllDisplayedColumns(): Column[];
     getAllPivotColumns(): Column[];
     selectIsSelectAllRowsEnabled(): Observable<boolean>;
+    getSecondaryColumn(colId: string): Column;
     private filterCheckboxSelectionColumn;
 }

package/lib/grid-v2/grid-store/grid.service.d.ts

@@ -3,7 +3,7 @@ import { DatoGridApi } from '../grid-controller/grid-controller.types';
 import { Column, RowNode, RowNodeTransaction } from 'ag-grid-community';
 import { GridQuery } from './grid.query';
 import { DatoTranslateService } from '../../services/translate.service';
-import { DatoGridFilter, ServerSidePaginationFilter } from '../grid-filter/grid-filter.types';
+import { DatoGridExternalFilter, DatoGridFilter, ServerSidePaginationFilter } from '../grid-filter/grid-filter.types';
 import { AgGridNg2 } from 'ag-grid-angular';
 import { IconRegistry, SvgRegistry } from '../../services/icon-registry';
 import { DatoGridSettings, NormalizeOptionsParams, ServerSidePaginationConfig } from './grid.store.types';
@@ -80,7 +80,9 @@ export declare class GridService implements OnDestroy {
     };
     clearAllFilters(): void;
     clearColumnFilter(columnField: string): void;
-    setColumnFilter(column: Column, filter: DatoGridFilter): void;
+    setColumnFilter(column: Column, filter: DatoGridFilter, notifyGrid?: boolean): void;
+    setGridFilters(filters: DatoGridExternalFilter[]): void;
+    private updateFilter;
     setSearchTerm(searchTerm: string): void;
     setServerSidePagination(config: Partial<ServerSidePaginationConfig>): void;
     setLoading(show: boolean): void;
@@ -120,7 +122,6 @@ export declare class GridService implements OnDestroy {
     /**
      * When pivoting,
      * we add the field name to the column header class in order to access it through the auto generated pivot column.
-     * @private
      */
     private initPivotSecondaryColsProcess;
     private setPivotModeRows;

package/lib/grid-v2/grid-toolbar/grid-toolbar.component.d.ts

@@ -39,6 +39,7 @@ export declare class DatoGridV2ToolbarComponent implements OnInit, OnDestroy {
     hideGrouping: boolean;
     searchPlaceholder: string;
     rowActionsShortLabelThreshold: GridRowActionsScreenThreshold;
+    displayCustomGridActionsSeparator: boolean;
     openMenus: {
         group: boolean;
         settings: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datorama/core",
-  "version": "21.4.0-rc.9",
+  "version": "22.1.1-rc.1",
   "peerDependencies": {
     "@angular/common": "8.2.14",
     "@angular/core": "8.2.14",