@lumeer/pivot 0.0.3 → 0.0.6

package/lib/lmr-pivot-table.component.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter, OnChanges, OnInit, SimpleChanges, TemplateRef } from '@angular/core';
-import { LmrPivotConfig, LmrPivotStrings, LmrPivotTransform } from './util/lmr-pivot-config';
+import { LmrPivotConfig, LmrPivotTransform } from './util/lmr-pivot-config';
 import { Collection, ConstraintData, DocumentsAndLinksData, LinkType, Query } from '@lumeer/data-filters';
 import { LmrPivotData } from './util/lmr-pivot-data';
 import { Observable } from 'rxjs';
@@ -13,9 +13,11 @@ export declare class LmrPivotTableComponent implements OnInit, OnChanges {
     constraintData: ConstraintData;
     config: LmrPivotConfig;
     transform: LmrPivotTransform;
-    strings: LmrPivotStrings;
+    emptyTablesTemplateInput: TemplateRef<any>;
+    tableCellTemplateInput: TemplateRef<any>;
     cellClick: EventEmitter<LmrPivotTableCell>;
     pivotDataChange: EventEmitter<LmrPivotData>;
+    pivotTablesChange: EventEmitter<LmrPivotTable[]>;
     emptyTablesTemplate: TemplateRef<any>;
     tableCellTemplate: TemplateRef<any>;
     private readonly pivotTransformer;
@@ -27,5 +29,5 @@ export declare class LmrPivotTableComponent implements OnInit, OnChanges {
     private handleData;
     ngOnChanges(changes: SimpleChanges): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<LmrPivotTableComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<LmrPivotTableComponent, "lmr-pivot-table", never, { "collections": { "alias": "collections"; "required": false; }; "data": { "alias": "data"; "required": false; }; "linkTypes": { "alias": "linkTypes"; "required": false; }; "query": { "alias": "query"; "required": false; }; "constraintData": { "alias": "constraintData"; "required": false; }; "config": { "alias": "config"; "required": false; }; "transform": { "alias": "transform"; "required": false; }; "strings": { "alias": "strings"; "required": false; }; }, { "cellClick": "cellClick"; "pivotDataChange": "pivotDataChange"; }, ["emptyTablesTemplate", "tableCellTemplate"], never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LmrPivotTableComponent, "lmr-pivot-table", never, { "collections": { "alias": "collections"; "required": false; }; "data": { "alias": "data"; "required": false; }; "linkTypes": { "alias": "linkTypes"; "required": false; }; "query": { "alias": "query"; "required": false; }; "constraintData": { "alias": "constraintData"; "required": false; }; "config": { "alias": "config"; "required": false; }; "transform": { "alias": "transform"; "required": false; }; "emptyTablesTemplateInput": { "alias": "emptyTablesTemplateInput"; "required": false; }; "tableCellTemplateInput": { "alias": "tableCellTemplateInput"; "required": false; }; }, { "cellClick": "cellClick"; "pivotDataChange": "pivotDataChange"; "pivotTablesChange": "pivotTablesChange"; }, ["emptyTablesTemplate", "tableCellTemplate"], never, false, never>;
 }

package/lib/lmr-pivot-table.module.d.ts

@@ -1,12 +1,14 @@
 import * as i0 from "@angular/core";
 import * as i1 from "./lmr-pivot-table.component";
-import * as i2 from "./pipes/pivot-data-empty.pipe";
-import * as i3 from "./pipes/pivot-table-value.pipe";
-import * as i4 from "./pipes/contrast-color.pipe";
-import * as i5 from "./directives/lmr-templates.directive";
-import * as i6 from "@angular/common";
+import * as i2 from "./lmr-simple-pivot-table.component";
+import * as i3 from "./pipes/pivot-data-empty.pipe";
+import * as i4 from "./pipes/pivot-table-value.pipe";
+import * as i5 from "./pipes/contrast-color.pipe";
+import * as i6 from "./directives/lmr-templates.directive";
+import * as i7 from "@angular/common";
+import * as i8 from "@angular/cdk/scrolling";
 export declare class LmrPivotTableModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<LmrPivotTableModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<LmrPivotTableModule, [typeof i1.LmrPivotTableComponent, typeof i2.PivotDataEmptyPipe, typeof i3.PivotTableCellHasValuePipe, typeof i4.ContrastColorPipe, typeof i5.LmrEmptyTablesTemplateDirective, typeof i5.LmrTableCellTemplateDirective], [typeof i6.CommonModule], [typeof i1.LmrPivotTableComponent, typeof i5.LmrEmptyTablesTemplateDirective, typeof i5.LmrTableCellTemplateDirective]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<LmrPivotTableModule, [typeof i1.LmrPivotTableComponent, typeof i2.LmrSimplePivotTableComponent, typeof i3.PivotDataEmptyPipe, typeof i4.PivotTableCellHasValuePipe, typeof i5.ContrastColorPipe, typeof i6.LmrEmptyTablesTemplateDirective, typeof i6.LmrTableCellTemplateDirective], [typeof i7.CommonModule, typeof i8.ScrollingModule], [typeof i1.LmrPivotTableComponent, typeof i2.LmrSimplePivotTableComponent, typeof i6.LmrEmptyTablesTemplateDirective, typeof i6.LmrTableCellTemplateDirective]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<LmrPivotTableModule>;
 }

