diff --git a/demo-shell/src/app/app.component.ts b/demo-shell/src/app/app.component.ts index 7303b530d7..2273758e1d 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 2a39e06e41..894e4ba329 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/cloud-layout.component.scss b/demo-shell/src/app/components/cloud/cloud-layout.component.scss index 7457ba1a16..5c365d16bb 100644 --- a/demo-shell/src/app/components/cloud/cloud-layout.component.scss +++ b/demo-shell/src/app/components/cloud/cloud-layout.component.scss @@ -2,6 +2,7 @@ overflow: auto; } +/* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ .app-cloud-layout-tab-body .mat-tab-body-wrapper { height: 100%; } 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 228d25bc6f..1f9fcc64e1 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 0111e9f077..935e2b9777 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 { 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 1facf3679b..779788e0dd 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 f136c9a7d6..601a21d358 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/material.module.ts b/demo-shell/src/app/material.module.ts index c48d9dcf9a..550114010c 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.scss b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss index f24ec5004c..492fd66717 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss +++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss @@ -19,7 +19,7 @@ } &-aspect-list-dialog { - .mat-dialog-actions { + .mat-mdc-dialog-actions { justify-content: space-between; } } @@ -28,7 +28,7 @@ padding-top: 3px; .adf-aspect-property-table { - .mat-cell { + .mat-mdc-cell { font-size: smaller; } 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 a076efac28..fa857354d0 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 { TranslateModule } from '@ngx-translate/core'; 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 9c9caee61f..8a3672e209 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 17f77f04a2..5619415cb9 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 1a55ebc034..1022a80645 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 085ba0d95b..4fb64f183a 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.scss b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss index 66134e3782..b08958ee03 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss @@ -24,7 +24,7 @@ overflow: hidden; margin-top: 35px; - &.mat-select { + &.mat-mdc-select { width: 0; } } diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts index e77709584d..7d129df18d 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.scss b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss index 6ef1aee8d2..e07689295b 100644 --- a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss +++ b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.scss @@ -49,7 +49,7 @@ $dropdown-horizontal-offset: 30px; overflow: hidden; margin-top: 35px; - &.mat-select { + &.mat-mdc-select { width: 0; } } @@ -63,18 +63,18 @@ $dropdown-horizontal-offset: 30px; color: var(--adf-theme-foreground-text-color); } - &-dropdown-breadcrumb-path-option.mat-option { + &-dropdown-breadcrumb-path-option.mat-mdc-option { height: 28px; line-height: 28px; padding: 0 12px; font-size: var(--theme-caption-font-size); } - &-dropdown-breadcrumb-path-option.mat-option:first-child { + &-dropdown-breadcrumb-path-option.mat-mdc-option:first-child { padding-top: 4px; } - &-dropdown-breadcrumb-path-option.mat-option:last-child { + &-dropdown-breadcrumb-path-option.mat-mdc-option:last-child { padding-bottom: 4px; } } 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 5233b5ab5c..aa6bf592d1 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/category/categories-management/categories-management.component.scss b/lib/content-services/src/lib/category/categories-management/categories-management.component.scss index ffa69523b5..4f7e90d55b 100644 --- a/lib/content-services/src/lib/category/categories-management/categories-management.component.scss +++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.scss @@ -37,19 +37,21 @@ } .adf-categories-list { - .mat-list-base .mat-list-item, + padding-bottom: 10px; + + .mat-mdc-list-base .mat-mdc-list-item, .mat-list-base .mat-list-option { display: flex; height: 100%; overflow-wrap: anywhere; padding: 5px 0; font-size: 14px; - + /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */ &.mat-list-item-disabled { background-color: inherit; color: inherit; } - + /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */ .mat-list-item-content, .mat-list-item-content-reverse { padding: 0; diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts b/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts index 6e8b03309a..c72f7378dd 100644 --- a/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts +++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts @@ -18,8 +18,8 @@ import { Category, CategoryPaging, ResultNode, ResultSetPaging } from '@alfresco/js-api'; import { ComponentFixture, discardPeriodicTasks, fakeAsync, flush, TestBed, tick } from '@angular/core/testing'; import { Validators } from '@angular/forms'; -import { MatLegacyError as MatError } from '@angular/material/legacy-form-field'; -import { MatLegacyListOption as MatListOption, MatLegacySelectionList as MatSelectionList } from '@angular/material/legacy-list'; +import { MatError } from '@angular/material/form-field'; +import { MatListOption, MatSelectionList } from '@angular/material/list'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; import { of, Subject } from 'rxjs'; diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.ts b/lib/content-services/src/lib/category/categories-management/categories-management.component.ts index d84d4c0ddb..e5fd1d24b5 100644 --- a/lib/content-services/src/lib/category/categories-management/categories-management.component.ts +++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.ts @@ -18,7 +18,7 @@ import { Category } from '@alfresco/js-api'; import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormControl, Validators } from '@angular/forms'; -import { MatLegacySelectionListChange as MatSelectionListChange } from '@angular/material/legacy-list'; +import { MatSelectionListChange } from '@angular/material/list'; import { EMPTY, Observable, Subject, timer } from 'rxjs'; import { debounce, first, map, takeUntil, tap } from 'rxjs/operators'; import { CategoriesManagementMode } from './categories-management-mode'; diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html index d49b5d688b..b6ad329099 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html @@ -1,4 +1,4 @@ - + - +
-
{{ecmUser | fullName}}
+
{{ecmUser | fullName}}
@@ -77,7 +77,7 @@ - +
-
{{identityUser | fullName}}
+
{{identityUser | fullName}}
diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.component.scss b/lib/content-services/src/lib/content-user-info/content-user-info.component.scss index 8d458c8f6e..fedd86bd9b 100644 --- a/lib/content-services/src/lib/content-user-info/content-user-info.component.scss +++ b/lib/content-services/src/lib/content-user-info/content-user-info.component.scss @@ -49,7 +49,7 @@ display: inline-block; } - &-userinfo-menu_button.mat-button { + &-userinfo-menu_button.mat-mdc-button { margin-right: 0; border-radius: 90%; padding: 0; @@ -57,12 +57,12 @@ height: 40px; } - &-userinfo-tab .mat-tab-header { + &-userinfo-tab .mat-mdc-tab-header { align-self: center; width: 100%; min-width: 250px; } - + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ &-userinfo-tab .mat-tab-label { flex: auto; font-weight: 500; @@ -81,7 +81,7 @@ box-sizing: border-box; } - &-userinfo-card.mat-card { + &-userinfo-card.mat-mdc-card { padding: 0; } @@ -146,14 +146,14 @@ &-userinfo-detail { text-align: left; } - + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ &-hide-tab .mat-tab-label-active { display: none !important; } } @media only screen and (min-device-width: 480px) { - .mat-menu-panel.adf-userinfo-menu { + .mat-mdc-menu-panel.adf-userinfo-menu { max-height: 450px; min-width: 450px; overflow: auto; @@ -161,6 +161,6 @@ } } -.mat-menu-panel.adf-userinfo-menu .mat-menu-content { +.mat-mdc-menu-panel.adf-userinfo-menu .mat-mdc-menu-content { padding: 0; } 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 baa713ad0b..3d82c178f1 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 { TranslateModule } from '@ngx-translate/core'; import { fakeEcmEditedUser, fakeEcmUser, fakeEcmUserNoImage } from '../common/mocks/ecm-user.service.mock'; 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 6215dbaf84..c7c8ae8fa4 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/content-user-info/content-user-info.module.ts b/lib/content-services/src/lib/content-user-info/content-user-info.module.ts index f5f895efb9..f6ef2a642d 100644 --- a/lib/content-services/src/lib/content-user-info/content-user-info.module.ts +++ b/lib/content-services/src/lib/content-user-info/content-user-info.module.ts @@ -20,10 +20,10 @@ import { CommonModule } from '@angular/common'; import { ContentUserInfoComponent } from './content-user-info.component'; import { TranslateModule } from '@ngx-translate/core'; import { PipeModule } from '@alfresco/adf-core'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs'; -import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatTabsModule } from '@angular/material/tabs'; +import { MatCardModule } from '@angular/material/card'; @NgModule({ declarations: [ContentUserInfoComponent], diff --git a/lib/content-services/src/lib/dialogs/confirm.dialog.scss b/lib/content-services/src/lib/dialogs/confirm.dialog.scss index 2475496a16..f88b23c0e9 100644 --- a/lib/content-services/src/lib/dialogs/confirm.dialog.scss +++ b/lib/content-services/src/lib/dialogs/confirm.dialog.scss @@ -2,6 +2,7 @@ flex: 1 1 auto; } +/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ .adf-confirm-dialog .mat-dialog-actions .mat-button-wrapper { text-transform: uppercase; } 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 bd823d2d94..a52bf92f85 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 a1a8fa270a..18ef0a5e47 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 c1cc577c01..13e14516e7 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.scss b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.scss index b21782e6b9..f41504de0d 100755 --- a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.scss +++ b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.scss @@ -1,3 +1,5 @@ + +/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ .adf-download-zip-dialog .mat-dialog-actions .mat-button-wrapper { text-transform: uppercase; } 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 666a69895b..579fc0b006 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.scss b/lib/content-services/src/lib/dialogs/folder.dialog.scss index c046663901..0d01cfca9d 100644 --- a/lib/content-services/src/lib/dialogs/folder.dialog.scss +++ b/lib/content-services/src/lib/dialogs/folder.dialog.scss @@ -7,15 +7,16 @@ } .adf-lock-file-name { + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ .mat-checkbox-layout { width: 100%; } - + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ .mat-checkbox-label { text-overflow: ellipsis; overflow: hidden; } - + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ .mat-checkbox-inner-container { margin: auto 8px auto 0; } @@ -34,11 +35,11 @@ } @media screen and (max-width: 380px) { - .mat-form-field { + .mat-mdc-form-field { font-size: 6px; } - .mat-dialog-title { + .mat-mdc-dialog-title { margin: 0; } 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 1c6de3a185..7cd36094da 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 214a621c8e..c0791714a3 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.scss b/lib/content-services/src/lib/dialogs/library/library.dialog.scss index f8ddbcc305..945a3e4fce 100644 --- a/lib/content-services/src/lib/dialogs/library/library.dialog.scss +++ b/lib/content-services/src/lib/dialogs/library/library.dialog.scss @@ -1,15 +1,15 @@ .adf-library-dialog { - .mat-radio-group { + .mat-mdc-radio-group { display: flex; flex-direction: column; margin: 0 0 20px; } - .mat-radio-group .mat-radio-button { + .mat-mdc-radio-group .mat-mdc-radio-button { margin: 10px 0; } - .mat-form-field { + .mat-mdc-form-field { width: 100%; } @@ -22,7 +22,7 @@ flex-direction: row; justify-content: flex-end; - .mat-button { + .mat-mdc-button { text-transform: uppercase; } } 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 85dab8f0fd..f61e772019 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 { TranslateModule } from '@ngx-translate/core'; import { of, throwError } from 'rxjs'; 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 f948786965..21b53697df 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 dd4df9e460..f71202a3dd 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 { TranslateModule } from '@ngx-translate/core'; 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 34c14a9703..c92b46e1dc 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 3e72ac1a8d..18c897af38 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 7a1527bc17..b428551961 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 a7642d9820..fde024656f 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 @@ -59,7 +59,7 @@ import { ShareDataRow } from '../data/share-data-row.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/document-list.component.ts b/lib/content-services/src/lib/document-list/components/document-list.component.ts index e0a7742f59..18319ec43d 100644 --- a/lib/content-services/src/lib/document-list/components/document-list.component.ts +++ b/lib/content-services/src/lib/document-list/components/document-list.component.ts @@ -78,7 +78,7 @@ import { LockService } from '../services/lock.service'; import { DocumentLoaderNode } from '../models/document-folder.model'; import { takeUntil } from 'rxjs/operators'; import { ADF_DOCUMENT_PARENT_COMPONENT } from './document-list.token'; -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'; const BYTES_TO_MB_CONVERSION_VALUE = 1048576; 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 29b208b681..59842131ad 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 { TranslateModule } from '@ngx-translate/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 f56482916e..737ce71338 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 fa8bf06240..2bb86cbc10 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 @@ -22,7 +22,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 { TranslateModule } from '@ngx-translate/core'; 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 882f1d73e9..eafce591a5 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-create.directive.spec.ts b/lib/content-services/src/lib/folder-directive/folder-create.directive.spec.ts index 44991de0a2..650822ce62 100644 --- a/lib/content-services/src/lib/folder-directive/folder-create.directive.spec.ts +++ b/lib/content-services/src/lib/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/lib/content-services/src/lib/folder-directive/folder-create.directive.ts b/lib/content-services/src/lib/folder-directive/folder-create.directive.ts index 223b2197b0..35ab1dcf88 100644 --- a/lib/content-services/src/lib/folder-directive/folder-create.directive.ts +++ b/lib/content-services/src/lib/folder-directive/folder-create.directive.ts @@ -18,7 +18,7 @@ /* eslint-disable @angular-eslint/no-input-rename */ 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 { FolderDialogComponent } from '../dialogs/folder.dialog'; import { ContentService } from '../common/services/content.service'; 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 de6754ce02..4edaec862f 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 8778f8094e..6a6e21f9e4 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.scss b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss index f994ff9cec..67c564817f 100644 --- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss +++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss @@ -24,7 +24,7 @@ height: 500px; } - .mat-dialog { + .mat-mdc-dialog { &-title { flex: 0 0 auto; font-size: 20px; @@ -59,7 +59,8 @@ } } } - + /*TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. + */ .mat-list-item-content { padding: 0; margin: 0 16px; @@ -72,7 +73,7 @@ padding: 0; } - .mat-list.adf-version-list { + .mat-mdc-list.adf-version-list { overflow: auto; } } 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 3bfe6903a2..85d1037b9c 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 @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } 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 { TranslateModule } from '@ngx-translate/core'; import { mockFile, mockNode } from '../mock'; import { ContentTestingModule } from '../testing/content.testing.module'; 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 a29d3c4070..d1580d96cc 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 b9b14895a6..432f855a6f 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 @@ -17,7 +17,7 @@ import { Component, EventEmitter, Output } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { MatLegacyDialog as MatDialog, MatLegacyDialogConfig as MatDialogConfig } from '@angular/material/legacy-dialog'; +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'; 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 97ad143f7e..226d8dae24 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.scss b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss index 5b4ed96024..73976aeb90 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss @@ -1,5 +1,5 @@ .adf-add-permission-dialog { - .mat-dialog-title { + .mat-mdc-dialog-title { margin-left: 24px; margin-right: 24px; font-size: var(--theme-title-font-size); @@ -11,12 +11,12 @@ color: var(--adf-theme-foreground-text-color-087); } - .mat-dialog-container { + .mat-mdc-dialog-container { padding-left: 0; padding-right: 0; } - .mat-dialog-content { + .mat-mdc-dialog-content { margin: 0; overflow: hidden; flex-grow: 1; @@ -31,7 +31,7 @@ } } - .mat-dialog-actions { + .mat-mdc-dialog-actions { padding: 0 24px; background-color: var(--theme-background-color); display: flex; @@ -57,7 +57,7 @@ .adf { &-search-user-button { width: 100%; - + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ .mat-button-wrapper { display: flex; align-items: center; 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 dc8e7269a5..a56b15d00a 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 { TranslateModule } from '@ngx-translate/core'; 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 f289a1ee79..3558f08093 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 759da58717..e98a4d73c3 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.component.scss b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss index 1c3800187c..c5d2cebc03 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss @@ -50,7 +50,7 @@ &-permission-role-column-header { position: relative; height: 40px; - + /* 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: none; } 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 dbd0e257f4..7fbd0ca1aa 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 600dd90420..6b11b8c3fe 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 edd91a9cfb..7bdeac2260 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 @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { AppConfigService } from '@alfresco/adf-core'; 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 c25c00abd3..6d0ef138e2 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.scss b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.scss index 936267870d..31b366b41a 100644 --- a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.scss +++ b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.scss @@ -3,16 +3,16 @@ flex-direction: column; .adf-facet-filter { - &.mat-checkbox { + &.mat-mdc-checkbox { display: block; } - + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ .mat-checkbox-label { text-overflow: ellipsis; overflow: hidden; width: 100%; } - + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ .mat-checkbox-layout { width: 100%; } 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 cdb459fd5f..7a4516e520 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 2082007384..fc1e21ef96 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.scss b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss index ced2a9d4a1..9fc682c575 100644 --- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss +++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss @@ -2,23 +2,23 @@ adf-search-chip-autocomplete-input { .adf-chip-list { width: 100%; } - + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-appearance-outline .mat-form-field-outline { top: 0; } - + /* 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: none; } - .mat-chip.adf-option-chips { + .mat-mdc-chip.adf-option-chips { border: 1px solid var(--theme-text-color); border-radius: 10px; background-color: var(--theme-primary-color-default-contrast); height: auto; word-break: break-word; } - + /* TODO(mdc-migration): The following rule targets internal classes of chips that may no longer apply for the MDC version. */ .mat-chip-remove.adf-option-chips-delete-button { font-size: 13px; height: 13px; @@ -30,21 +30,22 @@ adf-search-chip-autocomplete-input { width: 13px; } } - + /* TODO(mdc-migration): The following rule targets internal classes of chips that may no longer apply for the MDC version. */ .mat-chip-list-wrapper { min-height: 40px; } - + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-wrapper { padding: 0; } } +/* TODO(mdc-migration): The following rule targets internal classes of tooltip that may no longer apply for the MDC version. */ .mat-tooltip-hide { display: none; } -.mat-option.adf-autocomplete-added-option { +.mat-mdc-option.adf-autocomplete-added-option { background: var(--adf-theme-mat-grey-color-a200); color: var(--adf-theme-primary-300); } diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts index 8201aa37e1..45056d2f60 100644 --- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyChip as MatChip, MatLegacyChipRemove as MatChipRemove } from '@angular/material/legacy-chips'; +import { MatChip, MatChipRemove } from '@angular/material/chips'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; import { Subject } from 'rxjs'; 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 ffe5e02382..6098b3ef73 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 1090d59cec..ef272a9e2f 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-chip-list/search-chip-list.component.scss b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.scss index d1e581d6a9..f3da9331a2 100644 --- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.scss +++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.scss @@ -1,7 +1,7 @@ -.mat-chip:focus { +.mat-mdc-chip:focus { color: var(--theme-accent-color-default-contrast); background-color: var(--theme-accent-color); - + /* TODO(mdc-migration): The following rule targets internal classes of chips that may no longer apply for the MDC version. */ .mat-chip-remove { color: var(--theme-accent-color-default-contrast); opacity: 1; 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 78d1814d9f..8556b3dce4 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.scss b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss index 894fa64168..3b92e2463a 100644 --- a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss +++ b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss @@ -6,13 +6,13 @@ max-height: 180px; padding: 5px 0; overflow-y: auto; - + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ .mat-checkbox-label { text-overflow: ellipsis; overflow: hidden; width: 100%; } - + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ .mat-checkbox-layout { width: 100%; } @@ -23,9 +23,9 @@ white-space: nowrap; } - .mat-checkbox { + .mat-mdc-checkbox { margin: 5px; - + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ &.mat-checkbox-checked .mat-checkbox-label { font-weight: bold; } @@ -57,11 +57,11 @@ font-size: var(--theme-body-1-font-size); line-height: 24px; letter-spacing: 0.25px; - + /* 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; } - + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-suffix { padding-right: 1px; } @@ -72,7 +72,7 @@ .adf-facet-buttons { text-align: right; - .mat-button { + .mat-mdc-button { text-transform: uppercase; } @@ -80,7 +80,7 @@ padding-top: 15px; } } - + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ .mat-checkbox-label, .mat-radio-label { color: var(--adf-theme-foreground-text-color-054); 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 95033e7476..94574897e7 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 { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token'; import { SearchQueryBuilderService } from '../../services/search-query-builder.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 7864ab69e7..a0759d37bd 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,4 +1,4 @@ - remove - +
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss index fcc7c885c3..9c42cbc00f 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss @@ -11,6 +11,7 @@ adf-search-facet-chip-tabbed { } adf-search-filter-tabbed { + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ .mat-tab-body-wrapper { margin-top: 16px; } 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 04e7d1a5f4..2e0829c686 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 4f014722b9..d944590e7b 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,4 +1,4 @@ - 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 aba3c5ec93..d338da44ed 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 baf944810e..ad90d9e296 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,4 +1,4 @@ - + @@ -14,4 +14,4 @@ - + diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss index 3277cbb268..e60c9446dd 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss @@ -2,7 +2,7 @@ .adf-search-filter-chip, .adf-search-filter-chip-tabbed { - &.mat-chip { + &.mat-mdc-chip { border: 2px solid transparent; transition: border 500ms ease-in-out; max-width: 320px; @@ -14,11 +14,11 @@ color: unset; } - &.mat-standard-chip::after { + &.mat-mdc-standard-chip::after { background: var(--adf-theme-background-unselected-chip-color); color: unset; } - + /* TODO(mdc-migration): The following rule targets internal classes of chips that may no longer apply for the MDC version. */ &.mat-chip-list-wrapper { margin: 4px 6px; } @@ -28,7 +28,7 @@ background: var(--adf-theme-background-card-color); border: 2px solid var(--theme-primary-color); - &.mat-chip::after { + &.mat-mdc-chip::after { background: unset; } } @@ -55,7 +55,7 @@ padding-left: 5px; } - &-menu + * .cdk-overlay-pane .mat-menu-panel { + &-menu + * .cdk-overlay-pane .mat-mdc-menu-panel { min-width: 320px; border-radius: 12px; 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 75bbbe6403..2b54ea1a01 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,4 +1,4 @@ -  {{ '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 baaec8f993..4ce0b66be1 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 @@ -20,7 +20,7 @@ import { SearchWidgetChipComponent } from './search-widget-chip.component'; import { simpleCategories } from '../../../../mock'; import { TranslateModule } from '@ngx-translate/core'; 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 ae2d891e81..83c4fb431c 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.scss b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss index 0fede8f85b..bc77c64c21 100644 --- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss @@ -61,7 +61,7 @@ } } -.mat-menu-panel.adf-filter-menu .mat-menu-content { +.mat-mdc-menu-panel.adf-filter-menu .mat-mdc-menu-content { min-width: 260px; padding: 0; } 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 553ca59244..e86ab10bb8 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 @@ -23,7 +23,7 @@ import { SearchHeaderQueryBuilderService } from '../../services/search-header-qu import { SearchCategory } from '../../models/search-category.interface'; import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token'; 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-filter-tabbed/search-filter-tabbed.component.scss b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss index fa74c8d502..f45e60dcb9 100644 --- a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss @@ -1,7 +1,9 @@ adf-search-filter-tabbed { + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version.*/ + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version.*/ .mat-tab-label { flex: 1; - + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version.*/ &.mat-tab-label-active { border-bottom: 2px solid var(--theme-primary-color); } @@ -9,7 +11,8 @@ adf-search-filter-tabbed { // The important tag is used here as a workaround for a bug in angular material, when MatTabs are used in conjunction with MatMenu // https://github.com/angular/components/issues/27426 - .mat-tab-body.mat-tab-body-active .mat-tab-body-content { + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version.*/ + .mat-mdc-tab-body.mat-tab-body-active .mat-tab-body-content { display: block; visibility: visible !important; } diff --git a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss index 275ecf1bf1..ff1c320592 100644 --- a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss @@ -3,7 +3,7 @@ font-size: var(--theme-body-1-font-size); color: var(--adf-theme-foreground-text-color-087); } - + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ .mat-checkbox-label, .mat-radio-label { color: var(--adf-theme-foreground-text-color-054); diff --git a/lib/content-services/src/lib/search/components/search-form/search-form.component.scss b/lib/content-services/src/lib/search/components/search-form/search-form.component.scss index 32a6efea66..240b768d87 100644 --- a/lib/content-services/src/lib/search/components/search-form/search-form.component.scss +++ b/lib/content-services/src/lib/search/components/search-form/search-form.component.scss @@ -1,13 +1,13 @@ @use '@angular/material' as mat; .adf-search-form { - &.mat-button { + &.mat-mdc-button { height: 35px; max-width: 190px; min-width: 190px; align-content: center; overflow: hidden; - + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ .mat-button-wrapper { display: flex; align-items: center; @@ -36,12 +36,12 @@ border-color: var(--theme-accent-color); } - &-menu + * .mat-menu-panel { + &-menu + * .mat-mdc-menu-panel { @include mat.elevation(2); border-radius: 6px; - .mat-menu-content { + .mat-mdc-menu-content { padding: 0; } } 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 c9f27a09c1..70417cd0c1 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 @@ -18,6 +18,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; @@ -25,12 +26,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; } @@ -41,8 +43,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 { @@ -61,13 +65,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 4d188035f9..68d39e251b 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 @@ -20,7 +20,7 @@ import { SearchPropertiesComponent } from './search-properties.component'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; 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.scss b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.scss index dbbcd0c374..351321196a 100644 --- a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.scss +++ b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.scss @@ -1,20 +1,21 @@ .adf-search-radio { - .mat-radio-group { + .mat-mdc-radio-group { display: flex; flex-direction: column; } - .mat-radio-button { + .mat-mdc-radio-button { margin: 5px; } .adf-facet-filter { + /* TODO(mdc-migration): The following rule targets internal classes of radio that may no longer apply for the MDC version. */ .mat-radio-label-content { text-overflow: ellipsis; overflow: hidden; width: 100%; } - + /* TODO(mdc-migration): The following rule targets internal classes of radio that may no longer apply for the MDC version. */ .mat-radio-label { width: 100%; } 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 a455fc23a1..2c33ce8580 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 e5f4bab942..695451517a 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,11 +1,9 @@ + data-automation-id="slider-range" #ngSlider>
diff --git a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.scss b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.scss index 2f05890816..55e29e6dfa 100644 --- a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.scss +++ b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.scss @@ -1,5 +1,5 @@ .adf-search-slider { - .mat-slider { + .mat-mdc-slider { width: 100%; } } 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 1d580d3242..624fada56b 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 c20f89c1f5..1cc141a8bc 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/search/components/search-sorting-picker/search-sorting-picker.component.scss b/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.scss index 4e3d6bb66c..7774859e70 100644 --- a/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.scss +++ b/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.scss @@ -1,5 +1,5 @@ .adf-search-sorting-picker { - .mat-icon-button { + .mat-mdc-icon-button { color: var(--adf-theme-foreground-text-color-054); } } diff --git a/lib/content-services/src/lib/search/components/search-text/search-text.component.scss b/lib/content-services/src/lib/search/components/search-text/search-text.component.scss index c617acaf08..b2de1b6dea 100644 --- a/lib/content-services/src/lib/search/components/search-text/search-text.component.scss +++ b/lib/content-services/src/lib/search/components/search-text/search-text.component.scss @@ -1,5 +1,5 @@ .adf-search-text { - .mat-form-field { + .mat-mdc-form-field { width: 100%; max-width: 168px; } 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 index d3d5abc34f..73a0e3be64 100644 --- a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.scss +++ b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.scss @@ -1,6 +1,6 @@ .adf-sites-dropdown { &.adf-full-width { - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } 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 bbb82db5ab..d65654aad1 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 { LogService, 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/social/rating.component.scss b/lib/content-services/src/lib/social/rating.component.scss index 99e22d3078..4284420e25 100644 --- a/lib/content-services/src/lib/social/rating.component.scss +++ b/lib/content-services/src/lib/social/rating.component.scss @@ -22,7 +22,7 @@ $adf-average-star-color: #808080; transition: all 0.3s; cursor: pointer; width: 25px; - + /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */ .mat-list-item-content { padding: 0 !important; } 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 9c9d678ca9..6e6bbdd503 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}} +
@@ -48,10 +48,10 @@
- + {{ 'ADF_PROCESS_LIST.DETAILS.LABELS.TASKS_COMPLETED'|translate }} - {{completedTasks?.length}} - + {{completedTasks?.length}} +
diff --git a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts index 1959b0e69f..7111122650 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts @@ -18,7 +18,7 @@ import { LogService } from '@alfresco/adf-core'; import { DatePipe } from '@angular/common'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild, OnDestroy } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Observable, Observer, Subject } from 'rxjs'; import { TaskDetailsEvent, TaskDetailsModel } from '../../task-list'; import { ProcessInstance } from '../models/process-instance.model'; diff --git a/lib/process-services/src/lib/process-list/components/start-process.component.scss b/lib/process-services/src/lib/process-list/components/start-process.component.scss index 3c869ed94e..1c0f519dbd 100644 --- a/lib/process-services/src/lib/process-list/components/start-process.component.scss +++ b/lib/process-services/src/lib/process-list/components/start-process.component.scss @@ -10,7 +10,7 @@ mat-form-field { width: 100%; } - + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-label { color: var(--adf-theme-mat-grey-color-a200-dark); } @@ -19,7 +19,7 @@ text-align: right; } - .mat-button { + .mat-mdc-button { text-transform: uppercase !important; } } @@ -51,7 +51,7 @@ } &-start-form-container { - .mat-card { + .mat-mdc-card { box-shadow: none !important; padding: 0 !important; } diff --git a/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts b/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts index 840043dd99..18e84bdc33 100644 --- a/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AppConfigService } from '@alfresco/adf-core'; import { AppsProcessService } from '../../app-list/services/apps-process.service'; import { of, throwError } from 'rxjs'; -import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; +import { MatSelectChange } from '@angular/material/select'; import { ProcessInstanceVariable } from '../models/process-instance-variable.model'; import { ProcessService } from '../services/process.service'; import { newProcess, taskFormMock, testProcessDef, testMultipleProcessDefs, testProcessDefWithForm, testProcessDefinitions } from '../../mock'; diff --git a/lib/process-services/src/lib/process-list/components/start-process.component.ts b/lib/process-services/src/lib/process-list/components/start-process.component.ts index 6fe3fe1b82..e977300849 100644 --- a/lib/process-services/src/lib/process-list/components/start-process.component.ts +++ b/lib/process-services/src/lib/process-list/components/start-process.component.ts @@ -25,8 +25,8 @@ import { ProcessService } from './../services/process.service'; import { UntypedFormControl, Validators, AbstractControl } from '@angular/forms'; import { Observable, Subject, forkJoin } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; -import { MatLegacyAutocompleteTrigger as MatAutocompleteTrigger } from '@angular/material/legacy-autocomplete'; -import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; +import { MatAutocompleteTrigger } from '@angular/material/autocomplete'; +import { MatSelectChange } from '@angular/material/select'; import { StartFormComponent } from '../../form'; import { Node, RelatedContentRepresentation } from '@alfresco/js-api'; import { AppDefinitionRepresentationModel } from '../../task-list'; diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.html b/lib/process-services/src/lib/process-user-info/process-user-info.component.html index 85710b88ce..4854ef282c 100644 --- a/lib/process-services/src/lib/process-user-info/process-user-info.component.html +++ b/lib/process-services/src/lib/process-user-info/process-user-info.component.html @@ -39,7 +39,7 @@ class="adf-userinfo-tab" [class.adf-hide-tab]="!ecmUser"> - +
-
{{ecmUser | fullName}}
+
{{ecmUser | fullName}}
@@ -73,7 +73,7 @@ - +
-
{{bpmUser | fullName}}
+
{{bpmUser | fullName}}
diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.scss b/lib/process-services/src/lib/process-user-info/process-user-info.component.scss index 8d458c8f6e..fedd86bd9b 100644 --- a/lib/process-services/src/lib/process-user-info/process-user-info.component.scss +++ b/lib/process-services/src/lib/process-user-info/process-user-info.component.scss @@ -49,7 +49,7 @@ display: inline-block; } - &-userinfo-menu_button.mat-button { + &-userinfo-menu_button.mat-mdc-button { margin-right: 0; border-radius: 90%; padding: 0; @@ -57,12 +57,12 @@ height: 40px; } - &-userinfo-tab .mat-tab-header { + &-userinfo-tab .mat-mdc-tab-header { align-self: center; width: 100%; min-width: 250px; } - + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ &-userinfo-tab .mat-tab-label { flex: auto; font-weight: 500; @@ -81,7 +81,7 @@ box-sizing: border-box; } - &-userinfo-card.mat-card { + &-userinfo-card.mat-mdc-card { padding: 0; } @@ -146,14 +146,14 @@ &-userinfo-detail { text-align: left; } - + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ &-hide-tab .mat-tab-label-active { display: none !important; } } @media only screen and (min-device-width: 480px) { - .mat-menu-panel.adf-userinfo-menu { + .mat-mdc-menu-panel.adf-userinfo-menu { max-height: 450px; min-width: 450px; overflow: auto; @@ -161,6 +161,6 @@ } } -.mat-menu-panel.adf-userinfo-menu .mat-menu-content { +.mat-mdc-menu-panel.adf-userinfo-menu .mat-mdc-menu-content { padding: 0; } diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts b/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts index f45798455a..172528faee 100644 --- a/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts +++ b/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts @@ -18,7 +18,7 @@ import { CoreTestingModule, UserInfoMode } from '@alfresco/adf-core'; import { fakeEcmUser, fakeEcmUserNoImage } from '@alfresco/adf-content-services'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; +import { MatMenuModule } from '@angular/material/menu'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; import { BpmUserModel } from '../common/models/bpm-user.model'; diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.ts b/lib/process-services/src/lib/process-user-info/process-user-info.component.ts index 35f0c69be1..3d4f2b84f1 100644 --- a/lib/process-services/src/lib/process-user-info/process-user-info.component.ts +++ b/lib/process-services/src/lib/process-user-info/process-user-info.component.ts @@ -18,7 +18,7 @@ import { UserInfoMode } from '@alfresco/adf-core'; import { EcmUserModel, PeopleContentService } from '@alfresco/adf-content-services'; 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 { PeopleProcessService } from '../common/services/people-process.service'; import { BpmUserModel } from '../common/models/bpm-user.model'; diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.module.ts b/lib/process-services/src/lib/process-user-info/process-user-info.module.ts index cbdbf81eb2..83bb9b53b8 100644 --- a/lib/process-services/src/lib/process-user-info/process-user-info.module.ts +++ b/lib/process-services/src/lib/process-user-info/process-user-info.module.ts @@ -18,10 +18,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ProcessUserInfoComponent } from './process-user-info.component'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatTabsModule } from '@angular/material/tabs'; import { TranslateModule } from '@ngx-translate/core'; import { PipeModule } from '@alfresco/adf-core'; diff --git a/lib/process-services/src/lib/task-list/components/attach-form.component.html b/lib/process-services/src/lib/task-list/components/attach-form.component.html index d74dd3f9af..7a8b0a9486 100644 --- a/lib/process-services/src/lib/task-list/components/attach-form.component.html +++ b/lib/process-services/src/lib/task-list/components/attach-form.component.html @@ -1,5 +1,5 @@
- +
diff --git a/lib/process-services/src/lib/task-list/components/attach-form.component.scss b/lib/process-services/src/lib/task-list/components/attach-form.component.scss index 83df7b3753..84d47d3105 100644 --- a/lib/process-services/src/lib/task-list/components/attach-form.component.scss +++ b/lib/process-services/src/lib/task-list/components/attach-form.component.scss @@ -1,5 +1,5 @@ .adf-attach-form { - .mat-form-field { + .mat-mdc-form-field { width: 100%; } diff --git a/lib/process-services/src/lib/task-list/components/checklist.component.html b/lib/process-services/src/lib/task-list/components/checklist.component.html index cd654deee5..be538ebfb6 100644 --- a/lib/process-services/src/lib/task-list/components/checklist.component.html +++ b/lib/process-services/src/lib/task-list/components/checklist.component.html @@ -1,8 +1,8 @@
- + {{ 'ADF_TASK_LIST.DETAILS.LABELS.CHECKLIST' | translate }} - {{checklist?.length}} - + {{checklist?.length}} +