Merge from base.

MKirova · MKirova · commit 70cdb0ba74b9 · 2021-11-18T10:40:31.000+02:00
diff --git a/package.json b/package.json
@@ -15,10 +15,12 @@
     "test:lib:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.grid.conf.js",
     "test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",
     "test:lib:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.hierarchical-grid.conf.js",
+    "test:lib:pgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.pivot-grid.conf.js",
     "test:lib:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.non-grid.conf.js",
     "test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js",
     "test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js",
     "test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js",
+    "test:lib:azure:pgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.pivot-grid.conf.js",
     "test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js",
     "test:lib:watch": "ng test igniteui-angular --karma-config=./projects/igniteui-angular/karma.watch.conf.js",
     "test:schematics": "ts-node --project projects/igniteui-angular/migrations/tsconfig.json ./node_modules/jasmine/bin/jasmine.js ./projects/igniteui-angular/migrations/**/*.spec.ts ./projects/igniteui-angular/schematics/**/*.spec.ts",
diff --git a/projects/igniteui-angular-i18n/src/i18n/BG/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/BG/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsBG_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Закачи',
     igx_grid_actions_unpin_label: 'Откачи',
     igx_grid_actions_jumpUp_label: 'Придвижи се нагоре',
-    igx_grid_actions_jumpDown_label: 'Придвижи се надолу'
+    igx_grid_actions_jumpDown_label: 'Придвижи се надолу',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/CS/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/CS/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsCS_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Kolík',
     igx_grid_actions_unpin_label: 'Odepnout',
     igx_grid_actions_jumpUp_label: 'Vyskočit',
-    igx_grid_actions_jumpDown_label: 'Skočit dolů'
+    igx_grid_actions_jumpDown_label: 'Skočit dolů',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/DA/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/DA/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsDA_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Fastgør',
     igx_grid_actions_unpin_label: 'Frigør',
     igx_grid_actions_jumpUp_label: 'Spring op',
-    igx_grid_actions_jumpDown_label: 'Spring ned'
+    igx_grid_actions_jumpDown_label: 'Spring ned',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/DE/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/DE/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsDE_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Fixiere',
     igx_grid_actions_unpin_label: 'Löse',
     igx_grid_actions_jumpUp_label: 'Springe hoch',
-    igx_grid_actions_jumpDown_label: 'Springe runter'
+    igx_grid_actions_jumpDown_label: 'Springe runter',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/ES/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ES/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsES_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Anclar',
     igx_grid_actions_unpin_label: 'Desanclar',
     igx_grid_actions_jumpUp_label: 'Saltar arriba',
-    igx_grid_actions_jumpDown_label: 'Saltar abajo'
+    igx_grid_actions_jumpDown_label: 'Saltar abajo',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/FR/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/FR/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsFR_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Attacher',
     igx_grid_actions_unpin_label: 'Détacher',
     igx_grid_actions_jumpUp_label: 'Sauter au début',
-    igx_grid_actions_jumpDown_label: 'Sauter à la fin'
+    igx_grid_actions_jumpDown_label: 'Sauter à la fin',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/HU/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/HU/grid-resources.ts
@@ -133,7 +133,8 @@ const GridResourceStringsHU_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Rögzítés',
     igx_grid_actions_unpin_label: 'Rögzítés feloldása',
     igx_grid_actions_jumpUp_label: 'Ugrás felfelé',
-    igx_grid_actions_jumpDown_label: 'Ugrás lefelé'
+    igx_grid_actions_jumpDown_label: 'Ugrás lefelé',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/IT/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/IT/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsIT_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Aggiungi',
     igx_grid_actions_unpin_label: 'Deseleziona',
     igx_grid_actions_jumpUp_label: 'Salta su',
-    igx_grid_actions_jumpDown_label: 'Salta giù'
+    igx_grid_actions_jumpDown_label: 'Salta giù',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/JA/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/JA/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsJA_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: '固定',
     igx_grid_actions_unpin_label: '固定解除',
     igx_grid_actions_jumpUp_label: '上へ移動',
-    igx_grid_actions_jumpDown_label: '下へ移動'
+    igx_grid_actions_jumpDown_label: '下へ移動',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/KO/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/KO/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsKO_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: '고정',
     igx_grid_actions_unpin_label: '고정 해제',
     igx_grid_actions_jumpUp_label: '위로 이동',