package/lib/lmr-simple-pivot-table.component.d.ts

@@ -0,0 +1,32 @@
+import { EventEmitter, OnChanges, SimpleChanges, TemplateRef } from '@angular/core';
+import { LmrPivotConfig, LmrPivotTransform } from './util/lmr-pivot-config';
+import { Attribute, Collection, ConstraintData, DocumentsAndLinksData, LanguageTag, Query } from '@lumeer/data-filters';
+import { LmrPivotData } from './util/lmr-pivot-data';
+import { LmrPivotTable, LmrPivotTableCell } from './util/lmr-pivot-table';
+import { LmrSimplePivotConfig } from './util/lmr-simple-pivot-config';
+import * as i0 from "@angular/core";
+export declare class LmrSimplePivotTableComponent implements OnChanges {
+    rows: Record<string, any>[];
+    attributes: Attribute[];
+    color: string;
+    config: LmrSimplePivotConfig;
+    transform: LmrPivotTransform;
+    locale: LanguageTag;
+    cellClick: EventEmitter<LmrPivotTableCell>;
+    pivotDataChange: EventEmitter<LmrPivotData>;
+    pivotTablesChange: EventEmitter<LmrPivotTable[]>;
+    emptyTablesTemplate: TemplateRef<any>;
+    tableCellTemplate: TemplateRef<any>;
+    readonly collectionId: string;
+    readonly query: Query;
+    collection: Collection;
+    pivotConfig: LmrPivotConfig;
+    data: DocumentsAndLinksData;
+    constraintData: ConstraintData;
+    ngOnChanges(changes: SimpleChanges): void;
+    private createCollection;
+    private createConfig;
+    private createRows;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LmrSimplePivotTableComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LmrSimplePivotTableComponent, "lmr-simple-pivot-table", never, { "rows": { "alias": "rows"; "required": false; }; "attributes": { "alias": "attributes"; "required": false; }; "color": { "alias": "color"; "required": false; }; "config": { "alias": "config"; "required": false; }; "transform": { "alias": "transform"; "required": false; }; "locale": { "alias": "locale"; "required": false; }; }, { "cellClick": "cellClick"; "pivotDataChange": "pivotDataChange"; "pivotTablesChange": "pivotTablesChange"; }, ["emptyTablesTemplate", "tableCellTemplate"], never, false, never>;
+}

package/lib/util/lmr-pivot-config.d.ts

@@ -1,4 +1,5 @@
 import { Constraint, DataAggregationType, QueryAttribute, QueryStem } from '@lumeer/data-filters';
