From e566ab9a0ba6936d44053edffb89961f7c97048a Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Tue, 14 Nov 2023 00:25:17 +0000 Subject: [PATCH] Changed ng version before material migration --- .eslintrc.json | 3 ++ demo-shell/src/app/app.component.ts | 2 +- demo-shell/src/app/app.module.ts | 2 +- .../user-info/user-info.component.ts | 2 +- .../cloud/shared/cloud.shared.module.ts | 8 ++-- .../app/components/files/files.component.ts | 2 +- ...ersion-manager-dialog-adapter.component.ts | 2 +- .../settings/host-settings.component.ts | 2 +- demo-shell/src/app/material.module.ts | 18 ++++---- demo-shell/src/custom-style-dev.scss | 13 +++++- demo-shell/src/custom-style.scss | 13 +++++- .../aspect-list-dialog.component.spec.ts | 2 +- .../aspect-list-dialog.component.ts | 2 +- .../aspect-list/aspect-list.component.spec.ts | 6 +-- .../lib/aspect-list/aspect-list.component.ts | 2 +- .../src/lib/aspect-list/aspect-list.module.ts | 12 +++--- .../services/dialog-aspect-list.service.ts | 2 +- .../lib/breadcrumb/breadcrumb.component.ts | 2 +- .../dropdown-breadcrumb.component.ts | 2 +- .../categories-management.component.spec.ts | 6 +-- .../categories-management.component.ts | 2 +- .../services/content-type-property.service.ts | 2 +- .../content-node-dialog.service.spec.ts | 2 +- .../content-node-dialog.service.ts | 2 +- .../content-node-selector.component.spec.ts | 2 +- .../content-node-selector.component.ts | 2 +- .../content-node-share.dialog.spec.ts | 4 +- .../content-node-share.dialog.ts | 4 +- .../content-node-share.directive.ts | 2 +- .../content-type-dialog.component.spec.ts | 2 +- .../content-type-dialog.component.ts | 2 +- .../lib/content-type/content-type.module.ts | 8 ++-- .../content-user-info.component.spec.ts | 2 +- .../content-user-info.component.ts | 2 +- .../content-user-info.module.ts | 8 ++-- .../src/lib/dialogs/confirm.dialog.spec.ts | 2 +- .../src/lib/dialogs/confirm.dialog.ts | 2 +- .../download-zip.dialog.module.ts | 6 +-- .../download-zip/download-zip.dialog.spec.ts | 2 +- .../src/lib/dialogs/folder.dialog.spec.ts | 2 +- .../src/lib/dialogs/folder.dialog.ts | 2 +- .../dialogs/library/library.dialog.spec.ts | 2 +- .../src/lib/dialogs/library/library.dialog.ts | 2 +- .../src/lib/dialogs/node-lock.dialog.spec.ts | 2 +- .../src/lib/dialogs/node-lock.dialog.ts | 2 +- .../node-download.directive.spec.ts | 2 +- .../lib/directives/node-download.directive.ts | 2 +- .../document-list.component.spec.ts | 4 +- .../components/document-list.component.ts | 2 +- .../file-auto-download.component.spec.ts | 2 +- .../file-auto-download.component.ts | 2 +- .../services/node-actions.service.spec.ts | 2 +- .../services/node-actions.service.ts | 2 +- .../folder-create.directive.spec.ts | 2 +- .../folder-create.directive.ts | 2 +- .../folder-edit.directive.spec.ts | 2 +- .../folder-directive/folder-edit.directive.ts | 2 +- .../src/lib/material.module.ts | 33 +++++++-------- .../new-version-uploader.dialog.spec.ts | 2 +- .../new-version-uploader.dialog.ts | 2 +- .../new-version-uploader.service.spec.ts | 2 +- .../new-version-uploader.service.ts | 2 +- .../add-permission-dialog.component.spec.ts | 4 +- .../add-permission-dialog.component.ts | 2 +- .../add-permission-panel.component.ts | 2 +- .../permission-container.component.spec.ts | 4 +- .../permission-list.component.spec.ts | 4 +- .../permission-list.service.ts | 2 +- .../node-permission-dialog.service.spec.ts | 2 +- .../node-permission-dialog.service.ts | 2 +- .../search-check-list.component.spec.ts | 4 +- .../search-check-list.component.ts | 2 +- ...-chip-autocomplete-input.component.spec.ts | 2 +- ...earch-chip-autocomplete-input.component.ts | 4 +- .../search-chip-list.component.spec.ts | 2 +- .../components/search-control.component.ts | 2 +- .../search-facet-field.component.ts | 2 +- ...search-facet-chip-tabbed.component.spec.ts | 2 +- .../search-facet-chip-tabbed.component.ts | 2 +- .../search-facet-chip.component.spec.ts | 4 +- .../search-facet-chip.component.ts | 2 +- .../search-widget-chip.component.spec.ts | 4 +- .../search-widget-chip.component.ts | 2 +- .../search-filter-container.component.spec.ts | 6 +-- .../search-filter-container.component.ts | 2 +- .../search-filter.component.spec.ts | 6 +-- .../search-form/search-form.component.spec.ts | 4 +- .../search-panel.component.spec.ts | 2 +- .../search-properties.component.spec.ts | 2 +- .../search-radio.component.spec.ts | 2 +- .../search-radio/search-radio.component.ts | 2 +- .../search-slider.component.spec.ts | 2 +- .../search-slider/search-slider.component.ts | 2 +- .../search-text/search-text.component.spec.ts | 4 +- .../sites-dropdown.component.spec.ts | 2 +- .../site-dropdown/sites-dropdown.component.ts | 2 +- .../src/lib/tag/tag-node-list.component.ts | 2 +- .../tags-creator.component.spec.ts | 4 +- .../tags-creator/tags-creator.component.ts | 2 +- .../src/lib/tree/components/tree.component.ts | 2 +- .../version-list.component.spec.ts | 2 +- .../version-manager/version-list.component.ts | 2 +- .../alfresco-viewer.component.spec.ts | 4 +- .../components/alfresco-viewer.component.ts | 2 +- .../src/_stories/breadcrumb.stories.ts | 4 +- .../breadcrumb/breadcrumb.component.ts | 4 +- lib/core/custom-theme/theme/typography.scss | 4 +- .../src/lib/auth/guard/auth-guard-base.ts | 2 +- .../auth/guard/auth-guard-bpm.service.spec.ts | 2 +- .../lib/auth/guard/auth-guard-bpm.service.ts | 2 +- .../auth/guard/auth-guard-ecm.service.spec.ts | 2 +- .../lib/auth/guard/auth-guard-ecm.service.ts | 2 +- .../guard/auth-guard-sso-role.service.spec.ts | 2 +- .../auth/guard/auth-guard-sso-role.service.ts | 2 +- .../src/lib/auth/guard/auth-guard.service.ts | 2 +- .../buttons-menu/buttons-menu.component.ts | 2 +- .../lib/buttons-menu/buttons-menu.module.ts | 4 +- .../src/lib/card-view/card-view.module.ts | 20 ++++----- .../card-view-arrayitem.component.spec.ts | 4 +- .../card-view-boolitem.component.spec.ts | 2 +- .../card-view-boolitem.component.ts | 9 +++- .../card-view-dateitem.component.spec.ts | 2 +- .../card-view-keyvaluepairsitem.component.ts | 2 +- .../card-view-selectitem.component.spec.ts | 2 +- .../card-view-selectitem.component.ts | 2 +- .../select-filter-input.component.spec.ts | 2 +- .../select-filter-input.component.ts | 2 +- .../card-view-textitem.component.spec.ts | 4 +- .../card-view-textitem.component.ts | 2 +- .../card-view/card-view.component.spec.ts | 2 +- .../lib/clipboard/clipboard.service.spec.ts | 2 +- .../comment-list/comment-list.module.ts | 8 ++-- lib/core/src/lib/comments/comments.module.ts | 8 ++-- .../context-menu-list.component.ts | 2 +- lib/core/src/lib/core.module.ts | 2 +- .../columns-selector.component.spec.ts | 4 +- .../columns-selector.component.ts | 2 +- .../datatable/datatable.component.spec.ts | 2 +- .../datatable/datatable.component.stories.ts | 2 +- .../datatable/datatable.component.ts | 4 +- .../json-cell/json-cell.component.spec.ts | 2 +- .../json-cell/json-cell.component.ts | 2 +- .../edit-json/edit-json.dialog.module.ts | 4 +- .../edit-json.dialog.stories.component.ts | 2 +- .../edit-json/edit-json.dialog.stories.ts | 2 +- .../lib/dialogs/edit-json/edit-json.dialog.ts | 2 +- .../infinite-select-scroll.directive.spec.ts | 2 +- .../infinite-select-scroll.directive.ts | 2 +- .../widgets/amount/amount.widget.spec.ts | 6 +-- .../widgets/checkbox/checkbox.widget.spec.ts | 8 ++-- .../date-time/date-time.widget.spec.ts | 6 +-- .../hyperlink/hyperlink.widget.spec.ts | 2 +- .../components/widgets/json/json.widget.ts | 2 +- .../multiline-text.widget.spec.ts | 4 +- .../widgets/number/number.widget.spec.ts | 6 +-- .../widgets/text/text.widget.spec.ts | 8 ++-- .../identity-user-info.component.spec.ts | 2 +- .../identity-user-info.component.ts | 2 +- .../identity-user-info.module.ts | 8 ++-- .../info-drawer/info-drawer.component.spec.ts | 2 +- .../lib/info-drawer/info-drawer.component.ts | 2 +- .../src/lib/info-drawer/info-drawer.module.ts | 4 +- .../lib/language-menu/language-menu.module.ts | 4 +- .../sidenav-layout.component.stories.ts | 2 +- .../login-dialog.component.stories.ts | 2 +- .../components/login-dialog.component.ts | 2 +- .../login-dialog.stories.component.ts | 2 +- lib/core/src/lib/material.module.ts | 39 +++++++++--------- .../services/notification.service.spec.ts | 4 +- .../services/notification.service.ts | 2 +- .../snackbar-content.component.spec.ts | 4 +- .../snackbar-content.component.ts | 2 +- .../snackbar-content.module.ts | 4 +- .../sorting-picker.component.ts | 2 +- .../sorting-picker/sorting-picker.module.ts | 4 +- lib/core/src/lib/styles/_typography.scss | 2 +- .../lib/styles/prebuilt/adf-blue-orange.scss | 13 +++++- .../lib/styles/prebuilt/adf-blue-purple.scss | 13 +++++- .../lib/styles/prebuilt/adf-cyan-orange.scss | 13 +++++- .../lib/styles/prebuilt/adf-cyan-purple.scss | 13 +++++- .../lib/styles/prebuilt/adf-green-orange.scss | 13 +++++- .../lib/styles/prebuilt/adf-green-purple.scss | 13 +++++- .../lib/styles/prebuilt/adf-indigo-pink.scss | 13 +++++- .../styles/prebuilt/adf-pink-bluegrey.scss | 13 +++++- .../lib/styles/prebuilt/adf-purple-green.scss | 13 +++++- lib/core/src/lib/templates/template.module.ts | 2 +- .../download-prompt-dialog.component.spec.ts | 2 +- .../pdf-viewer-password-dialog.spec.ts | 2 +- .../components/pdf-viewer-password-dialog.ts | 2 +- .../components/pdf-viewer.component.spec.ts | 2 +- .../viewer-render.component.spec.ts | 4 +- .../components/viewer-render.component.ts | 2 +- .../components/viewer.component.spec.ts | 4 +- .../lib/viewer/components/viewer.component.ts | 2 +- .../analytics-report-parameters.component.ts | 2 +- lib/insights/src/lib/material.module.ts | 37 +++++++++-------- .../date-range-filter.component.spec.ts | 2 +- .../date-range-filter.component.ts | 2 +- .../components/form-cloud.component.spec.ts | 4 +- .../form/components/form-cloud.component.ts | 2 +- ...orm-definition-selector-cloud.component.ts | 2 +- ...e-properties-table-cloud.component.spec.ts | 2 +- ...ontent-cloud-node-selector.service.spec.ts | 2 +- .../content-cloud-node-selector.service.ts | 2 +- .../components/group-cloud.component.spec.ts | 4 +- .../src/lib/material.module.ts | 37 +++++++++-------- .../components/people-cloud.component.spec.ts | 4 +- ...dit-process-filter-cloud.component.spec.ts | 6 +-- .../edit-process-filter-cloud.component.ts | 2 +- ...cess-filter-dialog-cloud.component.spec.ts | 2 +- .../process-filter-dialog-cloud.component.ts | 2 +- .../process-list-cloud.component.spec.ts | 4 +- .../start-process-cloud.component.spec.ts | 17 ++++---- .../start-process-cloud.component.ts | 2 +- .../base-edit-task-filter-cloud.component.ts | 4 +- ...ervice-task-filter-cloud.component.spec.ts | 6 +-- .../edit-task-filter-cloud.component.spec.ts | 6 +-- .../task-assignment-filter.component.ts | 2 +- ...task-filter-dialog-cloud.component.spec.ts | 2 +- .../task-filter-dialog-cloud.component.ts | 2 +- .../task-filters/task-filters-cloud.module.ts | 2 +- .../task-form-cloud.component.spec.ts | 2 +- .../task-header-cloud.component.spec.ts | 2 +- .../service-task-list-cloud.component.spec.ts | 2 +- .../task-list-cloud.component.spec.ts | 2 +- .../lib/app-list/apps-list.component.spec.ts | 2 +- .../src/lib/app-list/apps-list.module.ts | 2 +- .../select-apps-dialog.component.spec.ts | 2 +- .../app-list/select-apps-dialog.component.ts | 2 +- .../process-attachment-list.component.spec.ts | 2 +- ...ttach-file-widget-dialog.component.spec.ts | 2 +- .../attach-file-widget-dialog.component.ts | 2 +- .../attach-file-widget-dialog.service.spec.ts | 2 +- .../attach-file-widget-dialog.service.ts | 2 +- .../radio-buttons.widget.spec.ts | 2 +- .../src/lib/material.module.ts | 37 +++++++++-------- .../process-instance-tasks.component.ts | 2 +- .../start-process.component.spec.ts | 2 +- .../components/start-process.component.ts | 4 +- .../process-user-info.component.spec.ts | 2 +- .../process-user-info.component.ts | 2 +- .../process-user-info.module.ts | 8 ++-- .../components/checklist.component.ts | 2 +- .../components/task-details.component.ts | 2 +- package.json | 41 ++++++++++--------- 245 files changed, 590 insertions(+), 474 deletions(-) create mode 100644 .eslintrc.json diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000000..81894c2c7d --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,3 @@ +{ + "extends": ["./.eslintrc.js"] +} diff --git a/demo-shell/src/app/app.component.ts b/demo-shell/src/app/app.component.ts index 2273758e1d..7303b530d7 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { AdfHttpClient } from '@alfresco/adf-core/api'; @Component({ diff --git a/demo-shell/src/app/app.module.ts b/demo-shell/src/app/app.module.ts index 2822b58c51..46d85528db 100644 --- a/demo-shell/src/app/app.module.ts +++ b/demo-shell/src/app/app.module.ts @@ -73,7 +73,7 @@ import { UserInfoComponent } from './components/app-layout/user-info/user-info.c BrowserModule, environment.e2e ? NoopAnimationsModule : BrowserAnimationsModule, ReactiveFormsModule, - RouterModule.forRoot(appRoutes, { useHash: true, relativeLinkResolution: 'legacy' }), + RouterModule.forRoot(appRoutes, { useHash: true }), AuthModule.forRoot({ useHash: true }), FormsModule, HttpClientModule, 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 894e4ba329..2a39e06e41 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 { MenuPositionX, MenuPositionY } from '@angular/material/menu'; +import { LegacyMenuPositionX as MenuPositionX, LegacyMenuPositionY as MenuPositionY } from '@angular/material/legacy-menu'; import { Observable, of } from 'rxjs'; @Component({ 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 1f9fcc64e1..228d25bc6f 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 { 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 { 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 { 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 935e2b9777..0111e9f077 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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 779788e0dd..1facf3679b 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_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-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 601a21d358..f136c9a7d6 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_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; +import { MAT_LEGACY_FORM_FIELD_DEFAULT_OPTIONS as MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/legacy-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 550114010c..c48d9dcf9a 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 { MatCardModule } from '@angular/material/card'; -import { MatDialogModule } from '@angular/material/dialog'; +import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatExpansionModule } from '@angular/material/expansion'; -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 { 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 { MatSidenavModule } from '@angular/material/sidenav'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; +import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-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 7249e1c884..b778643bb3 100644 --- a/demo-shell/src/custom-style-dev.scss +++ b/demo-shell/src/custom-style-dev.scss @@ -1,7 +1,16 @@ @use '@angular/material' as mat; @import '../../lib/core/src/lib/styles/index'; @import '../../lib/core/src/lib/styles/typography'; -@include mat.core; +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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(); $primary: mat.define-palette($alfresco-accent-orange); $accent: mat.define-palette($alfresco-accent-purple); @@ -17,7 +26,7 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-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 c7cc6f98fd..046919e107 100644 --- a/demo-shell/src/custom-style.scss +++ b/demo-shell/src/custom-style.scss @@ -1,6 +1,15 @@ @use '@angular/material' as mat; @import '~@alfresco/adf-core/theming'; -@include mat.core($alfresco-typography); +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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($alfresco-typography);` +@include mat.all-legacy-component-typographies($alfresco-typography); +@include mat.legacy-core(); $primary: mat.define-palette($alfresco-accent-orange); $accent: mat.define-palette($alfresco-accent-purple); @@ -14,7 +23,7 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); @include alfresco-material-theme($theme); body, diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts index fa857354d0..a076efac28 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_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogModule as MatDialogModule, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-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 8a3672e209..9c9caee61f 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_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { AspectListDialogComponentData } from './aspect-list-dialog-data.interface'; @Component({ diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.spec.ts b/lib/content-services/src/lib/aspect-list/aspect-list.component.spec.ts index aaddd55f7d..47aafb4fdd 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list.component.spec.ts +++ b/lib/content-services/src/lib/aspect-list/aspect-list.component.spec.ts @@ -26,9 +26,9 @@ import { AspectEntry } from '@alfresco/js-api'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatExpansionPanelHarness } from '@angular/material/expansion/testing'; -import { MatTableHarness } from '@angular/material/table/testing'; -import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacyTableHarness as MatTableHarness } from '@angular/material/legacy-table/testing'; +import { MatLegacyCheckboxHarness as MatCheckboxHarness } from '@angular/material/legacy-checkbox/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; const aspectListMock: AspectEntry[] = [ { 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 5619415cb9..17f77f04a2 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 { MatCheckboxChange } from '@angular/material/checkbox'; +import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-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 1022a80645..1a55ebc034 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 { MatTableModule } from '@angular/material/table'; +import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; import { MatExpansionModule } from '@angular/material/expansion'; -import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { PipeModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; -import { MatDialogModule } from '@angular/material/dialog'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { AspectListDialogComponent } from './aspect-list-dialog.component'; -import { MatButtonModule } from '@angular/material/button'; -import { MatTooltipModule } from '@angular/material/tooltip'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +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 { 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 4fb64f183a..085ba0d95b 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { Observable, Subject } from 'rxjs'; import { AspectListDialogComponentData } from '../aspect-list-dialog-data.interface'; import { AspectListDialogComponent } from '../aspect-list-dialog.component'; diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts index 7d129df18d..e77709584d 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 { MatSelect } from '@angular/material/select'; +import { MatLegacySelect as MatSelect } from '@angular/material/legacy-select'; import { Node, PathElement } from '@alfresco/js-api'; import { DocumentListComponent } from '../document-list/components/document-list.component'; import { Subject } from 'rxjs'; diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts index aa6bf592d1..5233b5ab5c 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 { MatSelect } from '@angular/material/select'; +import { MatLegacySelect as MatSelect } from '@angular/material/legacy-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.spec.ts b/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts index 25e41c8959..6e8b03309a 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 { MatError } from '@angular/material/form-field'; -import { MatListOption, MatSelectionList } from '@angular/material/list'; +import { MatLegacyError as MatError } from '@angular/material/legacy-form-field'; +import { MatLegacyListOption as MatListOption, MatLegacySelectionList as MatSelectionList } from '@angular/material/legacy-list'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; import { of, Subject } from 'rxjs'; @@ -29,7 +29,7 @@ import { CategoryService } from '../services/category.service'; import { CategoriesManagementComponent } from './categories-management.component'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; describe('CategoriesManagementComponent', () => { let loader: HarnessLoader; 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 e5fd1d24b5..d84d4c0ddb 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 { MatSelectionListChange } from '@angular/material/list'; +import { MatLegacySelectionListChange as MatSelectionListChange } from '@angular/material/legacy-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/services/content-type-property.service.ts b/lib/content-services/src/lib/content-metadata/services/content-type-property.service.ts index 05b27367a0..4bebf8371c 100644 --- a/lib/content-services/src/lib/content-metadata/services/content-type-property.service.ts +++ b/lib/content-services/src/lib/content-metadata/services/content-type-property.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { CardViewItem, CardViewSelectItemModel, CardViewSelectItemOption, CardViewTextItemModel } from '@alfresco/adf-core'; import { Observable, of, Subject, zip } from 'rxjs'; import { distinctUntilChanged, map } from 'rxjs/operators'; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts index 18800954a7..7ee5f89305 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts @@ -20,7 +20,7 @@ import { NodeEntry, Node, SitePaging, Site } from '@alfresco/js-api'; import { AppConfigService } from '@alfresco/adf-core'; import { DocumentListService } from '../document-list/services/document-list.service'; import { ContentNodeDialogService } from './content-node-dialog.service'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { Subject, of } from 'rxjs'; import { ContentTestingModule } from '../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts index 77a3fde9ee..1ae457abb1 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { EventEmitter, Injectable, Output } from '@angular/core'; import { ThumbnailService, TranslationService } from '@alfresco/adf-core'; import { Subject, Observable, throwError } from 'rxjs'; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts index ad4fff2902..50723c0071 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogModule as MatDialogModule, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ContentNodeSelectorComponent } from './content-node-selector.component'; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts index fe939ff96d..23ccdce187 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { TranslationService, NotificationService } from '@alfresco/adf-core'; import { Node } from '@alfresco/js-api'; import { AllowableOperationsEnum } from '../common/models/allowable-operations.enum'; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts index 51fa1e1e08..6e574f0058 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { of } from 'rxjs'; import { NotificationService, AppConfigService } from '@alfresco/adf-core'; import { NodesApiService } from '../common/services/nodes-api.service'; @@ -30,7 +30,7 @@ import { By } from '@angular/platform-browser'; import { NodeEntry } from '@alfresco/js-api'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSlideToggleHarness } from '@angular/material/slide-toggle/testing'; +import { MatLegacySlideToggleHarness as MatSlideToggleHarness } from '@angular/material/legacy-slide-toggle/testing'; describe('ShareDialogComponent', () => { let loader: HarnessLoader; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts index b0e369d7c9..5dc75d8663 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts @@ -16,8 +16,8 @@ */ import { Component, Inject, OnInit, ViewEncapsulation, ViewChild, OnDestroy } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; -import { MatSlideToggleChange } from '@angular/material/slide-toggle'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MatLegacySlideToggleChange as MatSlideToggleChange } from '@angular/material/legacy-slide-toggle'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Subject } from 'rxjs'; import { ContentService } from '../common/services/content.service'; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts b/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts index d8b3b334db..03bb0395b4 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts @@ -16,7 +16,7 @@ */ import { Directive, Input, HostListener, OnChanges, NgZone, OnDestroy } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { NodeEntry, NodesApi } from '@alfresco/js-api'; import { ShareDialogComponent } from './content-node-share.dialog'; diff --git a/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts b/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts index 46d01e720d..27662141fd 100644 --- a/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts +++ b/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogModule as MatDialogModule, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of, Subject } from 'rxjs'; diff --git a/lib/content-services/src/lib/content-type/content-type-dialog.component.ts b/lib/content-services/src/lib/content-type/content-type-dialog.component.ts index fa580e9e95..2362053851 100644 --- a/lib/content-services/src/lib/content-type/content-type-dialog.component.ts +++ b/lib/content-services/src/lib/content-type/content-type-dialog.component.ts @@ -17,7 +17,7 @@ import { TypeEntry } from '@alfresco/js-api'; import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { ContentTypeDialogComponentData } from './content-type-metadata.interface'; import { ContentTypeService } from './content-type.service'; diff --git a/lib/content-services/src/lib/content-type/content-type.module.ts b/lib/content-services/src/lib/content-type/content-type.module.ts index 9cda52b7dd..1e4082c8fb 100644 --- a/lib/content-services/src/lib/content-type/content-type.module.ts +++ b/lib/content-services/src/lib/content-type/content-type.module.ts @@ -17,12 +17,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { MatTableModule } from '@angular/material/table'; +import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; import { MatExpansionModule } from '@angular/material/expansion'; -import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { TranslateModule } from '@ngx-translate/core'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { ContentTypeDialogComponent } from './content-type-dialog.component'; @NgModule({ diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts b/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts index 3d82c178f1..baa713ad0b 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 { MatMenuModule } from '@angular/material/menu'; +import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-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 c7c8ae8fa4..6215dbaf84 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 { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu'; +import { MatLegacyMenuTrigger as MatMenuTrigger, LegacyMenuPositionX as MenuPositionX, LegacyMenuPositionY as MenuPositionY } from '@angular/material/legacy-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 f6ef2a642d..f5f895efb9 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 { MatButtonModule } from '@angular/material/button'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatTabsModule } from '@angular/material/tabs'; -import { MatCardModule } from '@angular/material/card'; +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'; @NgModule({ declarations: [ContentUserInfoComponent], 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 a52bf92f85..bd823d2d94 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 { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-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 18ef0a5e47..a1a8fa270a 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_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-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 13e14516e7..c1cc577c01 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 { MatDialogModule } from '@angular/material/dialog'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatButtonModule } from '@angular/material/button'; +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 { TranslateModule } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; diff --git a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts index 579fc0b006..666a69895b 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 { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; import { DownloadZipDialogComponent } from './download-zip.dialog'; import { CoreTestingModule } from '@alfresco/adf-core'; import { DownloadZipService } from './services/download-zip.service'; diff --git a/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts b/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts index 7cd36094da..1c6de3a185 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 { MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-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 c0791714a3..214a621c8e 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_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { Node } from '@alfresco/js-api'; import { TranslationService } from '@alfresco/adf-core'; diff --git a/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts b/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts index f61e772019..85dab8f0fd 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 { MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-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 21b53697df..f948786965 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 { MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-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 f71202a3dd..dd4df9e460 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 { MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-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 c92b46e1dc..34c14a9703 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_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-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 18c897af38..3e72ac1a8d 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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 b428551961..7a1527bc17 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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 6e54796349..a7642d9820 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,12 +59,12 @@ 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { FileAutoDownloadComponent } from './file-auto-download/file-auto-download.component'; import { ShareDataTableAdapter } from '../data/share-datatable-adapter'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; const mockDialog = { open: jasmine.createSpy('open') 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 18319ec43d..e0a7742f59 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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 59842131ad..29b208b681 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_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-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 737ce71338..f56482916e 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_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-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 2bb86cbc10..fa8bf06240 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 { MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-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 eafce591a5..882f1d73e9 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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 650822ce62..44991de0a2 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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 35ab1dcf88..223b2197b0 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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 4edaec862f..de6754ce02 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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 5f19d8f0cf..d3a72cc4bc 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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 f266aac188..8778f8094e 100644 --- a/lib/content-services/src/lib/material.module.ts +++ b/lib/content-services/src/lib/material.module.ts @@ -16,25 +16,26 @@ */ import { NgModule } from '@angular/core'; -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, MatOptionModule } from '@angular/material/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 { MatRippleModule } from '@angular/material/core'; +import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatDialogModule } from '@angular/material/dialog'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; -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 { 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 { MatTreeModule } from '@angular/material/tree'; import { MatBadgeModule } from '@angular/material/badge'; diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts index 85d1037b9c..3bfe6903a2 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 { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-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 d1580d96cc..a29d3c4070 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 { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-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 432f855a6f..b9b14895a6 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 { MatDialog, MatDialogConfig } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog, MatLegacyDialogConfig as MatDialogConfig } from '@angular/material/legacy-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 226d8dae24..97ad143f7e 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 { MatDialog, MatDialogConfig } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog, MatLegacyDialogConfig as MatDialogConfig } from '@angular/material/legacy-dialog'; import { AlfrescoApiService } from '@alfresco/adf-core'; import { NewVersionUploaderDialogComponent } from './new-version-uploader.dialog'; diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts index 15e6e9805e..dc8e7269a5 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_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; @@ -28,7 +28,7 @@ import { AddPermissionDialogData } from './add-permission-dialog-data.interface' import { fakeAuthorityResults } from '../../../mock/add-permission.component.mock'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSelectHarness } from '@angular/material/select/testing'; +import { MatLegacySelectHarness as MatSelectHarness } from '@angular/material/legacy-select/testing'; describe('AddPermissionDialog', () => { let loader: HarnessLoader; 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 3558f08093..f289a1ee79 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_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-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 e98a4d73c3..759da58717 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 { MatSelectionList } from '@angular/material/list'; +import { MatLegacySelectionList as MatSelectionList } from '@angular/material/legacy-list'; @Component({ selector: 'adf-add-permission-panel', diff --git a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.spec.ts index 7550775b7c..0ce9f90f4b 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.spec.ts @@ -21,8 +21,8 @@ import { PermissionContainerComponent } from './permission-container.component'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSelectHarness } from '@angular/material/select/testing'; -import { MatButtonHarness } from '@angular/material/button/testing'; +import { MatLegacySelectHarness as MatSelectHarness } from '@angular/material/legacy-select/testing'; +import { MatLegacyButtonHarness as MatButtonHarness } from '@angular/material/legacy-button/testing'; describe('PermissionContainerComponent', () => { let loader: HarnessLoader; diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.spec.ts index c7c91b0bbb..a45c81ebf6 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.spec.ts @@ -37,8 +37,8 @@ import { Node } from '@alfresco/js-api'; import { NodesApiService } from '../../../common/services/nodes-api.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSlideToggleHarness } from '@angular/material/slide-toggle/testing'; -import { MatSelectHarness } from '@angular/material/select/testing'; +import { MatLegacySlideToggleHarness as MatSlideToggleHarness } from '@angular/material/legacy-slide-toggle/testing'; +import { MatLegacySelectHarness as MatSelectHarness } from '@angular/material/legacy-select/testing'; describe('PermissionListComponent', () => { let loader: HarnessLoader; 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 7fbd0ca1aa..dbd0e257f4 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 { MatSlideToggleChange } from '@angular/material/slide-toggle'; +import { MatLegacySlideToggleChange as MatSlideToggleChange } from '@angular/material/legacy-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/services/node-permission-dialog.service.spec.ts b/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.spec.ts index 7bdeac2260..edd91a9cfb 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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 6d0ef138e2..c25c00abd3 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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.spec.ts b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.spec.ts index 2edd6b39ba..cebce7a890 100644 --- a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.spec.ts @@ -23,8 +23,8 @@ import { sizeOptions, stepOne, stepThree } from '../../../mock'; import { TranslateModule } from '@ngx-translate/core'; import { HarnessLoader, TestKey } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; -import { MatButtonHarness } from '@angular/material/button/testing'; +import { MatLegacyCheckboxHarness as MatCheckboxHarness } from '@angular/material/legacy-checkbox/testing'; +import { MatLegacyButtonHarness as MatButtonHarness } from '@angular/material/legacy-button/testing'; describe('SearchCheckListComponent', () => { let loader: HarnessLoader; 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 7a4516e520..cdb459fd5f 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 { MatCheckboxChange } from '@angular/material/checkbox'; +import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-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.spec.ts b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts index 45056d2f60..8201aa37e1 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 { MatChip, MatChipRemove } from '@angular/material/chips'; +import { MatLegacyChip as MatChip, MatLegacyChipRemove as MatChipRemove } from '@angular/material/legacy-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 6098b3ef73..ffe5e02382 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 { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; -import { MatChipInputEvent } from '@angular/material/chips'; +import { MatLegacyAutocompleteSelectedEvent as MatAutocompleteSelectedEvent } from '@angular/material/legacy-autocomplete'; +import { MatLegacyChipInputEvent as MatChipInputEvent } from '@angular/material/legacy-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.spec.ts b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts index d13033cac8..cc24a57c75 100644 --- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts @@ -23,7 +23,7 @@ import { ContentTestingModule } from '../../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatChipHarness, MatChipRemoveHarness } from '@angular/material/chips/testing'; +import { MatLegacyChipHarness as MatChipHarness, MatLegacyChipRemoveHarness as MatChipRemoveHarness } from '@angular/material/legacy-chips/testing'; @Component({ selector: 'adf-test-component', 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 8556b3dce4..78d1814d9f 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 { MatListItem } from '@angular/material/list'; +import { MatLegacyListItem as MatListItem } from '@angular/material/legacy-list'; import { EmptySearchResultComponent } from './empty-search-result.component'; @Component({ diff --git a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.ts b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.ts index 94574897e7..95033e7476 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 { MatCheckboxChange } from '@angular/material/checkbox'; +import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-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.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.spec.ts index 0ac62cfa0c..904222a2a5 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.spec.ts @@ -25,7 +25,7 @@ import { FacetField } from '../../../models/facet-field.interface'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { HarnessLoader, TestKey } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatChipHarness } from '@angular/material/chips/testing'; +import { MatLegacyChipHarness as MatChipHarness } from '@angular/material/legacy-chips/testing'; import { MatIconHarness } from '@angular/material/icon/testing'; describe('SearchFacetChipTabbedComponent', () => { 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 2e0829c686..04e7d1a5f4 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 { MatMenuTrigger } from '@angular/material/menu'; +import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-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.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.spec.ts index 72c1117311..261858f529 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.spec.ts @@ -22,9 +22,9 @@ import { TranslateModule } from '@ngx-translate/core'; import { SearchQueryBuilderService } from '../../../services/search-query-builder.service'; import { SearchFilterList } from '../../../models/search-filter-list.model'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatMenuHarness } from '@angular/material/menu/testing'; +import { MatLegacyMenuHarness as MatMenuHarness } from '@angular/material/legacy-menu/testing'; import { HarnessLoader, TestKey } from '@angular/cdk/testing'; -import { MatButtonHarness } from '@angular/material/button/testing'; +import { MatLegacyButtonHarness as MatButtonHarness } from '@angular/material/legacy-button/testing'; import { MatIconHarness } from '@angular/material/icon/testing'; describe('SearchFacetChipComponent', () => { 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 d338da44ed..aba3c5ec93 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 { MatMenuTrigger } from '@angular/material/menu'; +import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-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-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 a4027fb6dc..baaec8f993 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,12 +20,12 @@ 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 { MatMenuModule } from '@angular/material/menu'; +import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { By } from '@angular/platform-browser'; import { SearchQueryBuilderService } from '../../../services/search-query-builder.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatChipHarness } from '@angular/material/chips/testing'; +import { MatLegacyChipHarness as MatChipHarness } from '@angular/material/legacy-chips/testing'; import { MatIconHarness } from '@angular/material/icon/testing'; describe('SearchWidgetChipComponent', () => { 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 4ff847a753..ae2d891e81 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 { MatMenuTrigger } from '@angular/material/menu'; +import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; import { SearchWidgetContainerComponent } from '../../search-widget-container/search-widget-container.component'; @Component({ diff --git a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts index def44e1aac..12df683a2e 100644 --- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts @@ -27,9 +27,9 @@ import { SearchFilterContainerComponent } from './search-filter-container.compon import { SearchCategory } from '../../models/search-category.interface'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatInputHarness } from '@angular/material/input/testing'; -import { MatMenuHarness } from '@angular/material/menu/testing'; -import { MatButtonHarness } from '@angular/material/button/testing'; +import { MatLegacyInputHarness as MatInputHarness } from '@angular/material/legacy-input/testing'; +import { MatLegacyMenuHarness as MatMenuHarness } from '@angular/material/legacy-menu/testing'; +import { MatLegacyButtonHarness as MatButtonHarness } from '@angular/material/legacy-button/testing'; import { MatBadgeHarness } from '@angular/material/badge/testing'; const mockCategory: SearchCategory = { 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 e86ab10bb8..553ca59244 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 { MatMenuTrigger } from '@angular/material/menu'; +import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; import { FilterSearch } from '../../models/filter-search.interface'; @Component({ diff --git a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts index 5fdf889aeb..8dbb83fa7f 100644 --- a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts @@ -43,9 +43,9 @@ import { SearchFacetFieldComponent } from '../search-facet-field/search-facet-fi import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatExpansionPanelHarness } from '@angular/material/expansion/testing'; -import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; -import { MatButtonHarness } from '@angular/material/button/testing'; -import { MatInputHarness } from '@angular/material/input/testing'; +import { MatLegacyCheckboxHarness as MatCheckboxHarness } from '@angular/material/legacy-checkbox/testing'; +import { MatLegacyButtonHarness as MatButtonHarness } from '@angular/material/legacy-button/testing'; +import { MatLegacyInputHarness as MatInputHarness } from '@angular/material/legacy-input/testing'; describe('SearchFilterComponent', () => { let loader: HarnessLoader; diff --git a/lib/content-services/src/lib/search/components/search-form/search-form.component.spec.ts b/lib/content-services/src/lib/search/components/search-form/search-form.component.spec.ts index 8182b49033..6ea4fa40f0 100644 --- a/lib/content-services/src/lib/search/components/search-form/search-form.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-form/search-form.component.spec.ts @@ -25,8 +25,8 @@ import { SearchForm } from '../../models/search-form.interface'; import { By } from '@angular/platform-browser'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatMenuHarness } from '@angular/material/menu/testing'; -import { MatButtonHarness } from '@angular/material/button/testing'; +import { MatLegacyMenuHarness as MatMenuHarness } from '@angular/material/legacy-menu/testing'; +import { MatLegacyButtonHarness as MatButtonHarness } from '@angular/material/legacy-button/testing'; describe('SearchFormComponent', () => { let loader: HarnessLoader; diff --git a/lib/content-services/src/lib/search/components/search-panel/search-panel.component.spec.ts b/lib/content-services/src/lib/search/components/search-panel/search-panel.component.spec.ts index 69b40cd8d6..f346f3d6b5 100644 --- a/lib/content-services/src/lib/search/components/search-panel/search-panel.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-panel/search-panel.component.spec.ts @@ -23,7 +23,7 @@ import { sizeOptions, stepOne, stepThree } from '../../../mock'; import { TranslateModule } from '@ngx-translate/core'; import { HarnessLoader, TestKey } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; +import { MatLegacyCheckboxHarness as MatCheckboxHarness } from '@angular/material/legacy-checkbox/testing'; import { By } from '@angular/platform-browser'; describe('SearchCheckListComponent', () => { 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 68d39e251b..4d188035f9 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 { MatOption } from '@angular/material/core'; +import { MatLegacyOption as MatOption } from '@angular/material/legacy-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.spec.ts b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.spec.ts index 415217637f..245e30842c 100644 --- a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.spec.ts @@ -22,7 +22,7 @@ import { ContentTestingModule } from '../../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatRadioButtonHarness, MatRadioGroupHarness } from '@angular/material/radio/testing'; +import { MatLegacyRadioButtonHarness as MatRadioButtonHarness, MatLegacyRadioGroupHarness as MatRadioGroupHarness } from '@angular/material/legacy-radio/testing'; describe('SearchRadioComponent', () => { let loader: HarnessLoader; 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 2c33ce8580..a455fc23a1 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 { MatRadioChange } from '@angular/material/radio'; +import { MatLegacyRadioChange as MatRadioChange } from '@angular/material/legacy-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.spec.ts b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.spec.ts index 624fada56b..1d580d3242 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 { MatSliderChange } from '@angular/material/slider'; +import { MatLegacySliderChange as MatSliderChange } from '@angular/material/legacy-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 1cc141a8bc..c20f89c1f5 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 { MatSliderChange } from '@angular/material/slider'; +import { MatLegacySliderChange as MatSliderChange } from '@angular/material/legacy-slider'; import { Subject } from 'rxjs'; @Component({ diff --git a/lib/content-services/src/lib/search/components/search-text/search-text.component.spec.ts b/lib/content-services/src/lib/search/components/search-text/search-text.component.spec.ts index 2ba2a5f116..1980e901c7 100644 --- a/lib/content-services/src/lib/search/components/search-text/search-text.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-text/search-text.component.spec.ts @@ -21,8 +21,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatInputHarness } from '@angular/material/input/testing'; -import { MatButtonHarness } from '@angular/material/button/testing'; +import { MatLegacyInputHarness as MatInputHarness } from '@angular/material/legacy-input/testing'; +import { MatLegacyButtonHarness as MatButtonHarness } from '@angular/material/legacy-button/testing'; describe('SearchTextComponent', () => { let loader: HarnessLoader; diff --git a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts index 2281db8bfa..ff3274fbed 100644 --- a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts +++ b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts @@ -31,7 +31,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { SitesService } from '../common/services/sites.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSelectHarness } from '@angular/material/select/testing'; +import { MatLegacySelectHarness as MatSelectHarness } from '@angular/material/legacy-select/testing'; import { SiteEntry } from '@alfresco/js-api'; const customSiteList = { 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 d65654aad1..bbb82db5ab 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 { MatSelectChange } from '@angular/material/select'; +import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; import { LiveAnnouncer } from '@angular/cdk/a11y'; import { TranslateService } from '@ngx-translate/core'; import { SitesService } from '../common/services/sites.service'; diff --git a/lib/content-services/src/lib/tag/tag-node-list.component.ts b/lib/content-services/src/lib/tag/tag-node-list.component.ts index e20454b774..96364a5eac 100644 --- a/lib/content-services/src/lib/tag/tag-node-list.component.ts +++ b/lib/content-services/src/lib/tag/tag-node-list.component.ts @@ -35,7 +35,7 @@ import { TagService } from './services/tag.service'; import { TagEntry } from '@alfresco/js-api'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { MatChip } from '@angular/material/chips'; +import { MatLegacyChip as MatChip } from '@angular/material/legacy-chips'; /** * diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts index ee74afb128..361a71e970 100644 --- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts +++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts @@ -24,13 +24,13 @@ import { MatIconModule } from '@angular/material/icon'; import { MatError, MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { ReactiveFormsModule } from '@angular/forms'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { ContentDirectiveModule, TagsCreatorMode, TagService } from '@alfresco/adf-content-services'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { EMPTY, of, throwError } from 'rxjs'; import { DebugElement } from '@angular/core'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { MatListModule, MatSelectionList, MatSelectionListChange } from '@angular/material/list'; +import { MatLegacyListModule as MatListModule, MatLegacySelectionList as MatSelectionList, MatLegacySelectionListChange as MatSelectionListChange } from '@angular/material/legacy-list'; describe('TagsCreatorComponent', () => { let fixture: ComponentFixture; diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts index fb58525f8c..f6c335eff1 100644 --- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts +++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts @@ -33,7 +33,7 @@ import { debounce, distinctUntilChanged, finalize, first, map, takeUntil, tap } import { EMPTY, forkJoin, Observable, Subject, timer } from 'rxjs'; import { NotificationService } from '@alfresco/adf-core'; import { TagsCreatorMode } from './tags-creator-mode'; -import { MatSelectionListChange } from '@angular/material/list'; +import { MatLegacySelectionListChange as MatSelectionListChange } from '@angular/material/legacy-list'; import { TagService } from '../services/tag.service'; interface TagNameControlErrors { diff --git a/lib/content-services/src/lib/tree/components/tree.component.ts b/lib/content-services/src/lib/tree/components/tree.component.ts index c2b89eb714..9f3591b948 100644 --- a/lib/content-services/src/lib/tree/components/tree.component.ts +++ b/lib/content-services/src/lib/tree/components/tree.component.ts @@ -34,7 +34,7 @@ import { TreeService } from '../services/tree.service'; import { PaginationModel, UserPreferencesService } from '@alfresco/adf-core'; import { SelectionChange, SelectionModel } from '@angular/cdk/collections'; import { TreeResponse } from '../models/tree-response.interface'; -import { MatCheckbox } from '@angular/material/checkbox'; +import { MatLegacyCheckbox as MatCheckbox } from '@angular/material/legacy-checkbox'; import { TreeContextMenuResult } from '../models/tree-context-menu-result.interface'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/content-services/src/lib/version-manager/version-list.component.spec.ts b/lib/content-services/src/lib/version-manager/version-list.component.spec.ts index 009f928eb4..dbe36988a2 100644 --- a/lib/content-services/src/lib/version-manager/version-list.component.spec.ts +++ b/lib/content-services/src/lib/version-manager/version-list.component.spec.ts @@ -19,7 +19,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { VersionListComponent } from './version-list.component'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { of } from 'rxjs'; import { Node, VersionPaging, NodeEntry, VersionEntry, Version } from '@alfresco/js-api'; import { ContentTestingModule } from '../testing/content.testing.module'; diff --git a/lib/content-services/src/lib/version-manager/version-list.component.ts b/lib/content-services/src/lib/version-manager/version-list.component.ts index 65e593d1b7..89a609ea22 100644 --- a/lib/content-services/src/lib/version-manager/version-list.component.ts +++ b/lib/content-services/src/lib/version-manager/version-list.component.ts @@ -18,7 +18,7 @@ import { AlfrescoApiService } from '@alfresco/adf-core'; import { Component, Input, OnChanges, ViewEncapsulation, EventEmitter, Output } from '@angular/core'; import { VersionsApi, Node, VersionEntry, VersionPaging, NodesApi, NodeEntry, ContentApi } from '@alfresco/js-api'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { ConfirmDialogComponent } from '../dialogs/confirm.dialog'; import { ContentVersionService } from './content-version.service'; import { ContentService } from '../common/services/content.service'; diff --git a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts index 886b8d1809..71d8991861 100644 --- a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts +++ b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts @@ -19,10 +19,10 @@ import { Location } from '@angular/common'; import { SpyLocation } from '@angular/common/testing'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AppExtensionService, ViewerExtensionRef } from '@alfresco/adf-extensions'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatIconModule } from '@angular/material/icon'; import { ContentInfo, Node, NodeEntry, VersionEntry } from '@alfresco/js-api'; import { AlfrescoViewerComponent, NodeActionsService, RenditionService } from '@alfresco/adf-content-services'; diff --git a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts index c6be71e932..7da737f696 100644 --- a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts +++ b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts @@ -45,7 +45,7 @@ import { import { Subject } from 'rxjs'; import { ContentApi, Node, NodeEntry, NodesApi, RenditionEntry, SharedlinksApi, Version, VersionEntry, VersionsApi } from '@alfresco/js-api'; import { RenditionService } from '../../common/services/rendition.service'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { filter, takeUntil } from 'rxjs/operators'; import { ContentService } from '../../common/services/content.service'; import { NodesApiService } from '../../common/services/nodes-api.service'; diff --git a/lib/core/breadcrumbs/src/_stories/breadcrumb.stories.ts b/lib/core/breadcrumbs/src/_stories/breadcrumb.stories.ts index 3217a96bf8..fc32eddd85 100644 --- a/lib/core/breadcrumbs/src/_stories/breadcrumb.stories.ts +++ b/lib/core/breadcrumbs/src/_stories/breadcrumb.stories.ts @@ -16,8 +16,8 @@ */ import { Meta, moduleMetadata, Story } from '@storybook/angular'; -import { MatButtonModule } from '@angular/material/button'; -import { MatMenuModule } from '@angular/material/menu'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatIconModule } from '@angular/material/icon'; import { BreadcrumbComponent } from '../components/breadcrumb/breadcrumb.component'; import { BreadcrumbItemComponent } from '../components/breadcrumb-item/breadcrumb-item.component'; diff --git a/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts b/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts index c19776ada0..3c62a453f6 100644 --- a/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts +++ b/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts @@ -17,9 +17,9 @@ import { AfterContentInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChildren, EventEmitter, Input, OnChanges, Output, QueryList, SimpleChanges, TemplateRef, ViewChildren } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatIconModule } from '@angular/material/icon'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { map, startWith } from 'rxjs/operators'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/core/custom-theme/theme/typography.scss b/lib/core/custom-theme/theme/typography.scss index d1a1273a92..3aaded4d53 100644 --- a/lib/core/custom-theme/theme/typography.scss +++ b/lib/core/custom-theme/theme/typography.scss @@ -3,7 +3,7 @@ @import '../variables/font-family'; @function get-mat-typography($base-font-size, $font-family) { - $custom-typography: mat.define-typography-config( + $custom-typography: mat.define-legacy-typography-configmat.define-legacy-typography-config( $font-family: $default-font-family, $display-4: mat.define-typography-level(112px, 112px, 300), $display-3: mat.define-typography-level(56px, 56px, 400), @@ -22,7 +22,7 @@ ); @if $base-font-size { - $custom-typography: mat.define-typography-config( + $custom-typography: mat.define-legacy-typography-configmat.define-legacy-typography-config( $display-4: mat.define-typography-level(8rem, 8rem, 300), $display-3: mat.define-typography-level(4rem, 4rem, 400), $display-2: mat.define-typography-level(3.21rem, 3.21rem, 400), diff --git a/lib/core/src/lib/auth/guard/auth-guard-base.ts b/lib/core/src/lib/auth/guard/auth-guard-base.ts index 7727fe546c..8240a3ab96 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-base.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-base.ts @@ -22,7 +22,7 @@ import { AppConfigValues } from '../../app-config/app-config.service'; import { OauthConfigModel } from '../models/oauth-config.model'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { StorageService } from '../../common/services/storage.service'; import { Observable } from 'rxjs'; import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service'; diff --git a/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts index 810d13e964..3163c85577 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts @@ -21,7 +21,7 @@ import { AuthGuardBpm } from './auth-guard-bpm.service'; import { AuthenticationService } from '../services/authentication.service'; import { RouterStateSnapshot, Router } from '@angular/router'; import { CoreTestingModule } from '../../testing/core.testing.module'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { TranslateModule } from '@ngx-translate/core'; import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service'; import { OidcAuthenticationService } from '../services/oidc-authentication.service'; diff --git a/lib/core/src/lib/auth/guard/auth-guard-bpm.service.ts b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.ts index 59a1a3457b..9d745e43c0 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-bpm.service.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.ts @@ -20,7 +20,7 @@ import { ActivatedRouteSnapshot, Router, UrlTree } from '@angular/router'; import { AppConfigService } from '../../app-config/app-config.service'; import { AuthenticationService } from '../services/authentication.service'; import { AuthGuardBase } from './auth-guard-base'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { StorageService } from '../../common/services/storage.service'; import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service'; import { OidcAuthenticationService } from '../services/oidc-authentication.service'; diff --git a/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts index e865954443..6bd19fb128 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts @@ -21,7 +21,7 @@ import { AuthGuardEcm } from './auth-guard-ecm.service'; import { AuthenticationService } from '../services/authentication.service'; import { RouterStateSnapshot, Router } from '@angular/router'; import { CoreTestingModule } from '../../testing/core.testing.module'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { TranslateModule } from '@ngx-translate/core'; import { OidcAuthenticationService } from '../services/oidc-authentication.service'; import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service'; diff --git a/lib/core/src/lib/auth/guard/auth-guard-ecm.service.ts b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.ts index 0621b528e1..54aa3e0f8c 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-ecm.service.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.ts @@ -22,7 +22,7 @@ import { import { AuthenticationService } from '../services/authentication.service'; import { AppConfigService } from '../../app-config/app-config.service'; import { AuthGuardBase } from './auth-guard-base'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { StorageService } from '../../common/services/storage.service'; import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service'; import { OidcAuthenticationService } from '../services/oidc-authentication.service'; diff --git a/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts index 31e3440c60..5107e2cc2b 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts @@ -20,7 +20,7 @@ import { ActivatedRouteSnapshot, Router } from '@angular/router'; import { CoreTestingModule } from '../../testing/core.testing.module'; import { AuthGuardSsoRoleService } from './auth-guard-sso-role.service'; import { JwtHelperService } from '../services/jwt-helper.service'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { TranslateModule } from '@ngx-translate/core'; describe('Auth Guard SSO role service', () => { diff --git a/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.ts b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.ts index c34ab4b948..2d9eeab7b9 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { UserAccessService } from '../services/user-access.service'; @Injectable({ diff --git a/lib/core/src/lib/auth/guard/auth-guard.service.ts b/lib/core/src/lib/auth/guard/auth-guard.service.ts index 23eb64f47a..86f9a68809 100644 --- a/lib/core/src/lib/auth/guard/auth-guard.service.ts +++ b/lib/core/src/lib/auth/guard/auth-guard.service.ts @@ -21,7 +21,7 @@ import { AuthenticationService } from '../services/authentication.service'; import { AppConfigService } from '../../app-config/app-config.service'; import { AuthGuardBase } from './auth-guard-base'; import { JwtHelperService } from '../services/jwt-helper.service'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { StorageService } from '../../common/services/storage.service'; import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service'; import { OidcAuthenticationService } from '../services/oidc-authentication.service'; diff --git a/lib/core/src/lib/buttons-menu/buttons-menu.component.ts b/lib/core/src/lib/buttons-menu/buttons-menu.component.ts index 8e4f21ecbf..a5bb0978ca 100644 --- a/lib/core/src/lib/buttons-menu/buttons-menu.component.ts +++ b/lib/core/src/lib/buttons-menu/buttons-menu.component.ts @@ -16,7 +16,7 @@ */ import { Component, ContentChildren, QueryList, AfterContentInit, ViewEncapsulation } from '@angular/core'; -import { MatMenuItem } from '@angular/material/menu'; +import { MatLegacyMenuItem as MatMenuItem } from '@angular/material/legacy-menu'; @Component({ selector: 'adf-buttons-action-menu', diff --git a/lib/core/src/lib/buttons-menu/buttons-menu.module.ts b/lib/core/src/lib/buttons-menu/buttons-menu.module.ts index bdf1c6f09c..44dda30763 100644 --- a/lib/core/src/lib/buttons-menu/buttons-menu.module.ts +++ b/lib/core/src/lib/buttons-menu/buttons-menu.module.ts @@ -19,8 +19,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { ButtonsMenuComponent } from './buttons-menu.component'; @NgModule({ diff --git a/lib/core/src/lib/card-view/card-view.module.ts b/lib/core/src/lib/card-view/card-view.module.ts index af328e99fd..ee379990f3 100644 --- a/lib/core/src/lib/card-view/card-view.module.ts +++ b/lib/core/src/lib/card-view/card-view.module.ts @@ -18,19 +18,19 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MatButtonModule } from '@angular/material/button'; -import { MatCardModule } from '@angular/material/card'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatChipsModule } from '@angular/material/chips'; +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 { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; import { MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIconModule } from '@angular/material/icon'; -import { MatInputModule } from '@angular/material/input'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatSelectModule } from '@angular/material/select'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatTableModule } from '@angular/material/table'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; +import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; +import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts index 8eba3158be..137422bb6e 100644 --- a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts @@ -25,8 +25,8 @@ import { TranslateModule } from '@ngx-translate/core'; import { CardViewUpdateService } from '../../services/card-view-update.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatChipHarness, MatChipListHarness } from '@angular/material/chips/testing'; -import { MatButtonHarness } from '@angular/material/button/testing'; +import { MatLegacyChipHarness as MatChipHarness, MatLegacyChipListHarness as MatChipListHarness } from '@angular/material/legacy-chips/testing'; +import { MatLegacyButtonHarness as MatButtonHarness } from '@angular/material/legacy-button/testing'; import { MatIconHarness } from '@angular/material/icon/testing'; describe('CardViewArrayItemComponent', () => { diff --git a/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts index 5dd121da2a..88b57ff930 100644 --- a/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { MatCheckbox, MatCheckboxChange } from '@angular/material/checkbox'; +import { MatLegacyCheckbox as MatCheckbox, MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-checkbox'; import { CardViewUpdateService } from '../../services/card-view-update.service'; import { CardViewBoolItemComponent } from './card-view-boolitem.component'; import { CardViewBoolItemModel } from '../../models/card-view-boolitem.model'; diff --git a/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.ts b/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.ts index 8d36313b57..ba2791a3e4 100644 --- a/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { MatCheckboxChange } from '@angular/material/checkbox'; import { CardViewBoolItemModel } from '../../models/card-view-boolitem.model'; import { BaseCardView } from '../base-card-view'; @@ -33,6 +33,13 @@ import { BaseCardView } from '../base-card-view'; }) export class CardViewBoolItemComponent extends BaseCardView { + @Input() + editable: boolean; + + isEditable() { + return this.editable && this.property.editable; + } + changed(change: MatCheckboxChange) { this.cardViewUpdateService.update({ ...this.property } as CardViewBoolItemModel, change.checked ); this.property.value = change.checked; diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts index bb85bc7b36..87fdda9f3d 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts @@ -28,7 +28,7 @@ import { AppConfigService } from '@alfresco/adf-core'; import { MatDatetimepickerInputEvent } from '@mat-datetimepicker/core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatChipHarness } from '@angular/material/chips/testing'; +import { MatLegacyChipHarness as MatChipHarness } from '@angular/material/legacy-chips/testing'; describe('CardViewDateItemComponent', () => { let loader: HarnessLoader; diff --git a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts index 0e13fbe092..f028cb43f2 100644 --- a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts @@ -18,7 +18,7 @@ import { Component, OnChanges, ViewEncapsulation } from '@angular/core'; import { CardViewKeyValuePairsItemModel } from '../../models/card-view.models'; import { CardViewKeyValuePairsItemType } from '../../interfaces/card-view.interfaces'; -import { MatTableDataSource } from '@angular/material/table'; +import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table'; import { BaseCardView } from '../base-card-view'; @Component({ diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts index 9421959f39..4e0c7a3cf4 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts @@ -25,7 +25,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { AppConfigService } from '../../../app-config/app-config.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSelectHarness } from '@angular/material/select/testing'; +import { MatLegacySelectHarness as MatSelectHarness } from '@angular/material/legacy-select/testing'; describe('CardViewSelectItemComponent', () => { let loader: HarnessLoader; diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.ts index 89761a2138..77c8b16314 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.ts @@ -19,7 +19,7 @@ import { Component, Input, OnChanges, OnDestroy, OnInit, inject, ViewEncapsulati import { CardViewSelectItemModel } from '../../models/card-view-selectitem.model'; import { BehaviorSubject, combineLatest, Observable } from 'rxjs'; import { CardViewSelectItemOption } from '../../interfaces/card-view.interfaces'; -import { MatSelectChange } from '@angular/material/select'; +import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; import { BaseCardView } from '../base-card-view'; import { AppConfigService } from '../../../app-config/app-config.service'; import { takeUntil, map } from 'rxjs/operators'; diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts index be3d2fcc10..09be6937c9 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CoreTestingModule } from '../../../../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; import { SelectFilterInputComponent } from './select-filter-input.component'; -import { MatSelect } from '@angular/material/select'; +import { MatLegacySelect as MatSelect } from '@angular/material/legacy-select'; describe('SelectFilterInputComponent', () => { let fixture: ComponentFixture; diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts index 6fc1a02ce2..99c45923c3 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts @@ -16,7 +16,7 @@ */ import { Component, ViewEncapsulation, ViewChild, ElementRef, OnDestroy, Inject, Output, EventEmitter, OnInit } from '@angular/core'; -import { MatSelect } from '@angular/material/select'; +import { MatLegacySelect as MatSelect } from '@angular/material/legacy-select'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts index 9a05e55e86..26608c1ed4 100644 --- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts @@ -25,14 +25,14 @@ import { CardViewItemFloatValidator } from '../../validators/card-view-item-floa import { CardViewItemIntValidator } from '../../validators/card-view-item-int.validator'; import { CardViewIntItemModel } from '../../models/card-view-intitem.model'; import { CardViewFloatItemModel } from '../../models/card-view-floatitem.model'; -import { MatChipsModule } from '@angular/material/chips'; +import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; import { ClipboardService } from '../../../clipboard/clipboard.service'; import { SimpleChange } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { CardViewItemValidator } from '../../interfaces/card-view-item-validator.interface'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatChipHarness, MatChipListHarness } from '@angular/material/chips/testing'; +import { MatLegacyChipHarness as MatChipHarness, MatLegacyChipListHarness as MatChipListHarness } from '@angular/material/legacy-chips/testing'; describe('CardViewTextItemComponent', () => { let loader: HarnessLoader; diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts index cbcbeeaa75..fe031a1bdb 100644 --- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts @@ -18,7 +18,7 @@ import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { CardViewTextItemModel } from '../../models/card-view-textitem.model'; import { BaseCardView } from '../base-card-view'; -import { MatChipInputEvent } from '@angular/material/chips'; +import { MatLegacyChipInputEvent as MatChipInputEvent } from '@angular/material/legacy-chips'; import { ClipboardService } from '../../../clipboard/clipboard.service'; import { TranslationService } from '../../../translation/translation.service'; import { CardViewItemValidator } from '../../interfaces/card-view-item-validator.interface'; diff --git a/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts b/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts index 4b6e81b81b..302d10149f 100644 --- a/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts @@ -29,7 +29,7 @@ import { CardViewItem } from '../../interfaces/card-view-item.interface'; import { CardViewItemDispatcherComponent } from '../card-view-item-dispatcher/card-view-item-dispatcher.component'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSelectHarness } from '@angular/material/select/testing'; +import { MatLegacySelectHarness as MatSelectHarness } from '@angular/material/legacy-select/testing'; describe('CardViewComponent', () => { let loader: HarnessLoader; diff --git a/lib/core/src/lib/clipboard/clipboard.service.spec.ts b/lib/core/src/lib/clipboard/clipboard.service.spec.ts index cd5ee501f9..1f713eda18 100644 --- a/lib/core/src/lib/clipboard/clipboard.service.spec.ts +++ b/lib/core/src/lib/clipboard/clipboard.service.spec.ts @@ -18,7 +18,7 @@ import { NotificationService } from '../notifications/services/notification.service'; import { TestBed } from '@angular/core/testing'; import { ClipboardService } from './clipboard.service'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; import { CoreTestingModule } from '../testing'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/core/src/lib/comments/comment-list/comment-list.module.ts b/lib/core/src/lib/comments/comment-list/comment-list.module.ts index 3fed2dfa8e..3708b12fc3 100644 --- a/lib/core/src/lib/comments/comment-list/comment-list.module.ts +++ b/lib/core/src/lib/comments/comment-list/comment-list.module.ts @@ -18,10 +18,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; -import { MatButtonModule } from '@angular/material/button'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatListModule } from '@angular/material/list'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLineModule } from '@angular/material/core'; import { FormsModule } from '@angular/forms'; import { PipeModule } from '../../pipes/pipe.module'; diff --git a/lib/core/src/lib/comments/comments.module.ts b/lib/core/src/lib/comments/comments.module.ts index 4a659c5a20..f9a576f743 100644 --- a/lib/core/src/lib/comments/comments.module.ts +++ b/lib/core/src/lib/comments/comments.module.ts @@ -18,10 +18,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; -import { MatButtonModule } from '@angular/material/button'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatListModule } from '@angular/material/list'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLineModule } from '@angular/material/core'; import { FormsModule } from '@angular/forms'; import { PipeModule } from '../pipes/pipe.module'; diff --git a/lib/core/src/lib/context-menu/context-menu-list.component.ts b/lib/core/src/lib/context-menu/context-menu-list.component.ts index 676cafe282..27e3a6a9ce 100644 --- a/lib/core/src/lib/context-menu/context-menu-list.component.ts +++ b/lib/core/src/lib/context-menu/context-menu-list.component.ts @@ -19,7 +19,7 @@ import { Component, ViewEncapsulation, HostListener, AfterViewInit, Optional, In import { trigger } from '@angular/animations'; import { DOWN_ARROW, UP_ARROW } from '@angular/cdk/keycodes'; import { FocusKeyManager } from '@angular/cdk/a11y'; -import { MatMenuItem } from '@angular/material/menu'; +import { MatLegacyMenuItem as MatMenuItem } from '@angular/material/legacy-menu'; import { ContextMenuOverlayRef } from './context-menu-overlay'; import { contextMenuAnimation } from './animations'; import { CONTEXT_MENU_DATA } from './context-menu.tokens'; diff --git a/lib/core/src/lib/core.module.ts b/lib/core/src/lib/core.module.ts index 60fc0a87ce..50e74b17f8 100644 --- a/lib/core/src/lib/core.module.ts +++ b/lib/core/src/lib/core.module.ts @@ -57,7 +57,7 @@ import { AdfHttpClient } from '@alfresco/adf-core/api'; import { AuthenticationInterceptor, Authentication } from '@alfresco/adf-core/auth'; import { HttpClientModule, HttpClientXsrfModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { AuthenticationService } from './auth/services/authentication.service'; -import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar'; +import { MAT_LEGACY_SNACK_BAR_DEFAULT_OPTIONS as MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/legacy-snack-bar'; import { IdentityUserInfoModule } from './identity-user-info/identity-user-info.module'; import { loadAppConfig } from './app-config/app-config.loader'; import { AppConfigService } from './app-config/app-config.service'; diff --git a/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.spec.ts b/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.spec.ts index 790fbf1766..d40847eaeb 100644 --- a/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.spec.ts +++ b/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.spec.ts @@ -19,13 +19,13 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testin import { ColumnsSelectorComponent } from './columns-selector.component'; import { DataColumn } from '../../data/data-column.model'; import { Observable, Subject } from 'rxjs'; -import { MatMenuTrigger } from '@angular/material/menu'; +import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; import { CoreTestingModule } from '../../../testing'; import { TranslateModule } from '@ngx-translate/core'; import { By } from '@angular/platform-browser'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { HarnessLoader } from '@angular/cdk/testing'; -import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; +import { MatLegacyCheckboxHarness as MatCheckboxHarness } from '@angular/material/legacy-checkbox/testing'; describe('ColumnsSelectorComponent', () => { let fixture: ComponentFixture; diff --git a/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.ts b/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.ts index 4761768fb3..172878bdaa 100644 --- a/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.ts +++ b/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.ts @@ -17,7 +17,7 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; -import { MatMenuTrigger } from '@angular/material/menu'; +import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; import { Subject } from 'rxjs'; import { debounceTime, takeUntil } from 'rxjs/operators'; import { DataColumn } from '../../data/data-column.model'; diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts index baa2c4a103..2eb4b5cd53 100644 --- a/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts +++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts @@ -17,7 +17,7 @@ import { Component, NO_ERRORS_SCHEMA, QueryList, SimpleChange, TemplateRef, ViewChild } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { MatCheckboxChange } from '@angular/material/checkbox'; +import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-checkbox'; import { DataColumn } from '../../data/data-column.model'; import { DataRow } from '../../data/data-row.model'; import { DataSorting } from '../../data/data-sorting.model'; diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.stories.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.stories.ts index 2da1bbeea5..8e2679556b 100644 --- a/lib/core/src/lib/datatable/components/datatable/datatable.component.stories.ts +++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.stories.ts @@ -21,7 +21,7 @@ import { DataTableComponent } from './datatable.component'; import { DataTableModule } from '../../datatable.module'; import { RouterTestingModule } from '@angular/router/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; import { mockPathInfos } from '../mocks/datatable.mock'; export default { diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.ts index b76d6ec685..942ce6b479 100644 --- a/lib/core/src/lib/datatable/components/datatable/datatable.component.ts +++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.ts @@ -40,8 +40,8 @@ import { ViewEncapsulation } from '@angular/core'; import { FocusKeyManager } from '@angular/cdk/a11y'; -import { MatCheckboxChange } from '@angular/material/checkbox'; -import { MatMenuTrigger } from '@angular/material/menu'; +import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-checkbox'; +import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; import { Observable, Observer, Subscription } from 'rxjs'; import { DataColumnListComponent } from '../../data-column/data-column-list.component'; import { DataColumn } from '../../data/data-column.model'; diff --git a/lib/core/src/lib/datatable/components/json-cell/json-cell.component.spec.ts b/lib/core/src/lib/datatable/components/json-cell/json-cell.component.spec.ts index 0a943730b5..a05237ad5b 100644 --- a/lib/core/src/lib/datatable/components/json-cell/json-cell.component.spec.ts +++ b/lib/core/src/lib/datatable/components/json-cell/json-cell.component.spec.ts @@ -23,7 +23,7 @@ import { JsonCellComponent } from './json-cell.component'; import { TranslateModule } from '@ngx-translate/core'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { HarnessLoader } from '@angular/cdk/testing'; -import { MatButtonHarness } from '@angular/material/button/testing'; +import { MatLegacyButtonHarness as MatButtonHarness } from '@angular/material/legacy-button/testing'; describe('JsonCellComponent', () => { let loader: HarnessLoader; diff --git a/lib/core/src/lib/datatable/components/json-cell/json-cell.component.ts b/lib/core/src/lib/datatable/components/json-cell/json-cell.component.ts index 4261aab84b..644b4dbd47 100644 --- a/lib/core/src/lib/datatable/components/json-cell/json-cell.component.ts +++ b/lib/core/src/lib/datatable/components/json-cell/json-cell.component.ts @@ -17,7 +17,7 @@ import { ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation, Input } from '@angular/core'; import { DataTableCellComponent } from '../datatable-cell/datatable-cell.component'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { EditJsonDialogComponent, EditJsonDialogSettings } from '../../../dialogs/edit-json/edit-json.dialog'; @Component({ diff --git a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.module.ts b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.module.ts index a0edcee367..58958d434d 100644 --- a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.module.ts +++ b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.module.ts @@ -20,8 +20,8 @@ import { EditJsonDialogComponent } from './edit-json.dialog'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; @NgModule({ declarations: [EditJsonDialogComponent], imports: [ diff --git a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.component.ts b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.component.ts index 0a65e25e0b..ed5596d7ff 100644 --- a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.component.ts +++ b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.component.ts @@ -16,7 +16,7 @@ */ import { Component, OnInit, OnChanges, Input } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { EditJsonDialogComponent, EditJsonDialogSettings diff --git a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.ts b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.ts index 05df07e361..8d2a51c281 100644 --- a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.ts +++ b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.ts @@ -19,7 +19,7 @@ import { Meta, moduleMetadata, Story } from '@storybook/angular'; import { CoreStoryModule } from '../../testing/core.story.module'; import { EditJsonDialogModule } from './edit-json.dialog.module'; import { EditJsonDialogStorybookComponent } from './edit-json.dialog.stories.component'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; const jsonData = { maxValue: 50, diff --git a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.ts b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.ts index 4855529930..c01f8bed0e 100644 --- a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.ts +++ b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, OnInit, Input, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; export interface EditJsonDialogSettings { title?: string; diff --git a/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts b/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts index a1a98c49a8..b946f7ade3 100644 --- a/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts +++ b/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts @@ -18,7 +18,7 @@ import { Component, ViewChild } from '@angular/core'; import { ComponentFixture, fakeAsync, flush, TestBed } from '@angular/core/testing'; import { InfiniteSelectScrollDirective } from './infinite-select-scroll.directive'; -import { MatSelect, MatSelectModule } from '@angular/material/select'; +import { MatLegacySelect as MatSelect, MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; @Component({ diff --git a/lib/core/src/lib/directives/infinite-select-scroll.directive.ts b/lib/core/src/lib/directives/infinite-select-scroll.directive.ts index ab59aaf451..905fce56bf 100644 --- a/lib/core/src/lib/directives/infinite-select-scroll.directive.ts +++ b/lib/core/src/lib/directives/infinite-select-scroll.directive.ts @@ -16,7 +16,7 @@ */ import { Inject, AfterViewInit, Directive, EventEmitter, OnDestroy, Output } from '@angular/core'; -import { MatSelect } from '@angular/material/select'; +import { MatLegacySelect as MatSelect } from '@angular/material/legacy-select'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts b/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts index db9040c8d0..7f7a7d0bdc 100644 --- a/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts @@ -25,9 +25,9 @@ import { TranslateModule } from '@ngx-translate/core'; import { FormModel } from '../core/form.model'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatTooltipHarness } from '@angular/material/tooltip/testing'; -import { MatInputHarness } from '@angular/material/input/testing'; -import { MatFormFieldHarness } from '@angular/material/form-field/testing'; +import { MatLegacyTooltipHarness as MatTooltipHarness } from '@angular/material/legacy-tooltip/testing'; +import { MatLegacyInputHarness as MatInputHarness } from '@angular/material/legacy-input/testing'; +import { MatLegacyFormFieldHarness as MatFormFieldHarness } from '@angular/material/legacy-form-field/testing'; describe('AmountWidgetComponent', () => { let loader: HarnessLoader; diff --git a/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.spec.ts b/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.spec.ts index db2ea90384..d44a6ce2c0 100644 --- a/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.spec.ts @@ -23,13 +23,13 @@ import { CheckboxWidgetComponent } from './checkbox.widget'; import { FormBaseModule } from '../../../form-base.module'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderService } from '../../../../translation/translate-loader.service'; -import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { CoreTestingModule } from '../../../../testing'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; -import { MatTooltipHarness } from '@angular/material/tooltip/testing'; +import { MatLegacyCheckboxHarness as MatCheckboxHarness } from '@angular/material/legacy-checkbox/testing'; +import { MatLegacyTooltipHarness as MatTooltipHarness } from '@angular/material/legacy-tooltip/testing'; describe('CheckboxWidgetComponent', () => { let loader: HarnessLoader; diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts index d2b26da973..881b36054c 100644 --- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts @@ -21,13 +21,13 @@ import { FormModel } from '../core/form.model'; import { DateTimeWidgetComponent } from './date-time.widget'; import { CoreTestingModule } from '../../../../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { FormFieldTypes } from '../core/form-field-types'; import { DateFieldValidator, DateTimeFieldValidator } from '../core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatTooltipHarness } from '@angular/material/tooltip/testing'; -import { MatInputHarness } from '@angular/material/input/testing'; +import { MatLegacyTooltipHarness as MatTooltipHarness } from '@angular/material/legacy-tooltip/testing'; +import { MatLegacyInputHarness as MatInputHarness } from '@angular/material/legacy-input/testing'; describe('DateTimeWidgetComponent', () => { let loader: HarnessLoader; diff --git a/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.spec.ts b/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.spec.ts index 9b9e2b2f92..0367fc1698 100644 --- a/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.spec.ts @@ -22,7 +22,7 @@ import { FormModel } from '../core/form.model'; import { HyperlinkWidgetComponent } from './hyperlink.widget'; import { CoreTestingModule } from '../../../../testing'; import { TranslateModule } from '@ngx-translate/core'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; describe('HyperlinkWidgetComponent', () => { diff --git a/lib/core/src/lib/form/components/widgets/json/json.widget.ts b/lib/core/src/lib/form/components/widgets/json/json.widget.ts index 502f2c6503..48d1f39329 100644 --- a/lib/core/src/lib/form/components/widgets/json/json.widget.ts +++ b/lib/core/src/lib/form/components/widgets/json/json.widget.ts @@ -18,7 +18,7 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { FormService } from '../../../services/form.service'; import { WidgetComponent } from '../widget.component'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { EditJsonDialogSettings, EditJsonDialogComponent } from '../../../../dialogs/edit-json/edit-json.dialog'; @Component({ diff --git a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts b/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts index 533057a3d9..18551008f4 100644 --- a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts @@ -24,8 +24,8 @@ import { FormModel } from '../core/form.model'; import { FormFieldTypes } from '../core/form-field-types'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatInputHarness } from '@angular/material/input/testing'; -import { MatTooltipHarness } from '@angular/material/tooltip/testing'; +import { MatLegacyInputHarness as MatInputHarness } from '@angular/material/legacy-input/testing'; +import { MatLegacyTooltipHarness as MatTooltipHarness } from '@angular/material/legacy-tooltip/testing'; describe('MultilineTextWidgetComponentComponent', () => { let loader: HarnessLoader; diff --git a/lib/core/src/lib/form/components/widgets/number/number.widget.spec.ts b/lib/core/src/lib/form/components/widgets/number/number.widget.spec.ts index 96841b829c..8580f5dd4f 100644 --- a/lib/core/src/lib/form/components/widgets/number/number.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/number/number.widget.spec.ts @@ -18,15 +18,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; -import { MatInputModule } from '@angular/material/input'; +import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { TranslateModule } from '@ngx-translate/core'; import { CoreTestingModule } from '../../../../testing'; import { FormFieldModel, FormFieldTypes, FormModel } from '../core'; import { NumberWidgetComponent } from './number.widget'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatInputHarness } from '@angular/material/input/testing'; -import { MatTooltipHarness } from '@angular/material/tooltip/testing'; +import { MatLegacyInputHarness as MatInputHarness } from '@angular/material/legacy-input/testing'; +import { MatLegacyTooltipHarness as MatTooltipHarness } from '@angular/material/legacy-tooltip/testing'; describe('NumberWidgetComponent', () => { let loader: HarnessLoader; diff --git a/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts b/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts index 1c4fa226cc..dd33d4ff05 100644 --- a/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts @@ -22,14 +22,14 @@ import { FormModel } from '../core/form.model'; import { TextWidgetComponent } from './text.widget'; import { FormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; -import { MatInputModule } from '@angular/material/input'; +import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { CoreTestingModule } from '../../../../testing'; import { TranslateModule } from '@ngx-translate/core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatInputHarness } from '@angular/material/input/testing'; -import { MatFormFieldHarness } from '@angular/material/form-field/testing'; -import { MatTooltipHarness } from '@angular/material/tooltip/testing'; +import { MatLegacyInputHarness as MatInputHarness } from '@angular/material/legacy-input/testing'; +import { MatLegacyFormFieldHarness as MatFormFieldHarness } from '@angular/material/legacy-form-field/testing'; +import { MatLegacyTooltipHarness as MatTooltipHarness } from '@angular/material/legacy-tooltip/testing'; describe('TextWidgetComponent', () => { const form = new FormModel({ taskId: 'fake-task-id' }); diff --git a/lib/core/src/lib/identity-user-info/identity-user-info.component.spec.ts b/lib/core/src/lib/identity-user-info/identity-user-info.component.spec.ts index 703a8ea1da..f6f6217bcd 100644 --- a/lib/core/src/lib/identity-user-info/identity-user-info.component.spec.ts +++ b/lib/core/src/lib/identity-user-info/identity-user-info.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { IdentityUserInfoComponent } from './identity-user-info.component'; import { TranslateModule } from '@ngx-translate/core'; import { CoreTestingModule } from '../testing/core.testing.module'; -import { MatMenuModule } from '@angular/material/menu'; +import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { By } from '@angular/platform-browser'; import { IdentityUserModel } from '../auth/models/identity-user.model'; diff --git a/lib/core/src/lib/identity-user-info/identity-user-info.component.ts b/lib/core/src/lib/identity-user-info/identity-user-info.component.ts index e42ec0674c..023e330cc1 100644 --- a/lib/core/src/lib/identity-user-info/identity-user-info.component.ts +++ b/lib/core/src/lib/identity-user-info/identity-user-info.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, OnDestroy, ViewChild, ViewEncapsulation } from '@angular/core'; -import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu'; +import { MatLegacyMenuTrigger as MatMenuTrigger, LegacyMenuPositionX as MenuPositionX, LegacyMenuPositionY as MenuPositionY } from '@angular/material/legacy-menu'; import { IdentityUserModel } from '../auth/models/identity-user.model'; import { Subject } from 'rxjs'; diff --git a/lib/core/src/lib/identity-user-info/identity-user-info.module.ts b/lib/core/src/lib/identity-user-info/identity-user-info.module.ts index 9f5d86162f..2f28ef02f3 100644 --- a/lib/core/src/lib/identity-user-info/identity-user-info.module.ts +++ b/lib/core/src/lib/identity-user-info/identity-user-info.module.ts @@ -18,10 +18,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { IdentityUserInfoComponent } from './identity-user-info.component'; -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 { 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 { TranslateModule } from '@ngx-translate/core'; import { PipeModule } from '../pipes/pipe.module'; diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.spec.ts b/lib/core/src/lib/info-drawer/info-drawer.component.spec.ts index fa0496b1ab..fb3c9d950c 100644 --- a/lib/core/src/lib/info-drawer/info-drawer.component.spec.ts +++ b/lib/core/src/lib/info-drawer/info-drawer.component.spec.ts @@ -17,7 +17,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatTabChangeEvent } from '@angular/material/tabs'; +import { MatLegacyTabChangeEvent as MatTabChangeEvent } from '@angular/material/legacy-tabs'; import { By } from '@angular/platform-browser'; import { InfoDrawerComponent } from './info-drawer.component'; import { of } from 'rxjs'; diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.ts b/lib/core/src/lib/info-drawer/info-drawer.component.ts index f6fda8b975..8db48a56aa 100644 --- a/lib/core/src/lib/info-drawer/info-drawer.component.ts +++ b/lib/core/src/lib/info-drawer/info-drawer.component.ts @@ -16,7 +16,7 @@ */ import { Component, ContentChildren, EventEmitter, HostListener, Input, Output, QueryList, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core'; -import { MatTabChangeEvent } from '@angular/material/tabs'; +import { MatLegacyTabChangeEvent as MatTabChangeEvent } from '@angular/material/legacy-tabs'; @Component({ selector: 'adf-info-drawer-tab', template: '', diff --git a/lib/core/src/lib/info-drawer/info-drawer.module.ts b/lib/core/src/lib/info-drawer/info-drawer.module.ts index b12fb3aba4..0a813ecb27 100644 --- a/lib/core/src/lib/info-drawer/info-drawer.module.ts +++ b/lib/core/src/lib/info-drawer/info-drawer.module.ts @@ -21,8 +21,8 @@ import { InfoDrawerLayoutComponent, InfoDrawerTitleDirective, InfoDrawerButtonsD import { InfoDrawerComponent, InfoDrawerTabComponent } from './info-drawer.component'; import { TranslateModule } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; -import { MatTabsModule } from '@angular/material/tabs'; -import { MatCardModule } from '@angular/material/card'; +import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs'; +import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; @NgModule({ imports: [ diff --git a/lib/core/src/lib/language-menu/language-menu.module.ts b/lib/core/src/lib/language-menu/language-menu.module.ts index b19a837714..8791eebbbb 100644 --- a/lib/core/src/lib/language-menu/language-menu.module.ts +++ b/lib/core/src/lib/language-menu/language-menu.module.ts @@ -19,9 +19,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; -import { MatMenuModule } from '@angular/material/menu'; +import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatIconModule } from '@angular/material/icon'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { LanguageMenuComponent } from './language-menu.component'; import { LanguagePickerComponent } from './language-picker.component'; diff --git a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.stories.ts b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.stories.ts index 30c4725afd..dde389bc0f 100644 --- a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.stories.ts +++ b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.stories.ts @@ -19,7 +19,7 @@ import { Meta, moduleMetadata, Story } from '@storybook/angular'; import { CoreStoryModule } from '../../../testing/core.story.module'; import { SidenavLayoutModule } from '../../layout.module'; import { SidenavLayoutComponent } from './sidenav-layout.component'; -import { MatListModule } from '@angular/material/list'; +import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatIconModule } from '@angular/material/icon'; import { RouterTestingModule } from '@angular/router/testing'; diff --git a/lib/core/src/lib/login/components/login-dialog.component.stories.ts b/lib/core/src/lib/login/components/login-dialog.component.stories.ts index 550c79971a..d9d625c09f 100644 --- a/lib/core/src/lib/login/components/login-dialog.component.stories.ts +++ b/lib/core/src/lib/login/components/login-dialog.component.stories.ts @@ -20,7 +20,7 @@ import { CoreStoryModule } from '../../testing/core.story.module'; import { RouterTestingModule } from '@angular/router/testing'; import { LoginModule } from './../login.module'; import { LoginDialogStorybookComponent } from './login-dialog.stories.component'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { AuthenticationService } from '../../auth/services/authentication.service'; import { AuthenticationMock } from '../../auth/mock/authentication.service.mock'; diff --git a/lib/core/src/lib/login/components/login-dialog.component.ts b/lib/core/src/lib/login/components/login-dialog.component.ts index 4952db14c5..022b855e73 100644 --- a/lib/core/src/lib/login/components/login-dialog.component.ts +++ b/lib/core/src/lib/login/components/login-dialog.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, ViewEncapsulation, ViewChild } from '@angular/core'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; import { LoginDialogComponentData } from './login-dialog-component-data.interface'; import { LoginDialogPanelComponent } from './login-dialog-panel.component'; @Component({ diff --git a/lib/core/src/lib/login/components/login-dialog.stories.component.ts b/lib/core/src/lib/login/components/login-dialog.stories.component.ts index 011f40958d..c7108ea8a9 100644 --- a/lib/core/src/lib/login/components/login-dialog.stories.component.ts +++ b/lib/core/src/lib/login/components/login-dialog.stories.component.ts @@ -16,7 +16,7 @@ */ import { Component, Output, EventEmitter } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { Subject } from 'rxjs'; import { LoginDialogComponent } from './login-dialog.component'; import { LoginDialogComponentData } from './login-dialog-component-data.interface'; diff --git a/lib/core/src/lib/material.module.ts b/lib/core/src/lib/material.module.ts index d836fa365a..7cdc3f7167 100644 --- a/lib/core/src/lib/material.module.ts +++ b/lib/core/src/lib/material.module.ts @@ -18,31 +18,32 @@ import { NgModule } from '@angular/core'; import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatButtonModule } from '@angular/material/button'; -import { MatCardModule } from '@angular/material/card'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatChipsModule } from '@angular/material/chips'; -import { MatNativeDateModule, MatOptionModule, MatRippleModule } from '@angular/material/core'; +import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete'; +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 { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; +import { MatNativeDateModule, MatRippleModule } from '@angular/material/core'; +import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatDialogModule } from '@angular/material/dialog'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; -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 { 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 { MatSidenavModule } from '@angular/material/sidenav'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { MatTableModule } from '@angular/material/table'; -import { MatTabsModule } from '@angular/material/tabs'; +import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; +import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; +import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; +import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { MatBadgeModule } from '@angular/material/badge'; @NgModule({ diff --git a/lib/core/src/lib/notifications/services/notification.service.spec.ts b/lib/core/src/lib/notifications/services/notification.service.spec.ts index 94ada59f58..357f415965 100644 --- a/lib/core/src/lib/notifications/services/notification.service.spec.ts +++ b/lib/core/src/lib/notifications/services/notification.service.spec.ts @@ -17,7 +17,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatSnackBarConfig, MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatLegacySnackBarConfig as MatSnackBarConfig, MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; import { NotificationService } from './notification.service'; import { TranslationService } from '../../translation/translation.service'; import { CoreTestingModule } from '../../testing/core.testing.module'; @@ -25,7 +25,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatIconHarness } from '@angular/material/icon/testing'; -import { MatSnackBarHarness } from '@angular/material/snack-bar/testing'; +import { MatLegacySnackBarHarness as MatSnackBarHarness } from '@angular/material/legacy-snack-bar/testing'; @Component({ template: '', diff --git a/lib/core/src/lib/notifications/services/notification.service.ts b/lib/core/src/lib/notifications/services/notification.service.ts index 1d47f45863..416d1eb0a1 100644 --- a/lib/core/src/lib/notifications/services/notification.service.ts +++ b/lib/core/src/lib/notifications/services/notification.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { MatSnackBar, MatSnackBarRef, MatSnackBarConfig } from '@angular/material/snack-bar'; +import { MatLegacySnackBar as MatSnackBar, MatLegacySnackBarRef as MatSnackBarRef, MatLegacySnackBarConfig as MatSnackBarConfig } from '@angular/material/legacy-snack-bar'; import { TranslationService } from '../../translation/translation.service'; import { Subject } from 'rxjs'; import { NotificationModel } from '../models/notification.model'; diff --git a/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts b/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts index d9bff92a83..9cda984890 100644 --- a/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts +++ b/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts @@ -17,8 +17,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatIcon, MatIconModule } from '@angular/material/icon'; -import { MAT_SNACK_BAR_DATA, MatSnackBarModule, MatSnackBarRef } from '@angular/material/snack-bar'; -import { MatButtonModule } from '@angular/material/button'; +import { MAT_LEGACY_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA, MatLegacySnackBarModule as MatSnackBarModule, MatLegacySnackBarRef as MatSnackBarRef } from '@angular/material/legacy-snack-bar'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; import { SnackbarContentComponent } from './snackbar-content.component'; diff --git a/lib/core/src/lib/snackbar-content/snackbar-content.component.ts b/lib/core/src/lib/snackbar-content/snackbar-content.component.ts index e89fdc1e9e..306216d98f 100644 --- a/lib/core/src/lib/snackbar-content/snackbar-content.component.ts +++ b/lib/core/src/lib/snackbar-content/snackbar-content.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject } from '@angular/core'; -import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from '@angular/material/snack-bar'; +import { MAT_LEGACY_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA, MatLegacySnackBarRef as MatSnackBarRef } from '@angular/material/legacy-snack-bar'; import { SnackBarData } from './snack-bar-data'; @Component({ diff --git a/lib/core/src/lib/snackbar-content/snackbar-content.module.ts b/lib/core/src/lib/snackbar-content/snackbar-content.module.ts index 957672c886..58116e50bc 100644 --- a/lib/core/src/lib/snackbar-content/snackbar-content.module.ts +++ b/lib/core/src/lib/snackbar-content/snackbar-content.module.ts @@ -19,8 +19,8 @@ import { NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { CommonModule } from '@angular/common'; import { SnackbarContentComponent } from './snackbar-content.component'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { TranslateModule } from '@ngx-translate/core'; @NgModule({ diff --git a/lib/core/src/lib/sorting-picker/sorting-picker.component.ts b/lib/core/src/lib/sorting-picker/sorting-picker.component.ts index 72d09ea8fa..c1e4a9a6a7 100644 --- a/lib/core/src/lib/sorting-picker/sorting-picker.component.ts +++ b/lib/core/src/lib/sorting-picker/sorting-picker.component.ts @@ -16,7 +16,7 @@ */ import { Component, ViewEncapsulation, Input, EventEmitter, Output } from '@angular/core'; -import { MatSelectChange } from '@angular/material/select'; +import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; @Component({ selector: 'adf-sorting-picker', diff --git a/lib/core/src/lib/sorting-picker/sorting-picker.module.ts b/lib/core/src/lib/sorting-picker/sorting-picker.module.ts index 51f6fd49ac..fe0873d9b1 100644 --- a/lib/core/src/lib/sorting-picker/sorting-picker.module.ts +++ b/lib/core/src/lib/sorting-picker/sorting-picker.module.ts @@ -20,8 +20,8 @@ import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { SortingPickerComponent } from './sorting-picker.component'; import { MatIconModule } from '@angular/material/icon'; -import { MatButtonModule } from '@angular/material/button'; -import { MatSelectModule } from '@angular/material/select'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; @NgModule({ imports: [ diff --git a/lib/core/src/lib/styles/_typography.scss b/lib/core/src/lib/styles/_typography.scss index 43b6244fa0..23930b6e8b 100644 --- a/lib/core/src/lib/styles/_typography.scss +++ b/lib/core/src/lib/styles/_typography.scss @@ -1,6 +1,6 @@ @use '@angular/material' as mat; -$alfresco-typography: mat.define-typography-config( +$alfresco-typography: mat.define-legacy-typography-config( $font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif', $display-4: mat.define-typography-level(112px, 112px, 300), $display-3: mat.define-typography-level(56px, 56px, 400), diff --git a/lib/core/src/lib/styles/prebuilt/adf-blue-orange.scss b/lib/core/src/lib/styles/prebuilt/adf-blue-orange.scss index 34fddc4c59..92e029b6e9 100644 --- a/lib/core/src/lib/styles/prebuilt/adf-blue-orange.scss +++ b/lib/core/src/lib/styles/prebuilt/adf-blue-orange.scss @@ -1,7 +1,16 @@ @use '@angular/material' as mat; @import '../theming'; @import './all-theme'; -@include mat.core; +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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(); $primary: mat.define-palette($alfresco-ecm-blue); $accent: mat.define-palette($alfresco-accent-orange); @@ -16,5 +25,5 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); @include alfresco-material-theme($theme); diff --git a/lib/core/src/lib/styles/prebuilt/adf-blue-purple.scss b/lib/core/src/lib/styles/prebuilt/adf-blue-purple.scss index 52b17c8a11..f79824077f 100644 --- a/lib/core/src/lib/styles/prebuilt/adf-blue-purple.scss +++ b/lib/core/src/lib/styles/prebuilt/adf-blue-purple.scss @@ -1,7 +1,16 @@ @use '@angular/material' as mat; @import '../theming'; @import './all-theme'; -@include mat.core; +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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(); $primary: mat.define-palette(mat.$pink-palette, 700, 500, 900); $accent: mat.define-palette($alfresco-accent-purple); @@ -16,5 +25,5 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); @include alfresco-material-theme($theme); diff --git a/lib/core/src/lib/styles/prebuilt/adf-cyan-orange.scss b/lib/core/src/lib/styles/prebuilt/adf-cyan-orange.scss index 61c9f8e902..efbe1a77b2 100644 --- a/lib/core/src/lib/styles/prebuilt/adf-cyan-orange.scss +++ b/lib/core/src/lib/styles/prebuilt/adf-cyan-orange.scss @@ -1,7 +1,16 @@ @use '@angular/material' as mat; @import '../theming'; @import './all-theme'; -@include mat.core; +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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(); $primary: mat.define-palette($alfresco-ecm-cyan); $accent: mat.define-palette($alfresco-accent-orange); @@ -16,5 +25,5 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); @include alfresco-material-theme($theme); diff --git a/lib/core/src/lib/styles/prebuilt/adf-cyan-purple.scss b/lib/core/src/lib/styles/prebuilt/adf-cyan-purple.scss index d4e2d15a55..84efedcff7 100644 --- a/lib/core/src/lib/styles/prebuilt/adf-cyan-purple.scss +++ b/lib/core/src/lib/styles/prebuilt/adf-cyan-purple.scss @@ -1,7 +1,16 @@ @use '@angular/material' as mat; @import '../theming'; @import './all-theme'; -@include mat.core; +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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(); $primary: mat.define-palette($alfresco-ecm-cyan); $accent: mat.define-palette($alfresco-accent-purple); @@ -16,5 +25,5 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); @include alfresco-material-theme($theme); diff --git a/lib/core/src/lib/styles/prebuilt/adf-green-orange.scss b/lib/core/src/lib/styles/prebuilt/adf-green-orange.scss index 9bd7163d87..daf87cd774 100644 --- a/lib/core/src/lib/styles/prebuilt/adf-green-orange.scss +++ b/lib/core/src/lib/styles/prebuilt/adf-green-orange.scss @@ -1,7 +1,16 @@ @use '@angular/material' as mat; @import '../theming'; @import './all-theme'; -@include mat.core; +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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(); $primary: mat.define-palette($alfresco-bpm-green); $accent: mat.define-palette($alfresco-accent-orange); @@ -16,5 +25,5 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); @include alfresco-material-theme($theme); diff --git a/lib/core/src/lib/styles/prebuilt/adf-green-purple.scss b/lib/core/src/lib/styles/prebuilt/adf-green-purple.scss index 81e1c0a36d..8fbd6b173b 100644 --- a/lib/core/src/lib/styles/prebuilt/adf-green-purple.scss +++ b/lib/core/src/lib/styles/prebuilt/adf-green-purple.scss @@ -1,7 +1,16 @@ @use '@angular/material' as mat; @import '../theming'; @import './all-theme'; -@include mat.core; +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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(); $primary: mat.define-palette($alfresco-bpm-green); $accent: mat.define-palette($alfresco-accent-purple); @@ -16,5 +25,5 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); @include alfresco-material-theme($theme); diff --git a/lib/core/src/lib/styles/prebuilt/adf-indigo-pink.scss b/lib/core/src/lib/styles/prebuilt/adf-indigo-pink.scss index aaba218265..fcfb51e774 100644 --- a/lib/core/src/lib/styles/prebuilt/adf-indigo-pink.scss +++ b/lib/core/src/lib/styles/prebuilt/adf-indigo-pink.scss @@ -2,7 +2,16 @@ @use '@angular/material' as mat; @import '../theming'; @import './all-theme'; -@include mat.core; +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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(); $primary: mat.define-palette(mat.$indigo-palette); $accent: mat.define-palette(mat.$pink-palette, A200, A100, A400); @@ -17,5 +26,5 @@ $theme: mat.define-light-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); @include alfresco-material-theme($theme); diff --git a/lib/core/src/lib/styles/prebuilt/adf-pink-bluegrey.scss b/lib/core/src/lib/styles/prebuilt/adf-pink-bluegrey.scss index a107e834de..a4726874bd 100644 --- a/lib/core/src/lib/styles/prebuilt/adf-pink-bluegrey.scss +++ b/lib/core/src/lib/styles/prebuilt/adf-pink-bluegrey.scss @@ -2,7 +2,16 @@ @use '@angular/material' as mat; @import '../theming'; @import './all-theme'; -@include mat.core; +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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(); $primary: mat.define-palette(mat.$pink-palette, 700, 500, 900); $accent: mat.define-palette(mat.$blue-grey-palette, A200, A100, A400); @@ -17,5 +26,5 @@ $theme: mat.define-dark-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); @include alfresco-material-theme($theme); diff --git a/lib/core/src/lib/styles/prebuilt/adf-purple-green.scss b/lib/core/src/lib/styles/prebuilt/adf-purple-green.scss index eb8d5aa8d7..7e8a2f2733 100644 --- a/lib/core/src/lib/styles/prebuilt/adf-purple-green.scss +++ b/lib/core/src/lib/styles/prebuilt/adf-purple-green.scss @@ -2,7 +2,16 @@ @use '@angular/material' as mat; @import '../theming'; @import './all-theme'; -@include mat.core; +// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. +// The following line adds: +// 1. Default typography styles for all components +// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1) +// 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(); $primary: mat.define-palette(mat.$purple-palette, 700, 500, 800); $accent: mat.define-palette(mat.$green-palette, A200, A100, A400); @@ -17,5 +26,5 @@ $theme: mat.define-dark-theme( ) ); -@include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); @include alfresco-material-theme($theme); diff --git a/lib/core/src/lib/templates/template.module.ts b/lib/core/src/lib/templates/template.module.ts index b47a4db3c9..8dc762d538 100644 --- a/lib/core/src/lib/templates/template.module.ts +++ b/lib/core/src/lib/templates/template.module.ts @@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { ErrorContentComponent } from './error-content/error-content.component'; import { EmptyContentComponent } from './empty-content/empty-content.component'; import { IconModule } from '../icon/icon.module'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; @NgModule({ imports: [CommonModule, TranslateModule, IconModule], diff --git a/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts b/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts index ab1e645ccc..d3f5b1393c 100644 --- a/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts +++ b/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts @@ -18,7 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { TranslateModule } from '@ngx-translate/core'; import { DownloadPromptDialogComponent } from './download-prompt-dialog.component'; import { CoreTestingModule } from '../../../testing/core.testing.module'; diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.spec.ts b/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.spec.ts index b4302e533f..bd6cf7b52f 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.spec.ts +++ b/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; import { PdfPasswordDialogComponent } from './pdf-viewer-password-dialog'; import { CoreTestingModule } from '../../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.ts b/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.ts index 4d63ac0d18..350bb2b503 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.ts +++ b/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; import { UntypedFormControl, Validators } from '@angular/forms'; declare const pdfjsLib: any; diff --git a/lib/core/src/lib/viewer/components/pdf-viewer.component.spec.ts b/lib/core/src/lib/viewer/components/pdf-viewer.component.spec.ts index e33a9e0f22..3c6142bf54 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer.component.spec.ts +++ b/lib/core/src/lib/viewer/components/pdf-viewer.component.spec.ts @@ -21,7 +21,7 @@ import { EventMock } from '../../mock/event.mock'; import { RenderingQueueServices } from '../services/rendering-queue.services'; import { PdfViewerComponent } from './pdf-viewer.component'; import { RIGHT_ARROW, LEFT_ARROW } from '@angular/cdk/keycodes'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { of } from 'rxjs'; import { take } from 'rxjs/operators'; import { AppConfigService } from '../../app-config/app-config.service'; diff --git a/lib/core/src/lib/viewer/components/viewer-render.component.spec.ts b/lib/core/src/lib/viewer/components/viewer-render.component.spec.ts index 183cb48af3..3660d182f6 100644 --- a/lib/core/src/lib/viewer/components/viewer-render.component.spec.ts +++ b/lib/core/src/lib/viewer/components/viewer-render.component.spec.ts @@ -23,10 +23,10 @@ import { RenderingQueueServices } from '../services/rendering-queue.services'; import { ViewerRenderComponent } from './viewer-render.component'; import { CoreTestingModule } from '../../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AppExtensionService, ViewerExtensionRef } from '@alfresco/adf-extensions'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatIconModule } from '@angular/material/icon'; import { By } from '@angular/platform-browser'; diff --git a/lib/core/src/lib/viewer/components/viewer-render.component.ts b/lib/core/src/lib/viewer/components/viewer-render.component.ts index 20c4846db6..dac28da0ec 100644 --- a/lib/core/src/lib/viewer/components/viewer-render.component.ts +++ b/lib/core/src/lib/viewer/components/viewer-render.component.ts @@ -23,7 +23,7 @@ import { import { Subject } from 'rxjs'; import { ViewUtilService } from '../services/view-util.service'; import { AppExtensionService, ViewerExtensionRef } from '@alfresco/adf-extensions'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { Track } from '../models/viewer.model'; @Component({ diff --git a/lib/core/src/lib/viewer/components/viewer.component.spec.ts b/lib/core/src/lib/viewer/components/viewer.component.spec.ts index 6d38519e58..1908db7792 100644 --- a/lib/core/src/lib/viewer/components/viewer.component.spec.ts +++ b/lib/core/src/lib/viewer/components/viewer.component.spec.ts @@ -18,9 +18,9 @@ import { ComponentFixture, discardPeriodicTasks, fakeAsync, flush, TestBed, tick } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { MatButtonModule } from '@angular/material/button'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatIconModule } from '@angular/material/icon'; import { CoreTestingModule, diff --git a/lib/core/src/lib/viewer/components/viewer.component.ts b/lib/core/src/lib/viewer/components/viewer.component.ts index 3789c3c7f3..b2cafdbaef 100644 --- a/lib/core/src/lib/viewer/components/viewer.component.ts +++ b/lib/core/src/lib/viewer/components/viewer.component.ts @@ -31,7 +31,7 @@ import { ViewEncapsulation } from '@angular/core'; import { fromEvent, Subject } from 'rxjs'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { ViewerToolbarComponent } from './viewer-toolbar.component'; import { ViewerOpenWithComponent } from './viewer-open-with.component'; import { ViewerMoreActionsComponent } from './viewer-more-actions.component'; diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts index e7f1415da9..ae78b2ab88 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts @@ -30,7 +30,7 @@ import { ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { ReportParameterDetailsModel } from '../../diagram/models/report/report-parameter-details.model'; import { ReportParametersModel } from '../../diagram/models/report/report-parameters.model'; import { ReportQuery } from '../../diagram/models/report/report-query.model'; diff --git a/lib/insights/src/lib/material.module.ts b/lib/insights/src/lib/material.module.ts index e2dc8b11cd..7af07c4801 100644 --- a/lib/insights/src/lib/material.module.ts +++ b/lib/insights/src/lib/material.module.ts @@ -16,27 +16,28 @@ */ import { NgModule } from '@angular/core'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatButtonModule } from '@angular/material/button'; -import { MatCardModule } from '@angular/material/card'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatChipsModule } from '@angular/material/chips'; -import { MatNativeDateModule, MatOptionModule, MatRippleModule } from '@angular/material/core'; -import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; +import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete'; +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 { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; +import { MatNativeDateModule, MatRippleModule } from '@angular/material/core'; +import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; +import { MAT_LEGACY_FORM_FIELD_DEFAULT_OPTIONS as MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/legacy-form-field'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatDialogModule } from '@angular/material/dialog'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; -import { MatInputModule } from '@angular/material/input'; -import { MatListModule } from '@angular/material/list'; -import { MatMenuModule } from '@angular/material/menu'; -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 { MatTableModule } from '@angular/material/table'; -import { MatTabsModule } from '@angular/material/tabs'; -import { MatTooltipModule } from '@angular/material/tooltip'; +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 { 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 { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; +import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; @NgModule({ imports: [ diff --git a/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.spec.ts b/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.spec.ts index dc88b14946..e34a8171b9 100644 --- a/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.spec.ts +++ b/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.spec.ts @@ -19,7 +19,7 @@ import { DateRangeFilterComponent } from './date-range-filter.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; -import { MatSelectChange } from '@angular/material/select'; +import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; import { DateCloudFilterType } from '../../models/date-cloud-filter.model'; import { DateRangeFilterService } from './date-range-filter.service'; import { mockFilterProperty } from '../mock/date-range-filter.mock'; diff --git a/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.ts b/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.ts index 11c2a8a83a..51cc4fc6cf 100644 --- a/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.ts +++ b/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, EventEmitter, Output, OnInit } from '@angular/core'; -import { MatSelectChange } from '@angular/material/select'; +import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; import { ProcessFilterProperties, ProcessFilterOptions } from '../../process/process-filters/models/process-filter-cloud.model'; import { FormGroup, FormControl } from '@angular/forms'; import { DateRangeFilter, DateCloudFilterType } from '../../models/date-cloud-filter.model'; diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts index 4a970df4e3..7448deb36b 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts @@ -35,8 +35,8 @@ import { Component, ComponentFactoryResolver, Injector, SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialog } from '@angular/material/dialog'; -import { MatDialogHarness } from '@angular/material/dialog/testing'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatLegacyDialogHarness as MatDialogHarness } from '@angular/material/legacy-dialog/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts index 0c57370bc4..a2f3a494c4 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts @@ -36,7 +36,7 @@ import { import { FormCloudService } from '../services/form-cloud.service'; import { TaskVariableCloud } from '../models/task-variable-cloud.model'; import { TaskDetailsCloudModel } from '../../task/start-task/models/task-details-cloud.model'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { ConfirmDialogComponent } from '@alfresco/adf-content-services'; @Component({ diff --git a/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.ts index e146182c95..72f9540e8b 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.ts @@ -18,7 +18,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Observable } from 'rxjs'; import { FormDefinitionSelectorCloudService } from '../services/form-definition-selector-cloud.service'; -import { MatSelectChange } from '@angular/material/select'; +import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; import { FormRepresentation } from '../../services/form-fields.interfaces'; @Component({ diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.spec.ts index c620078cc6..04582b615f 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.spec.ts @@ -21,7 +21,7 @@ import { ProcessServiceCloudTestingModule } from '../../../../testing/process-se import { TranslateModule } from '@ngx-translate/core'; import { FilePropertiesTableCloudComponent } from './file-properties-table-cloud.component'; import { By } from '@angular/platform-browser'; -import { MatTableModule } from '@angular/material/table'; +import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; import { MatIconModule } from '@angular/material/icon'; describe('FilePropertiesTableCloudComponent', () => { diff --git a/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts b/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts index 85e3bc32f5..0343f77289 100644 --- a/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts +++ b/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts @@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing'; import { AlfrescoApiService, AlfrescoApiServiceMock, NotificationService } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { TranslateModule } from '@ngx-translate/core'; -import { MatDialog, MatDialogModule } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog, MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { of, Subject } from 'rxjs'; import { ContentCloudNodeSelectorService } from './content-cloud-node-selector.service'; diff --git a/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.ts b/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.ts index e84bdbc20d..5807be00fb 100644 --- a/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.ts +++ b/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { AlfrescoApiService, LogService, NotificationService } from '@alfresco/adf-core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { ContentNodeSelectorComponent, ContentNodeSelectorComponentData, diff --git a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts index 43a9068f69..96e1663561 100644 --- a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts @@ -28,9 +28,9 @@ import { IdentityGroupService } from '../services/identity-group.service'; import { mockFoodGroups, mockMeatChicken, mockVegetableAubergine } from '../mock/group-cloud.mock'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatChipHarness, MatChipListHarness } from '@angular/material/chips/testing'; +import { MatLegacyChipHarness as MatChipHarness, MatLegacyChipListHarness as MatChipListHarness } from '@angular/material/legacy-chips/testing'; import { MatIconHarness } from '@angular/material/icon/testing'; -import { MatInputHarness } from '@angular/material/input/testing'; +import { MatLegacyInputHarness as MatInputHarness } from '@angular/material/legacy-input/testing'; describe('GroupCloudComponent', () => { let loader: HarnessLoader; diff --git a/lib/process-services-cloud/src/lib/material.module.ts b/lib/process-services-cloud/src/lib/material.module.ts index f94046de08..71ecadaa5a 100644 --- a/lib/process-services-cloud/src/lib/material.module.ts +++ b/lib/process-services-cloud/src/lib/material.module.ts @@ -16,28 +16,29 @@ */ import { NgModule } from '@angular/core'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatButtonModule } from '@angular/material/button'; -import { MatCardModule } from '@angular/material/card'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatChipsModule } from '@angular/material/chips'; -import { MatNativeDateModule, MatOptionModule, MatRippleModule } from '@angular/material/core'; -import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; +import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete'; +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 { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; +import { MatNativeDateModule, MatRippleModule } from '@angular/material/core'; +import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; +import { MAT_LEGACY_FORM_FIELD_DEFAULT_OPTIONS as MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/legacy-form-field'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatDialogModule } from '@angular/material/dialog'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; -import { MatInputModule } from '@angular/material/input'; -import { MatListModule } from '@angular/material/list'; -import { MatMenuModule } from '@angular/material/menu'; -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 { MatTableModule } from '@angular/material/table'; -import { MatTabsModule } from '@angular/material/tabs'; -import { MatTooltipModule } from '@angular/material/tooltip'; +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 { 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 { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; +import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; @NgModule({ providers: [ diff --git a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts index a2dadeaf24..2fa1504e44 100644 --- a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts @@ -29,8 +29,8 @@ import { IDENTITY_USER_SERVICE_TOKEN } from '../services/identity-user-service.t import { mockFoodUsers, mockKielbasaSausage, mockShepherdsPie, mockYorkshirePudding, mockPreselectedFoodUsers } from '../mock/people-cloud.mock'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatChipHarness, MatChipListHarness } from '@angular/material/chips/testing'; -import { MatInputHarness } from '@angular/material/input/testing'; +import { MatLegacyChipHarness as MatChipHarness, MatLegacyChipListHarness as MatChipListHarness } from '@angular/material/legacy-chips/testing'; +import { MatLegacyInputHarness as MatInputHarness } from '@angular/material/legacy-input/testing'; describe('PeopleCloudComponent', () => { let loader: HarnessLoader; diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts index d8f6201b80..b08900a5dc 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SimpleChange } from '@angular/core'; import { AlfrescoApiService } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { of } from 'rxjs'; import { ProcessFilterDialogCloudComponent } from './process-filter-dialog-cloud.component'; import { @@ -44,9 +44,9 @@ import { fakeEnvironmentList } from '../../../common/mock/environment.mock'; import { endOfDay, format, startOfDay, subYears, isValid } from 'date-fns'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSelectHarness } from '@angular/material/select/testing'; +import { MatLegacySelectHarness as MatSelectHarness } from '@angular/material/legacy-select/testing'; import { MatExpansionPanelHarness } from '@angular/material/expansion/testing'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; describe('EditProcessFilterCloudComponent', () => { let loader: HarnessLoader; diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts index 31293de0fa..0a15666267 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts @@ -18,7 +18,7 @@ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, OnDestroy, ViewEncapsulation } from '@angular/core'; import { FormBuilder, AbstractControl, FormGroup, FormControl } from '@angular/forms'; import { DateAdapter } from '@angular/material/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { debounceTime, filter, takeUntil, finalize, switchMap, tap } from 'rxjs/operators'; import { Subject, Observable, Subscription } from 'rxjs'; import { AppsProcessCloudService } from '../../../app/services/apps-process-cloud.service'; diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.spec.ts index 5d32a2d054..6577537983 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; import { ProcessFilterDialogCloudComponent } from './process-filter-dialog-cloud.component'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; import { ProcessFiltersCloudModule } from '../process-filters-cloud.module'; diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.ts index 26051926e1..b3d1e3d674 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; @Component({ diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts index 2c5dd2c20d..e22d17caf3 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts @@ -42,11 +42,11 @@ import { ProcessListCloudPreferences } from '../models/process-cloud-preferences import { PROCESS_LIST_CUSTOM_VARIABLE_COLUMN } from '../../../models/data-column-custom-data'; import { HttpClientModule } from '@angular/common/http'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; import { PreferenceCloudServiceInterface } from '@alfresco/adf-process-services-cloud'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; @Component({ template: ` diff --git a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts index 94a2902c94..3cad4c6f63 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts @@ -22,13 +22,14 @@ import { of, throwError } from 'rxjs'; import { StartProcessCloudService } from '../services/start-process-cloud.service'; import { FormCloudService } from '../../../form/services/form-cloud.service'; import { StartProcessCloudComponent } from './start-process-cloud.component'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatButtonModule } from '@angular/material/button'; -import { MatCardModule } from '@angular/material/card'; -import { MatOptionModule, MatRippleModule, MatCommonModule } from '@angular/material/core'; -import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete'; +import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; +import { MatRippleModule, MatCommonModule } from '@angular/material/core'; +import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; +import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatIconModule } from '@angular/material/icon'; -import { MatInputModule } from '@angular/material/input'; +import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { fakeProcessDefinitions, @@ -51,8 +52,8 @@ import { ProcessDefinitionCloud, TaskVariableCloud } from '@alfresco/adf-process import { first } from 'rxjs/operators'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatAutocompleteHarness } from '@angular/material/autocomplete/testing'; -import { MatButtonHarness } from '@angular/material/button/testing'; +import { MatLegacyAutocompleteHarness as MatAutocompleteHarness } from '@angular/material/legacy-autocomplete/testing'; +import { MatLegacyButtonHarness as MatButtonHarness } from '@angular/material/legacy-button/testing'; describe('StartProcessCloudComponent', () => { let loader: HarnessLoader; diff --git a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts index 49b6b65e55..436f01d70c 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts @@ -31,7 +31,7 @@ import { import { ContentLinkModel, FormModel } from '@alfresco/adf-core'; import { AbstractControl, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, ValidatorFn, Validators } from '@angular/forms'; -import { MatAutocompleteTrigger } from '@angular/material/autocomplete'; +import { MatLegacyAutocompleteTrigger as MatAutocompleteTrigger } from '@angular/material/legacy-autocomplete'; import { debounceTime, takeUntil, tap } from 'rxjs/operators'; import { ProcessInstanceCloud } from '../models/process-instance-cloud.model'; import { ProcessPayloadCloud } from '../models/process-payload-cloud.model'; diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts index 8773144574..092f775e6a 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.ts @@ -26,10 +26,10 @@ import { Observable, Subject } from 'rxjs'; import { DateAdapter } from '@angular/material/core'; import { DateFnsUtils, TranslationService, UserPreferencesService, UserPreferenceValues } from '@alfresco/adf-core'; import { TaskFilterDialogCloudComponent } from '../task-filter-dialog/task-filter-dialog-cloud.component'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { IdentityUserModel } from '../../../../people/models/identity-user.model'; import { IdentityGroupModel } from '../../../../group/models/identity-group.model'; -import { MatSelectChange } from '@angular/material/select'; +import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; import { Environment } from '../../../../common/interface/environment.interface'; import { isValid } from 'date-fns'; diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts index 8f96370f02..59bcc6ce02 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SimpleChange } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { of, Subject } from 'rxjs'; import { TASK_FILTERS_SERVICE_TOKEN } from '../../../../services/cloud-token.service'; import { LocalPreferenceCloudService } from '../../../../services/local-preference-cloud.service'; @@ -38,8 +38,8 @@ import { mockApplicationTaskFilterProperties } from '../../mock/edit-task-filter import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatExpansionPanelHarness } from '@angular/material/expansion/testing'; -import { MatSelectHarness } from '@angular/material/select/testing'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacySelectHarness as MatSelectHarness } from '@angular/material/legacy-select/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; describe('EditServiceTaskFilterCloudComponent', () => { let loader: HarnessLoader; diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts index 5d5bc75bca..6e64d71ea3 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts @@ -18,7 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { AlfrescoApiService } from '@alfresco/adf-core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { of, Subject } from 'rxjs'; import { TASK_FILTERS_SERVICE_TOKEN } from '../../../../services/cloud-token.service'; import { LocalPreferenceCloudService } from '../../../../services/local-preference-cloud.service'; @@ -55,9 +55,9 @@ import { TaskFilterDialogCloudComponent } from '../task-filter-dialog/task-filte import { set } from 'date-fns'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSelectHarness } from '@angular/material/select/testing'; +import { MatLegacySelectHarness as MatSelectHarness } from '@angular/material/legacy-select/testing'; import { MatExpansionPanelHarness } from '@angular/material/expansion/testing'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; describe('EditTaskFilterCloudComponent', () => { let loader: HarnessLoader; diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.ts index e5963fbd4c..dd213b3334 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; -import { MatSelectChange } from '@angular/material/select'; +import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; import { AssignmentType, TaskFilterProperties, TaskStatusFilter } from '../../models/filter-cloud.model'; import { IdentityUserModel } from '../../../../people/models/identity-user.model'; import { IdentityUserService } from '../../../../people/services/identity-user.service'; diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts index 0905f9f1fe..73c589d624 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; import { TaskFilterDialogCloudComponent } from './task-filter-dialog-cloud.component'; import { TaskFiltersCloudModule } from '../../task-filters-cloud.module'; import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module'; diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.ts index 098dbf1858..9a618660f6 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; @Component({ diff --git a/lib/process-services-cloud/src/lib/task/task-filters/task-filters-cloud.module.ts b/lib/process-services-cloud/src/lib/task/task-filters/task-filters-cloud.module.ts index bbf727c21b..69a2882981 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/task-filters-cloud.module.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/task-filters-cloud.module.ts @@ -31,7 +31,7 @@ import { TaskFilterDialogCloudComponent } from './components/task-filter-dialog/ import { ServiceTaskFiltersCloudComponent } from './components/service-task-filters-cloud.component'; import { TaskAssignmentFilterCloudComponent } from './components/task-assignment-filter/task-assignment-filter.component'; import { GroupCloudModule } from '../../group/group-cloud.module'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; @NgModule({ imports: [ diff --git a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.spec.ts index 25ddb985a0..f285d76be3 100644 --- a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.spec.ts @@ -35,7 +35,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { IdentityUserService } from '../../../people/services/identity-user.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; const taskDetails: TaskDetailsCloudModel = { appName: 'simple-app', diff --git a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts index d8b4fd7054..ab3c511555 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts @@ -32,7 +32,7 @@ import { createdTaskDetailsCloudMock } from '../mocks/task-details-cloud.mock'; import { TranslateModule } from '@ngx-translate/core'; -import { MatSelectModule } from '@angular/material/select'; +import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; describe('TaskHeaderCloudComponent', () => { let component: TaskHeaderCloudComponent; diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.spec.ts index 074d02d347..e626471293 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.spec.ts @@ -29,7 +29,7 @@ import { shareReplay, skip } from 'rxjs/operators'; import { ServiceTaskListCloudService } from '../services/service-task-list-cloud.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; @Component({ template: ` diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts index 7b3d5f083c..74ad2cf247 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts @@ -47,7 +47,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { PreferenceCloudServiceInterface } from '../../../services/preference-cloud.interface'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; @Component({ template: ` diff --git a/lib/process-services/src/lib/app-list/apps-list.component.spec.ts b/lib/process-services/src/lib/app-list/apps-list.component.spec.ts index bf5747632d..2fec4aba1e 100644 --- a/lib/process-services/src/lib/app-list/apps-list.component.spec.ts +++ b/lib/process-services/src/lib/app-list/apps-list.component.spec.ts @@ -27,7 +27,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { AppDefinitionRepresentationModel } from '../task-list'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; +import { MatLegacyProgressSpinnerHarness as MatProgressSpinnerHarness } from '@angular/material/legacy-progress-spinner/testing'; describe('AppsListComponent', () => { let loader: HarnessLoader; diff --git a/lib/process-services/src/lib/app-list/apps-list.module.ts b/lib/process-services/src/lib/app-list/apps-list.module.ts index a926b3b9ef..d0ed7895ae 100644 --- a/lib/process-services/src/lib/app-list/apps-list.module.ts +++ b/lib/process-services/src/lib/app-list/apps-list.module.ts @@ -22,7 +22,7 @@ import { CoreModule } from '@alfresco/adf-core'; import { AppsListComponent } from './apps-list.component'; import { SelectAppsDialogComponent } from './select-apps-dialog.component'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; @NgModule({ imports: [CommonModule, MaterialModule, CoreModule, MatProgressSpinnerModule], diff --git a/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts b/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts index d588f86edb..0a70323518 100644 --- a/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts +++ b/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts @@ -17,7 +17,7 @@ import { Component } from '@angular/core'; import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; import { OverlayContainer } from '@angular/cdk/overlay'; import { AppsProcessService } from './services/apps-process.service'; import { deployedApps } from '../mock/apps-list.mock'; diff --git a/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts b/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts index 60a8b238b3..8aba95fe8f 100644 --- a/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts +++ b/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { AppsProcessService } from './services/apps-process.service'; @Component({ diff --git a/lib/process-services/src/lib/attachment/process-attachment-list.component.spec.ts b/lib/process-services/src/lib/attachment/process-attachment-list.component.spec.ts index 6f875dd47b..2b8fe73b0e 100644 --- a/lib/process-services/src/lib/attachment/process-attachment-list.component.spec.ts +++ b/lib/process-services/src/lib/attachment/process-attachment-list.component.spec.ts @@ -26,7 +26,7 @@ import { mockEmittedProcessAttachments, mockProcessAttachments } from '../mock/p import { ProcessContentService } from '../form/services/process-content.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatMenuHarness } from '@angular/material/menu/testing'; +import { MatLegacyMenuHarness as MatMenuHarness } from '@angular/material/legacy-menu/testing'; describe('ProcessAttachmentListComponent', () => { let loader: HarnessLoader; diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts index 5c674c8c61..b52bf17251 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { ContentModule, ContentNodeSelectorPanelComponent, DocumentListService, SitesService, NodesApiService } from '@alfresco/adf-content-services'; import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts index 57698741ce..72319e9786 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, ViewEncapsulation, ViewChild } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { AlfrescoApiService, LoginDialogPanelComponent, TranslationService, AuthenticationService } from '@alfresco/adf-core'; import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface'; import { DocumentListService, SitesService, SearchService } from '@alfresco/adf-content-services'; diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.spec.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.spec.ts index 744b120236..af74dd4f8a 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.spec.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { AttachFileWidgetDialogService } from './attach-file-widget-dialog.service'; import { Subject, of } from 'rxjs'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.ts index fd42e41e3c..07350eac13 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { EventEmitter, Injectable, Output } from '@angular/core'; import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core'; import { Observable, of, Subject } from 'rxjs'; diff --git a/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts b/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts index 2aaeb4ae98..61eeb6f003 100644 --- a/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts @@ -28,7 +28,7 @@ import { } from '@alfresco/adf-core'; import { RadioButtonsWidgetComponent } from './radio-buttons.widget'; import { MatIconModule } from '@angular/material/icon'; -import { MatRadioModule } from '@angular/material/radio'; +import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; import { TaskFormService } from '../../services/task-form.service'; diff --git a/lib/process-services/src/lib/material.module.ts b/lib/process-services/src/lib/material.module.ts index 5e6debbd00..63f02d862e 100644 --- a/lib/process-services/src/lib/material.module.ts +++ b/lib/process-services/src/lib/material.module.ts @@ -16,27 +16,28 @@ */ import { NgModule } from '@angular/core'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatButtonModule } from '@angular/material/button'; -import { MatCardModule } from '@angular/material/card'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatChipsModule } from '@angular/material/chips'; -import { MatNativeDateModule, MatOptionModule, MatRippleModule } from '@angular/material/core'; -import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; +import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete'; +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 { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; +import { MatNativeDateModule, MatRippleModule } from '@angular/material/core'; +import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; +import { MAT_LEGACY_FORM_FIELD_DEFAULT_OPTIONS as MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/legacy-form-field'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatDialogModule } from '@angular/material/dialog'; +import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; -import { MatInputModule } from '@angular/material/input'; -import { MatListModule } from '@angular/material/list'; -import { MatMenuModule } from '@angular/material/menu'; -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 { MatTableModule } from '@angular/material/table'; -import { MatTabsModule } from '@angular/material/tabs'; -import { MatTooltipModule } from '@angular/material/tooltip'; +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 { 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 { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; +import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs'; +import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; @NgModule({ providers: [ 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 7111122650..1959b0e69f 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 { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-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.spec.ts b/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts index 18e84bdc33..840043dd99 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 { MatSelectChange } from '@angular/material/select'; +import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-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 e977300849..6fe3fe1b82 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 { MatAutocompleteTrigger } from '@angular/material/autocomplete'; -import { MatSelectChange } from '@angular/material/select'; +import { MatLegacyAutocompleteTrigger as MatAutocompleteTrigger } from '@angular/material/legacy-autocomplete'; +import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-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.spec.ts b/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts index 172528faee..f45798455a 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 { MatMenuModule } from '@angular/material/menu'; +import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-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 3d4f2b84f1..35f0c69be1 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 { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu'; +import { MatLegacyMenuTrigger as MatMenuTrigger, LegacyMenuPositionX as MenuPositionX, LegacyMenuPositionY as MenuPositionY } from '@angular/material/legacy-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 83bb9b53b8..cbdbf81eb2 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 { MatButtonModule } from '@angular/material/button'; -import { MatCardModule } from '@angular/material/card'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatTabsModule } from '@angular/material/tabs'; +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 { TranslateModule } from '@ngx-translate/core'; import { PipeModule } from '@alfresco/adf-core'; diff --git a/lib/process-services/src/lib/task-list/components/checklist.component.ts b/lib/process-services/src/lib/task-list/components/checklist.component.ts index 3f9d25e894..367395a66d 100644 --- a/lib/process-services/src/lib/task-list/components/checklist.component.ts +++ b/lib/process-services/src/lib/task-list/components/checklist.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { TaskDetailsModel } from '../models/task-details.model'; import { TaskListService } from './../services/tasklist.service'; diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.ts b/lib/process-services/src/lib/task-list/components/task-details.component.ts index d3b138420b..07a1677834 100644 --- a/lib/process-services/src/lib/task-list/components/task-details.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-details.component.ts @@ -39,7 +39,7 @@ import { ViewChild, ViewEncapsulation } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; import { Observable, Observer, of, Subject } from 'rxjs'; import { TaskQueryRequestRepresentationModel } from '../models/filter.model'; import { TaskDetailsModel } from '../models/task-details.model'; diff --git a/package.json b/package.json index bc7dc127fc..ec4069e60d 100644 --- a/package.json +++ b/package.json @@ -61,24 +61,24 @@ ], "dependencies": { "@alfresco/js-api": ">=7.2.0", - "@angular/animations": "14.1.3", - "@angular/cdk": "14.1.2", - "@angular/common": "14.1.3", - "@angular/compiler": "14.1.3", - "@angular/core": "14.1.3", - "@angular/forms": "14.1.3", - "@angular/material": "14.1.2", - "@angular/material-date-fns-adapter": "^14.1.2", - "@angular/platform-browser": "14.1.3", - "@angular/platform-browser-dynamic": "14.1.3", - "@angular/router": "14.1.3", + "@angular/animations": "15.2.10", + "@angular/cdk": "15.2.9", + "@angular/common": "15.2.10", + "@angular/compiler": "15.2.10", + "@angular/core": "15.2.10", + "@angular/forms": "15.2.10", + "@angular/material": "15.2.9", + "@angular/material-date-fns-adapter": "15.2.9", + "@angular/platform-browser": "15.2.10", + "@angular/platform-browser-dynamic": "15.2.10", + "@angular/router": "15.2.10", "@apollo/client": "^3.8.4", "@cspell/eslint-plugin": "^7.3.6", "@editorjs/editorjs": "^2.26.5", "@editorjs/header": "2.7.0", "@editorjs/list": "1.8.0", "@editorjs/underline": "1.1.0", - "@mat-datetimepicker/core": "^10.1.1", + "@mat-datetimepicker/core": "11.0.3", "@ngx-translate/core": "^14.0.0", "@storybook/core-server": "^7.6.5", "angular-oauth2-oidc": "^13.0.1", @@ -93,9 +93,9 @@ "event-emitter": "^0.3.5", "material-icons": "^1.13.12", "minimatch-browser": "1.0.0", - "monaco-editor": "^0.33.0", + "monaco-editor": "0.34.1", "ng2-charts": "^4.1.1", - "ngx-monaco-editor-v2": "^14.0.4", + "ngx-monaco-editor-v2": "15.0.1", "pdfjs-dist": "3.3.122", "raphael": "2.3.0", "rxjs": "6.6.6", @@ -105,13 +105,13 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "14.1.3", - "@angular-devkit/schematics": "~14.2.12", + "@angular-devkit/build-angular": "15.2.10", + "@angular-devkit/schematics": "15.2.10", "@angular-eslint/eslint-plugin": "15.2.1", "@angular-eslint/eslint-plugin-template": "14.3.0", "@angular-eslint/template-parser": "16.2.0", - "@angular/cli": "~14.2.12", - "@angular/compiler-cli": "14.1.3", + "@angular/cli": "15.2.10", + "@angular/compiler-cli": "15.2.10", "@editorjs/code": "2.8.0", "@editorjs/inline-code": "1.4.0", "@editorjs/marker": "1.2.2", @@ -182,9 +182,9 @@ "mini-css-extract-plugin": "^2.7.6", "mocha": "^10.2.0", "moment": "^2.29.4", - "ng-packagr": "14.0.3", "nock": "^13.3.8", "npm-run-all": "^4.1.5", + "ng-packagr": "15.2.2", "nx": "14.4.2", "postcss": "^8.4.31", "postcss-sass": "^0.5.0", @@ -203,7 +203,7 @@ "stylelint-config-standard-scss": "^3.0.0", "ts-node": "^10.9.1", "tsconfig-paths": "^4.1.1", - "typescript": "4.7.4", + "typescript": "4.9.5", "webdriver-manager": "12.1.9", "webpack": "^5.88.2", "webpack-cli": "^5.1.2" @@ -245,3 +245,4 @@ "module": "./index.js", "typings": "./index.d.ts" } +