Merge branch 'master' into mkirova/mch-percentage

Author: ChronosSF

projects/igniteui-angular/src/lib/grids/columns/column-layout.component.ts

@@ -100,7 +100,12 @@ export class IgxColumnLayoutComponent extends IgxColumnGroupComponent implements
         this.children.forEach(child => child.hidden = value);
         if (this.grid && this.grid.columns && this.grid.columns.length > 0) {
             // reset indexes in case columns are hidden/shown runtime
-            this.grid.columns.filter(x => x.columnGroup).forEach(x => x.populateVisibleIndexes());
+            const columns = this.grid && this.grid.pinnedColumns && this.grid.unpinnedColumns ?
+            this.grid.pinnedColumns.concat(this.grid.unpinnedColumns) : [];
+            if (!this._hidden && !columns.find(c => c.field === this.field)) {
+                this.grid.resetColumnCollections();
+            }
+            this.grid.columns.filter(x => x.columnLayout).forEach(x => x.populateVisibleIndexes());
         }
     }
 

projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.integration.spec.ts

@@ -143,6 +143,43 @@ describe('IgxGrid - multi-row-layout Integration #grid - ', () => {
             expect(grid.getColumnByName('ContactTitle').hidden).toBeTruthy();
         });
 
+        it('verify visible column indexes when hide/show a column', () => {
+
+            expect(grid.getColumnByName('ID').visibleIndex).toBe(0);
+            expect(grid.getColumnByName('CompanyName').visibleIndex).toBe(1);
+            expect(grid.getColumnByName('ContactName').visibleIndex).toBe(2);
+            expect(grid.getColumnByName('ContactTitle').visibleIndex).toBe(3);
+            // show PostalCode
+            grid.getColumnByName('PostalCode').hidden = false;
+            fixture.detectChanges();
+
+            expect(grid.getColumnByName('ID').visibleIndex).toBe(1);
+            expect(grid.getColumnByName('CompanyName').visibleIndex).toBe(2);
+            expect(grid.getColumnByName('ContactName').visibleIndex).toBe(3);
+            expect(grid.getColumnByName('ContactTitle').visibleIndex).toBe(6);
+            expect(grid.getColumnByName('PostalCode').visibleIndex).toBe(0);
+            expect(grid.getColumnByName('City').visibleIndex).toBe(4);
+            expect(grid.getColumnByName('Country').visibleIndex).toBe(5);
+            expect(grid.getColumnByName('Address').visibleIndex).toBe(7);
+
+            // hide PostalCode
+            grid.getColumnByName('PostalCode').hidden = true;
+            fixture.detectChanges();
+            expect(grid.getColumnByName('PostalCode').visibleIndex).toBe(-1);
+            expect(grid.getColumnByName('City').visibleIndex).toBe(-1);
+            expect(grid.getColumnByName('Country').visibleIndex).toBe(-1);
+            expect(grid.getColumnByName('Address').visibleIndex).toBe(-1);
+
+            // show PostalCode
+            grid.getColumnByName('PostalCode').hidden = false;
+            fixture.detectChanges();
+            expect(grid.getColumnByName('PostalCode').visibleIndex).toBe(0);
+            expect(grid.getColumnByName('City').visibleIndex).toBe(4);
+            expect(grid.getColumnByName('Country').visibleIndex).toBe(5);
+            expect(grid.getColumnByName('Address').visibleIndex).toBe(7);
+        });
+
+
         it('should work with horizontal virtualization when some groups are hidden/shown.', async() => {
             const uniqueGroups = [
                 {

projects/igniteui-angular/src/lib/services/transaction/igx-hierarchical-transaction.ts

@@ -55,7 +55,7 @@ export class IgxHierarchicalTransactionService<T extends HierarchicalTransaction
      * Applies all transactions over the provided data
      * @param data Data source to update
      * @param primaryKey Primary key of the hierarchical data
-     * @param childDataKey Kye of child data collection
+     * @param childDataKey Key of child data collection
      * @param id Optional record id to commit transactions for
      */
     public commit(data: any[], primaryKey?: any, childDataKey?: any, id?: any): void {
@@ -65,10 +65,10 @@ export class IgxHierarchicalTransactionService<T extends HierarchicalTransaction
                 transactions = transactions.filter(t => t.id === id);
             }
             DataUtil.mergeHierarchicalTransactions(data, transactions, childDataKey, primaryKey, true);
+            this.clear(id);
         } else {
             super.commit(data, id);
         }
-        this.clear(id);
     }
 
     //  TODO: remove this method. Force cloning to strip child arrays when needed instead

projects/igniteui-angular/src/lib/services/transaction/igx-transaction.spec.ts

@@ -945,5 +945,26 @@ describe('IgxTransaction', () => {
             expect(transaction.canUndo).toBeFalsy();
             expect(transaction.getAggregatedChanges(false).length).toBe(0);
         });
+
+        it('Should emit onStateUpdate once when commiting a hierarchical transaction', () => {
+            const data = SampleTestData.employeeTreeData();
+            const transaction = new IgxHierarchicalTransactionService();
+            spyOn(transaction.onStateUpdate, 'emit').and.callThrough();
+            expect(transaction).toBeDefined();
+
+            const updateTransaction: HierarchicalTransaction = {
+                id: 475,
+                type: TransactionType.UPDATE,
+                newValue: {
+                    Age: 60
+                },
+                path: [data[0].ID]
+            };
+            transaction.add(updateTransaction, data[0].Employees[0]);
+            expect(transaction.onStateUpdate.emit).toHaveBeenCalledTimes(1);
+
+            transaction.commit(data, 'ID');
+            expect(transaction.onStateUpdate.emit).toHaveBeenCalledTimes(2);
+        });
     });
 });