+import { LmrPivotDataHeader } from './lmr-pivot-data';
 export interface LmrPivotConfig {
     version?: LmrPivotConfigVersion;
     stemsConfigs: LmrPivotStemConfig[];
@@ -6,11 +7,13 @@ export interface LmrPivotConfig {
 }
 export interface LmrPivotTransform {
     checkValidConstraintOverride?: (c1: Constraint, c2: Constraint) => Constraint;
-    translateAggregation?: (type: DataAggregationType) => string;
-}
-export interface LmrPivotStrings {
-    summaryString: string;
-    headerSummaryString: string;
+    formatAggregation?: (type: DataAggregationType) => string;
+    formatSummaryHeader?: (header: LmrPivotDataHeader, level: number) => {
+        title?: string;
+        summary: string;
+    };
+    formatRowHeader?: (title: string, level: number) => string;
+    formatColumnHeader?: (title: string, level: number) => string;
 }
 export interface LmrPivotStemConfig {
     stem?: QueryStem;
@@ -27,8 +30,10 @@ export interface LmrPivotRowColumnAttribute extends LmrPivotAttribute {
     showSums?: boolean;
     sticky?: boolean;
     sort?: LmrPivotSort;
+    expressions?: LmrPivotExpression[];
 }
 export interface LmrPivotRowAttribute extends LmrPivotRowColumnAttribute {
+    showHeader?: boolean;
 }
 export interface LmrPivotColumnAttribute extends LmrPivotRowColumnAttribute {
 }
@@ -55,3 +60,19 @@ export interface LmrPivotValueAttribute extends LmrPivotAttribute {
     aggregation: DataAggregationType;
     valueType?: LmrPivotValueType;
 }
+export interface LmrPivotExpression {
+    operation: LmrPivotExpressionOperation;
+    operands: LmrPivotOperand[];
+    title: string;
+    type: 'expression';
+}
+export type LmrPivotExpressionOperation = 'add' | 'subtract' | 'multiply' | 'divide';
+export interface LmrPivotHeaderOperand {
+    type: 'header';
+    value: string;
+}
+export interface LmrPivotValueOperand {
+    type: 'value';
+    value: number;
+}
+export type LmrPivotOperand = LmrPivotHeaderOperand | LmrPivotValueOperand | LmrPivotExpression;

package/lib/util/lmr-pivot-data.d.ts

@@ -1,5 +1,5 @@
 import { Constraint, ConstraintData, DataAggregationType, DataResource } from '@lumeer/data-filters';
-import { LmrPivotSort, LmrPivotValueType } from './lmr-pivot-config';
+import { LmrPivotExpression, LmrPivotHeaderOperand, LmrPivotSort, LmrPivotValueOperand, LmrPivotValueType } from './lmr-pivot-config';
 export interface LmrPivotData {
     data: LmrPivotStemData[];
     constraintData?: ConstraintData;
@@ -8,21 +8,29 @@ export interface LmrPivotData {
 }
 export interface LmrPivotStemData {
     columnHeaders: LmrPivotDataHeader[];
+    columnHeaderAttributes: LmrPivotHeaderAttribute[];
     rowHeaders: LmrPivotDataHeader[];
+    rowHeaderAttributes: LmrPivotHeaderAttribute[];
     valueTitles: string[];
     values: any[][];
     dataResources: DataResource[][][];
     valuesConstraints?: Constraint[];
     valueTypes?: LmrPivotValueType[];
     valueAggregations?: DataAggregationType[];
-    rowShowSums: boolean[];
-    rowSticky: boolean[];
-    rowSorts?: LmrPivotSort[];
-    columnShowSums: boolean[];
-    columnSticky: boolean[];
-    columnSorts?: LmrPivotSort[];
+    rowsConfig: LmrPivotDimensionConfig[];
+    columnsConfig: LmrPivotDimensionConfig[];
     hasAdditionalColumnLevel?: boolean;
 }
+export interface LmrPivotDimensionConfig {
+    showSums?: boolean;
+    sticky?: boolean;
+    sort?: LmrPivotSort;
+    expressions?: LmrPivotExpression[];
+}
+export interface LmrPivotHeaderAttribute {
+    title: string;
+    color: string;
+}
 export interface LmrPivotDataHeader {
     title: string;
     children?: LmrPivotDataHeader[];
@@ -31,4 +39,12 @@ export interface LmrPivotDataHeader {
     isValueHeader: boolean;
     constraint?: Constraint;
     attributeName?: string;
+    expressions?: LmrPivotDataHeaderExpression[];
+}
+export interface LmrPivotDataHeaderExpression extends LmrPivotExpression {
+    lastHeaderIndex?: number;
+    operands: LmrPivotDataHeaderOperand[];
 }
+export type LmrPivotDataHeaderOperand = LmrPivotHeaderOperand & {
+    headers: LmrPivotDataHeader[];
+} | LmrPivotValueOperand | LmrPivotDataHeaderExpression;

package/lib/util/lmr-simple-pivot-config.d.ts

@@ -0,0 +1,9 @@
+import { LmrPivotColumnAttribute, LmrPivotRowAttribute, LmrPivotValueAttribute } from './lmr-pivot-config';
+export interface LmrSimplePivotConfig {
+    rowAttributes: LmrSimplePivotRowAttribute[];
+    columnAttributes: LmrSimplePivotColumnAttribute[];
+    valueAttributes: LmrSimplePivotValueAttribute[];
+}
+export type LmrSimplePivotRowAttribute = Omit<LmrPivotRowAttribute, 'resourceType' | 'resourceId' | 'resourceIndex'>;
+export type LmrSimplePivotColumnAttribute = Omit<LmrPivotColumnAttribute, 'resourceType' | 'resourceId' | 'resourceIndex'>;
+export type LmrSimplePivotValueAttribute = Omit<LmrPivotValueAttribute, 'resourceType' | 'resourceId' | 'resourceIndex'>;

package/lib/util/pivot-data-converter.d.ts

@@ -9,7 +9,7 @@ export declare class PivotDataConverter {
     private data;
     private config;
     private transform;
-    private constraintData?;
+    private constraintData;
     private dataAggregator;
     constructor();
     private formatPivotValue;

package/lib/util/pivot-table-converter.d.ts

@@ -1,19 +1,20 @@
 import { ConstraintData } from '@lumeer/data-filters';
 import { LmrPivotData, LmrPivotStemData } from './lmr-pivot-data';
 import { LmrPivotTable } from './lmr-pivot-table';
-import { LmrPivotStrings } from './lmr-pivot-config';
+import { LmrPivotTransform } from './lmr-pivot-config';
 export declare class PivotTableConverter {
     static readonly emptyClass = "pivot-empty-cell";
     static readonly dataClass = "pivot-data-cell";
     static readonly groupDataClass = "pivot-data-group-cell";
     static readonly rowHeaderClass = "pivot-row-header-cell";
     static readonly rowGroupHeaderClass = "pivot-row-group-header-cell";
+    static readonly rowAttributeHeaderClass = "pivot-row-attribute-header-cell";
     static readonly columnHeaderClass = "pivot-column-header-cell";
     static readonly columnGroupHeaderClass = "pivot-column-group-header-cell";
     private readonly groupColors;
     private readonly percentageConstraint;
     private data;
-    private strings;
+    private transform;
     private values;
     private dataResources;
     private constraintData;
@@ -23,7 +24,8 @@ export declare class PivotTableConverter {
     private columnsTransformationArray;
     private valueTypeInfo;
     private nonStickyRowIndex;
-    createTables(pivotData: LmrPivotData, strings: LmrPivotStrings): LmrPivotTable[];
+    private nonStickyColumnIndex;
+    createTables(pivotData: LmrPivotData, transform: LmrPivotTransform): LmrPivotTable[];
     private dataAreEmpty;
     private updateData;
     private get rowShowSums();
@@ -31,6 +33,10 @@ export declare class PivotTableConverter {
     private transformData;
     private fillCellsByRows;
     private iterateAndFillCellsByRows;
+    private splitRowGroupHeader;
+    private formatSummaryHeader;
+    private formatRowHeader;
+    private formatColumnHeader;
     private getHeaderBackground;
     private getLevelOpacity;
     private isRowLevelSticky;
@@ -43,11 +49,15 @@ export declare class PivotTableConverter {
     private formatValueByPercentage;
     private formatValueByConstraint;
     private fillCellsForGroupedRow;
+    private fillCellsForExpressionRow;
+    private evaluateExpression;
+    private evaluateOperand;
     private getGroupedValuesForRowsAndCols;
     private fillCellsByColumns;
     private iterateAndFillCellsByColumns;
     private fillCellsForGroupedColumn;
     private aggregateAndFormatDataValues;
+    private aggregateDataValues;
     private aggregationByColumns;
     private fillCellsForColumn;
     private aggregateOrFormatSingleValue;

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@lumeer/pivot",
-  "version": "0.0.3",
+  "version": "0.0.6",
   "peerDependencies": {
+    "@angular/cdk": "^16.2.12",
     "@angular/common": "^16.2.12",
     "@angular/core": "^16.2.12",
-    "@lumeer/data-filters": "^0.8.5",
+    "@lumeer/data-filters": "^0.8.6",
     "@lumeer/utils": "^0.1.3"
   },
   "dependencies": {

package/public-api.d.ts

@@ -1,6 +1,8 @@
 export * from './lib/lmr-pivot-table.component';
+export * from './lib/lmr-simple-pivot-table.component';
 export * from './lib/lmr-pivot-table.module';
 export * from './lib/util/lmr-pivot-config';
+export * from './lib/util/lmr-simple-pivot-config';
 export * from './lib/util/lmr-pivot-data';
 export * from './lib/util/lmr-pivot-table';
 export * from './lib/util/pivot-util';