Merge master into SKrastev/grid-disabled-pin-row

skrustev · skrustev · commit 392146247cea · 2020-04-15T20:49:01.000+03:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -53,11 +53,12 @@
     "@angular/platform-browser-dynamic": "^9.1.0",
     "@angular/router": "^9.1.0",
     "@types/hammerjs": "^2.0.36",
+    "@types/jszip": "^3.1.7",
     "@types/source-map": "0.5.2",
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.6.2",
     "hammerjs": "^2.0.8",
-    "jszip": "^3.1.5",
+    "jszip": "^3.3.0",
     "resize-observer-polyfill": "^1.5.1",
     "rxjs": "^6.5.4",
     "tslib": "^1.10.0",
diff --git a/projects/igniteui-angular/ng-package.json b/projects/igniteui-angular/ng-package.json
@@ -7,6 +7,7 @@
   },
   "whitelistedNonPeerDependencies": [
       "@types/hammerjs",
+      "@types/jszip",
       "hammerjs",
       "jszip",
       "resize-observer-polyfill"
diff --git a/projects/igniteui-angular/ng-package.prod.json b/projects/igniteui-angular/ng-package.prod.json
@@ -4,12 +4,12 @@
   "lib": {
     "entryFile": "src/public_api.ts",
     "umdModuleIds": {
-      "jszip/dist/jszip": "JSZip",
       "resize-observer-polyfill": "ResizeObserver"
     }
   },
   "whitelistedNonPeerDependencies": [
       "@types/hammerjs",
+      "@types/jszip",
       "hammerjs",
       "jszip",
       "resize-observer-polyfill"
diff --git a/projects/igniteui-angular/package.json b/projects/igniteui-angular/package.json
@@ -67,8 +67,9 @@
     ],
     "dependencies": {
         "@types/hammerjs": "^2.0.36",
+        "@types/jszip": "^3.1.7",
         "hammerjs": "^2.0.8",
-        "jszip": "^3.1.5",
+        "jszip": "^3.3.0",
         "resize-observer-polyfill": "^1.5.1"
     },
     "peerDependencies": {
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-search.component.html b/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-search.component.html
@@ -30,13 +30,12 @@
             [indeterminate]="item.indeterminate"
             [disableTransitions]="true"
             (change)="onCheckboxChange($event)">
-                {{ column.formatter && !item.isSpecial ? column.formatter(item.label) : column.dataType === 'number' ? (item.label | igxdecimal:
-                    column.grid.locale) : column.dataType === 'date' ? (item.label | igxdate: column.grid.locale) : item.label }}
+                {{ item.label }}
             </igx-checkbox>
         </igx-list-item>
     </div>
 
-    <ng-template igxDataLoading>        
+    <ng-template igxDataLoading>
         <div class="igx-excel-filter__loading">
             <ng-container *ngTemplateOutlet="valuesLoadingTemplate">
             </ng-container>
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-search.pipe.ts b/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-search.pipe.ts
@@ -20,8 +20,9 @@ export class IgxExcelStyleSearchFilterPipe implements PipeTransform {
 
         searchText = searchText.toLowerCase();
         const result = items.filter((it, i) => (i === 0 && it.isSpecial) ||
-            (it.value !== null && it.value !== undefined) &&
-            it.value.toString().toLowerCase().indexOf(searchText) > -1);
+            (it.label !== null && it.label !== undefined) &&
+            !it.isBlanks &&
+            it.label.toString().toLowerCase().indexOf(searchText) > -1);
 
         // If 'result' contains the 'Select All' item and at least one more - we use it, otherwise we use an empty array.
         return result.length > 1 ? result : [];
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts b/projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts
@@ -41,6 +41,7 @@ import { IgxColumnComponent } from '../../columns/column.component';
 import { IgxGridBaseDirective } from '../../grid-base.directive';
 import { DisplayDensity } from '../../../core/density';
 import { GridSelectionMode } from '../../common/enums';
+import { IgxDecimalPipeComponent, IgxDatePipeComponent } from '../../common/pipes';
 
 /**
  * @hidden
@@ -51,6 +52,7 @@ export class FilterListItem {
     public isSelected: boolean;
     public indeterminate: boolean;
     public isSpecial = false;
+    public isBlanks = false;
 }
 
 @Directive({
@@ -712,6 +714,10 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
     private addItems(shouldUpdateSelection: boolean) {
         this.selectAllSelected = true;
         this.selectAllIndeterminate = false;
+
+        const numberPipe = new IgxDecimalPipeComponent(this.column.grid.locale);
+        const datePipe = new IgxDatePipeComponent(this.column.grid.locale);
+
         this.uniqueValues.forEach(element => {
             if (element !== undefined && element !== null && element !== '') {
                 const filterListItem = new FilterListItem();
@@ -731,12 +737,29 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
                     filterListItem.isSelected = true;
                 }
                 if (this.column.dataType === DataType.Date) {
-                    filterListItem.value = new Date(element);
-                    filterListItem.label = new Date(element);
+                    const date = new Date(element);
+
+                    filterListItem.value = date;
+
+                    filterListItem.label = this.column.formatter ?
+                        this.column.formatter(date) :
+                        datePipe.transform(date, this.column.grid.locale);
+
+                } else if (this.column.dataType === DataType.Number) {
+                    filterListItem.value = element;
+
+                    filterListItem.label = this.column.formatter ?
+                        this.column.formatter(element) :
+                        numberPipe.transform(element, this.column.grid.locale);
+
                 } else {
                     filterListItem.value = element;
-                    filterListItem.label = element;
+
+                    filterListItem.label = this.column.formatter ?
+                        this.column.formatter(element) :
+                        element;
                 }
+
                 filterListItem.indeterminate = false;
                 this.listData.push(filterListItem);
             } else {
@@ -772,6 +795,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
         blanks.label = this.grid.resourceStrings.igx_grid_excel_blanks;
         blanks.indeterminate = false;
         blanks.isSpecial = true;
+        blanks.isBlanks = true;
         this.listData.unshift(blanks);
     }
 
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts
@@ -4264,6 +4264,34 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             excelMenu = GridFunctions.getExcelStyleFilteringComponent(fix);
             expect(excelMenu).toBeNull();
         }));
+
+        it('Should filter date by input string', fakeAsync(() => {
+            GridFunctions.clickExcelFilterIcon(fix, 'ReleaseDate');
+            tick(100);
+            fix.detectChanges();
+
+            const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
+            let listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
+            const inputNativeElement = GridFunctions.getExcelStyleSearchComponentInput(fix, searchComponent);
+
+            const todayDateFull = SampleTestData.today;
+            const todayDate = todayDateFull.getDate().toString();
+            const dayOfWeek = todayDateFull.toString().substring(0, 3);
+
+            UIInteractions.sendInputElementValue(inputNativeElement, todayDate, fix);
+            tick(100);
+            fix.detectChanges();
+
+            listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
+            expect(listItems.length).toBe(4, 'incorrect rendered list items count');
+
+            UIInteractions.sendInputElementValue(inputNativeElement, dayOfWeek, fix);
+            tick(100);
+            fix.detectChanges();
+
+            listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
+            expect(listItems.length).toBe(0, 'incorrect rendered list items count');
+        }));
     });
 
     describe(null, () => {
diff --git a/projects/igniteui-angular/src/lib/services/excel/excel-exporter.ts b/projects/igniteui-angular/src/lib/services/excel/excel-exporter.ts
@@ -1,4 +1,4 @@
-import * as JSZip from 'jszip/dist/jszip';
+import * as JSZip from 'jszip';
 
 import { EventEmitter, Injectable, Output } from '@angular/core';
 import { ExcelElementsFactory } from './excel-elements-factory';
@@ -38,7 +38,7 @@ export interface IExcelExportEndedEventArgs extends IBaseEventArgs {
 @Injectable()
 export class IgxExcelExporterService extends IgxBaseExporter {
 
-    private static ZIP_OPTIONS = { compression: 'DEFLATE', type: 'base64' };
+    private static ZIP_OPTIONS = { compression: 'DEFLATE', type: 'base64' } as JSZip.JSZipGeneratorOptions<'base64'>;
     private _xlsx: JSZip;
 
     /**
diff --git a/projects/igniteui-angular/src/lib/services/excel/excel-files.ts b/projects/igniteui-angular/src/lib/services/excel/excel-files.ts
@@ -2,7 +2,7 @@ import { IExcelFile } from './excel-interfaces';
 import { ExcelStrings } from './excel-strings';
 import { WorksheetData } from './worksheet-data';
 
-import * as JSZip from 'jszip/dist/jszip';
+import * as JSZip from 'jszip';
 
 /**
  * @hidden
diff --git a/projects/igniteui-angular/src/lib/services/excel/excel-interfaces.ts b/projects/igniteui-angular/src/lib/services/excel/excel-interfaces.ts
@@ -1,4 +1,4 @@
-import * as JSZip from 'jszip/dist/jszip';
+import * as JSZip from 'jszip';
 
 import {
     ExcelFileTypes,
diff --git a/projects/igniteui-angular/src/lib/services/excel/jszip-verification-wrapper.spec.ts b/projects/igniteui-angular/src/lib/services/excel/jszip-verification-wrapper.spec.ts
@@ -1,12 +1,12 @@
-import * as JSZip from 'jszip/dist/jszip';
+import * as JSZip from 'jszip';
 import { ExcelFileTypes } from './excel-enums';
 import { JSZipFiles } from './jszip-helper.spec';
 
 export class JSZipWrapper {
     private _zip: JSZip;
-    private _filesAndFolders: JSZip.ZipObject[];
+    private _filesAndFolders: string[];
     private _fileContent = '';
-    private _files: any[];
+    private _files: {[key: string]: JSZip.JSZipObject};
     private _filesContent: IFileContent[] = [];
     private _hasValues = true;
 
@@ -19,32 +19,30 @@ export class JSZipWrapper {
     }
 
     private createFilesAndFolders() {
-        this._filesAndFolders = Object.keys(this._files).map((f: JSZip.ZipObject) => {
-            return f;
-        });
+        this._filesAndFolders = Object.keys(this._files).map(f => f);
     }
 
-    get templateFilesAndFolders(): JSZip.ZipObject[] {
+    get templateFilesAndFolders(): string[] {
         return this._filesAndFolders.filter((name) => JSZipFiles.templatesNames.indexOf(name) !== -1);
     }
 
-    get dataFilesAndFolders(): JSZip.ZipObject[] {
+    get dataFilesAndFolders(): string[] {
         return this._filesAndFolders.filter((name) => JSZipFiles.dataFilesAndFoldersNames.indexOf(name) !== -1);
     }
 
-    get dataFilesOnly(): JSZip.ZipObject[] {
+    get dataFilesOnly(): string[] {
         return this.getFiles(this.dataFilesAndFolders);
     }
 
-    get templateFilesOnly(): JSZip.ZipObject[] {
+    get templateFilesOnly(): string[] {
         return this.getFiles(this.templateFilesAndFolders);
     }
 
     get hasValues() {
         return this._hasValues;
     }
 
-    private getFiles(collection: JSZip.ZipObject[]) {
+    private getFiles(collection: string[]) {
         return collection.filter((f) => this._files[f].dir === false);
     }
 
@@ -54,14 +52,14 @@ export class JSZipWrapper {
             return 'Zip file not found!';
         }
 
-        await this._files[fileName].async('string')
+        await this._files[fileName].async('text')
         .then((txt) => {
                 this._fileContent = txt;
         });
     }
 
     /* Reads all files and stores their contents in this._filesContent. */
-    private async readFiles(files: any[]) {
+    private async readFiles(files: string[]) {
         // const self = this;
         this._filesContent = [];
         for (const file of files) {
@@ -141,19 +139,6 @@ export class JSZipWrapper {
         });
     }
 
-    /* Verifies the contents of all files and asserts the result.
-    Optionally, a message can be passed in, which, if specified, will be shown in the beginning of the comparison result. */
-    public async verifyFilesContent(expectedData: IFileContent[], message = '') {
-        // const self = this;
-        let result;
-        const msg = (message !== '') ? message + '\r\n' : '';
-
-        await this.readFiles(this._files).then(() => {
-            result = this.compareFiles(this._filesContent, expectedData);
-            expect(result.areEqual).toBe(true, msg + result.differences);
-        });
-    }
-
     /* Compares the content of two files based on the provided file type and expected value data. */
     private compareFilesContent(currentContent: string, fileType: ExcelFileTypes, fileData: string) {
         let result = true;
