Merge branch 'master' into mkirova/partial-fix-13993

ChronosSF · web-flow · commit 7f5fa09d7332 · 2024-11-21T10:19:54.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 All notable changes for each version of this project will be documented in this file.
 
 ## 19.0.0
+### General
+- `IgxFilteringService`, `IgxGridBaseDirective`
+    - **Deprecation** The `filterGlobal` method has been deprecated and will be removed in a future version.
 ### New Features
 - `IgxColumn`
     - Introduced the `disabledSummaries` property, allowing users to specify which summaries should be disabled for a given column. This property accepts an array of strings corresponding to the summary keys, enabling selective control over both default summaries (e.g., 'Count', 'Min') and any custom summaries created by the user.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -79,7 +79,6 @@
     "lodash-es": "^4.17.21",
     "rxjs": "^7.8.0",
     "tslib": "^2.3.0",
-    "uuid": "^9.0.0",
     "zone.js": "~0.14.10"
   },
   "devDependencies": {
diff --git a/projects/igniteui-angular-elements/src/app/wrapper/template-ref-wrapper.ts b/projects/igniteui-angular-elements/src/app/wrapper/template-ref-wrapper.ts
@@ -1,5 +1,4 @@
-import { ElementRef, EmbeddedViewRef, Injector, TemplateRef, ViewChild } from '@angular/core';
-import { v4 as uuidv4 } from 'uuid';
+import { ElementRef, EmbeddedViewRef, Injector, TemplateRef } from '@angular/core';
 
 const CONTEXT_PROP = 'context';
 const IMPLICIT_PROP = 'implicit';
@@ -71,7 +70,7 @@ export class TemplateRefWrapper<C extends object> extends TemplateRef<C> {
             root = viewRef.rootNodes[0];
 
             contentContext = new TemplateRefWrapperContentContext();
-            contentId = uuidv4() as string;
+            contentId = crypto.randomUUID();
             contentContext._id = contentId;
             root._id = contentId;
             contentContext.root = root;
diff --git a/projects/igniteui-angular/ng-package.json b/projects/igniteui-angular/ng-package.json
@@ -11,7 +11,6 @@
     "fflate",
     "igniteui-trial-watermark",
     "lodash-es",
-    "uuid",
     "@igniteui/material-icons-extended",
     "igniteui-theming"
   ]
diff --git a/projects/igniteui-angular/ng-package.prod.json b/projects/igniteui-angular/ng-package.prod.json
@@ -10,7 +10,6 @@
     "fflate",
     "igniteui-trial-watermark",
     "lodash-es",
-    "uuid",
     "@igniteui/material-icons-extended",
     "igniteui-theming"
   ]
diff --git a/projects/igniteui-angular/package.json b/projects/igniteui-angular/package.json
@@ -73,7 +73,6 @@
         "tslib": "^2.3.0",
         "igniteui-trial-watermark": "^3.0.2",
         "lodash-es": "^4.17.21",
-        "uuid": "^9.0.0",
         "igniteui-theming": "^14.2.0",
         "@igniteui/material-icons-extended": "^3.0.0"
     },
