Skip to content

Commit 15bf7aa

Browse files
kdinevkdinev
authored
Merge branch 'master' into featureList-populating
2 parents 69accbd + 5b87976 commit 15bf7aa

File tree

8 files changed

+182
-17
lines changed

8 files changed

+182
-17
lines changed

‎src/igcombo/igcombo.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export class IgComboComponent extends IgControlBase<IgCombo> implements ControlV
3030
var items = ui.items;
3131

3232
if (items.length <= 0 || !that._model) {
33+
that._model.viewToModelUpdate(ui.owner.value());
3334
return;
3435
}
3536

‎src/iggrid/iggridbase.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,10 @@ export class IgGridBase<Model> extends IgControlBase<Model> implements AfterCont
9494
}
9595
//check for changes in collection
9696
this._changes = this._differ.diff(this._config.dataSource);
97-
if (this._config.dataSource.length !== this._dataSource.length) {
97+
if (this._changes && grid) {
9898
this._dataSource = jQuery.extend(true, [], this._config.dataSource);
99-
if (this._changes) {
100-
this._changes.forEachAddedItem(r => this.addRow(r.item, r.currentIndex));
101-
this._changes.forEachRemovedItem(r => this.deleteRow(r.item[pkKey]))
102-
}
99+
this._changes.forEachAddedItem(r => this.addRow(r.item, r.currentIndex));
100+
this._changes.forEachRemovedItem(r => this.deleteRow(r.item[pkKey]));
103101
}
104102
//check for changes in values
105103
if (!this.equalsDiff(this._config.dataSource, this._dataSource, diff)) {

‎src/ighierarchicalgrid/ighierarchicalgrid.component.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@ export class IgHierarchicalGridComponent extends IgGridBase<IgHierarchicalGrid>
3737

3838
//check for changes in collection
3939
this._changes = this._differ.diff(this._config.dataSource);
40-
if (this._config.dataSource.length !== this._dataSource.length) {
40+
if (this._changes && mainGrid) {
4141
this._dataSource = jQuery.extend(true, [], this._config.dataSource);
42-
if (this._changes) {
43-
this._changes.forEachAddedItem(r => this.addRow(r.item, r.currentIndex));
44-
this._changes.forEachRemovedItem(r => this.deleteRow(r.item[pkKey]))
45-
}
42+
this._changes.forEachAddedItem(r => this.addRow(r.item, r.currentIndex));
43+
this._changes.forEachRemovedItem(r => this.deleteRow(r.item[pkKey]));
4644
}
4745
//check for changes in data source values
4846
if (!this.equalsDiff(this._config.dataSource, this._dataSource, diff)) {

‎src/igtreegrid/igtreegrid.component.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,10 @@ export class IgTreeGridComponent extends IgGridBase<IgTreeGrid> {
3939

4040
//check for changes in collection
4141
this._changes = this._differ.diff(this._config.dataSource);
42-
if (this._config.dataSource.length !== this._dataSource.length) {
43-
this._dataSource = jQuery.extend(true, [], this._config.dataSource);
44-
if (this._changes) {
45-
this._changes.forEachAddedItem(r => this.addRow(r.item, r.currentIndex));
46-
this._changes.forEachRemovedItem(r => this.deleteRow(r.item[pkKey]))
47-
}
42+
if (this._changes && grid) {
43+
this._dataSource = jQuery.extend(true, [], this._config.dataSource);
44+
this._changes.forEachAddedItem(r => this.addRow(r.item, r.currentIndex));
45+
this._changes.forEachRemovedItem(r => this.deleteRow(r.item[pkKey]));
4846
}
4947
//check for changes in values
5048
if (!this.equalsDiff(this._config.dataSource, this._dataSource, diff)) {

‎tests/unit/igcombo/combo.spec.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,30 @@ export function main() {
6767
});
6868
});
6969

70+
it('should be updated correctly if the ngModel value is cleared.', (done) => {
71+
var template = '<div><ig-combo [(widgetId)]="comboID" [(options)]="options" [changeDetectionInterval]="cdi" [(ngModel)]="combo.value1"></ig-combo></div>';
72+
TestBed.overrideComponent(TestComponent, {
73+
set: {
74+
template: template
75+
}
76+
});
77+
TestBed.compileComponents().then(() => {
78+
let fixture = TestBed.createComponent(TestComponent);
79+
fixture.detectChanges();
80+
fixture.componentInstance.combo.value1 = 1;
81+
fixture.detectChanges();
82+
setTimeout(function () {
83+
//clear
84+
$("#combo1").parents("ig-combo").find(".ui-igcombo-clearicon").click();
85+
fixture.detectChanges();
86+
setTimeout(function(){
87+
expect(fixture.componentInstance.combo.value1 instanceof Array && fixture.componentInstance.combo.value1.length === 0).toBeTruthy();
88+
done();
89+
}, 10);
90+
}, 10);
91+
});
92+
});
93+
7094
it('the ngModel should be updated correctly if the combo selection is updated', (done) => {
7195
var template = '<div><ig-combo [(widgetId)]="comboID" [(options)]="options" [changeDetectionInterval]="cdi" [(ngModel)]="combo.value1"></ig-combo></div>';
7296
TestBed.overrideComponent(TestComponent, {

‎tests/unit/iggrid/grid.spec.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,25 @@ export function main() {
394394
});
395395
});
396396

397+
it("should detect changes when original data source is changed but the data source length is the same.", (done) => {
398+
var template = "<ig-grid [widgetId]='gridID' [(options)]='optsNew'></ig-grid>";
399+
TestBed.overrideComponent(TestComponent, {
400+
set: {
401+
template: template
402+
}
403+
});
404+
TestBed.compileComponents().then(() => {
405+
var fixture = TestBed.createComponent(TestComponent);
406+
fixture.componentInstance.singleRecData.length = 0;
407+
Array.prototype.push.apply( fixture.componentInstance.singleRecData, fixture.componentInstance.singleRecData2);
408+
fixture.detectChanges();
409+
let $grid = $("#grid1");
410+
expect($grid.data("igGrid").allRows().length === 1).toBeTruthy("There should be one record in grid.");
411+
expect($($grid.data("igGrid").cellById(1, "Name")).text() === "Test").toBeTruthy("Change in text should be reflected in grid.");
412+
done();
413+
});
414+
});
415+
397416
it('should initialize grid features 2', (done) => {
398417
var template = "<ig-grid [widgetId]='gridID' [width]='gridWidth' [autoCommit]='true' [dataSource]='data' [height]='h' [autoGenerateColumns]='false' [primaryKey]='\"Id\"'>" +
399418
"<column [key]=\"'Id'\" [(headerText)]=\"idHeaderText\" [width]=\"'165px'\" [dataType]=\"'number'\"></column>" +
@@ -653,9 +672,12 @@ class TestComponent {
653672
public opts1: any;
654673
public opts2: any;
655674
public opts3: any;
675+
public optsNew:any;
656676
private gridID: string;
657677
public data: Array<any>;
658678
public data1: Array<any>;
679+
public singleRecData: Array<any>;
680+
public singleRecData2: Array<any>;
659681
private cdi: number;
660682
public pi: number;
661683
private firedEvent: any;
@@ -665,6 +687,8 @@ class TestComponent {
665687
@ViewChild(Infragistics.IgGridComponent) public viewChild: Infragistics.IgGridComponent;
666688

667689
constructor() {
690+
this.singleRecData = [{ "Id": 1, "Name": "John Smith", "Age": 45, "HireDate": "2002-05-09" }];
691+
this.singleRecData2 = [{ "Id": 1, "Name": "Test", "Age": 45, "HireDate": "2002-05-09" }];
668692
this.gridID = "grid1";
669693
this.cdi = 0;
670694
this.caption = "My Caption";
@@ -734,6 +758,17 @@ class TestComponent {
734758
}
735759
]
736760
};
761+
this.optsNew = {
762+
dataSource: this.singleRecData,
763+
height: "300px",
764+
autoGenerateColumns: false,
765+
primaryKey: "Id",
766+
columns: [
767+
{ key: "Id", headerText: "Id", dataType: "number", hidden: true },
768+
{ key: "Name", headerText: "Name", dataType: "string", width: "100px" },
769+
{ key: "Age", headerText: "Age", dataType: "number", width: "100px", template: "Age: ${Age}" },
770+
{ key: "HireDate", headerText: "HireDate", dataType: "date", width: "100px" },
771+
]};
737772
}
738773

739774
public cellClickHandler(evt) {

‎tests/unit/ighierarchicalgrid/hierarchicalgrid.spec.ts‎

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,25 @@ export function main() {
209209
});
210210
});
211211
});
212+
213+
it("should detect changes when original data source is changed but the data source length is the same.", (done) => {
214+
var template = '<ig-hierarchical-grid [(widgetId)]="gridID" [(options)]="optsNew"></ig-hierarchical-grid>';
215+
TestBed.overrideComponent(TestComponent, {
216+
set: {
217+
template: template
218+
}
219+
});
220+
TestBed.compileComponents().then(() => {
221+
var fixture = TestBed.createComponent(TestComponent);
222+
fixture.componentInstance.singleRecData.length = 0;
223+
Array.prototype.push.apply( fixture.componentInstance.singleRecData, fixture.componentInstance.singleRecData2);
224+
fixture.detectChanges();
225+
let $grid = $("#grid1");
226+
expect($grid.data("igGrid").allRows().length === 1).toBeTruthy("There should be one record in grid.");
227+
expect($($grid.data("igGrid").cellById(1, "Name")).text() === "Test").toBeTruthy("Change in text should be reflected in grid.");
228+
done();
229+
});
230+
});
212231
});
213232
}
214233

