diff --git a/demo-shell/src/app/app.component.ts b/demo-shell/src/app/app.component.ts index c32f2abe50..82186c8eff 100644 --- a/demo-shell/src/app/app.component.ts +++ b/demo-shell/src/app/app.component.ts @@ -21,7 +21,7 @@ import { PageTitleService } from '@alfresco/adf-core'; import { Router } from '@angular/router'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { AdfHttpClient } from '@alfresco/adf-core/api'; @Component({ diff --git a/demo-shell/src/app/components/app-layout/cloud/form-demo/cloud-form-demo.component.scss b/demo-shell/src/app/components/app-layout/cloud/form-demo/cloud-form-demo.component.scss index 25952ed76a..3d9a0ea5fc 100644 --- a/demo-shell/src/app/components/app-layout/cloud/form-demo/cloud-form-demo.component.scss +++ b/demo-shell/src/app/components/app-layout/cloud/form-demo/cloud-form-demo.component.scss @@ -31,7 +31,7 @@ } .app-form-editor-buttons { - & > .mat-raised-button { + & > .mat-mdc-raised-button { margin-right: 5px; } } diff --git a/demo-shell/src/app/components/app-layout/user-info/user-info.component.ts b/demo-shell/src/app/components/app-layout/user-info/user-info.component.ts index f284968bd5..7921bd189d 100644 --- a/demo-shell/src/app/components/app-layout/user-info/user-info.component.ts +++ b/demo-shell/src/app/components/app-layout/user-info/user-info.component.ts @@ -25,7 +25,7 @@ import { UserInfoMode } from '@alfresco/adf-core'; import { Component, OnInit, Input } from '@angular/core'; -import { LegacyMenuPositionX as MenuPositionX, LegacyMenuPositionY as MenuPositionY } from '@angular/material/legacy-menu'; +import { MenuPositionX, MenuPositionY } from '@angular/material/menu'; import { Observable, of } from 'rxjs'; @Component({ diff --git a/demo-shell/src/app/components/cloud/shared/cloud-settings.component.html b/demo-shell/src/app/components/cloud/shared/cloud-settings.component.html index 62f74a56fc..bdc8ab70be 100644 --- a/demo-shell/src/app/components/cloud/shared/cloud-settings.component.html +++ b/demo-shell/src/app/components/cloud/shared/cloud-settings.component.html @@ -43,11 +43,11 @@
- - + + {{action.title}} cancel - - + +
diff --git a/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts b/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts index c4bf03d867..00cf011aaf 100644 --- a/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts +++ b/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts @@ -18,10 +18,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { CloudSettingsComponent } from './cloud-settings.component'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; -import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatInputModule } from '@angular/material/input'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { CoreModule } from '@alfresco/adf-core'; @NgModule({ diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts index e9962507f3..6b87421254 100644 --- a/demo-shell/src/app/components/files/files.component.ts +++ b/demo-shell/src/app/components/files/files.component.ts @@ -28,7 +28,7 @@ import { Output, ViewEncapsulation } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { NodeEntry, NodePaging, Pagination, Node, SearchEntry } from '@alfresco/js-api'; import { NotificationService, UserPreferencesService, PaginationComponent, ShowHeaderMode, FormRenderingService } from '@alfresco/adf-core'; diff --git a/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.ts b/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.ts index d4563411c3..448d7a1f18 100644 --- a/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.ts +++ b/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, ViewEncapsulation } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Node } from '@alfresco/js-api'; import { PreviewService } from '../../services/preview.service'; import { NotificationService } from '@alfresco/adf-core'; diff --git a/demo-shell/src/app/components/settings/host-settings.component.ts b/demo-shell/src/app/components/settings/host-settings.component.ts index a5d54770a9..d5891f2c14 100644 --- a/demo-shell/src/app/components/settings/host-settings.component.ts +++ b/demo-shell/src/app/components/settings/host-settings.component.ts @@ -19,7 +19,7 @@ import { Component, EventEmitter, Output, ViewEncapsulation, OnInit, Input } fro import { Validators, UntypedFormGroup, UntypedFormBuilder, UntypedFormControl } from '@angular/forms'; import { AppConfigService, AppConfigValues, StorageService, AlfrescoApiService, AuthenticationService } from '@alfresco/adf-core'; import { ENTER } from '@angular/cdk/keycodes'; -import { MAT_LEGACY_FORM_FIELD_DEFAULT_OPTIONS as MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/legacy-form-field'; +import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; export const HOST_REGEX = '^(http|https)://.*[^/]$'; diff --git a/demo-shell/src/app/folder-directive/folder-create.directive.spec.ts b/demo-shell/src/app/folder-directive/folder-create.directive.spec.ts index 42b1ca2953..614a8e328f 100644 --- a/demo-shell/src/app/folder-directive/folder-create.directive.spec.ts +++ b/demo-shell/src/app/folder-directive/folder-create.directive.spec.ts @@ -17,7 +17,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { By } from '@angular/platform-browser'; import { Subject, of } from 'rxjs'; import { FolderCreateDirective } from './folder-create.directive'; diff --git a/demo-shell/src/app/folder-directive/folder-create.directive.ts b/demo-shell/src/app/folder-directive/folder-create.directive.ts index a5d03d546e..3e49d2c532 100644 --- a/demo-shell/src/app/folder-directive/folder-create.directive.ts +++ b/demo-shell/src/app/folder-directive/folder-create.directive.ts @@ -18,7 +18,7 @@ /* eslint-disable */ import { Directive, HostListener, Input, Output, EventEmitter } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Node } from '@alfresco/js-api'; import { ContentService, FolderDialogComponent } from '@alfresco/adf-content-services'; diff --git a/demo-shell/src/app/material.module.ts b/demo-shell/src/app/material.module.ts index 1ebf5e71df..ea97216864 100644 --- a/demo-shell/src/app/material.module.ts +++ b/demo-shell/src/app/material.module.ts @@ -16,17 +16,17 @@ */ import { NgModule } from '@angular/core'; -import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatCardModule } from '@angular/material/card'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatExpansionModule } from '@angular/material/expansion'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatInputModule } from '@angular/material/input'; +import { MatListModule } from '@angular/material/list'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatSelectModule } from '@angular/material/select'; import { MatSidenavModule } from '@angular/material/sidenav'; -import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; -import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatToolbarModule } from '@angular/material/toolbar'; @NgModule({ diff --git a/demo-shell/src/custom-style-dev.scss b/demo-shell/src/custom-style-dev.scss index b778643bb3..84213af530 100644 --- a/demo-shell/src/custom-style-dev.scss +++ b/demo-shell/src/custom-style-dev.scss @@ -8,9 +8,9 @@ // If you specify typography styles for the components you use elsewhere, you should delete this line. // If you don't need the default component typographies but still want the hierarchy styles, // you can delete this line and instead use: -// `@include mat.legacy-typography-hierarchy(mat.define-legacy-typography-config());` -@include mat.all-legacy-component-typographies; -@include mat.legacy-core(); +// `@include mat.legacy-typography-hierarchy(mat.define-typography-config());` +@include mat.all-component-typographies; +@include mat.core(); $primary: mat.define-palette($alfresco-accent-orange); $accent: mat.define-palette($alfresco-accent-purple); @@ -26,7 +26,7 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-legacy-component-themes($theme); +@include mat.all-component-themes($theme); @include alfresco-material-theme($theme); $typography: map-get($theme, typography); diff --git a/demo-shell/src/custom-style.scss b/demo-shell/src/custom-style.scss index 046919e107..e5fce7f3a9 100644 --- a/demo-shell/src/custom-style.scss +++ b/demo-shell/src/custom-style.scss @@ -8,8 +8,8 @@ // If you don't need the default component typographies but still want the hierarchy styles, // you can delete this line and instead use: // `@include mat.legacy-typography-hierarchy($alfresco-typography);` -@include mat.all-legacy-component-typographies($alfresco-typography); -@include mat.legacy-core(); +@include mat.all-component-typographies($alfresco-typography); +@include mat.core(); $primary: mat.define-palette($alfresco-accent-orange); $accent: mat.define-palette($alfresco-accent-purple); @@ -23,7 +23,7 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-legacy-component-themes($theme); +@include mat.all-component-themes($theme); @include alfresco-material-theme($theme); body, diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts index a75e5abb41..88254e3c39 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts +++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogModule as MatDialogModule, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AspectListDialogComponent } from './aspect-list-dialog.component'; import { of, Subject } from 'rxjs'; diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts index 6d86a4c2f3..6d74b92ee3 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts +++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { AspectListDialogComponentData } from './aspect-list-dialog-data.interface'; @Component({ diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.ts b/lib/content-services/src/lib/aspect-list/aspect-list.component.ts index ee6df0f413..55c100741c 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list.component.ts +++ b/lib/content-services/src/lib/aspect-list/aspect-list.component.ts @@ -20,7 +20,7 @@ import { NodesApiService } from '../common/services/nodes-api.service'; import { Observable, Subject, zip } from 'rxjs'; import { concatMap, map, takeUntil, tap } from 'rxjs/operators'; import { AspectListService } from './services/aspect-list.service'; -import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-checkbox'; +import { MatCheckboxChange } from '@angular/material/checkbox'; import { AspectEntry } from '@alfresco/js-api'; @Component({ selector: 'adf-aspect-list', diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.module.ts b/lib/content-services/src/lib/aspect-list/aspect-list.module.ts index 0a876f07e0..91a57f41e8 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list.module.ts +++ b/lib/content-services/src/lib/aspect-list/aspect-list.module.ts @@ -18,16 +18,16 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { AspectListComponent } from './aspect-list.component'; -import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; +import { MatTableModule } from '@angular/material/table'; import { MatExpansionModule } from '@angular/material/expansion'; -import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; +import { MatCheckboxModule } from '@angular/material/checkbox'; import { PipeModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { AspectListDialogComponent } from './aspect-list-dialog.component'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; -import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; +import { MatButtonModule } from '@angular/material/button'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { ContentDirectiveModule } from '../directives/content-directive.module'; @NgModule({ diff --git a/lib/content-services/src/lib/aspect-list/services/dialog-aspect-list.service.ts b/lib/content-services/src/lib/aspect-list/services/dialog-aspect-list.service.ts index 0c81b59209..8c4cec941c 100644 --- a/lib/content-services/src/lib/aspect-list/services/dialog-aspect-list.service.ts +++ b/lib/content-services/src/lib/aspect-list/services/dialog-aspect-list.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Observable, Subject } from 'rxjs'; import { AspectListDialogComponentData } from '../aspect-list-dialog-data.interface'; import { AspectListDialogComponent } from '../aspect-list-dialog.component'; diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts index 82e3f56bb0..95d68baaaa 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild, ViewEncapsulation, OnDestroy } from '@angular/core'; -import { MatLegacySelect as MatSelect } from '@angular/material/legacy-select'; +import { MatSelect } from '@angular/material/select'; import { Node, PathElement } from '@alfresco/js-api'; import { DocumentListComponent } from '../document-list/components/document-list.component'; import { Subject } from 'rxjs'; diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts index a68da6a136..b7bc520044 100644 --- a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts +++ b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts @@ -16,7 +16,7 @@ */ import { Component, OnChanges, ViewChild, ViewEncapsulation } from '@angular/core'; -import { MatLegacySelect as MatSelect } from '@angular/material/legacy-select'; +import { MatSelect } from '@angular/material/select'; import { PathElement, Node } from '@alfresco/js-api'; import { BreadcrumbComponent } from './breadcrumb.component'; diff --git a/lib/content-services/src/lib/content-metadata/services/content-type-property.service.ts b/lib/content-services/src/lib/content-metadata/services/content-type-property.service.ts index 90e32f76eb..c035a062fc 100644 --- a/lib/content-services/src/lib/content-metadata/services/content-type-property.service.ts +++ b/lib/content-services/src/lib/content-metadata/services/content-type-property.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { CardViewItem, CardViewSelectItemModel, CardViewSelectItemOption, CardViewTextItemModel } from '@alfresco/adf-core'; import { Observable, of, Subject, zip } from 'rxjs'; import { distinctUntilChanged, map } from 'rxjs/operators'; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts index c3acfcfe70..e37292c391 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts @@ -19,7 +19,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { NodeEntry, Node, SitePaging, Site } from '@alfresco/js-api'; import { DocumentListService, NodeAction } from '../document-list'; import { ContentNodeDialogService } from './content-node-dialog.service'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Subject, of } from 'rxjs'; import { ContentTestingModule } from '../testing/content.testing.module'; import { SitesService } from '../common'; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts index 7d3c74c74b..1851d40903 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { EventEmitter, Injectable, Output } from '@angular/core'; import { ThumbnailService, TranslationService } from '@alfresco/adf-core'; import { Subject, Observable, throwError } from 'rxjs'; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts index 424ad4fc0f..71196ec8ac 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogModule as MatDialogModule, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ContentNodeSelectorComponent } from './content-node-selector.component'; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts index fcc55ea3ef..3785c6741d 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { TranslationService, NotificationService } from '@alfresco/adf-core'; import { Node } from '@alfresco/js-api'; import { AllowableOperationsEnum } from '../common/models/allowable-operations.enum'; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts index 69a8f8176f..d62da9a536 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog'; import { of } from 'rxjs'; import { NotificationService } from '@alfresco/adf-core'; import { NodesApiService, RenditionService } from '../common'; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts index c7e2ac661e..fe95433518 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts @@ -16,8 +16,8 @@ */ import { Component, Inject, OnInit, ViewEncapsulation, ViewChild, OnDestroy } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; -import { MatLegacySlideToggleChange as MatSlideToggleChange } from '@angular/material/legacy-slide-toggle'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatSlideToggleChange } from '@angular/material/slide-toggle'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Subject } from 'rxjs'; import { ContentService } from '../common/services/content.service'; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts b/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts index d553f7f847..79d2148eae 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts @@ -16,7 +16,7 @@ */ import { Directive, Input, HostListener, OnChanges, NgZone, OnDestroy } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { NodeEntry, NodesApi } from '@alfresco/js-api'; import { ShareDialogComponent } from './content-node-share.dialog'; diff --git a/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts b/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts index d50115b1c7..7ebadbacd9 100644 --- a/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts +++ b/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogModule as MatDialogModule, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of, Subject } from 'rxjs'; import { ContentTestingModule } from '../testing/content.testing.module'; diff --git a/lib/content-services/src/lib/content-type/content-type-dialog.component.ts b/lib/content-services/src/lib/content-type/content-type-dialog.component.ts index 09b2e4dab7..52e689c83d 100644 --- a/lib/content-services/src/lib/content-type/content-type-dialog.component.ts +++ b/lib/content-services/src/lib/content-type/content-type-dialog.component.ts @@ -17,7 +17,7 @@ import { TypeEntry } from '@alfresco/js-api'; import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ContentTypeDialogComponentData } from './content-type-metadata.interface'; import { ContentTypeService } from './content-type.service'; diff --git a/lib/content-services/src/lib/content-type/content-type.module.ts b/lib/content-services/src/lib/content-type/content-type.module.ts index 661fe7aed7..47c3564d18 100644 --- a/lib/content-services/src/lib/content-type/content-type.module.ts +++ b/lib/content-services/src/lib/content-type/content-type.module.ts @@ -17,12 +17,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; +import { MatTableModule } from '@angular/material/table'; import { MatExpansionModule } from '@angular/material/expansion'; -import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; +import { MatCheckboxModule } from '@angular/material/checkbox'; import { TranslateModule } from '@ngx-translate/core'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatButtonModule } from '@angular/material/button'; import { ContentTypeDialogComponent } from './content-type-dialog.component'; @NgModule({ diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts b/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts index ffd5350568..d78bdfe3c7 100644 --- a/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts +++ b/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts @@ -17,7 +17,7 @@ import { CoreTestingModule, IdentityUserModel, InitialUsernamePipe, UserInfoMode } from '@alfresco/adf-core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; +import { MatMenuModule } from '@angular/material/menu'; import { By, DomSanitizer } from '@angular/platform-browser'; import { fakeEcmEditedUser, fakeEcmUser, fakeEcmUserNoImage } from '../common/mocks/ecm-user.service.mock'; import { ContentTestingModule } from '../testing/content.testing.module'; diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.component.ts b/lib/content-services/src/lib/content-user-info/content-user-info.component.ts index 0c04edc677..91fd28281c 100644 --- a/lib/content-services/src/lib/content-user-info/content-user-info.component.ts +++ b/lib/content-services/src/lib/content-user-info/content-user-info.component.ts @@ -17,7 +17,7 @@ import { IdentityUserModel, UserInfoMode } from '@alfresco/adf-core'; import { Component, Input, OnDestroy, ViewChild, ViewEncapsulation } from '@angular/core'; -import { MatLegacyMenuTrigger as MatMenuTrigger, LegacyMenuPositionX as MenuPositionX, LegacyMenuPositionY as MenuPositionY } from '@angular/material/legacy-menu'; +import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu'; import { Subject } from 'rxjs'; import { EcmUserModel } from '../common/models/ecm-user.model'; import { PeopleContentService } from '../common/services/people-content.service'; diff --git a/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts b/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts index 6bdcf1a35a..bbf8499709 100644 --- a/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { ConfirmDialogComponent } from './confirm.dialog'; import { ContentTestingModule } from '../testing/content.testing.module'; import { By } from '@angular/platform-browser'; diff --git a/lib/content-services/src/lib/dialogs/confirm.dialog.ts b/lib/content-services/src/lib/dialogs/confirm.dialog.ts index 223be52d78..0e3fd5c917 100644 --- a/lib/content-services/src/lib/dialogs/confirm.dialog.ts +++ b/lib/content-services/src/lib/dialogs/confirm.dialog.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, ViewEncapsulation, SecurityContext } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { DomSanitizer } from '@angular/platform-browser'; export interface ConfirmDialogComponentProps { diff --git a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.module.ts b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.module.ts index cb0d10707d..14b2ec2bbf 100644 --- a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.module.ts +++ b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.module.ts @@ -18,9 +18,9 @@ import { NgModule } from '@angular/core'; import { DownloadZipDialogComponent } from './download-zip.dialog'; import { PipeModule } from '@alfresco/adf-core'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatButtonModule } from '@angular/material/button'; import { TranslateModule } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; diff --git a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts index 6f7963cb98..1dfa6aeb08 100755 --- a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { DownloadZipDialogComponent } from './download-zip.dialog'; import { CoreTestingModule } from '@alfresco/adf-core'; import { DownloadZipService } from './services/download-zip.service'; diff --git a/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts b/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts index 0213c5da02..da166d781f 100644 --- a/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MatDialogRef } from '@angular/material/dialog'; import { NodesApiService } from '../common/services/nodes-api.service'; import { FolderDialogComponent } from './folder.dialog'; diff --git a/lib/content-services/src/lib/dialogs/folder.dialog.ts b/lib/content-services/src/lib/dialogs/folder.dialog.ts index 41ef9564be..a1a16230eb 100644 --- a/lib/content-services/src/lib/dialogs/folder.dialog.ts +++ b/lib/content-services/src/lib/dialogs/folder.dialog.ts @@ -19,7 +19,7 @@ import { Observable } from 'rxjs'; import { Component, Inject, OnInit, Optional, EventEmitter, Output, ViewEncapsulation } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Node } from '@alfresco/js-api'; import { TranslationService } from '@alfresco/adf-core'; diff --git a/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts b/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts index eb883504ed..527e6cc6b8 100644 --- a/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts @@ -18,7 +18,7 @@ import { LibraryDialogComponent } from './library.dialog'; import { TestBed, fakeAsync, tick, flush, ComponentFixture, flushMicrotasks } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MatDialogRef } from '@angular/material/dialog'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { of, throwError } from 'rxjs'; import { delay } from 'rxjs/operators'; diff --git a/lib/content-services/src/lib/dialogs/library/library.dialog.ts b/lib/content-services/src/lib/dialogs/library/library.dialog.ts index 77b74689a6..066a082234 100644 --- a/lib/content-services/src/lib/dialogs/library/library.dialog.ts +++ b/lib/content-services/src/lib/dialogs/library/library.dialog.ts @@ -31,7 +31,7 @@ import { UntypedFormControl, AbstractControl } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MatDialogRef } from '@angular/material/dialog'; import { QueriesApi, SiteBodyCreate, SiteEntry, SitePaging } from '@alfresco/js-api'; import { AlfrescoApiService, NotificationService } from '@alfresco/adf-core'; import { debounceTime, finalize, mergeMap, takeUntil } from 'rxjs/operators'; diff --git a/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts b/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts index ed4f03af82..d76a6ea638 100644 --- a/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; -import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MatDialogRef } from '@angular/material/dialog'; import { NodeLockDialogComponent } from './node-lock.dialog'; import { ContentTestingModule } from '../testing/content.testing.module'; import { addMinutes } from 'date-fns'; diff --git a/lib/content-services/src/lib/dialogs/node-lock.dialog.ts b/lib/content-services/src/lib/dialogs/node-lock.dialog.ts index a84d1e45ae..7a200816ad 100644 --- a/lib/content-services/src/lib/dialogs/node-lock.dialog.ts +++ b/lib/content-services/src/lib/dialogs/node-lock.dialog.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, OnInit, Optional, ViewEncapsulation } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { differenceInSeconds } from 'date-fns'; import { NodeBodyLock, Node, NodeEntry, NodesApi } from '@alfresco/js-api'; diff --git a/lib/content-services/src/lib/directives/node-download.directive.spec.ts b/lib/content-services/src/lib/directives/node-download.directive.spec.ts index 9ec4213f7d..0de9a9bd8f 100755 --- a/lib/content-services/src/lib/directives/node-download.directive.spec.ts +++ b/lib/content-services/src/lib/directives/node-download.directive.spec.ts @@ -17,7 +17,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Component, DebugElement, ViewChild } from '@angular/core'; import { AlfrescoApiService, CoreTestingModule } from '@alfresco/adf-core'; import { NodeDownloadDirective } from './node-download.directive'; diff --git a/lib/content-services/src/lib/directives/node-download.directive.ts b/lib/content-services/src/lib/directives/node-download.directive.ts index d366a3006b..261cef33c7 100755 --- a/lib/content-services/src/lib/directives/node-download.directive.ts +++ b/lib/content-services/src/lib/directives/node-download.directive.ts @@ -16,7 +16,7 @@ */ import { Directive, Input, HostListener } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { AlfrescoApiService, DownloadService } from '@alfresco/adf-core'; import { DownloadZipDialogComponent } from '../dialogs/download-zip/download-zip.dialog'; import { ContentApi, NodeEntry, VersionEntry } from '@alfresco/js-api'; diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts index ac5862538d..7bb1da352e 100644 --- a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts @@ -62,7 +62,7 @@ import { ContentActionModel } from '../models/content-action.model'; import { DocumentLoaderNode } from '../models/document-folder.model'; import { matIconRegistryMock } from '../../testing/mat-icon-registry-mock'; import { domSanitizerMock } from '../../testing/dom-sanitizer-mock'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { FileAutoDownloadComponent } from './file-auto-download/file-auto-download.component'; import { ShareDataTableAdapter } from '../data/share-datatable-adapter'; import { HarnessLoader } from '@angular/cdk/testing'; diff --git a/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.spec.ts b/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.spec.ts index 4ac6e4f3d4..e6471d36e3 100644 --- a/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.spec.ts @@ -18,7 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FileAutoDownloadComponent } from './file-auto-download.component'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { By } from '@angular/platform-browser'; import { CoreTestingModule } from '@alfresco/adf-core'; import { NO_ERRORS_SCHEMA } from '@angular/core'; diff --git a/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.ts b/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.ts index 55a1c8a388..6ba38dc259 100644 --- a/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.ts +++ b/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { NodeEntry } from '@alfresco/js-api'; @Component({ diff --git a/lib/content-services/src/lib/document-list/services/node-actions.service.spec.ts b/lib/content-services/src/lib/document-list/services/node-actions.service.spec.ts index 1817fa4d4e..0fdb448505 100644 --- a/lib/content-services/src/lib/document-list/services/node-actions.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/node-actions.service.spec.ts @@ -21,7 +21,7 @@ import { DocumentListService } from './document-list.service'; import { NodeActionsService } from './node-actions.service'; import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service'; import { of, throwError } from 'rxjs'; -import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MatDialogRef } from '@angular/material/dialog'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { delay } from 'rxjs/operators'; diff --git a/lib/content-services/src/lib/document-list/services/node-actions.service.ts b/lib/content-services/src/lib/document-list/services/node-actions.service.ts index 35655df243..256d2b98f1 100644 --- a/lib/content-services/src/lib/document-list/services/node-actions.service.ts +++ b/lib/content-services/src/lib/document-list/services/node-actions.service.ts @@ -19,7 +19,7 @@ import { Injectable, Output, EventEmitter } from '@angular/core'; import { Node, NodeEntry } from '@alfresco/js-api'; import { Subject } from 'rxjs'; import { AlfrescoApiService, DownloadService } from '@alfresco/adf-core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ContentService } from '../../common/services/content.service'; import { NodeDownloadDirective } from '../../directives/node-download.directive'; diff --git a/lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts b/lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts index f53264018b..6b49f20e25 100644 --- a/lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts +++ b/lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts @@ -17,7 +17,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { By } from '@angular/platform-browser'; import { Subject, of } from 'rxjs'; import { FolderEditDirective } from './folder-edit.directive'; diff --git a/lib/content-services/src/lib/folder-directive/folder-edit.directive.ts b/lib/content-services/src/lib/folder-directive/folder-edit.directive.ts index d3a72cc4bc..5f19d8f0cf 100644 --- a/lib/content-services/src/lib/folder-directive/folder-edit.directive.ts +++ b/lib/content-services/src/lib/folder-directive/folder-edit.directive.ts @@ -18,7 +18,7 @@ /* eslint-disable @angular-eslint/no-input-rename */ import { Directive, ElementRef, HostListener, Input, Output, EventEmitter } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Node } from '@alfresco/js-api'; import { FolderDialogComponent } from '../dialogs/folder.dialog'; import { ContentService } from '../common/services/content.service'; diff --git a/lib/content-services/src/lib/material.module.ts b/lib/content-services/src/lib/material.module.ts index a25e867f19..98a3cbe556 100644 --- a/lib/content-services/src/lib/material.module.ts +++ b/lib/content-services/src/lib/material.module.ts @@ -16,26 +16,26 @@ */ import { NgModule } from '@angular/core'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; -import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete'; -import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatChipsModule } from '@angular/material/chips'; import { MatRippleModule } from '@angular/material/core'; -import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; +import { MatOptionModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar'; -import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; -import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; -import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; -import { MatLegacySliderModule as MatSliderModule } from '@angular/material/legacy-slider'; +import { MatInputModule } from '@angular/material/input'; +import { MatListModule } from '@angular/material/list'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatSliderModule } from '@angular/material/slider'; import { MatTreeModule } from '@angular/material/tree'; import { MatBadgeModule } from '@angular/material/badge'; diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts index 5b45aa05de..b4ea37b08f 100644 --- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts +++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts @@ -17,6 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { TranslateModule } from '@ngx-translate/core'; import { mockFile, mockNode } from '../mock'; import { ContentTestingModule } from '../testing/content.testing.module'; import { UploadVersionButtonComponent } from '../upload'; diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.ts b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.ts index 6bcc9011df..75133c57cc 100644 --- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.ts +++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.ts @@ -17,7 +17,7 @@ import { Node } from '@alfresco/js-api'; import { Component, EventEmitter, Inject, OnInit, Output, ViewEncapsulation } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { NewVersionUploaderDialogData, NewVersionUploaderData, NewVersionUploaderDataAction } from './models'; @Component({ diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.spec.ts b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.spec.ts index bea1733292..d6761d2dfc 100644 --- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.spec.ts +++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.spec.ts @@ -18,6 +18,7 @@ import { Component, EventEmitter, Output } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; +import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, of, Subject } from 'rxjs'; import { mockFile, mockNewVersionUploaderData, mockNode } from '../mock'; import { ContentTestingModule } from '../testing/content.testing.module'; diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.ts b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.ts index 942708f75b..aa5ebfedf0 100644 --- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.ts +++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { MatLegacyDialog as MatDialog, MatLegacyDialogConfig as MatDialogConfig } from '@angular/material/legacy-dialog'; +import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; import { AlfrescoApiService } from '@alfresco/adf-core'; import { NewVersionUploaderDialogComponent } from './new-version-uploader.dialog'; diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts index ec4674a24f..56399f615c 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts @@ -16,7 +16,7 @@ */ import { Node, PermissionElement } from '@alfresco/js-api'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Subject } from 'rxjs'; diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts index 9599f884a1..20f05fb09f 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, ViewEncapsulation } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { NodeEntry, PermissionElement } from '@alfresco/js-api'; import { AddPermissionDialogData } from './add-permission-dialog-data.interface'; import { MemberModel } from '../../models/member.model'; diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts index 39d33fafff..be466fddb6 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts @@ -23,7 +23,7 @@ import { UntypedFormControl } from '@angular/forms'; import { debounceTime } from 'rxjs/operators'; import { SearchPermissionConfigurationService } from './search-config-permission.service'; import { SearchComponent } from '../../../search/components/search.component'; -import { MatLegacySelectionList as MatSelectionList } from '@angular/material/legacy-list'; +import { MatSelectionList } from '@angular/material/list'; @Component({ selector: 'adf-add-permission-panel', diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html index 78dc2b8464..2f3ac115db 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html @@ -1,4 +1,4 @@ - +
diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.service.ts b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.service.ts index 7ceb78407f..36b2a1e7f8 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.service.ts +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.service.ts @@ -18,7 +18,7 @@ import { NotificationService } from '@alfresco/adf-core'; import { Node, PermissionElement } from '@alfresco/js-api'; import { EventEmitter, Injectable } from '@angular/core'; -import { MatLegacySlideToggleChange as MatSlideToggleChange } from '@angular/material/legacy-slide-toggle'; +import { MatSlideToggleChange } from '@angular/material/slide-toggle'; import { BehaviorSubject, forkJoin, Observable, of, Subject } from 'rxjs'; import { finalize, map, switchMap } from 'rxjs/operators'; import { RoleModel } from '../../models/role.model'; diff --git a/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts b/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts index 7785184397..83cd323b54 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts @@ -42,18 +42,18 @@ import { RoleModel } from '../../models/role.model'; host: { class: 'adf-user-role-column adf-datatable-content-cell adf-expand-cell-4' }, styles: [ `.adf-role-selector-field { - width: 100%; - } - - .adf-role-selector-field .mat-form-field { - width: 100%; - max-width: 200px; - } - - .adf-readonly-role { - padding-left: 0 !important; - } - ` + width: 100%; + } + + .adf-role-selector-field .mat-mdc-form-field { + width: 100%; + max-width: 200px; + } + + .adf-readonly-role { + padding-left: 0 !important; + } + ` ] }) export class UserRoleColumnComponent { diff --git a/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.spec.ts b/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.spec.ts index c0913146b4..fbedf8baa5 100644 --- a/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.spec.ts +++ b/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.spec.ts @@ -17,7 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { NodePermissionDialogService } from './node-permission-dialog.service'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { of, Subject, throwError } from 'rxjs'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { NodePermissionService } from './node-permission.service'; diff --git a/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.ts b/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.ts index 67411b311d..f489fd82a1 100644 --- a/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.ts +++ b/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.ts @@ -16,7 +16,7 @@ */ import { Node, PermissionElement } from '@alfresco/js-api'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Injectable } from '@angular/core'; import { Observable, Subject, throwError } from 'rxjs'; import { switchMap } from 'rxjs/operators'; diff --git a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts index b3de161122..8a1f7067df 100644 --- a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts +++ b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts @@ -16,7 +16,7 @@ */ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-checkbox'; +import { MatCheckboxChange } from '@angular/material/checkbox'; import { SearchWidget } from '../../models/search-widget.interface'; import { SearchWidgetSettings } from '../../models/search-widget-settings.interface'; import { SearchQueryBuilderService } from '../../services/search-query-builder.service'; diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html index 91b08741e0..aea04f5b98 100644 --- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html +++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html @@ -1,6 +1,6 @@ - - + @@ -14,7 +14,7 @@ [attr.aria-label]="('SEARCH.FILTER.BUTTONS.REMOVE' | translate) + ' ' + option.value"> close - + - + diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts index f848180628..df7f95df42 100644 --- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts +++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts @@ -30,8 +30,8 @@ import { } from '@angular/core'; import { ENTER } from '@angular/cdk/keycodes'; import { FormControl } from '@angular/forms'; -import { MatLegacyAutocompleteSelectedEvent as MatAutocompleteSelectedEvent } from '@angular/material/legacy-autocomplete'; -import { MatLegacyChipInputEvent as MatChipInputEvent } from '@angular/material/legacy-chips'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatChipInputEvent } from '@angular/material/chips'; import { EMPTY, Observable, Subject, timer } from 'rxjs'; import { debounce, startWith, takeUntil, tap } from 'rxjs/operators'; import { AutocompleteOption } from '../../models/autocomplete-option.interface'; diff --git a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.html b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.html index 451d5c5e51..d4ed55bd52 100644 --- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.html +++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.html @@ -1,6 +1,6 @@ - + - {{ 'SEARCH.FILTER.BUTTONS.CLEAR-ALL.LABEL' | translate }} - + - {{ (selection.bucket.display || selection.bucket.label) | translate }} cancel - + - + diff --git a/lib/content-services/src/lib/search/components/search-control.component.ts b/lib/content-services/src/lib/search/components/search-control.component.ts index 5372d0740a..769626de7a 100644 --- a/lib/content-services/src/lib/search/components/search-control.component.ts +++ b/lib/content-services/src/lib/search/components/search-control.component.ts @@ -32,7 +32,7 @@ import { import { NodeEntry } from '@alfresco/js-api'; import { Subject } from 'rxjs'; import { SearchComponent } from './search.component'; -import { MatLegacyListItem as MatListItem } from '@angular/material/legacy-list'; +import { MatListItem } from '@angular/material/list'; import { EmptySearchResultComponent } from './empty-search-result.component'; @Component({ diff --git a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.ts b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.ts index bab8edecf8..94c9b278e3 100644 --- a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.ts +++ b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.ts @@ -17,7 +17,7 @@ import { Component, inject, Input, ViewEncapsulation } from '@angular/core'; import { FacetField } from '../../models/facet-field.interface'; -import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-checkbox'; +import { MatCheckboxChange } from '@angular/material/checkbox'; import { FacetFieldBucket } from '../../models/facet-field-bucket.interface'; import { SearchQueryBuilderService } from '../../services/search-query-builder.service'; import { SearchFacetFiltersService } from '../../services/search-facet-filters.service'; diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html index f53dfdc2ba..0517cfa58e 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html @@ -1,5 +1,5 @@ - remove - +
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts index d20a268491..4a9e1aca66 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts @@ -17,7 +17,7 @@ import { Component, ElementRef, Input, ViewChild, ViewEncapsulation } from '@angular/core'; import { ConfigurableFocusTrap, ConfigurableFocusTrapFactory } from '@angular/cdk/a11y'; -import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; +import { MatMenuTrigger } from '@angular/material/menu'; import { TabbedFacetField } from '../../../models/tabbed-facet-field.interface'; import { Subject } from 'rxjs'; diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.html b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.html index 27cc743075..f1756935d0 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.html +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.html @@ -1,5 +1,5 @@ - remove - +
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.ts index 296a68c32c..ccf83361d5 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.ts @@ -18,7 +18,7 @@ import { Component, ElementRef, Input, ViewChild, ViewEncapsulation } from '@angular/core'; import { ConfigurableFocusTrap, ConfigurableFocusTrapFactory } from '@angular/cdk/a11y'; import { FacetField } from '../../../models/facet-field.interface'; -import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; +import { MatMenuTrigger } from '@angular/material/menu'; import { SearchFacetFieldComponent } from '../../search-facet-field/search-facet-field.component'; @Component({ diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.html b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.html index bdc178a0e7..aee880d2cd 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.html +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.html @@ -1,5 +1,5 @@ - - + + @@ -15,6 +15,6 @@ - + - + diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html index c68b5aaed7..f0dd3795f4 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html @@ -1,5 +1,5 @@ -  {{ 'SEARCH.FILTER.ANY' | translate }} {{ chipIcon }} - +
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts index 0b858f7a24..bc3ef2ff86 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchWidgetChipComponent } from './search-widget-chip.component'; import { simpleCategories } from '../../../../mock'; import { ContentTestingModule } from '../../../../testing/content.testing.module'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; +import { MatMenuModule } from '@angular/material/menu'; import { By } from '@angular/platform-browser'; import { SearchQueryBuilderService } from '../../../services/search-query-builder.service'; import { HarnessLoader } from '@angular/cdk/testing'; diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts index 3276e9eddc..642c9dad44 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts @@ -18,7 +18,7 @@ import { Component, ElementRef, Input, ViewChild, ViewEncapsulation } from '@angular/core'; import { SearchCategory } from '../../../models/search-category.interface'; import { ConfigurableFocusTrap, ConfigurableFocusTrapFactory } from '@angular/cdk/a11y'; -import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; +import { MatMenuTrigger } from '@angular/material/menu'; import { SearchWidgetContainerComponent } from '../../search-widget-container/search-widget-container.component'; @Component({ @@ -26,10 +26,10 @@ import { SearchWidgetContainerComponent } from '../../search-widget-container/se templateUrl: './search-widget-chip.component.html', styles: [ ` - .adf-search-widget-extra-width { - max-width: 500px; - } - ` + .adf-search-widget-extra-width { + max-width: 500px; + } + ` ], encapsulation: ViewEncapsulation.None }) diff --git a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts index 4e092d2752..c819fb6d04 100644 --- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts +++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts @@ -22,7 +22,7 @@ import { SearchWidgetContainerComponent } from '../search-widget-container/searc import { SearchHeaderQueryBuilderService } from '../../services/search-header-query-builder.service'; import { SearchCategory } from '../../models/search-category.interface'; import { Subject } from 'rxjs'; -import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; +import { MatMenuTrigger } from '@angular/material/menu'; import { FilterSearch } from '../../models/filter-search.interface'; @Component({ diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss index 09b224fad6..81eb5adfe5 100644 --- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss +++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss @@ -19,6 +19,7 @@ adf-search-properties { .adf-search-properties-file-size-operator, .adf-search-properties-file-size-unit { + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-infix { border: 1px solid var(--adf-theme-mat-grey-color-a400); border-radius: 5px; @@ -26,12 +27,13 @@ adf-search-properties { } &.mat-focused { + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-infix { outline: 2px auto -webkit-focus-ring-color; } } } - + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-underline { display: none; } @@ -42,8 +44,10 @@ adf-search-properties { adf-search-chip-autocomplete-input { display: block; - + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-outline { + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-outline { &-start, &-end { @@ -62,13 +66,17 @@ adf-search-properties { } .mat-focused { + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-outline { outline: 2px auto -webkit-focus-ring-color; } } .mat-form-field-appearance-outline { + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-outline-thick { + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-outline { &-start, &-end { diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.spec.ts b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.spec.ts index 6efd56acc6..923a1d46fd 100644 --- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchPropertiesComponent } from './search-properties.component'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { By } from '@angular/platform-browser'; -import { MatLegacyOption as MatOption } from '@angular/material/legacy-core'; +import { MatOption } from '@angular/material/core'; import { SearchChipAutocompleteInputComponent, SearchQueryBuilderService } from '@alfresco/adf-content-services'; import { FileSizeUnit } from './file-size-unit.enum'; import { FileSizeOperator } from './file-size-operator.enum'; diff --git a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts index 74e4668c2c..15f6dcd0c9 100644 --- a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts +++ b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; -import { MatLegacyRadioChange as MatRadioChange } from '@angular/material/legacy-radio'; +import { MatRadioChange } from '@angular/material/radio'; import { SearchWidget } from '../../models/search-widget.interface'; import { SearchWidgetSettings } from '../../models/search-widget-settings.interface'; diff --git a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.html b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.html index 8de1e24d98..bf615c86ea 100644 --- a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.html +++ b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.html @@ -1,12 +1,10 @@ + data-automation-id="slider-range" #ngSlider>
diff --git a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.spec.ts b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.spec.ts index 63ee37fbcd..483fc56d63 100644 --- a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { MatLegacySliderChange as MatSliderChange } from '@angular/material/legacy-slider'; +import { MatSliderChange } from '@angular/material/slider'; import { SearchSliderComponent } from './search-slider.component'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; diff --git a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts index 255b300437..26085e05a8 100644 --- a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts +++ b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts @@ -19,7 +19,7 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { SearchWidget } from '../../models/search-widget.interface'; import { SearchWidgetSettings } from '../../models/search-widget-settings.interface'; import { SearchQueryBuilderService } from '../../services/search-query-builder.service'; -import { MatLegacySliderChange as MatSliderChange } from '@angular/material/legacy-slider'; +import { MatSliderChange } from '@angular/material/slider'; import { Subject } from 'rxjs'; @Component({ diff --git a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.scss b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts index 37d0cd4520..fa66b00827 100644 --- a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts +++ b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts @@ -18,7 +18,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { InfiniteSelectScrollDirective, AuthenticationService } from '@alfresco/adf-core'; import { SitePaging, SiteEntry, Site } from '@alfresco/js-api'; -import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; +import { MatSelectChange } from '@angular/material/select'; import { LiveAnnouncer } from '@angular/cdk/a11y'; import { TranslateService } from '@ngx-translate/core'; import { SitesService } from '../common/services/sites.service'; diff --git a/lib/content-services/src/lib/tag/tag-list.component.html b/lib/content-services/src/lib/tag/tag-list.component.html index 4a23bc3c12..03d7772a11 100644 --- a/lib/content-services/src/lib/tag/tag-list.component.html +++ b/lib/content-services/src/lib/tag/tag-list.component.html @@ -1,10 +1,10 @@ - +
- + {{currentEntry.entry.tag}} - +
-
+
- + {{ 'ADF_PROCESS_LIST.DETAILS.BUTTON.CANCEL' | translate }}
- + + diff --git a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html index 2fec2fb6bf..1149c07fd1 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html +++ b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html @@ -6,10 +6,10 @@ - + {{ 'ADF_PROCESS_LIST.DETAILS.LABELS.TASKS_ACTIVE'|translate }} - {{activeTasks?.length}} - + {{activeTasks?.length}} + - + {{ 'ADF_PROCESS_LIST.DETAILS.LABELS.TASKS_COMPLETED'|translate }} - {{completedTasks?.length}} - + {{completedTasks?.length}} +