-    igx_grid_actions_jumpDown_label: '아래로 이동'
+    igx_grid_actions_jumpDown_label: '아래로 이동',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 
diff --git a/projects/igniteui-angular-i18n/src/i18n/NB/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/NB/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsNB_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Fest',
     igx_grid_actions_unpin_label: 'Løsne',
     igx_grid_actions_jumpUp_label: 'Hoppe opp',
-    igx_grid_actions_jumpDown_label: 'Hopp ned'
+    igx_grid_actions_jumpDown_label: 'Hopp ned',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/NL/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/NL/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsNL_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Vastmaken',
     igx_grid_actions_unpin_label: 'Losmaken',
     igx_grid_actions_jumpUp_label: 'Omhoog springen',
-    igx_grid_actions_jumpDown_label: 'Omlaag springen'
+    igx_grid_actions_jumpDown_label: 'Omlaag springen',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/PL/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/PL/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsPL_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Przypnij',
     igx_grid_actions_unpin_label: 'Odepnij',
     igx_grid_actions_jumpUp_label: 'Skok w górę',
-    igx_grid_actions_jumpDown_label: 'Skok w dół'
+    igx_grid_actions_jumpDown_label: 'Skok w dół',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/PT/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/PT/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsPT_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Fixar',
     igx_grid_actions_unpin_label: 'Desafixar',
     igx_grid_actions_jumpUp_label: 'Ir para cima',
-    igx_grid_actions_jumpDown_label: 'Ir para baixo'
+    igx_grid_actions_jumpDown_label: 'Ir para baixo',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/RO/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/RO/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsRO_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Fixare',
     igx_grid_actions_unpin_label: 'Anulați fixarea',
     igx_grid_actions_jumpUp_label: 'Sari sus',
-    igx_grid_actions_jumpDown_label: 'Sari jos'
+    igx_grid_actions_jumpDown_label: 'Sari jos',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/SV/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/SV/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsSV_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Fäst',
     igx_grid_actions_unpin_label: 'Lossa',
     igx_grid_actions_jumpUp_label: 'Hoppa upp',
-    igx_grid_actions_jumpDown_label: 'Hoppa ner'
+    igx_grid_actions_jumpDown_label: 'Hoppa ner',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/TR/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/TR/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsTR_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: 'Sabitle',
     igx_grid_actions_unpin_label: 'Sabitlemeyi Kaldır',
     igx_grid_actions_jumpUp_label: 'Yukarı atla',
-    igx_grid_actions_jumpDown_label: 'Aşağı atla'
+    igx_grid_actions_jumpDown_label: 'Aşağı atla',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/ZH-HANS/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ZH-HANS/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsZHHANS_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: '固定',
     igx_grid_actions_unpin_label: '取消固定',
     igx_grid_actions_jumpUp_label: '跳上',
