@datorama/core 21.4.0-rc.1 → 21.4.0-rc.12

package/i18n/locale-en_US.json

@@ -115,6 +115,7 @@
     "try-to-refresh-or-contact": "Try to refresh or contact support",
     "something-went-wrong": "Something went wrong",
     "try-again-later": "Try again later",
-    "apply-filters": "Apply filters"
+    "apply-filters": "Apply filters",
+    "total": "Total"
   }
 }

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 { DatoGridFiltersMap } 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<DatoGridFiltersMap>;
+    setGridFilters(filters: DatoGridExternalFilter[]): void;
+    onFilterChanged(): Observable<DatoGridExternalFilter[]>;
     onSortChanged(): Observable<DatoGridSort>;
     private getGridIcons;
     private registerSettingsListeners;

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

@@ -55,19 +55,25 @@ export declare type DatoGridFilterCondition = {
     value: StringOrNumber;
 };
 export declare type DatoGridFilter = {
+    colId?: string;
     byValue?: {
         condition: DatoFilterConditions.IN_LIST | DatoFilterConditions.NOT_IN_LIST;
         values: StringOrNumber[];
     };
     conditional?: DatoGridConditionalFilter;
     pivotKeys?: string[];
-    pivotFields?: string[];
+    pivotFieldsMap?: HashMap<string>;
 };
 export declare type DatoGridConditionalFilter = {
     type: DatoGridFilterTypes;
     operator: OperatorTypes;
     conditions: (DatoGridFilterCondition | DatoGridRangeFilterCondition)[];
 };
+export declare type DatoGridExternalFilter = {
+    field: string;
+    filter: DatoGridFilter;
+    pivotFieldsMap?: HashMap<string>;
+};
 export declare type DatoGridFiltersMap = HashMap<DatoGridFilter>;
 export declare type ServerSidePaginationRangeCondition = {
     condition: DatoFilterConditions.IN_RANGE;

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 { 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,6 +42,7 @@ export declare class GridQuery extends Query<GridStoreState> implements OnDestro
     getSelectedRowNodes(onlyFirstRow: false): RowNode[];
     getFilter(): DatoGridFiltersMap;
     selectFilter(): Observable<DatoGridFiltersMap>;
+    filterChanged(): Observable<DatoGridExternalFilter[]>;
     getSearchTerm(): string;
     selectSearchTerm(): Observable<string>;
     waitForGrid(): Observable<boolean>;
@@ -55,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;

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

@@ -36,3 +36,7 @@ export interface GridStoreState {
     settings: DatoGridSettings;
     serverSidePagination: ServerSidePaginationConfig;
 }
+export declare type PivotColumnData = {
+    field: string;
+    value: string;
+};

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

@@ -0,0 +1,2 @@
+export * from './grid.store.types';
+export { tryParsePivotValue } from './util';

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

@@ -1,5 +1,6 @@
 import { ColDef, Column } from 'ag-grid-community';
 import { HashMap } from '../../utils/types';
+import { PivotColumnData } from './grid.store.types';
 export declare function getColumnsSizes(columns: Column[], original?: boolean): HashMap<number>;
 /**
  * Take pivoted value field if pivot column,
@@ -7,3 +8,4 @@ export declare function getColumnsSizes(columns: Column[], original?: boolean):
  * or group field form showRowGroup if its agg column
  */
 export declare function getColField(colDef: ColDef): string;
+export declare function tryParsePivotValue(str: string): PivotColumnData | undefined;

package/lib/grid-v2/public_api.d.ts

@@ -3,7 +3,6 @@ export * from './grid-on-hover/grid-on-hover.component';
 export * from './grid-loader/grid-v2-loader.component';
 export * from './grid-columns-display-menu/grid-columns-display-menu.component';
 export * from './grid-groups-menu/grid-groups-menu.component';
-export * from './grid/public_api';
 export * from './grid-controller/public_api';
 export * from './grid-column-header/public_api';
 export * from './grid-column-header-more-menu/public_api';
@@ -14,7 +13,7 @@ export * from './grid-header/public_api';
 export * from './grid-pagination/public_api';
 export * from './grid-toolbar/public_api';
 export * from './grid-settings';
-export * from './grid-store/grid.store.types';
+export * from './grid-store/public_api';
 export * from './grid-no-data-overlay/public_api';
 export * from './grid-v2.module';
 export * from './grid-column-cell-components/public_api';

package/package.json

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