diff --git a/projects/igniteui-angular/schematics/utils/dependency-handler.ts b/projects/igniteui-angular/schematics/utils/dependency-handler.ts
@@ -24,7 +24,6 @@ export const DEPENDENCIES_MAP: PackageEntry[] = [
     { name: 'tslib', target: PackageTarget.NONE },
     { name: 'igniteui-trial-watermark', target: PackageTarget.NONE },
     { name: 'lodash-es', target: PackageTarget.NONE },
-    { name: 'uuid', target: PackageTarget.NONE },
     { name: '@igniteui/material-icons-extended', target: PackageTarget.REGULAR },
     { name: 'igniteui-theming', target: PackageTarget.NONE },
     // peerDependencies
diff --git a/projects/igniteui-angular/src/lib/calendar/common/calendar-view.directive.ts b/projects/igniteui-angular/src/lib/calendar/common/calendar-view.directive.ts
@@ -21,6 +21,7 @@ import {
 import { CalendarDay, DayInterval } from "../common/model";
 import { getNextActiveDate, isDateInRanges } from "./helpers";
 import { DateRangeType } from "../../core/dates";
+import { isDate } from "../../core/utils";
 
 export enum Direction {
     NEXT = 1,
@@ -141,7 +142,7 @@ export abstract class IgxCalendarViewDirective implements ControlValueAccessor {
      */
     @Input()
     public set date(value: Date) {
-        if (!(value instanceof Date)) return;
+        if (!isDate(value)) return;
 
         this._date = value;
     }
diff --git a/projects/igniteui-angular/src/lib/calendar/common/model.ts b/projects/igniteui-angular/src/lib/calendar/common/model.ts
@@ -1,3 +1,5 @@
+import { isDate } from "../../core/utils";
+
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 export type DayParameter = CalendarDay | Date;
 
@@ -19,7 +21,7 @@ export const daysInWeek = 7;
 const millisecondsInDay = 86400000;
 
 export function toCalendarDay(date: DayParameter) {
-    return date instanceof Date ? CalendarDay.from(date) : date;
+    return isDate(date) ? CalendarDay.from(date) : date;
 }
 
 function checkRollover(original: CalendarDay, modified: CalendarDay) {
diff --git a/projects/igniteui-angular/src/lib/core/utils.ts b/projects/igniteui-angular/src/lib/core/utils.ts
@@ -214,7 +214,9 @@ export const isObject = (value: any): boolean => !!(value && value.toString() ==
  * @returns true if provided variable is Date
  * @hidden
  */
-export const isDate = (value: any): value is Date => value instanceof Date;
+export const isDate = (value: any): value is Date => {
+    return Object.prototype.toString.call(value) === "[object Date]";
+}
 
 /**
  * Checks if the two passed arguments are equal
@@ -642,7 +644,7 @@ export function getComponentCssSizeVar(size: string) {
 
 /**
  * @param path - The URI path to be normalized.
- * @returns string endoded using the encodeURI function.
+ * @returns string encoded using the encodeURI function.
  */
  export function normalizeURI(path: string) {
      return path.split('/').map(encodeURI).join('/');
diff --git a/projects/igniteui-angular/src/lib/grids/README.md b/projects/igniteui-angular/src/lib/grids/README.md
@@ -273,7 +273,6 @@ Here is a list of all public methods exposed by **igx-grid**:
 |`updateRow(value: any, rowIndex: number)`|Updates the row object and the data source record with the passed value.|
 |`updateCell(value: any, rowIndex: number, column: string)`|Updates the cell object and the record field in the data source.|
 |`filter(name: string, value: any, conditionOrExpressionTree?: IFilteringOperation | IFilteringExpressionsTree, ignoreCase?: boolean)`|Filters a single column. A filtering condition or filtering expressions tree could be used. Check the available [filtering conditions](#filtering-conditions)|
-|`filterGlobal(value: any, condition?, ignoreCase?)`|Filters all the columns in the grid with the same condition.|
 |`clearFilter(name?: string)`|If `name` is provided, clears the filtering state of the corresponding column, otherwise clears the filtering state of all columns.|
 |`sort(expression: ISortingExpression)`|Sorts a single column.|
 |`sort(expressions: Array)`|Sorts the grid columns based on the provided array of sorting expressions.|
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts b/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts
@@ -287,6 +287,7 @@ export class IgxFilteringService implements OnDestroy {
 
     /**
      * Filters all the `IgxColumnComponent` in the `IgxGridComponent` with the same condition.
+     * @deprecated in version 19.0.0.
      */
     public filterGlobal(value: any, condition, ignoreCase?) {
         if (!condition) {
diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -154,7 +154,6 @@ import { IgxColumnComponent } from './columns/column.component';
 import { IgxColumnGroupComponent } from './columns/column-group.component';
 import { IgxRowDragGhostDirective, IgxDragIndicatorIconDirective } from './row-drag.directive';
 import { IgxSnackbarComponent } from '../snackbar/snackbar.component';
-import { v4 as uuidv4 } from 'uuid';
 import { IgxActionStripToken } from '../action-strip/token';
 import { IgxGridRowComponent } from './grid/grid-row.component';
 import type { IgxPaginatorComponent } from '../paginator/paginator.component';
@@ -3771,7 +3770,7 @@ export abstract class IgxGridBaseDirective implements GridType,
         const primaryColumn = this._columns.find(col => col.field === this.primaryKey);
         const idType = this.data.length ?
             this.resolveDataTypes(this.data[0][this.primaryKey]) : primaryColumn ? primaryColumn.dataType : 'string';
-        return idType === 'string' ? uuidv4() : FAKE_ROW_ID--;
+        return idType === 'string' ? crypto.randomUUID() : FAKE_ROW_ID--;
     }
 
     /**
@@ -4930,6 +4929,7 @@ export abstract class IgxGridBaseDirective implements GridType,
      * @param value
      * @param condition
      * @param ignoreCase
+     * @deprecated in version 19.0.0. 
      */
     public filterGlobal(value: any, condition, ignoreCase?) {
         this.filteringService.filterGlobal(value, condition, ignoreCase);
diff --git a/src/app/avatar/avatar.sample.html b/src/app/avatar/avatar.sample.html
@@ -17,7 +17,7 @@ <h4 class="sample-title">Circular Avatars</h4>
 
             <igx-avatar src="https://images.unsplash.com/photo-1514041790697-53f1f86214d2?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=b7ac79503fbe78855a346c8d814f95ba&auto=format&fit=crop&w=1650&q=80" size="small" shape="circle"></igx-avatar>
 
-            <igx-avatar src="assets/images/avatar/17 - Test.jpg" size="medium" shape="circle"></igx-avatar>
+            <igx-avatar src="assets/images/avatar/17.jpg" size="medium" shape="circle"></igx-avatar>
 
             <igx-avatar src="https://images.unsplash.com/photo-1506804880640-f3205deb1b8b?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=2f8dd0c16478825034602dce63d9aaca&auto=format&fit=crop&w=1350&q=80" size="large" shape="circle"></igx-avatar>
         </article>
@@ -41,7 +41,7 @@ <h4 class="sample-title">Rounded Avatars</h4>
 
             <igx-avatar src="https://images.unsplash.com/photo-1514041790697-53f1f86214d2?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=b7ac79503fbe78855a346c8d814f95ba&auto=format&fit=crop&w=1650&q=80" size="small" shape="rounded"></igx-avatar>
 
-            <igx-avatar src="assets/images/avatar/17 - Test.jpg" size="medium"
+            <igx-avatar src="assets/images/avatar/17.jpg" size="medium"
                 shape="rounded"></igx-avatar>
 
             <igx-avatar src="https://images.unsplash.com/photo-1506804880640-f3205deb1b8b?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=2f8dd0c16478825034602dce63d9aaca&auto=format&fit=crop&w=1350&q=80" size="large" shape="rounded"></igx-avatar>
diff --git a/src/app/grid-events/grid-events.component.html b/src/app/grid-events/grid-events.component.html
@@ -9,9 +9,6 @@
 <igx-input-group>
     <input igxInput #productName type="text" placeholder="Filter by product name" (input)="filter(productName.value)">
 </igx-input-group><br>
-<igx-input-group>
-    <input igxInput #globalFilter type="text" placeholder="Filter global" (input)="filterGlobal(globalFilter.value)">
-</igx-input-group><br>
 
 <div class="sample-wrapper">
     <div class="grid-wrapper">
diff --git a/src/app/grid-events/grid-events.component.ts b/src/app/grid-events/grid-events.component.ts
@@ -19,8 +19,7 @@ import {
     IgxColumnComponent,
     IgxPaginatorComponent,
     IgxButtonDirective,
-    IgxIconComponent,
-    FilteringLogic
+    IgxIconComponent
 } from 'igniteui-angular';
 import { data } from '../shared/data';
 
@@ -54,15 +53,6 @@ export class GridEventsComponent {
         this.grid.filter('ProductName', term, IgxStringFilteringOperand.instance().condition('contains'));
     }
 
-    public filterGlobal(term) {
-        if (term) {
-            this.grid.filteringLogic = FilteringLogic.Or;
-            this.grid.filterGlobal(term, IgxStringFilteringOperand.instance().condition('contains'));
-        } else {
-            this.grid.clearFilter();
-        }
-    }
-
     public columnMovingStart(event: IColumnMovingStartEventArgs) {
         console.log('event' + event);
         this.logAnEvent('=> columnMovingStart');
diff --git a/src/app/input/input.sample.html b/src/app/input/input.sample.html
@@ -91,7 +91,7 @@ <h4 class="sample-title">Checkbox sample</h4>
                 <igx-list-item>
                     <igx-avatar igxListThumbnail src="assets/images/avatar/8.jpg"></igx-avatar>
                     <span igxListLineTitle>Petar Vasilev</span>
-                    <igx-checkbox igxListAction [(ngModel)]="user2.registered" [disableRipple]="true">Value</igx-checkbox>
+                    <igx-checkbox class="custom-checkbox" igxListAction [(ngModel)]="user2.registered" [disableRipple]="true">Value</igx-checkbox>
                 </igx-list-item>
 
                 <igx-list-item>
diff --git a/src/assets/images/avatar/17.jpg b/src/assets/images/avatar/17.jpg

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`"fflate",`
`12`	`12`	`"igniteui-trial-watermark",`
`13`	`13`	`"lodash-es",`
`14`		`- "uuid",`
`15`	`14`	`"@igniteui/material-icons-extended",`
`16`	`15`	`"igniteui-theming"`
`17`	`16`	`]`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`"fflate",`
`11`	`11`	`"igniteui-trial-watermark",`
`12`	`12`	`"lodash-es",`
`13`		`- "uuid",`
`14`	`13`	`"@igniteui/material-icons-extended",`
`15`	`14`	`"igniteui-theming"`
`16`	`15`	`]`