@@ -218,9 +237,13 @@ export function main() {
218237
})
219238
class TestComponent {
220239
private opts: any;
240+
private optsNew: any;
221241
private gridID: string;
222242
public data: any;
223243
protected cdi = 0;
244+
public singleRecData: Array<any>;
245+
public singleRecData2: Array<any>;
246+
224247
@ViewChild(Infragistics.IgHierarchicalGridComponent) public viewChild: Infragistics.IgHierarchicalGridComponent;
225248

226249
constructor() {
@@ -249,7 +272,21 @@ class TestComponent {
249272
]
250273
}
251274
];
252-
275+
this.singleRecData = [ {
276+
"ID": 0,
277+
"Name": "Food",
278+
"Products": [
279+
{ "ID": 0, "Name": "Bread", "Price": "2.5" }
280+
]
281+
}];
282+
this.singleRecData2 = [ {
283+
"ID": 1,
284+
"Name": "Test",
285+
"Products": [
286+
{ "ID": 1, "Name": "Milk", "Price": "3.5" },
287+
{ "ID": 2, "Name": "Vint soda", "Price": "20.9" }
288+
]
289+
}];
253290
this.gridID = "grid1";
254291
this.opts = {
255292
autoCommit: true,
@@ -283,5 +320,32 @@ class TestComponent {
283320
}
284321
]
285322
};
323+
this.optsNew = {
324+
autoCommit: true,
325+
dataSource: this.singleRecData,
326+
primaryKey: "ID",
327+
width: "100%",
328+
height: "400px",
329+
autoGenerateColumns: false,
330+
autoGenerateColumnLayouts: false,
331+
columns: [
332+
{ headerText: "ID", key: "ID", width: "50px", dataType: "number" },
333+
{ headerText: "Name", key: "Name", width: "130px", dataType: "string" }
334+
],
335+
columnLayouts: [
336+
{
337+
key: "Products",
338+
responseDataKey: "",
339+
childrenDataProperty: "Products",
340+
autoGenerateColumns: false,
341+
primaryKey: "ID",
342+
columns: [
343+
{ key: "ID", headerText: "ID", width: "25px" },
344+
{ key: "Name", headerText: "Product Name", width: "90px" },
345+
{ key: "Price", headerText: "Price", dataType: "number", width: "55px" }
346+
]
347+
}
348+
]
349+
};
286350
}
287351
}

