Merge branch '10.1.x' into mkirova/fix-8104-10.1.x

Author: dkamburov

projects/igniteui-angular/migrations/common/UpdateChanges.spec.ts

@@ -390,7 +390,7 @@ describe('UpdateChanges', () => {
         });
         spyOn<any>(fs, 'readFileSync').and.callFake(() => JSON.stringify(classJson));
 
-        const fileContent =
+        let fileContent =
 `import { Size, Type as someThg } from "igniteui-angular";
 import { IgxService, IgxDiffService as eDiffService, Calendar as Calendar } from 'igniteui-angular';
 import { Type } from "@angular/core";
@@ -411,7 +411,7 @@ export class Test {
         expect(update.getClassChanges()).toEqual(classJson);
 
         update.applyChanges();
-        expect(appTree.readContent('test.component.ts')).toEqual(
+        let expectedFileContent =
 `import { IgxSize, IgxType as someThg } from "igniteui-angular";
 import { IgxService1, IgxNewDiffService as eDiffService, CalendarActual as Calendar } from 'igniteui-angular';
 import { Type } from "@angular/core";
@@ -423,8 +423,15 @@ export class Test {
     cal: Calendar;
 
     constructor (public router: Router, private _iconService: IgxService1) {}
-}`
-        );
+}`;
+        expect(appTree.readContent('test.component.ts')).toEqual(expectedFileContent);
+
+        // with ig feed package:
+        fileContent = fileContent.replace(/igniteui-angular/g, '@infragistics/igniteui-angular');
+        expectedFileContent = expectedFileContent.replace(/igniteui-angular/g, '@infragistics/igniteui-angular');
+        appTree.overwrite('test.component.ts', fileContent);
+        update.applyChanges();
+        expect(appTree.readContent('test.component.ts')).toEqual(expectedFileContent);
     });
 
     it('should move property value between element tags', done => {

projects/igniteui-angular/migrations/common/tsUtils.ts

@@ -64,7 +64,7 @@ export function getImportModulePositions(sourceText: string, startsWith: string)
 /** Filters out statements to named imports (e.g. `import {x, y}`) from PACKAGE_IMPORT */
 const namedImportFilter = (statement: ts.Statement) => {
     if (statement.kind === ts.SyntaxKind.ImportDeclaration &&
-        ((statement as ts.ImportDeclaration).moduleSpecifier as ts.StringLiteral).text === PACKAGE_IMPORT) {
+        ((statement as ts.ImportDeclaration).moduleSpecifier as ts.StringLiteral).text.endsWith(PACKAGE_IMPORT)) {
 
         const clause = (statement as ts.ImportDeclaration).importClause;
         return clause && clause.namedBindings && clause.namedBindings.kind === ts.SyntaxKind.NamedImports;

projects/igniteui-angular/src/lib/calendar/public_api.ts

@@ -1,4 +1,5 @@
 export * from './calendar';
+export * from './calendar-base';
 export * from './calendar.component';
 export * from './days-view/days-view.component';
 export * from './months-view/months-view.component';

projects/igniteui-angular/src/lib/grids/cell.component.html

@@ -8,7 +8,7 @@
     >
 </ng-template>
 <ng-template #defaultCell>
-    <div
+    <div *ngIf="column.dataType !== 'boolean'"
         igxTextHighlight
         class="igx-grid__td-text"
         style="pointer-events: none;"
@@ -35,8 +35,6 @@
                 ? (value | number:column.pipeArgs.digitsInfo:grid.locale)
                 : column.dataType === "date"
                 ? (value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale)
-                : column.dataType === "boolean"
-                ? ""
                 : value
         }}</div>
     <igx-icon

projects/igniteui-angular/src/lib/grids/tree-grid/tree-cell.component.html

@@ -8,7 +8,7 @@
     >
 </ng-template>
 <ng-template #defaultCell>
-    <div
+    <div *ngIf="column.dataType !== 'boolean'"
         igxTextHighlight
         class="igx-grid__td-text"
         style="pointer-events: none;"
@@ -35,8 +35,6 @@
                 ? (value | number:column.pipeArgs.digitsInfo:grid.locale)
                 : column.dataType === "date"
                 ? (value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale)
-                : column.dataType === "boolean"
-                ? ""
                 : value
         }}</div>
     <igx-icon

src/app/calendar/calendar.sample.ts

@@ -1,6 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { IgxCalendarComponent, DateRangeType, CalendarView } from 'igniteui-angular';
-import { IViewDateChangeEventArgs } from '../../../projects/igniteui-angular/src/lib/calendar/calendar-base';
+import { IgxCalendarComponent, DateRangeType, CalendarView, IViewDateChangeEventArgs } from 'igniteui-angular';
 
 @Component({
     selector: 'app-calendar-sample',