-    igx_grid_actions_jumpDown_label: '跳下'
+    igx_grid_actions_jumpDown_label: '跳下',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular-i18n/src/i18n/ZH-HANT/grid-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ZH-HANT/grid-resources.ts
@@ -132,7 +132,8 @@ const GridResourceStringsZHHANT_: ExpandRequire<IGridResourceStrings> = {
     igx_grid_actions_pin_label: '釘選',
     igx_grid_actions_unpin_label: '取消釘選',
     igx_grid_actions_jumpUp_label: '跳上',
-    igx_grid_actions_jumpDown_label: '跳下'
+    igx_grid_actions_jumpDown_label: '跳下',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
 
 /**
diff --git a/projects/igniteui-angular/karma.azure.pivot-grid.conf.js b/projects/igniteui-angular/karma.azure.pivot-grid.conf.js
@@ -0,0 +1,47 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['parallel', 'jasmine', 'jasmine-spec-tags', '@angular-devkit/build-angular'],
+    files: [
+      { pattern: '../../node_modules/hammerjs/hammer.min.js', watched: false },
+      { pattern: '../../node_modules/hammer-simulator/index.js', watched: false },
+      { pattern: './test.css', watched: false },
+      { pattern: '../../dist/igniteui-angular/styles/igniteui-angular.css', watched: false }
+    ],
+    plugins: [
+      require('karma-parallel'),
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-spec-tags'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    parallelOptions: {
+      executors: 2,
+      shardStrategy: 'round-robin'
+    },
+    client: {
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+      jasmine: {
+        random: false
+      },
+      tagPrefix: '#',
+      tags: 'pivotGrid'
+    },
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['ChromeHeadlessNoSandbox'],
+    customLaunchers: {
+      ChromeHeadlessNoSandbox: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox', '--disable-gpu'],
+        debug: false
+      }
+    },
+    singleRun: true
+  });
+};
diff --git a/projects/igniteui-angular/karma.pivot-grid.conf.js b/projects/igniteui-angular/karma.pivot-grid.conf.js
@@ -0,0 +1,71 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['parallel', 'jasmine', 'jasmine-spec-tags', '@angular-devkit/build-angular'],
+    files: [
+      { pattern: '../../node_modules/hammerjs/hammer.min.js', watched: false },
+      { pattern: '../../node_modules/hammer-simulator/index.js', watched: false },
+      { pattern: './test.css', watched: false },
+      { pattern: '../../dist/igniteui-angular/styles/igniteui-angular.css', watched: false }
+    ],
+    plugins: [
+      require('karma-parallel'),
+      require('karma-jasmine'),
+      require('karma-coverage'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-spec-tags'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-spec-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    parallelOptions: {
+      executors: 2,
+      shardStrategy: 'round-robin'
+    },
+    client: {
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+      jasmine: {
+        random: false
+      },
+      tagPrefix: '#',
+      tags: 'pivotGrid'
+    },
+    preprocessors: {
+      'projects/igniteui-angular/**/*.js': ['coverage']
+    },
+    coverageReporter: {
+      dir: require('path').join(__dirname, '../../coverage/grid'),
+      reporters: [
+        // reporters not supporting the `file` property
+        { type: 'html' },
+        { type: 'json' },
+        { type: 'lcovonly' },
+      ]
+    },
+    reporters: ['progress', 'coverage'],
+    specReporter: {
+        suppressSkipped: true,
+        suppressErrorSummary: false,
+        suppressFailed: false,
+        suppressPassed: false,
+        showSpecTiming: false,
+        failFast: false
+    },
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['ChromeHeadlessNoSandbox'],
+    customLaunchers: {
+      ChromeHeadlessNoSandbox: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox', '--disable-gpu'],
+        debug: false
+      }
+    },
+    singleRun: false
+  });
+};
diff --git a/projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts b/projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts
@@ -130,6 +130,7 @@ export interface IGridResourceStrings {
     igx_grid_actions_unpin_label?: string;
     igx_grid_actions_jumpUp_label?: string;
     igx_grid_actions_jumpDown_label?: string;
+    igx_grid_pivot_date_dimension_total?: string;
 }
 
 export const GridResourceStringsEN: IGridResourceStrings = {
@@ -263,5 +264,6 @@ export const GridResourceStringsEN: IGridResourceStrings = {
     igx_grid_actions_pin_label: 'Pin',
     igx_grid_actions_unpin_label: 'Unpin',
     igx_grid_actions_jumpUp_label: 'Jump up',
-    igx_grid_actions_jumpDown_label: 'Jump down'
+    igx_grid_actions_jumpDown_label: 'Jump down',
+    igx_grid_pivot_date_dimension_total: 'All Periods'
 };
diff --git a/projects/igniteui-angular/src/lib/data-operations/pivot-strategy.ts b/projects/igniteui-angular/src/lib/data-operations/pivot-strategy.ts
@@ -66,7 +66,7 @@ export class PivotRowDimensionsStrategy implements IPivotDimensionStrategy {
                         PivotUtil.processSiblingProperties(newData[i], siblingData, pivotKeys);
 
                         PivotUtil.processSubGroups(row, prevRowDims.slice(0), siblingData, pivotKeys);
-                        if (PivotUtil.getDimensionDepth(prevDim) > PivotUtil.getDimensionDepth(row)) {
+                        if (siblingData.length > 1) {
                             newData[i][row.memberName + '_' + pivotKeys.records] = siblingData;
                         } else {
                             newData.splice(i , 1, ...siblingData);
diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-dimensions.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-dimensions.ts
diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts
diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.pipes.spec.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.pipes.spec.ts
diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-util.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-util.ts
diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/public_api.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/public_api.ts
diff --git a/src/app/pivot-grid/pivot-grid.sample.ts b/src/app/pivot-grid/pivot-grid.sample.ts
