fix(editor): shouldn't call cell changed when cell value is undefined

ghiscoding-SE · ghiscoding-SE · commit 211a2b961595 · 2020-06-29T14:25:09.000-04:00
- we were already checking for null value but undefined is another possibility, so now it checks for null/undefined in isValueChanged() method
diff --git a/src/app/modules/angular-slickgrid/editors/__tests__/autoCompleteEditor.spec.ts b/src/app/modules/angular-slickgrid/editors/__tests__/autoCompleteEditor.spec.ts
@@ -200,6 +200,7 @@ describe('AutoCompleteEditor', () => {
       const event = new (window.window as any).KeyboardEvent('keydown', { keyCode: KEY_CHAR_A, bubbles: true, cancelable: true });
 
       editor = new AutoCompleteEditor(editorArguments);
+      editor.setValue('z');
       const editorElm = divContainer.querySelector<HTMLInputElement>('input.editor-gender');
 
       editorElm.focus();
@@ -362,6 +363,7 @@ describe('AutoCompleteEditor', () => {
         const spy = jest.spyOn(gridStub.getEditorLock(), 'commitCurrentEdit');
 
         editor = new AutoCompleteEditor(editorArguments);
+        editor.setValue('a');
         editor.save();
 
         expect(spy).toHaveBeenCalled();
@@ -372,6 +374,7 @@ describe('AutoCompleteEditor', () => {
         const spy = jest.spyOn(editorArguments, 'commitChanges');
 
         editor = new AutoCompleteEditor(editorArguments);
+        editor.setValue('a');
         editor.save();
 
         expect(spy).toHaveBeenCalled();
diff --git a/src/app/modules/angular-slickgrid/editors/__tests__/dualInputEditor.spec.ts b/src/app/modules/angular-slickgrid/editors/__tests__/dualInputEditor.spec.ts
@@ -224,6 +224,7 @@ describe('DualInputEditor', () => {
         const event = new (window.window as any).KeyboardEvent('keydown', { keyCode: KEY_CHAR_0, bubbles: true, cancelable: true });
 
         editor = new DualInputEditor(editorArguments);
+        editor.setValues(['9', '9']);
         const editorElm = divContainer.querySelector<HTMLInputElement>('input.editor-range');
 
         editor.focus();
diff --git a/src/app/modules/angular-slickgrid/editors/__tests__/floatEditor.spec.ts b/src/app/modules/angular-slickgrid/editors/__tests__/floatEditor.spec.ts
@@ -178,6 +178,7 @@ describe('FloatEditor', () => {
         const event = new (window.window as any).KeyboardEvent('keydown', { keyCode: KEY_CHAR_0, bubbles: true, cancelable: true });
 
         editor = new FloatEditor(editorArguments);
+        editor.setValue(9);
         const editorElm = divContainer.querySelector<HTMLInputElement>('input.editor-price');
 
         editor.focus();
diff --git a/src/app/modules/angular-slickgrid/editors/__tests__/integerEditor.spec.ts b/src/app/modules/angular-slickgrid/editors/__tests__/integerEditor.spec.ts
@@ -178,6 +178,7 @@ describe('IntegerEditor', () => {
         const event = new (window.window as any).KeyboardEvent('keydown', { keyCode: KEY_CHAR_0, bubbles: true, cancelable: true });
 
         editor = new IntegerEditor(editorArguments);
+        editor.setValue(9);
         const editorElm = divContainer.querySelector<HTMLInputElement>('input.editor-price');
 
         editor.focus();
diff --git a/src/app/modules/angular-slickgrid/editors/__tests__/longTextEditor.spec.ts b/src/app/modules/angular-slickgrid/editors/__tests__/longTextEditor.spec.ts
@@ -212,6 +212,7 @@ describe('LongTextEditor', () => {
         const event = new (window.window as any).KeyboardEvent('keydown', { keyCode: KEY_CHAR_A, bubbles: true, cancelable: true });
 
         editor = new LongTextEditor(editorArguments);
+        editor.setValue('z');
         const editorElm = document.body.querySelector<HTMLTextAreaElement>('.editor-title textarea');
 
         editor.focus();
@@ -237,6 +238,7 @@ describe('LongTextEditor', () => {
         const event = new (window.window as any).KeyboardEvent('keydown', { keyCode: KeyCode.ENTER, bubbles: true, cancelable: true });
 
         editor = new LongTextEditor(editorArguments);
+        editor.setValue('a');
         const editorElm = document.body.querySelector<HTMLTextAreaElement>('.editor-title textarea');
 
         editor.focus();
diff --git a/src/app/modules/angular-slickgrid/editors/__tests__/textEditor.spec.ts b/src/app/modules/angular-slickgrid/editors/__tests__/textEditor.spec.ts
@@ -186,6 +186,7 @@ describe('TextEditor', () => {
         const event = new (window.window as any).KeyboardEvent('keydown', { keyCode: KEY_CHAR_A, bubbles: true, cancelable: true });
 
         editor = new TextEditor(editorArguments);
+        editor.setValue('z');
         const editorElm = divContainer.querySelector<HTMLInputElement>('input.editor-title');
 
         editor.focus();
diff --git a/src/app/modules/angular-slickgrid/editors/autoCompleteEditor.ts b/src/app/modules/angular-slickgrid/editors/autoCompleteEditor.ts
@@ -157,11 +157,12 @@ export class AutoCompleteEditor implements Editor {
   }
 
   isValueChanged(): boolean {
-    const lastEvent = this._lastInputEvent && this._lastInputEvent.keyCode;
-    if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastEvent === KeyCode.ENTER) {
+    const elmValue = this._$editorElm.val();
+    const lastKeyEvent = this._lastInputEvent && this._lastInputEvent.keyCode;
+    if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastKeyEvent === KeyCode.ENTER) {
       return true;
     }
-    return (!(this._$editorElm.val() === '' && this._defaultTextValue === null)) && (this._$editorElm.val() !== this._defaultTextValue);
+    return (!(elmValue === '' && (this._defaultTextValue === null || this._defaultTextValue === undefined))) && (elmValue !== this._defaultTextValue);
   }
 
   loadValue(item: any) {
diff --git a/src/app/modules/angular-slickgrid/editors/dualInputEditor.ts b/src/app/modules/angular-slickgrid/editors/dualInputEditor.ts
@@ -237,8 +237,8 @@ export class DualInputEditor implements Editor {
     if ((leftEditorParams && leftEditorParams.alwaysSaveOnEnterKey || rightEditorParams && rightEditorParams.alwaysSaveOnEnterKey) && lastKeyEvent === KeyCode.ENTER) {
       return true;
     }
-    const leftResult = (!(leftElmValue === '' && this.originalLeftValue === null)) && (leftElmValue !== this.originalLeftValue);
-    const rightResult = (!(rightElmValue === '' && this.originalRightValue === null)) && (rightElmValue !== this.originalRightValue);
+    const leftResult = (!(leftElmValue === '' && (this.originalLeftValue === null || this.originalLeftValue === undefined))) && (leftElmValue !== this.originalLeftValue);
+    const rightResult = (!(rightElmValue === '' && (this.originalRightValue === null || this.originalRightValue === undefined))) && (rightElmValue !== this.originalRightValue);
     return leftResult || rightResult;
   }
 
diff --git a/src/app/modules/angular-slickgrid/editors/floatEditor.ts b/src/app/modules/angular-slickgrid/editors/floatEditor.ts
@@ -130,13 +130,13 @@ export class FloatEditor implements Editor {
     }
   }
 
-  isValueChanged() {
+  isValueChanged(): boolean {
     const elmValue = this._$input.val();
-    const lastEvent = this._lastInputEvent && this._lastInputEvent.keyCode;
-    if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastEvent === KeyCode.ENTER) {
+    const lastKeyEvent = this._lastInputEvent && this._lastInputEvent.keyCode;
+    if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastKeyEvent === KeyCode.ENTER) {
       return true;
     }
-    return (!(elmValue === '' && this.originalValue === null)) && (elmValue !== this.originalValue);
+    return (!(elmValue === '' && (this.originalValue === null || this.originalValue === undefined))) && (elmValue !== this.originalValue);
   }
 
   loadValue(item: any) {
diff --git a/src/app/modules/angular-slickgrid/editors/integerEditor.ts b/src/app/modules/angular-slickgrid/editors/integerEditor.ts
@@ -104,13 +104,13 @@ export class IntegerEditor implements Editor {
     }
   }
 
-  isValueChanged() {
+  isValueChanged(): boolean {
     const elmValue = this._$input.val();
-    const lastEvent = this._lastInputEvent && this._lastInputEvent.keyCode;
-    if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastEvent === KeyCode.ENTER) {
+    const lastKeyEvent = this._lastInputEvent && this._lastInputEvent.keyCode;
+    if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastKeyEvent === KeyCode.ENTER) {
       return true;
     }
-    return (!(elmValue === '' && this.originalValue === null)) && (elmValue !== this.originalValue);
+    return (!(elmValue === '' && (this.originalValue === null || this.originalValue === undefined))) && (elmValue !== this.originalValue);
   }
 
   loadValue(item: any) {
diff --git a/src/app/modules/angular-slickgrid/editors/longTextEditor.ts b/src/app/modules/angular-slickgrid/editors/longTextEditor.ts
@@ -159,8 +159,9 @@ export class LongTextEditor implements Editor {
     }
   }
 
-  isValueChanged() {
-    return (!(this._$textarea.val() === '' && this.defaultValue === null)) && (this._$textarea.val() !== this.defaultValue);
+  isValueChanged(): boolean {
+    const elmValue = this._$textarea.val();
+    return (!(elmValue === '' && (this.defaultValue === null || this.defaultValue === undefined))) && (elmValue !== this.defaultValue);
   }
 
   loadValue(item: any) {
diff --git a/src/app/modules/angular-slickgrid/editors/textEditor.ts b/src/app/modules/angular-slickgrid/editors/textEditor.ts
@@ -104,13 +104,13 @@ export class TextEditor implements Editor {
     }
   }
 
-  isValueChanged() {
+  isValueChanged(): boolean {
     const elmValue = this._$input.val();
-    const lastEvent = this._lastInputEvent && this._lastInputEvent.keyCode;
-    if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastEvent === KeyCode.ENTER) {
+    const lastKeyEvent = this._lastInputEvent && this._lastInputEvent.keyCode;
+    if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastKeyEvent === KeyCode.ENTER) {
       return true;
     }
-    return (!(elmValue === '' && this.originalValue === null)) && (elmValue !== this.originalValue);
+    return (!(elmValue === '' && (this.originalValue === null || this.originalValue === undefined))) && (elmValue !== this.originalValue);
   }
 
   loadValue(item: any) {

Original file line number	Diff line number	Diff line change
`@@ -157,11 +157,12 @@ export class AutoCompleteEditor implements Editor {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`isValueChanged(): boolean {`
`160`		`- const lastEvent = this._lastInputEvent && this._lastInputEvent.keyCode;`
`161`		`- if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastEvent === KeyCode.ENTER) {`
	`160`	`+ const elmValue = this._$editorElm.val();`
	`161`	`+ const lastKeyEvent = this._lastInputEvent && this._lastInputEvent.keyCode;`
	`162`	`+ if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastKeyEvent === KeyCode.ENTER) {`
`162`	`163`	`return true;`
`163`	`164`	`}`
`164`		`- return (!(this._$editorElm.val() === '' && this._defaultTextValue === null)) && (this._$editorElm.val() !== this._defaultTextValue);`
	`165`	`+ return (!(elmValue === '' && (this._defaultTextValue === null \|\| this._defaultTextValue === undefined))) && (elmValue !== this._defaultTextValue);`
`165`	`166`	`}`
`166`	`167`
`167`	`168`	`loadValue(item: any) {`
Original file line number	Diff line number	Diff line change
`@@ -237,8 +237,8 @@ export class DualInputEditor implements Editor {`
`237`	`237`	`if ((leftEditorParams && leftEditorParams.alwaysSaveOnEnterKey \|\| rightEditorParams && rightEditorParams.alwaysSaveOnEnterKey) && lastKeyEvent === KeyCode.ENTER) {`
`238`	`238`	`return true;`
`239`	`239`	`}`
`240`		`- const leftResult = (!(leftElmValue === '' && this.originalLeftValue === null)) && (leftElmValue !== this.originalLeftValue);`
`241`		`- const rightResult = (!(rightElmValue === '' && this.originalRightValue === null)) && (rightElmValue !== this.originalRightValue);`
	`240`	`+ const leftResult = (!(leftElmValue === '' && (this.originalLeftValue === null \|\| this.originalLeftValue === undefined))) && (leftElmValue !== this.originalLeftValue);`
	`241`	`+ const rightResult = (!(rightElmValue === '' && (this.originalRightValue === null \|\| this.originalRightValue === undefined))) && (rightElmValue !== this.originalRightValue);`
`242`	`242`	`return leftResult \|\| rightResult;`
`243`	`243`	`}`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -130,13 +130,13 @@ export class FloatEditor implements Editor {`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`		`- isValueChanged() {`
	`133`	`+ isValueChanged(): boolean {`
`134`	`134`	`const elmValue = this._$input.val();`
`135`		`- const lastEvent = this._lastInputEvent && this._lastInputEvent.keyCode;`
`136`		`- if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastEvent === KeyCode.ENTER) {`
	`135`	`+ const lastKeyEvent = this._lastInputEvent && this._lastInputEvent.keyCode;`
	`136`	`+ if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastKeyEvent === KeyCode.ENTER) {`
`137`	`137`	`return true;`
`138`	`138`	`}`
`139`		`- return (!(elmValue === '' && this.originalValue === null)) && (elmValue !== this.originalValue);`
	`139`	`+ return (!(elmValue === '' && (this.originalValue === null \|\| this.originalValue === undefined))) && (elmValue !== this.originalValue);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`loadValue(item: any) {`
Original file line number	Diff line number	Diff line change
`@@ -104,13 +104,13 @@ export class IntegerEditor implements Editor {`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`- isValueChanged() {`
	`107`	`+ isValueChanged(): boolean {`
`108`	`108`	`const elmValue = this._$input.val();`
`109`		`- const lastEvent = this._lastInputEvent && this._lastInputEvent.keyCode;`
`110`		`- if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastEvent === KeyCode.ENTER) {`
	`109`	`+ const lastKeyEvent = this._lastInputEvent && this._lastInputEvent.keyCode;`
	`110`	`+ if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastKeyEvent === KeyCode.ENTER) {`
`111`	`111`	`return true;`
`112`	`112`	`}`
`113`		`- return (!(elmValue === '' && this.originalValue === null)) && (elmValue !== this.originalValue);`
	`113`	`+ return (!(elmValue === '' && (this.originalValue === null \|\| this.originalValue === undefined))) && (elmValue !== this.originalValue);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`loadValue(item: any) {`
Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,9 @@ export class LongTextEditor implements Editor {`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`162`		`- isValueChanged() {`
`163`		`- return (!(this._$textarea.val() === '' && this.defaultValue === null)) && (this._$textarea.val() !== this.defaultValue);`
	`162`	`+ isValueChanged(): boolean {`
	`163`	`+ const elmValue = this._$textarea.val();`
	`164`	`+ return (!(elmValue === '' && (this.defaultValue === null \|\| this.defaultValue === undefined))) && (elmValue !== this.defaultValue);`
`164`	`165`	`}`
`165`	`166`
`166`	`167`	`loadValue(item: any) {`
Original file line number	Diff line number	Diff line change
`@@ -104,13 +104,13 @@ export class TextEditor implements Editor {`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`- isValueChanged() {`
	`107`	`+ isValueChanged(): boolean {`
`108`	`108`	`const elmValue = this._$input.val();`
`109`		`- const lastEvent = this._lastInputEvent && this._lastInputEvent.keyCode;`
`110`		`- if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastEvent === KeyCode.ENTER) {`
	`109`	`+ const lastKeyEvent = this._lastInputEvent && this._lastInputEvent.keyCode;`
	`110`	`+ if (this.columnEditor && this.columnEditor.alwaysSaveOnEnterKey && lastKeyEvent === KeyCode.ENTER) {`
`111`	`111`	`return true;`
`112`	`112`	`}`
`113`		`- return (!(elmValue === '' && this.originalValue === null)) && (elmValue !== this.originalValue);`
	`113`	`+ return (!(elmValue === '' && (this.originalValue === null \|\| this.originalValue === undefined))) && (elmValue !== this.originalValue);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`loadValue(item: any) {`