diff --git a/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.html b/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.html index bed8e2f1ce..52188f5460 100644 --- a/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.html +++ b/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.html @@ -15,7 +15,7 @@ [title]="'CORE.BREADCRUMBS.SHOWALL' | translate" [attr.aria-label]="'CORE.BREADCRUMBS.SHOWALL' | translate" > - more_vert +
diff --git a/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts b/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts index 7286536429..f0b7ca3257 100644 --- a/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts +++ b/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts @@ -32,18 +32,18 @@ import { } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; import { map, startWith } from 'rxjs/operators'; import { TranslatePipe } from '@ngx-translate/core'; import { BreadcrumbFocusDirective } from '../../directives/breadcrumb-focus.directive'; import { BreadcrumbItemComponent } from '../breadcrumb-item/breadcrumb-item.component'; +import { IconModule } from '@alfresco/adf-core'; @Component({ selector: 'adf-breadcrumb', templateUrl: './breadcrumb.component.html', styleUrls: ['./breadcrumb.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - imports: [CommonModule, MatIconModule, TranslatePipe, MatButtonModule, BreadcrumbFocusDirective] + imports: [CommonModule, IconModule, TranslatePipe, MatButtonModule, BreadcrumbFocusDirective] }) export class BreadcrumbComponent implements AfterContentInit, OnChanges { private _breadcrumbTemplateRefs: Array> = []; diff --git a/lib/core/feature-flags/src/lib/components/flags/flags.component.html b/lib/core/feature-flags/src/lib/components/flags/flags.component.html index ff3b5b14a5..5d2b7948c8 100644 --- a/lib/core/feature-flags/src/lib/components/flags/flags.component.html +++ b/lib/core/feature-flags/src/lib/components/flags/flags.component.html @@ -8,11 +8,8 @@ - @@ -20,7 +17,7 @@
- search + @@ -64,6 +61,6 @@ - cloud + diff --git a/lib/core/feature-flags/src/lib/components/flags/flags.component.ts b/lib/core/feature-flags/src/lib/components/flags/flags.component.ts index c22f5ce300..e8a6d15152 100644 --- a/lib/core/feature-flags/src/lib/components/flags/flags.component.ts +++ b/lib/core/feature-flags/src/lib/components/flags/flags.component.ts @@ -30,7 +30,6 @@ import { debounceTime, map, take, tap } from 'rxjs/operators'; import { MatTableModule } from '@angular/material/table'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; import { MatInputModule } from '@angular/material/input'; import { FormsModule } from '@angular/forms'; @@ -38,6 +37,7 @@ import { FlagsOverrideComponent } from '../feature-override-indicator.component' import { MatDialogModule } from '@angular/material/dialog'; import { TranslatePipe } from '@ngx-translate/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; +import { IconModule } from '@alfresco/adf-core'; @Component({ selector: 'adf-feature-flags-overrides', @@ -48,7 +48,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; MatTableModule, MatSlideToggleModule, MatToolbarModule, - MatIconModule, + IconModule, MatButtonModule, MatInputModule, MatDialogModule, diff --git a/lib/core/src/lib/button/button.component.html b/lib/core/src/lib/button/button.component.html index 1ef9393927..44f2f8b5ff 100644 --- a/lib/core/src/lib/button/button.component.html +++ b/lib/core/src/lib/button/button.component.html @@ -80,7 +80,7 @@ [attr.aria-hidden]="ariaHidden" [attr.data-automation-id]="testId" > - {{ icon }} + @@ -98,7 +98,7 @@ [attr.aria-hidden]="ariaHidden" [attr.data-automation-id]="testId" > - {{ icon }} + @@ -116,7 +116,7 @@ [attr.aria-hidden]="ariaHidden" [attr.data-automation-id]="testId" > - {{ icon }} + diff --git a/lib/core/src/lib/button/button.component.ts b/lib/core/src/lib/button/button.component.ts index 3efd685229..c020ef4898 100644 --- a/lib/core/src/lib/button/button.component.ts +++ b/lib/core/src/lib/button/button.component.ts @@ -19,14 +19,14 @@ import { Component, HostBinding, Input, ViewEncapsulation } from '@angular/core' import { CommonModule } from '@angular/common'; import { MatButtonModule } from '@angular/material/button'; import { ThemePalette } from '@angular/material/core'; -import { MatIconModule } from '@angular/material/icon'; +import { IconModule } from '../icon/icon.module'; export type ButtonVariant = 'basic' | 'raised' | 'stroked' | 'flat' | 'icon' | 'fab' | 'mini-fab' | undefined; export type ButtonColor = ThemePalette; @Component({ selector: 'adf-button', - imports: [CommonModule, MatButtonModule, MatIconModule], + imports: [CommonModule, MatButtonModule, IconModule], templateUrl: './button.component.html', styleUrls: ['./button.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.html b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.html index bdc7395e3f..e40946327b 100644 --- a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.html +++ b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.html @@ -9,7 +9,7 @@ (click)="clicked()" [attr.data-automation-id]="'card-arrayitem-chip-' + item.value">
- {{item.icon}} + {{item?.value}}
@@ -27,7 +27,7 @@ (click)="clicked()" [attr.data-automation-id]="'card-arrayitem-chip-' + item.value">
- {{item.icon}} + {{item?.value}}
@@ -41,7 +41,7 @@ *ngFor="let item of items.slice(displayCount, items.length)" [attr.data-automation-id]="'card-arrayitem-chip-' + item.value">
- {{item.icon}} + {{item?.value}}
@@ -60,6 +60,6 @@ [attr.aria-label]="'CORE.METADATA.ACTIONS.EDIT' | translate" [attr.title]="'CORE.METADATA.ACTIONS.EDIT' | translate" [attr.data-automation-id]="'card-array-item-clickable-icon-' + property.key"> - {{property.icon}} + diff --git a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts index cb9fe8bcbc..2ec7f81819 100644 --- a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts @@ -21,14 +21,14 @@ import { BaseCardView } from '../base-card-view'; import { CommonModule } from '@angular/common'; import { MatChipsModule } from '@angular/material/chips'; import { TranslatePipe } from '@ngx-translate/core'; -import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatCardModule } from '@angular/material/card'; import { MatButtonModule } from '@angular/material/button'; +import { IconModule } from '../../../icon/icon.module'; @Component({ selector: 'adf-card-view-arrayitem', - imports: [CommonModule, MatChipsModule, TranslatePipe, MatIconModule, MatMenuModule, MatCardModule, MatButtonModule], + imports: [CommonModule, MatChipsModule, TranslatePipe, IconModule, MatMenuModule, MatCardModule, MatButtonModule], templateUrl: './card-view-arrayitem.component.html', styleUrls: ['./card-view-arrayitem.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.html b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.html index 14e08fc313..4e2dde8cb9 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.html +++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.html @@ -60,9 +60,8 @@ (click)="onDateClear()" [attr.title]="'CORE.METADATA.ACTIONS.CLEAR' | translate" [attr.data-automation-id]="'datepicker-date-clear-' + property.key" - > - clear - + adf-icon="clear" + /> {{ propertyValue }} - cancel + diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts index ed52b1d3c1..3241f6b91f 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts @@ -35,13 +35,13 @@ import { isValid } from 'date-fns'; import { DateFnsUtils } from '../../../common/utils/date-fns-utils'; import { CommonModule } from '@angular/common'; import { TranslatePipe } from '@ngx-translate/core'; -import { MatIconModule } from '@angular/material/icon'; import { MatChipsModule } from '@angular/material/chips'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { FormControl, ReactiveFormsModule } from '@angular/forms'; import { MatInputModule } from '@angular/material/input'; +import { IconModule } from '../../../icon/icon.module'; @Component({ providers: [ @@ -54,7 +54,7 @@ import { MatInputModule } from '@angular/material/input'; imports: [ CommonModule, TranslatePipe, - MatIconModule, + IconModule, MatDatetimepickerModule, MatChipsModule, MatInputModule, diff --git a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.html b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.html index bed65bd9b7..f43feb4e8e 100644 --- a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.html +++ b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.html @@ -47,7 +47,7 @@ mat-icon-button (click)="remove(i)" class="adf-property-col-delete"> - close + @@ -57,7 +57,7 @@ class="adf-card-view__key-value-pairs__add-btn" [attr.data-automation-id]="'card-key-value-pairs-button-' + property.key"> {{ 'CORE.CARDVIEW.KEYVALUEPAIRS.ADD' | translate }} - add + diff --git a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts index b7e10b0ca0..aa9a18b0e8 100644 --- a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts @@ -25,11 +25,11 @@ import { TranslatePipe } from '@ngx-translate/core'; import { MatInputModule } from '@angular/material/input'; import { FormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; +import { IconModule } from '../../../icon/icon.module'; @Component({ selector: 'adf-card-view-key-value-pairs-item', - imports: [CommonModule, TranslatePipe, MatTableModule, MatInputModule, FormsModule, MatButtonModule, MatIconModule], + imports: [CommonModule, TranslatePipe, MatTableModule, MatInputModule, FormsModule, MatButtonModule, IconModule], templateUrl: './card-view-keyvaluepairsitem.component.html', styleUrls: ['./card-view-keyvaluepairsitem.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.html b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.html index 147b6900bd..aa96c84472 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.html +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.html @@ -20,7 +20,7 @@ *ngIf="term" (keydown.enter)="reset($event)" (click)="reset()"> - close + diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts index 1d6c9501b4..ac55499af4 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts @@ -22,13 +22,13 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { FormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; import { TranslatePipe } from '@ngx-translate/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; +import { IconModule } from '../../../../icon/icon.module'; @Component({ selector: 'adf-select-filter-input', - imports: [CommonModule, MatFormFieldModule, MatInputModule, FormsModule, MatButtonModule, MatIconModule, TranslatePipe], + imports: [CommonModule, MatFormFieldModule, MatInputModule, FormsModule, MatButtonModule, IconModule, TranslatePipe], templateUrl: './select-filter-input.component.html', styleUrls: ['./select-filter-input.component.scss'], host: { class: 'adf-select-filter-input' }, diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html index 4b7cf636fc..dd6cbdaf28 100644 --- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html +++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html @@ -78,7 +78,7 @@ {{ propertyValue }} - cancel + @@ -154,7 +154,7 @@ [attr.title]="'CORE.METADATA.ACTIONS.EDIT' | translate" [attr.data-automation-id]="'card-textitem-clickable-icon-' + property.key" > - {{ property?.icon }} + diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts index 68388e4a64..ebeac0d097 100644 --- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts @@ -28,10 +28,10 @@ import { CommonModule } from '@angular/common'; import { MatFormFieldModule } from '@angular/material/form-field'; import { TranslatePipe } from '@ngx-translate/core'; import { MatInputModule } from '@angular/material/input'; -import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; +import { IconModule } from '../../../icon/icon.module'; export const DEFAULT_SEPARATOR = ', '; const templateTypes = { @@ -51,7 +51,7 @@ const templateTypes = { MatInputModule, ReactiveFormsModule, MatChipsModule, - MatIconModule, + IconModule, FormsModule, MatButtonModule, MatSnackBarModule diff --git a/lib/core/src/lib/context-menu/context-menu-list.component.html b/lib/core/src/lib/context-menu/context-menu-list.component.html index 35c3f5e6f3..9c0dd09dbb 100644 --- a/lib/core/src/lib/context-menu/context-menu-list.component.html +++ b/lib/core/src/lib/context-menu/context-menu-list.component.html @@ -7,7 +7,7 @@ [disabled]="link.model?.disabled" [title]="link.model?.tooltip | translate" (click)="onMenuItemClick($event, link)"> - {{ link.model.icon }} + {{ link.title || link.model?.title | translate }} diff --git a/lib/core/src/lib/context-menu/context-menu-list.component.ts b/lib/core/src/lib/context-menu/context-menu-list.component.ts index 2894bc33ea..39ed4fa627 100644 --- a/lib/core/src/lib/context-menu/context-menu-list.component.ts +++ b/lib/core/src/lib/context-menu/context-menu-list.component.ts @@ -22,10 +22,10 @@ import { ContextMenuOverlayRef } from './context-menu-overlay'; import { contextMenuAnimation } from './animations'; import { CONTEXT_MENU_DATA } from './context-menu.tokens'; import { AfterViewInit, Component, HostListener, Inject, Optional, QueryList, ViewChildren, ViewEncapsulation } from '@angular/core'; -import { MatIconModule } from '@angular/material/icon'; import { NgForOf, NgIf } from '@angular/common'; import { TranslatePipe } from '@ngx-translate/core'; import { DOWN_ARROW, UP_ARROW } from '@angular/cdk/keycodes'; +import { IconModule } from '../icon/icon.module'; @Component({ selector: 'adf-context-menu', @@ -36,7 +36,7 @@ import { DOWN_ARROW, UP_ARROW } from '@angular/cdk/keycodes'; class: 'adf-context-menu' }, encapsulation: ViewEncapsulation.None, - imports: [MatIconModule, MatMenuModule, NgForOf, NgIf, TranslatePipe], + imports: [IconModule, MatMenuModule, NgForOf, NgIf, TranslatePipe], animations: [trigger('panelAnimation', contextMenuAnimation)] }) export class ContextMenuListComponent implements AfterViewInit { diff --git a/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.html b/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.html index 999cd51f80..caba41ae5a 100644 --- a/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.html +++ b/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.html @@ -16,17 +16,14 @@ [attr.aria-label]="'CLOSE' | translate" (click)="closeMenu()" > - close +
- - search - + - view_week_outline +
@@ -213,7 +213,7 @@ class="adf-datatable-cell adf-datatable__actions-cell adf-datatable-hover-only">
@@ -224,14 +224,14 @@ [title]="'ADF-DATATABLE.CONTENT-ACTIONS.TOOLTIP' | translate" [attr.id]="'action_menu_left_' + idx" [attr.data-automation-id]="'action_menu_' + idx"> - more_vert + @@ -282,9 +282,9 @@ - {{ asIconValue(row, col) }} - + *ngIf="isIconValue(row, col); else no_iconvalue" + [adf-icon]="asIconValue(row, col)" + /> @@ -427,7 +427,7 @@ [attr.id]="'action_menu_right_' + idx" [attr.data-automation-id]="'action_menu_' + idx" (keydown.enter)="actionsMenuTrigger.openMenu()"> - more_vert + diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.ts index 1834762b3c..154a27fa82 100644 --- a/lib/core/src/lib/datatable/components/datatable/datatable.component.ts +++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.ts @@ -60,7 +60,7 @@ import { DataCellEvent } from '../data-cell.event'; import { DataRowActionEvent } from '../data-row-action.event'; import { buffer, debounceTime, filter, map, share } from 'rxjs/operators'; import { CdkDrag, CdkDragDrop, CdkDragHandle, CdkDropList, moveItemInArray } from '@angular/cdk/drag-drop'; -import { MatIconModule, MatIconRegistry } from '@angular/material/icon'; +import { MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer } from '@angular/platform-browser'; import { ResizeEvent } from '../../directives/resizable/types'; import { CommonModule } from '@angular/common'; @@ -83,6 +83,7 @@ import { JsonCellComponent } from '../json-cell/json-cell.component'; import { AmountCellComponent } from '../amount-cell/amount-cell.component'; import { NumberCellComponent } from '../number-cell/number-cell.component'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; +import { IconModule } from '../../../icon/icon.module'; // eslint-disable-next-line no-shadow export enum ShowHeaderMode { @@ -107,7 +108,7 @@ export enum ShowHeaderMode { ResizeHandleDirective, MatButtonModule, MatMenuModule, - MatIconModule, + IconModule, UploadDirective, ContextMenuDirective, FileTypePipe, diff --git a/lib/core/src/lib/datatable/components/icon-cell/icon-cell.component.ts b/lib/core/src/lib/datatable/components/icon-cell/icon-cell.component.ts index 96dee74775..69ecb708c9 100644 --- a/lib/core/src/lib/datatable/components/icon-cell/icon-cell.component.ts +++ b/lib/core/src/lib/datatable/components/icon-cell/icon-cell.component.ts @@ -16,17 +16,17 @@ */ import { ChangeDetectionStrategy, Component, ViewEncapsulation, computed } from '@angular/core'; -import { MatIconModule } from '@angular/material/icon'; import { DataTableCellComponent } from '../datatable-cell/datatable-cell.component'; import { toSignal } from '@angular/core/rxjs-interop'; +import { IconModule } from '../../../icon/icon.module'; @Component({ - imports: [MatIconModule], + imports: [IconModule], selector: 'adf-icon-cell', changeDetection: ChangeDetectionStrategy.OnPush, template: ` @if (icon()) { - + + [adf-icon]="data.headerIcon" + />

{{ data.title | translate }}

diff --git a/lib/core/src/lib/dialogs/dialog/dialog.component.ts b/lib/core/src/lib/dialogs/dialog/dialog.component.ts index 385dfd7ea1..98826bb0d1 100644 --- a/lib/core/src/lib/dialogs/dialog/dialog.component.ts +++ b/lib/core/src/lib/dialogs/dialog/dialog.component.ts @@ -22,9 +22,9 @@ import { BehaviorSubject } from 'rxjs'; import { DialogSize, DialogSizes } from './dialog.model'; import { CommonModule } from '@angular/common'; import { TranslatePipe } from '@ngx-translate/core'; -import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; +import { IconModule } from '../../icon/icon.module'; export const DIALOG_COMPONENT_DATA = new InjectionToken('dialog component data'); @@ -32,7 +32,7 @@ export const DIALOG_COMPONENT_DATA = new InjectionToken('dialog component d selector: 'adf-dialog', templateUrl: './dialog.component.html', styleUrls: ['./dialog.component.scss'], - imports: [CommonModule, TranslatePipe, MatIconModule, MatDialogModule, MatButtonModule], + imports: [CommonModule, TranslatePipe, IconModule, MatDialogModule, MatButtonModule], encapsulation: ViewEncapsulation.None }) export class DialogComponent { diff --git a/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.html b/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.html index 3d4a7d0363..adecf6948f 100644 --- a/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.html +++ b/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.html @@ -6,7 +6,7 @@ mat-icon-button [title]="'CLOSE' | translate" [mat-dialog-close]="false"> - close + diff --git a/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.ts b/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.ts index 50eec381c9..ead9c73c12 100644 --- a/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.ts +++ b/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.ts @@ -22,10 +22,10 @@ import { MatCheckboxChange, MatCheckboxModule } from '@angular/material/checkbox import { ReactiveFormsModule } from '@angular/forms'; import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; import { CommonModule } from '@angular/common'; import { UserPreferencesService } from '../../common'; import { AppConfigValues } from '../../app-config'; +import { IconModule } from '../../icon/icon.module'; /** * Dialog which informs about unsaved changes. Allows discard them and proceed or close dialog and stop proceeding. @@ -41,12 +41,15 @@ import { AppConfigValues } from '../../app-config'; templateUrl: './unsaved-changes-dialog.component.html', styleUrls: ['./unsaved-changes-dialog.component.scss'], host: { class: 'adf-unsaved-changes-dialog' }, - imports: [MatDialogModule, TranslatePipe, MatButtonModule, MatIconModule, CommonModule, MatCheckboxModule, ReactiveFormsModule] + imports: [MatDialogModule, TranslatePipe, MatButtonModule, IconModule, CommonModule, MatCheckboxModule, ReactiveFormsModule] }) export class UnsavedChangesDialogComponent implements OnInit { dialogData: UnsavedChangesDialogData; - constructor(@Inject(MAT_DIALOG_DATA) public data: UnsavedChangesDialogData, private userPreferencesService: UserPreferencesService) {} + constructor( + @Inject(MAT_DIALOG_DATA) public data: UnsavedChangesDialogData, + private userPreferencesService: UserPreferencesService + ) {} ngOnInit() { this.dialogData = { diff --git a/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html b/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html index 53328792df..6c9d4ef6df 100644 --- a/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html +++ b/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html @@ -18,13 +18,14 @@ [attr.aria-label]="chip.name" (removed)="removedChip.emit(chip.id)"> {{ chip.name }} - - close - + } diff --git a/lib/core/src/lib/form/components/form-renderer.component.ts b/lib/core/src/lib/form/components/form-renderer.component.ts index ff5c695e21..e532cd5c29 100644 --- a/lib/core/src/lib/form/components/form-renderer.component.ts +++ b/lib/core/src/lib/form/components/form-renderer.component.ts @@ -19,7 +19,6 @@ import { NgClass, NgForOf, NgIf, NgStyle, NgTemplateOutlet } from '@angular/comm import { ChangeDetectorRef, Component, Inject, inject, Injector, Input, OnDestroy, OnInit, Optional, ViewEncapsulation } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; import { MatTabsModule } from '@angular/material/tabs'; import { TranslatePipe } from '@ngx-translate/core'; import { FormRulesManager, formRulesManagerFactory } from '../models/form-rules.model'; @@ -33,6 +32,7 @@ import { DecimalRenderMiddlewareService } from './middlewares/decimal-middleware import { MatDialog } from '@angular/material/dialog'; import { ConfirmDialogComponent } from '../../../lib/dialogs/confirm-dialog/confirm.dialog'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { IconModule } from '../../icon/icon.module'; @Component({ selector: 'adf-form-renderer', @@ -57,7 +57,7 @@ import { MatTooltipModule } from '@angular/material/tooltip'; NgTemplateOutlet, TranslatePipe, MatButtonModule, - MatIconModule, + IconModule, NgStyle, FormFieldComponent, FormsModule, diff --git a/lib/core/src/lib/form/components/widgets/error/error.component.html b/lib/core/src/lib/form/components/widgets/error/error.component.html index c4807b5a5b..d037912d36 100644 --- a/lib/core/src/lib/form/components/widgets/error/error.component.html +++ b/lib/core/src/lib/form/components/widgets/error/error.component.html @@ -1,10 +1,10 @@
- error_outline +
{{ error.message | translate:translateParameters }}
- error_outline +
{{ required }}
diff --git a/lib/core/src/lib/form/components/widgets/error/error.component.ts b/lib/core/src/lib/form/components/widgets/error/error.component.ts index 3fed16cfda..561cde3e1d 100644 --- a/lib/core/src/lib/form/components/widgets/error/error.component.ts +++ b/lib/core/src/lib/form/components/widgets/error/error.component.ts @@ -20,11 +20,11 @@ import { animate, state, style, transition, trigger } from '@angular/animations'; import { NgIf } from '@angular/common'; import { Component, Input, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core'; -import { MatIconModule } from '@angular/material/icon'; import { TranslatePipe } from '@ngx-translate/core'; import { FormService } from '../../../services/form.service'; import { ErrorMessageModel } from '../core'; import { WidgetComponent } from '../widget.component'; +import { IconModule } from '../../../../icon/icon.module'; @Component({ selector: 'error-widget', @@ -53,7 +53,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [NgIf, MatIconModule, TranslatePipe], + imports: [NgIf, IconModule, TranslatePipe], encapsulation: ViewEncapsulation.None }) export class ErrorWidgetComponent extends WidgetComponent implements OnChanges { diff --git a/lib/core/src/lib/form/components/widgets/header/header.widget.html b/lib/core/src/lib/form/components/widgets/header/header.widget.html index 276242e9ce..30fabc78ab 100644 --- a/lib/core/src/lib/form/components/widgets/header/header.widget.html +++ b/lib/core/src/lib/form/components/widgets/header/header.widget.html @@ -30,7 +30,7 @@ class="mdl-button--icon" (click)="onExpanderClicked(element)" > - {{ element?.isExpanded ? 'expand_more' : 'expand_less' }} + } diff --git a/lib/core/src/lib/form/components/widgets/header/header.widget.ts b/lib/core/src/lib/form/components/widgets/header/header.widget.ts index a194a35b3d..39534b48d6 100644 --- a/lib/core/src/lib/form/components/widgets/header/header.widget.ts +++ b/lib/core/src/lib/form/components/widgets/header/header.widget.ts @@ -18,17 +18,17 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { ContainerModel } from '../core/container.model'; import { FieldStylePipe } from './../../../pipes/field-style.pipe'; -import { MatIconModule } from '@angular/material/icon'; import { NgTemplateOutlet } from '@angular/common'; import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; +import { IconModule } from '../../../../icon/icon.module'; @Component({ selector: 'adf-header-widget', templateUrl: './header.widget.html', styleUrls: ['./header.widget.scss'], encapsulation: ViewEncapsulation.None, - imports: [FieldStylePipe, MatIconModule, MatButtonModule, TranslatePipe, NgTemplateOutlet] + imports: [FieldStylePipe, IconModule, MatButtonModule, TranslatePipe, NgTemplateOutlet] }) export class HeaderWidgetComponent { @Input() element: ContainerModel; diff --git a/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.html b/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.html index cb46d4eacb..92053e3be8 100644 --- a/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.html +++ b/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.html @@ -20,7 +20,7 @@ [disabled]="element.field.readOnly" (click)="addRow()" > - add {{ 'FORM.FIELD.REPEATABLE_SECTION.ADD_ROW' | translate }} + {{ 'FORM.FIELD.REPEATABLE_SECTION.ADD_ROW' | translate }} } @else { {{ 'FORM.FIELD.REPEATABLE_SECTION.ROW_LIMIT_REACHED' | translate: { limit: element.field.params.maxNumberOfRows } }} diff --git a/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.ts b/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.ts index c0437d86c0..183a217166 100644 --- a/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.ts +++ b/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.ts @@ -17,17 +17,17 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { FieldStylePipe } from '../../../pipes/field-style.pipe'; -import { MatIconModule } from '@angular/material/icon'; import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; import { ContainerModel } from '../core/container.model'; +import { IconModule } from '../../../../icon/icon.module'; @Component({ selector: 'adf-repeat-widget', templateUrl: './repeat.widget.html', styleUrls: ['./repeat.widget.scss'], encapsulation: ViewEncapsulation.None, - imports: [FieldStylePipe, MatIconModule, MatButtonModule, TranslatePipe] + imports: [FieldStylePipe, IconModule, MatButtonModule, TranslatePipe] }) export class RepeatWidgetComponent { @Input() element: ContainerModel; diff --git a/lib/core/src/lib/form/components/widgets/unknown/unknown.widget.ts b/lib/core/src/lib/form/components/widgets/unknown/unknown.widget.ts index 7d8d15c90e..03d70e1729 100644 --- a/lib/core/src/lib/form/components/widgets/unknown/unknown.widget.ts +++ b/lib/core/src/lib/form/components/widgets/unknown/unknown.widget.ts @@ -18,17 +18,17 @@ /* eslint-disable @angular-eslint/component-selector */ import { Component, ViewEncapsulation } from '@angular/core'; -import { MatIconModule } from '@angular/material/icon'; import { MatListModule } from '@angular/material/list'; import { FormService } from '../../../services/form.service'; import { WidgetComponent } from '../widget.component'; +import { IconModule } from '../../../../icon/icon.module'; @Component({ selector: 'unknown-widget', template: ` - error_outline + Unknown type: {{ field.type }} @@ -45,7 +45,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [MatListModule, MatIconModule], + imports: [MatListModule, IconModule], encapsulation: ViewEncapsulation.None }) export class UnknownWidgetComponent extends WidgetComponent { diff --git a/lib/core/src/lib/icon/icon.component.mock.ts b/lib/core/src/lib/icon/icon.component.mock.ts new file mode 100644 index 0000000000..0ad4bac5ff --- /dev/null +++ b/lib/core/src/lib/icon/icon.component.mock.ts @@ -0,0 +1,28 @@ +/*! + * @license + * Copyright © 2005-2025 Hyland Software, Inc. and its affiliates. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Component } from '@angular/core'; +import { IconModule } from './icon.module'; + +@Component({ + template: ``, + standalone: true, + imports: [IconModule] +}) +export class IconComponent { + name: string; +} diff --git a/lib/core/src/lib/icon/icon.directive.spec.ts b/lib/core/src/lib/icon/icon.directive.spec.ts index 2ac74c37ae..87a07ad6aa 100644 --- a/lib/core/src/lib/icon/icon.directive.spec.ts +++ b/lib/core/src/lib/icon/icon.directive.spec.ts @@ -15,36 +15,25 @@ * limitations under the License. */ -import { Component } from '@angular/core'; -import { MatIconModule } from '@angular/material/icon'; -import { IconDirective } from './icon.directive'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { IconType, MatIconHarness, MatIconTestingModule } from '@angular/material/icon/testing'; import { HarnessLoader } from '@angular/cdk/testing'; import { ICON_ALIAS_MAP_TOKEN } from './icon-alias-map.token'; - -@Component({ - template: ``, - standalone: true, - imports: [MatIconModule, IconDirective] -}) -class TestComponent { - name: string; -} +import { IconComponent } from './icon.component.mock'; describe('IconDirective', () => { - let fixture: ComponentFixture; - let component: TestComponent; + let fixture: ComponentFixture; + let component: IconComponent; let loader: HarnessLoader; describe('alias map NOT provided', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [TestComponent, MatIconTestingModule] + imports: [IconComponent, MatIconTestingModule] }); - fixture = TestBed.createComponent(TestComponent); + fixture = TestBed.createComponent(IconComponent); component = fixture.componentInstance; loader = TestbedHarnessEnvironment.loader(fixture); }); @@ -62,7 +51,7 @@ describe('IconDirective', () => { describe('alias map provided', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [TestComponent, MatIconTestingModule], + imports: [IconComponent, MatIconTestingModule], providers: [ { provide: ICON_ALIAS_MAP_TOKEN, @@ -73,7 +62,7 @@ describe('IconDirective', () => { ] }); - fixture = TestBed.createComponent(TestComponent); + fixture = TestBed.createComponent(IconComponent); component = fixture.componentInstance; loader = TestbedHarnessEnvironment.loader(fixture); }); diff --git a/lib/core/src/lib/icon/icon.directive.ts b/lib/core/src/lib/icon/icon.directive.ts index ba21014eb0..0fe60918e0 100644 --- a/lib/core/src/lib/icon/icon.directive.ts +++ b/lib/core/src/lib/icon/icon.directive.ts @@ -16,18 +16,19 @@ */ import { Directive, ElementRef, inject, Input, OnChanges } from '@angular/core'; -import { ICON_ALIAS_MAP_TOKEN } from './icon-alias-map.token'; import { MatIcon } from '@angular/material/icon'; +import { ICON_ALIAS_MAP_TOKEN } from './icon-alias-map.token'; @Directive({ - selector: 'mat-icon[adf-icon]' + selector: 'mat-icon[adf-icon]', + standalone: false }) export class IconDirective implements OnChanges { private readonly matIcon = inject(MatIcon); private readonly elementRef: ElementRef = inject(ElementRef); private readonly aliasMap = inject(ICON_ALIAS_MAP_TOKEN, { optional: true }); - @Input() name: string; + @Input('adf-icon') name: string; ngOnChanges() { const iconAlias = this.aliasMap?.[this.name]; @@ -40,7 +41,7 @@ export class IconDirective implements OnChanges { } private appendLigatureText() { - this.resetSvg(); + this.resetSvgIcon(); const element = this.elementRef.nativeElement; const textNode = this.findTextNode(element); @@ -56,7 +57,7 @@ export class IconDirective implements OnChanges { return Array.from(element.childNodes).find((node: ChildNode) => node.nodeType === Node.TEXT_NODE); } - private resetSvg() { + private resetSvgIcon() { this.matIcon.svgIcon = null; } } diff --git a/lib/core/src/lib/icon/icon.module.ts b/lib/core/src/lib/icon/icon.module.ts new file mode 100644 index 0000000000..bfd6de42a2 --- /dev/null +++ b/lib/core/src/lib/icon/icon.module.ts @@ -0,0 +1,27 @@ +/*! + * @license + * Copyright © 2005-2025 Hyland Software, Inc. and its affiliates. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { NgModule } from '@angular/core'; +import { MatIconModule } from '@angular/material/icon'; +import { IconDirective } from './icon.directive'; + +@NgModule({ + declarations: [IconDirective], + imports: [MatIconModule], + exports: [MatIconModule, IconDirective] +}) +export class IconModule {} diff --git a/lib/core/src/lib/icon/public-api.ts b/lib/core/src/lib/icon/public-api.ts index f893d6ff81..c5ee4c555f 100644 --- a/lib/core/src/lib/icon/public-api.ts +++ b/lib/core/src/lib/icon/public-api.ts @@ -16,6 +16,7 @@ */ export * from './icon.component'; -export * from './icon-alias-map.type'; export * from './icon-alias-map.token'; +export * from './icon-alias-map.type'; export * from './icon.directive'; +export * from './icon.module'; diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.html b/lib/core/src/lib/info-drawer/info-drawer.component.html index 98f50f7fd2..6ca3e30b93 100644 --- a/lib/core/src/lib/info-drawer/info-drawer.component.html +++ b/lib/core/src/lib/info-drawer/info-drawer.component.html @@ -18,7 +18,7 @@ class="adf-info-drawer-tab"> - {{ contentBlock.icon }} + {{ contentBlock.label | translate }} diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.ts b/lib/core/src/lib/info-drawer/info-drawer.component.ts index 53b8fe1e3d..af35a00d25 100644 --- a/lib/core/src/lib/info-drawer/info-drawer.component.ts +++ b/lib/core/src/lib/info-drawer/info-drawer.component.ts @@ -36,7 +36,7 @@ import { InfoDrawerTitleDirective } from './info-drawer-layout.component'; import { TranslatePipe } from '@ngx-translate/core'; -import { MatIconModule } from '@angular/material/icon'; +import { IconModule } from '../icon/icon.module'; @Component({ selector: 'adf-info-drawer-tab', @@ -63,7 +63,7 @@ export class InfoDrawerTabComponent { InfoDrawerLayoutComponent, TranslatePipe, MatTabsModule, - MatIconModule, + IconModule, InfoDrawerButtonsDirective, InfoDrawerTitleDirective, InfoDrawerContentDirective, diff --git a/lib/core/src/lib/language-menu/language-picker.component.ts b/lib/core/src/lib/language-menu/language-picker.component.ts index eee80ce8ef..60d87908e9 100644 --- a/lib/core/src/lib/language-menu/language-picker.component.ts +++ b/lib/core/src/lib/language-menu/language-picker.component.ts @@ -21,14 +21,14 @@ import { CommonModule } from '@angular/common'; import { MatMenu, MatMenuItem, MatMenuModule } from '@angular/material/menu'; import { TranslatePipe } from '@ngx-translate/core'; import { LanguageMenuComponent } from './language-menu.component'; -import { MatIconModule } from '@angular/material/icon'; +import { IconModule } from '../icon/icon.module'; @Component({ selector: 'adf-picker-button', - imports: [CommonModule, MatMenuModule, TranslatePipe, LanguageMenuComponent, MatIconModule], + imports: [CommonModule, MatMenuModule, TranslatePipe, LanguageMenuComponent, IconModule], template: ` diff --git a/lib/core/src/lib/layout/components/header/header.component.html b/lib/core/src/lib/layout/components/header/header.component.html index d3276873b4..61ba8aec1d 100644 --- a/lib/core/src/lib/layout/components/header/header.component.html +++ b/lib/core/src/lib/layout/components/header/header.component.html @@ -12,11 +12,7 @@ (click)="toggleMenu()" [attr.aria-expanded]="expandedSidenav" [attr.aria-label]="'CORE.HEADER.ACCESSIBILITY.SIDEBAR_TOGGLE_BUTTON_ARIA_LABEL' | translate"> - +