‎tests/unit/igtreegrid/treegrid.spec.ts‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,25 @@ export function main() {
138138
}, 10);
139139
});
140140
});
141+
142+
it("should detect changes when original data source is changed but the data source length is the same.", (done) => {
143+
var template = '<ig-tree-grid [(widgetId)]="gridID" [(options)]="optsNew"></ig-tree-grid>';
144+
TestBed.overrideComponent(TestComponent, {
145+
set: {
146+
template: template
147+
}
148+
});
149+
TestBed.compileComponents().then(() => {
150+
var fixture = TestBed.createComponent(TestComponent);
151+
fixture.componentInstance.singleRecData.length = 0;
152+
Array.prototype.push.apply( fixture.componentInstance.singleRecData, fixture.componentInstance.singleRecData2);
153+
fixture.detectChanges();
154+
let $grid = $("#grid1");
155+
expect($grid.data("igTreeGrid").allRows().length === 1).toBeTruthy("There should be one record in grid.");
156+
expect($($grid.data("igTreeGrid").cellById(1, "tasks")).text() === "Test").toBeTruthy("Change in text should be reflected in grid.");
157+
done();
158+
});
159+
});
141160
});
142161
}
143162

@@ -147,16 +166,22 @@ export function main() {
147166
})
148167
class TestComponent {
149168
private opts: any;
169+
private optsNew: any;
150170
private gridID: string;
151171
public data: Array<any>;
152172
private cdi = 10;
173+
public singleRecData: Array<any>;
174+
public singleRecData2: Array<any>;
175+
153176
@ViewChild(Infragistics.IgTreeGridComponent) public viewChild: Infragistics.IgTreeGridComponent;
154177

155178
constructor() {
156179
this.gridID = "grid1";
157180
//this.cdi = 0;
158181
this.data = Tasks.getData();
159182

183+
this.singleRecData = [{ "id": 1, "tasks": "John Smith" }];
184+
this.singleRecData2 = [{ "id": 1, "tasks": "Test" }];
160185
this.opts = {
161186
autoCommit: true,
162187
dataSource: this.data,
@@ -179,5 +204,27 @@ class TestComponent {
179204
name: "Updating"
180205
}]
181206
};
207+
this.optsNew = {
208+
autoCommit: true,
209+
dataSource: this.singleRecData,
210+
width: "100%",
211+
height: "400px",
212+
autoGenerateColumns: false,
213+
autoGenerateColumnLayouts: false,
214+
primaryKey: "id",
215+
childDataKey: "products",
216+
renderExpansionIndicatorColumn: true,
217+
columns: [
218+
{ key: "id", headerText: "ID", width: "100px", dataType: "number" },
219+
{ key: "tasks", headerText: "Task", width: "250px", dataType: "string" },
220+
{ key: "start", headerText: "Start", width: "100px", dataType: "date" },
221+
{ key: "finish", headerText: "Finish", width: "100px", dataType: "date" },
222+
{ key: "duration", headerText: "Duration", width: "100px", dataType: "date" },
223+
{ key: "progress", headerText: "Progress", width: "100px", dataType: "date" }
224+
],
225+
features: [{
226+
name: "Updating"
227+
}]
228+
};
182229
}
183230
}

0 commit comments

Comments
 (0)