From 1a9d98534e1bd60e77daebae37942d178fae3e18 Mon Sep 17 00:00:00 2001 From: Denys Oliinyk <68949838+doliinyk@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:03:05 +0300 Subject: [PATCH] Oliinyk / MDC MatLegacyDialog migration (#2637) * Migrated MatDialog to MDC, fixed styles * Fixed tests --- .../confirmation-modal-window.component.scss | 56 +++++++++---------- ...onfirmation-modal-window.component.spec.ts | 6 +- .../confirmation-modal-window.component.ts | 2 +- .../reason-modal-window.component.spec.ts | 6 +- .../reason-modal-window.component.ts | 2 +- .../working-hours.component.scss | 2 +- .../image-cropper-modal.component.scss | 3 - .../image-cropper-modal.component.spec.ts | 8 +-- .../image-cropper-modal.component.ts | 2 +- .../image-form-control.component.spec.ts | 7 +-- .../image-form-control.component.ts | 2 +- ...gistered-user-warning-modal.component.scss | 3 +- ...tered-user-warning-modal.component.spec.ts | 2 +- ...registered-user-warning-modal.component.ts | 2 +- .../workshop-card.component.spec.ts | 3 +- .../workshop-card/workshop-card.component.ts | 2 +- .../workshop-seats-lack-modal.component.scss | 47 ++++++---------- ...orkshop-seats-lack-modal.component.spec.ts | 6 +- .../workshop-seats-lack-modal.component.ts | 2 +- src/app/shared/modules/material.module.ts | 2 +- .../admin-applications.component.spec.ts | 2 +- .../admin-applications.component.ts | 2 +- .../data/admins/admins.component.spec.ts | 6 +- .../data/admins/admins.component.ts | 2 +- .../create-admin.component.spec.ts | 2 +- .../create-admin/create-admin.component.ts | 2 +- ...itution-hierarchies-edit-form.component.ts | 2 +- ...itution-hierarchies-list.component.spec.ts | 2 +- ...-institution-hierarchies-list.component.ts | 2 +- .../directions-wrapper.component.spec.ts | 2 +- .../create-direction.component.spec.ts | 2 +- .../create-direction.component.ts | 2 +- .../directions/directions.component.spec.ts | 2 +- .../directions/directions.component.ts | 2 +- .../provider-list.component.spec.ts | 2 +- .../provider-list/provider-list.component.ts | 2 +- .../data/users/users.component.spec.ts | 6 +- .../admin-tools/data/users/users.component.ts | 2 +- .../platform/platform.component.spec.ts | 2 +- .../achievements.component.spec.ts | 2 +- .../achievements/achievements.component.ts | 2 +- .../reviews/reviews.component.spec.ts | 2 +- .../details-tabs/reviews/reviews.component.ts | 2 +- .../actions/actions.component.spec.ts | 14 ++--- .../side-menu/actions/actions.component.ts | 2 +- .../children/children.component.spec.ts | 2 +- .../parent/children/children.component.ts | 2 +- .../create-application.component.spec.ts | 3 +- .../create-application.component.ts | 2 +- .../create-child.component.spec.ts | 2 +- .../create-child/create-child.component.ts | 2 +- .../create-parent.component.spec.ts | 15 ++--- .../create-parent/create-parent.component.ts | 2 +- .../favorite-workshops.component.spec.ts | 2 +- .../favorite-workshops.component.ts | 2 +- .../parent-applications.component.spec.ts | 2 +- .../parent-applications.component.ts | 2 +- .../parent/parent.component.ts | 2 +- .../create-achievement.component.spec.ts | 2 +- .../create-achievement.component.ts | 2 +- .../create-provider-admin.component.spec.ts | 2 +- .../create-provider-admin.component.ts | 2 +- .../create-info-form.component.spec.ts | 2 +- .../create-provider.component.spec.ts | 2 +- .../create-provider.component.ts | 2 +- .../working-hours-form.component.scss | 12 ++-- .../create-teacher.component.spec.ts | 6 +- .../create-teacher.component.ts | 2 +- .../provider-admins.component.spec.ts | 6 +- .../provider-admins.component.ts | 2 +- .../provider-applications.component.spec.ts | 2 +- .../provider-applications.component.ts | 2 +- .../provider-org-info.component.spec.ts | 2 +- .../provider-org-info.component.ts | 2 +- .../provider-workshops.component.spec.ts | 2 +- .../provider-workshops.component.ts | 2 +- .../provider/provider.component.ts | 2 +- .../shared-cabinet/cabinet-data.component.ts | 2 +- .../create-form/create.guard.spec.ts | 2 +- .../create-form/create.guard.ts | 2 +- .../messages/messages.component.spec.ts | 6 +- .../messages/messages.component.ts | 2 +- .../user-config-edit.component.spec.ts | 2 +- .../user-config-edit.component.ts | 2 +- src/styles.scss | 15 ++++- 85 files changed, 155 insertions(+), 209 deletions(-) diff --git a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.scss b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.scss index 390bc9e3c7..1b114a7971 100644 --- a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.scss +++ b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.scss @@ -1,28 +1,31 @@ @import 'src/app/shared/styles/buttons.scss'; -:host ::ng-deep .mat-dialog-container { - min-width: 411px; - min-height: 178px; - background: #ffffff; - box-shadow: 0px 6px 16px rgba(0, 0, 0, 0.08); - border-radius: 5px; -} -:host ::ng-deep .mat-dialog-actions { - padding-bottom: 2rem; -} -:host ::ng-deep.mat-dialog-actions .mat-button-base + .mat-button-base { - margin-left: 1rem !important; -} -:host ::ng-deep .mat-dialog-title { - text-align: center; - margin-bottom: 0; - font-family: Innerspace; - font-style: normal; - font-weight: bold; - font-size: 18px; - line-height: 20px; - color: #444444; +:host ::ng-deep .mat-mdc-dialog { + &-actions { + padding-bottom: 8px; + + .mat-button-base + .mat-button-base { + margin-left: 1rem !important; + } + } + + &-title { + text-align: center; + margin-bottom: 0; + padding-bottom: 0; + font-family: Innerspace; + font-style: normal; + font-weight: bold; + font-size: 18px; + line-height: 20px; + color: #444444; + + &::before { + height: 32px; + } + } } + .confirmation { text-align: center; font-family: Open Sans; @@ -38,12 +41,3 @@ .btn { margin-top: 1rem; } -@media (max-width: 750px) { - :host ::ng-deep .mat-dialog-container { - min-width: fit-content; - min-height: 178px; - background: #ffffff; - box-shadow: 0px 6px 16px rgba(0, 0, 0, 0.08); - border-radius: 5px; - } -} diff --git a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.spec.ts b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.spec.ts index 98f493d0d5..aeea6f0ed0 100644 --- a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.spec.ts +++ b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.spec.ts @@ -1,12 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { - MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; import { TranslateModule } from '@ngx-translate/core'; import { ModalConfirmationTypeWithQuotes } from 'shared/enum/modal-confirmation'; diff --git a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.ts b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.ts index 40b7873970..37797d1403 100644 --- a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.ts +++ b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { ModalConfirmationText, diff --git a/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.spec.ts b/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.spec.ts index acb1154f77..b81c7ddc52 100644 --- a/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.spec.ts +++ b/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.spec.ts @@ -1,11 +1,7 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormBuilder, FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { - MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.ts b/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.ts index 920f2810ce..59a65c9d83 100644 --- a/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.ts +++ b/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MUST_CONTAIN_LETTERS } from 'shared/constants/regex-constants'; import { ValidationConstants } from 'shared/constants/validation'; diff --git a/src/app/shared/components/filters-list/working-hours/working-hours.component.scss b/src/app/shared/components/filters-list/working-hours/working-hours.component.scss index 556359761c..94c212e0df 100644 --- a/src/app/shared/components/filters-list/working-hours/working-hours.component.scss +++ b/src/app/shared/components/filters-list/working-hours/working-hours.component.scss @@ -68,7 +68,7 @@ opacity: 0.8; } } -::ng-deep.mat-dialog-container { +::ng-deep .mat-mdc-dialog-container { [mat-dialog-actions] { display: flex; justify-content: center !important; diff --git a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.scss b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.scss index 68a744349c..9684b33a81 100644 --- a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.scss +++ b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.scss @@ -11,6 +11,3 @@ small.warning { .image-cropper-wrapper { min-height: 50vh; } -.btn-wrapper { - padding-bottom: 2rem; -} diff --git a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.spec.ts b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.spec.ts index e7e2536e79..105ed83ea1 100644 --- a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.spec.ts +++ b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.spec.ts @@ -1,11 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { - MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { ImageCropperModule } from 'ngx-image-cropper'; + import { Cropper } from '../../models/cropper'; import { ImageCropperModalComponent } from './image-cropper-modal.component'; diff --git a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.ts b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.ts index 86ad41a37c..e6cf2901bc 100644 --- a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.ts +++ b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ImageCroppedEvent, LoadedImage, base64ToFile } from 'ngx-image-cropper'; import { Cropper } from 'shared/models/cropper'; diff --git a/src/app/shared/components/image-form-control/image-form-control.component.spec.ts b/src/app/shared/components/image-form-control/image-form-control.component.spec.ts index 6cdada96e9..ef20d167bf 100644 --- a/src/app/shared/components/image-form-control/image-form-control.component.spec.ts +++ b/src/app/shared/components/image-form-control/image-form-control.component.spec.ts @@ -1,11 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; -import { - MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; + import { ImageFormControlComponent } from './image-form-control.component'; describe('ImageFormControlComponent', () => { diff --git a/src/app/shared/components/image-form-control/image-form-control.component.ts b/src/app/shared/components/image-form-control/image-form-control.component.ts index f7f2a5a520..c00b5ee3fe 100644 --- a/src/app/shared/components/image-form-control/image-form-control.component.ts +++ b/src/app/shared/components/image-form-control/image-form-control.component.ts @@ -1,6 +1,6 @@ import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { AbstractControl, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Constants } from 'shared/constants/constants'; import { Cropper } from 'shared/models/cropper'; diff --git a/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.scss b/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.scss index 45892ab4f8..673c00bf18 100644 --- a/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.scss +++ b/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.scss @@ -14,6 +14,8 @@ text-align: center; } .unregistered-user-modal__message { + color: #333333; + padding: 20px 0; font-size: 18px; font-weight: 600; line-height: 1.5; @@ -24,7 +26,6 @@ background-color: #3849f9; border: 1px solid #3849f9; border-radius: 20px; - margin-bottom: 20px; display: block; &.white { diff --git a/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.spec.ts b/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.spec.ts index d156d1c02a..2536cb67ee 100644 --- a/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.spec.ts +++ b/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; import { NgxsModule, Store } from '@ngxs/store'; diff --git a/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.ts b/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.ts index 446bbfe6f1..a986624626 100644 --- a/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.ts +++ b/src/app/shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { Store } from '@ngxs/store'; import { ModeConstants } from 'shared/constants/constants'; diff --git a/src/app/shared/components/workshop-card/workshop-card.component.spec.ts b/src/app/shared/components/workshop-card/workshop-card.component.spec.ts index c4a00d7e29..0b5e888d9a 100644 --- a/src/app/shared/components/workshop-card/workshop-card.component.spec.ts +++ b/src/app/shared/components/workshop-card/workshop-card.component.spec.ts @@ -2,12 +2,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FlexLayoutModule } from '@angular/flex-layout'; import { MatCardModule } from '@angular/material/card'; import { MatChipsModule } from '@angular/material/chips'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { NgxsModule } from '@ngxs/store'; + import { Address } from '../../models/address.model'; import { Teacher } from '../../models/teacher.model'; import { WorkshopCard } from '../../models/workshop.model'; diff --git a/src/app/shared/components/workshop-card/workshop-card.component.ts b/src/app/shared/components/workshop-card/workshop-card.component.ts index e55390ea7f..3074b3b7ce 100644 --- a/src/app/shared/components/workshop-card/workshop-card.component.ts +++ b/src/app/shared/components/workshop-card/workshop-card.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Select, Store } from '@ngxs/store'; import { Observable, Subject } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.scss b/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.scss index 390bc9e3c7..75da26183c 100644 --- a/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.scss +++ b/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.scss @@ -1,28 +1,22 @@ @import 'src/app/shared/styles/buttons.scss'; -:host ::ng-deep .mat-dialog-container { - min-width: 411px; - min-height: 178px; - background: #ffffff; - box-shadow: 0px 6px 16px rgba(0, 0, 0, 0.08); - border-radius: 5px; -} -:host ::ng-deep .mat-dialog-actions { - padding-bottom: 2rem; -} -:host ::ng-deep.mat-dialog-actions .mat-button-base + .mat-button-base { - margin-left: 1rem !important; -} -:host ::ng-deep .mat-dialog-title { - text-align: center; - margin-bottom: 0; - font-family: Innerspace; - font-style: normal; - font-weight: bold; - font-size: 18px; - line-height: 20px; - color: #444444; +:host ::ng-deep .mat-mdc-dialog { + &-actions .mat-button-base + .mat-button-base { + margin-left: 1rem !important; + } + + &-title { + text-align: center; + margin-bottom: 0; + font-family: Innerspace; + font-style: normal; + font-weight: bold; + font-size: 18px; + line-height: 20px; + color: #444444; + } } + .confirmation { text-align: center; font-family: Open Sans; @@ -38,12 +32,3 @@ .btn { margin-top: 1rem; } -@media (max-width: 750px) { - :host ::ng-deep .mat-dialog-container { - min-width: fit-content; - min-height: 178px; - background: #ffffff; - box-shadow: 0px 6px 16px rgba(0, 0, 0, 0.08); - border-radius: 5px; - } -} diff --git a/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.spec.ts b/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.spec.ts index 429000ee1a..374a20e646 100644 --- a/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.spec.ts +++ b/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.spec.ts @@ -1,12 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { - MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.ts b/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.ts index 79bb1e8e25..c3e85f63ca 100644 --- a/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.ts +++ b/src/app/shared/components/workshop-card/workshop-seats-lack-modal/workshop-seats-lack-modal.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ selector: 'app-workshop-seats-lack-modal', diff --git a/src/app/shared/modules/material.module.ts b/src/app/shared/modules/material.module.ts index 418b6defda..5afa56e450 100644 --- a/src/app/shared/modules/material.module.ts +++ b/src/app/shared/modules/material.module.ts @@ -12,7 +12,7 @@ import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/lega 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 { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; diff --git a/src/app/shell/admin-tools/data/admin-applications/admin-applications.component.spec.ts b/src/app/shell/admin-tools/data/admin-applications/admin-applications.component.spec.ts index 79e69e50e8..fb8cb30c53 100644 --- a/src/app/shell/admin-tools/data/admin-applications/admin-applications.component.spec.ts +++ b/src/app/shell/admin-tools/data/admin-applications/admin-applications.component.spec.ts @@ -1,6 +1,6 @@ import { Component, Injectable, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { NgxsModule, State, Store } from '@ngxs/store'; import { ChildDeclination, WorkshopDeclination } from 'shared/enum/enumUA/declinations/declination'; diff --git a/src/app/shell/admin-tools/data/admin-applications/admin-applications.component.ts b/src/app/shell/admin-tools/data/admin-applications/admin-applications.component.ts index 351439e3a3..c645c71292 100644 --- a/src/app/shell/admin-tools/data/admin-applications/admin-applications.component.ts +++ b/src/app/shell/admin-tools/data/admin-applications/admin-applications.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Store } from '@ngxs/store'; import { PaginationConstants } from 'shared/constants/constants'; diff --git a/src/app/shell/admin-tools/data/admins/admins.component.spec.ts b/src/app/shell/admin-tools/data/admins/admins.component.spec.ts index a1a9e2a2e0..34fc6fdfdb 100644 --- a/src/app/shell/admin-tools/data/admins/admins.component.spec.ts +++ b/src/app/shell/admin-tools/data/admins/admins.component.spec.ts @@ -1,14 +1,10 @@ import { Component, Injectable, Input } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { - MatLegacyDialog as MatDialog, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; import { MatMenuModule } from '@angular/material/menu'; import { MatTabChangeEvent, MatTabsModule } from '@angular/material/tabs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/src/app/shell/admin-tools/data/admins/admins.component.ts b/src/app/shell/admin-tools/data/admins/admins.component.ts index e8b3d9428e..7eeed1bcbb 100644 --- a/src/app/shell/admin-tools/data/admins/admins.component.ts +++ b/src/app/shell/admin-tools/data/admins/admins.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { MatLegacyTabChangeEvent as MatTabChangeEvent } from '@angular/material/legacy-tabs'; import { ActivatedRoute, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; diff --git a/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.spec.ts b/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.spec.ts index 13f2f0cdcf..a8914e438e 100644 --- a/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.spec.ts +++ b/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.spec.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { Component, Injectable, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; diff --git a/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.ts b/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.ts index 4e2dc549b1..ef65f85f1d 100644 --- a/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.ts +++ b/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; import { Observable, map, switchMap } from 'rxjs'; diff --git a/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-edit-form/directions-institution-hierarchies-edit-form.component.ts b/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-edit-form/directions-institution-hierarchies-edit-form.component.ts index ae9a50fa90..d142a00362 100644 --- a/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-edit-form/directions-institution-hierarchies-edit-form.component.ts +++ b/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-edit-form/directions-institution-hierarchies-edit-form.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, AfterViewInit, ViewChild, ElementRef } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MatLegacyOption as MatOption } from '@angular/material/legacy-core'; import { MatLegacySelect as MatSelect } from '@angular/material/legacy-select'; import { Router } from '@angular/router'; diff --git a/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-list/directions-institution-hierarchies-list.component.spec.ts b/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-list/directions-institution-hierarchies-list.component.spec.ts index 977eafac96..3562b0cc31 100644 --- a/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-list/directions-institution-hierarchies-list.component.spec.ts +++ b/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-list/directions-institution-hierarchies-list.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatTableModule } from '@angular/material/table'; import { NgxsModule } from '@ngxs/store'; diff --git a/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-list/directions-institution-hierarchies-list.component.ts b/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-list/directions-institution-hierarchies-list.component.ts index 2255928855..e9dcfb4231 100644 --- a/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-list/directions-institution-hierarchies-list.component.ts +++ b/src/app/shell/admin-tools/data/directions-wrapper/directions-institution-hierarchies-list/directions-institution-hierarchies-list.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { MatSort } from '@angular/material/sort'; import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table'; import { Router } from '@angular/router'; diff --git a/src/app/shell/admin-tools/data/directions-wrapper/directions-wrapper.component.spec.ts b/src/app/shell/admin-tools/data/directions-wrapper/directions-wrapper.component.spec.ts index 237d730082..9d7f4ea6af 100644 --- a/src/app/shell/admin-tools/data/directions-wrapper/directions-wrapper.component.spec.ts +++ b/src/app/shell/admin-tools/data/directions-wrapper/directions-wrapper.component.spec.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatTabsModule } from '@angular/material/tabs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; diff --git a/src/app/shell/admin-tools/data/directions-wrapper/directions/create-direction/create-direction.component.spec.ts b/src/app/shell/admin-tools/data/directions-wrapper/directions/create-direction/create-direction.component.spec.ts index 04350c4ca0..62a06d94e7 100644 --- a/src/app/shell/admin-tools/data/directions-wrapper/directions/create-direction/create-direction.component.spec.ts +++ b/src/app/shell/admin-tools/data/directions-wrapper/directions/create-direction/create-direction.component.spec.ts @@ -1,8 +1,8 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatStepperModule } from '@angular/material/stepper'; diff --git a/src/app/shell/admin-tools/data/directions-wrapper/directions/create-direction/create-direction.component.ts b/src/app/shell/admin-tools/data/directions-wrapper/directions/create-direction/create-direction.component.ts index ba2d76056d..b2e8275a2a 100644 --- a/src/app/shell/admin-tools/data/directions-wrapper/directions/create-direction/create-direction.component.ts +++ b/src/app/shell/admin-tools/data/directions-wrapper/directions/create-direction/create-direction.component.ts @@ -1,7 +1,7 @@ import { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; import { Observable } from 'rxjs'; diff --git a/src/app/shell/admin-tools/data/directions-wrapper/directions/directions.component.spec.ts b/src/app/shell/admin-tools/data/directions-wrapper/directions/directions.component.spec.ts index 1ab0089a72..62022dfab8 100644 --- a/src/app/shell/admin-tools/data/directions-wrapper/directions/directions.component.spec.ts +++ b/src/app/shell/admin-tools/data/directions-wrapper/directions/directions.component.spec.ts @@ -1,10 +1,10 @@ import { Component, CUSTOM_ELEMENTS_SCHEMA, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatStepperModule } from '@angular/material/stepper'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; diff --git a/src/app/shell/admin-tools/data/directions-wrapper/directions/directions.component.ts b/src/app/shell/admin-tools/data/directions-wrapper/directions/directions.component.ts index 89190f8292..538356b34a 100644 --- a/src/app/shell/admin-tools/data/directions-wrapper/directions/directions.component.ts +++ b/src/app/shell/admin-tools/data/directions-wrapper/directions/directions.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, Validators } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Select, Store } from '@ngxs/store'; import { Observable, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter, map, skip, startWith, takeUntil } from 'rxjs/operators'; diff --git a/src/app/shell/admin-tools/data/provider-list/provider-list.component.spec.ts b/src/app/shell/admin-tools/data/provider-list/provider-list.component.spec.ts index e178fe70c9..fd950f9514 100644 --- a/src/app/shell/admin-tools/data/provider-list/provider-list.component.spec.ts +++ b/src/app/shell/admin-tools/data/provider-list/provider-list.component.spec.ts @@ -2,9 +2,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Component, Input, Provider } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatMenuModule } from '@angular/material/menu'; import { MatTableModule } from '@angular/material/table'; import { RouterTestingModule } from '@angular/router/testing'; diff --git a/src/app/shell/admin-tools/data/provider-list/provider-list.component.ts b/src/app/shell/admin-tools/data/provider-list/provider-list.component.ts index d31dc4af0d..b9d04017e0 100644 --- a/src/app/shell/admin-tools/data/provider-list/provider-list.component.ts +++ b/src/app/shell/admin-tools/data/provider-list/provider-list.component.ts @@ -1,7 +1,7 @@ import { LiveAnnouncer } from '@angular/cdk/a11y'; import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { AbstractControl, FormBuilder, FormControl, FormGroup } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { MatSort, Sort } from '@angular/material/sort'; import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table'; import { ActivatedRoute } from '@angular/router'; diff --git a/src/app/shell/admin-tools/data/users/users.component.spec.ts b/src/app/shell/admin-tools/data/users/users.component.spec.ts index 37160b8a32..f2ed72b14b 100644 --- a/src/app/shell/admin-tools/data/users/users.component.spec.ts +++ b/src/app/shell/admin-tools/data/users/users.component.spec.ts @@ -1,13 +1,9 @@ import { Component, Injectable, Input } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; -import { - MatLegacyDialog as MatDialog, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatTabChangeEvent, MatTabsModule } from '@angular/material/tabs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/src/app/shell/admin-tools/data/users/users.component.ts b/src/app/shell/admin-tools/data/users/users.component.ts index 8a8bb34438..e349fcd697 100644 --- a/src/app/shell/admin-tools/data/users/users.component.ts +++ b/src/app/shell/admin-tools/data/users/users.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { MatLegacyTabChangeEvent as MatTabChangeEvent } from '@angular/material/legacy-tabs'; import { ActivatedRoute, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; diff --git a/src/app/shell/admin-tools/platform/platform.component.spec.ts b/src/app/shell/admin-tools/platform/platform.component.spec.ts index 61e337600a..3d30794592 100644 --- a/src/app/shell/admin-tools/platform/platform.component.spec.ts +++ b/src/app/shell/admin-tools/platform/platform.component.spec.ts @@ -1,10 +1,10 @@ import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatTabChangeEvent, MatTabsModule } from '@angular/material/tabs'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute, Router } from '@angular/router'; diff --git a/src/app/shell/details/details-tabs/achievements/achievements.component.spec.ts b/src/app/shell/details/details-tabs/achievements/achievements.component.spec.ts index 4f6ffd03a7..55c6caa412 100644 --- a/src/app/shell/details/details-tabs/achievements/achievements.component.spec.ts +++ b/src/app/shell/details/details-tabs/achievements/achievements.component.spec.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatCardModule } from '@angular/material/card'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { NgxsModule } from '@ngxs/store'; diff --git a/src/app/shell/details/details-tabs/achievements/achievements.component.ts b/src/app/shell/details/details-tabs/achievements/achievements.component.ts index 0ead6edac0..5035e2977c 100644 --- a/src/app/shell/details/details-tabs/achievements/achievements.component.ts +++ b/src/app/shell/details/details-tabs/achievements/achievements.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Select, Store } from '@ngxs/store'; import { Observable, Subject, combineLatest } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/src/app/shell/details/details-tabs/reviews/reviews.component.spec.ts b/src/app/shell/details/details-tabs/reviews/reviews.component.spec.ts index ab1fe2b2b9..a0fa5d26ec 100644 --- a/src/app/shell/details/details-tabs/reviews/reviews.component.spec.ts +++ b/src/app/shell/details/details-tabs/reviews/reviews.component.spec.ts @@ -2,8 +2,8 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatTooltipModule } from '@angular/material/tooltip'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { NgxsModule, Store } from '@ngxs/store'; diff --git a/src/app/shell/details/details-tabs/reviews/reviews.component.ts b/src/app/shell/details/details-tabs/reviews/reviews.component.ts index 7d683d46ab..399c61d796 100644 --- a/src/app/shell/details/details-tabs/reviews/reviews.component.ts +++ b/src/app/shell/details/details-tabs/reviews/reviews.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { Actions, Select, Store, ofActionCompleted } from '@ngxs/store'; import { Observable, Subject } from 'rxjs'; diff --git a/src/app/shell/details/side-menu/actions/actions.component.spec.ts b/src/app/shell/details/side-menu/actions/actions.component.spec.ts index 740c3587d9..04c0dfb94a 100644 --- a/src/app/shell/details/side-menu/actions/actions.component.spec.ts +++ b/src/app/shell/details/side-menu/actions/actions.component.spec.ts @@ -1,25 +1,21 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef, - MatLegacyDialog as MatDialog -} from '@angular/material/legacy-dialog'; +import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { NgxsModule, Store } from '@ngxs/store'; import { of } from 'rxjs'; -import { Router } from '@angular/router'; +import { Role } from 'shared/enum/role'; import { User } from 'shared/models/user.model'; import { Workshop } from 'shared/models/workshop.model'; -import { Role } from 'shared/enum/role'; // eslint-disable-next-line max-len import { UnregisteredUserWarningModalComponent } from 'shared/components/unregistered-user-warning-modal/unregistered-user-warning-modal.component'; -import { ModalConfirmationDescription } from 'shared/enum/modal-confirmation'; +import { ModeConstants } from 'shared/constants/constants'; import { SnackbarText } from 'shared/enum/enumUA/message-bar'; +import { ModalConfirmationDescription } from 'shared/enum/modal-confirmation'; import { ShowMessageBar } from 'shared/store/app.actions'; -import { ModeConstants } from 'shared/constants/constants'; import { ActionsComponent } from './actions.component'; describe('ActionsComponent', () => { diff --git a/src/app/shell/details/side-menu/actions/actions.component.ts b/src/app/shell/details/side-menu/actions/actions.component.ts index 1fe1a0e057..81c649f573 100644 --- a/src/app/shell/details/side-menu/actions/actions.component.ts +++ b/src/app/shell/details/side-menu/actions/actions.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Select, Store } from '@ngxs/store'; import { Observable, Subject, combineLatest } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/src/app/shell/personal-cabinet/parent/children/children.component.spec.ts b/src/app/shell/personal-cabinet/parent/children/children.component.spec.ts index f6e51ccd5b..8aebe0fb74 100644 --- a/src/app/shell/personal-cabinet/parent/children/children.component.spec.ts +++ b/src/app/shell/personal-cabinet/parent/children/children.component.spec.ts @@ -1,6 +1,6 @@ import { CUSTOM_ELEMENTS_SCHEMA, Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { RouterTestingModule } from '@angular/router/testing'; import { NgxsModule } from '@ngxs/store'; diff --git a/src/app/shell/personal-cabinet/parent/children/children.component.ts b/src/app/shell/personal-cabinet/parent/children/children.component.ts index 4100f2fdaf..e713620c99 100644 --- a/src/app/shell/personal-cabinet/parent/children/children.component.ts +++ b/src/app/shell/personal-cabinet/parent/children/children.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Select, Store } from '@ngxs/store'; import { Observable } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/src/app/shell/personal-cabinet/parent/create-application/create-application.component.spec.ts b/src/app/shell/personal-cabinet/parent/create-application/create-application.component.spec.ts index 7a2b46d6b8..d7a8599a82 100644 --- a/src/app/shell/personal-cabinet/parent/create-application/create-application.component.spec.ts +++ b/src/app/shell/personal-cabinet/parent/create-application/create-application.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatOptionModule } from '@angular/material/core'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; @@ -14,6 +14,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { NgxsModule, Store } from '@ngxs/store'; import { of } from 'rxjs'; + import { Child } from 'shared/models/child.model'; import { Parent } from 'shared/models/parent.model'; import { Workshop } from 'shared/models/workshop.model'; diff --git a/src/app/shell/personal-cabinet/parent/create-application/create-application.component.ts b/src/app/shell/personal-cabinet/parent/create-application/create-application.component.ts index a5acb3a7af..46a1822958 100644 --- a/src/app/shell/personal-cabinet/parent/create-application/create-application.component.ts +++ b/src/app/shell/personal-cabinet/parent/create-application/create-application.component.ts @@ -3,7 +3,7 @@ import { filter, takeUntil } from 'rxjs/operators'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, Validators } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; import { MatLegacyTabChangeEvent as MatTabChangeEvent } from '@angular/material/legacy-tabs'; import { ActivatedRoute } from '@angular/router'; diff --git a/src/app/shell/personal-cabinet/parent/create-child/create-child.component.spec.ts b/src/app/shell/personal-cabinet/parent/create-child/create-child.component.spec.ts index 2fecc89a1a..b78691b713 100644 --- a/src/app/shell/personal-cabinet/parent/create-child/create-child.component.spec.ts +++ b/src/app/shell/personal-cabinet/parent/create-child/create-child.component.spec.ts @@ -3,8 +3,8 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { RouterTestingModule } from '@angular/router/testing'; import { NgxsModule } from '@ngxs/store'; diff --git a/src/app/shell/personal-cabinet/parent/create-child/create-child.component.ts b/src/app/shell/personal-cabinet/parent/create-child/create-child.component.ts index 77f951e396..b0257f7bff 100644 --- a/src/app/shell/personal-cabinet/parent/create-child/create-child.component.ts +++ b/src/app/shell/personal-cabinet/parent/create-child/create-child.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormArray, FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; import { Observable } from 'rxjs'; diff --git a/src/app/shell/personal-cabinet/parent/create-parent/create-parent.component.spec.ts b/src/app/shell/personal-cabinet/parent/create-parent/create-parent.component.spec.ts index 8e2529f1a8..a1746a4e6b 100644 --- a/src/app/shell/personal-cabinet/parent/create-parent/create-parent.component.spec.ts +++ b/src/app/shell/personal-cabinet/parent/create-parent/create-parent.component.spec.ts @@ -1,20 +1,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialogModule } from '@angular/material/legacy-dialog'; +import { FormBuilder, FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; +import { NgxsModule, Store } from '@ngxs/store'; import { of } from 'rxjs'; import { ConfirmationModalWindowComponent } from 'shared/components/confirmation-modal-window/confirmation-modal-window.component'; import { Constants } from 'shared/constants/constants'; import { ModalConfirmationType } from 'shared/enum/modal-confirmation'; import { CreateParent } from 'shared/store/parent.actions'; -import { Store, NgxsModule } from '@ngxs/store'; -import { ReactiveFormsModule, FormsModule, FormBuilder, FormControl } from '@angular/forms'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef, - MatLegacyDialog as MatDialog -} from '@angular/material/legacy-dialog'; import { CreateParentComponent } from './create-parent.component'; describe('CreateParentComponent', () => { @@ -37,7 +32,7 @@ describe('CreateParentComponent', () => { RouterTestingModule, BrowserAnimationsModule, MatDialogModule, - MatLegacyDialogModule, + MatDialogModule, TranslateModule.forRoot() ] }).compileComponents(); diff --git a/src/app/shell/personal-cabinet/parent/create-parent/create-parent.component.ts b/src/app/shell/personal-cabinet/parent/create-parent/create-parent.component.ts index 8e53772e51..a86b582822 100644 --- a/src/app/shell/personal-cabinet/parent/create-parent/create-parent.component.ts +++ b/src/app/shell/personal-cabinet/parent/create-parent/create-parent.component.ts @@ -4,7 +4,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { Select, Store } from '@ngxs/store'; import { Observable } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { SnackbarText } from 'shared/enum/enumUA/message-bar'; import { Role, Subrole } from 'shared/enum/role'; diff --git a/src/app/shell/personal-cabinet/parent/favorite-workshops/favorite-workshops.component.spec.ts b/src/app/shell/personal-cabinet/parent/favorite-workshops/favorite-workshops.component.spec.ts index 20f6b85a49..bf694fefee 100644 --- a/src/app/shell/personal-cabinet/parent/favorite-workshops/favorite-workshops.component.spec.ts +++ b/src/app/shell/personal-cabinet/parent/favorite-workshops/favorite-workshops.component.spec.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { RouterTestingModule } from '@angular/router/testing'; import { NgxsModule, Store } from '@ngxs/store'; import { of } from 'rxjs'; diff --git a/src/app/shell/personal-cabinet/parent/favorite-workshops/favorite-workshops.component.ts b/src/app/shell/personal-cabinet/parent/favorite-workshops/favorite-workshops.component.ts index e46e48f065..7273bef109 100644 --- a/src/app/shell/personal-cabinet/parent/favorite-workshops/favorite-workshops.component.ts +++ b/src/app/shell/personal-cabinet/parent/favorite-workshops/favorite-workshops.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Actions, Select, Store, ofAction } from '@ngxs/store'; import { Observable } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/src/app/shell/personal-cabinet/parent/parent-applications/parent-applications.component.spec.ts b/src/app/shell/personal-cabinet/parent/parent-applications/parent-applications.component.spec.ts index 70a50f482a..b396162de5 100644 --- a/src/app/shell/personal-cabinet/parent/parent-applications/parent-applications.component.spec.ts +++ b/src/app/shell/personal-cabinet/parent/parent-applications/parent-applications.component.spec.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { NgxsModule } from '@ngxs/store'; import { ChildDeclination } from 'shared/enum/enumUA/declinations/declination'; diff --git a/src/app/shell/personal-cabinet/parent/parent-applications/parent-applications.component.ts b/src/app/shell/personal-cabinet/parent/parent-applications/parent-applications.component.ts index d51d4d2a3d..7c7e0fd768 100644 --- a/src/app/shell/personal-cabinet/parent/parent-applications/parent-applications.component.ts +++ b/src/app/shell/personal-cabinet/parent/parent-applications/parent-applications.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; import { Observable } from 'rxjs'; diff --git a/src/app/shell/personal-cabinet/parent/parent.component.ts b/src/app/shell/personal-cabinet/parent/parent.component.ts index 70389b9794..eb59c0f9af 100644 --- a/src/app/shell/personal-cabinet/parent/parent.component.ts +++ b/src/app/shell/personal-cabinet/parent/parent.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Select, Store } from '@ngxs/store'; import { Observable } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.spec.ts b/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.spec.ts index 97601744ce..758f4ce789 100644 --- a/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.spec.ts +++ b/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.spec.ts @@ -6,8 +6,8 @@ import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angul import { MatChipsModule } from '@angular/material/chips'; import { MatNativeDateModule, MatOptionModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; diff --git a/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.ts b/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.ts index b2d468ee8a..2002571d24 100644 --- a/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.ts +++ b/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; import { combineLatest, Observable } from 'rxjs'; diff --git a/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.spec.ts b/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.spec.ts index f2680ed673..e9ee003a0a 100644 --- a/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.spec.ts +++ b/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.spec.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatStepperModule } from '@angular/material/stepper'; diff --git a/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.ts b/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.ts index 4819337b8c..c19f47f862 100644 --- a/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.ts +++ b/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; import { Observable, combineLatest } from 'rxjs'; diff --git a/src/app/shell/personal-cabinet/provider/create-provider/create-info-form/create-info-form.component.spec.ts b/src/app/shell/personal-cabinet/provider/create-provider/create-info-form/create-info-form.component.spec.ts index 6a2dce506b..c4408f9799 100644 --- a/src/app/shell/personal-cabinet/provider/create-provider/create-info-form/create-info-form.component.spec.ts +++ b/src/app/shell/personal-cabinet/provider/create-provider/create-info-form/create-info-form.component.spec.ts @@ -2,10 +2,10 @@ import { Component, Injectable, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyNativeDateModule as MatNativeDateModule, MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; diff --git a/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.spec.ts b/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.spec.ts index 4f028c5615..696a33cbcc 100644 --- a/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.spec.ts +++ b/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.spec.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormBuilder, FormControl, ReactiveFormsModule } from '@angular/forms'; import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatStepperModule } from '@angular/material/stepper'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; diff --git a/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.ts b/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.ts index 4ae1f08606..22f57aa298 100644 --- a/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.ts +++ b/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.ts @@ -1,7 +1,7 @@ import { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper'; import { AfterViewChecked, AfterViewInit, ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { MatStepper } from '@angular/material/stepper'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; diff --git a/src/app/shell/personal-cabinet/provider/create-workshop/create-about-form/working-hours-form-wrapper/working-hours-form/working-hours-form.component.scss b/src/app/shell/personal-cabinet/provider/create-workshop/create-about-form/working-hours-form-wrapper/working-hours-form/working-hours-form.component.scss index 7010a737de..e7c934d276 100644 --- a/src/app/shell/personal-cabinet/provider/create-workshop/create-about-form/working-hours-form-wrapper/working-hours-form/working-hours-form.component.scss +++ b/src/app/shell/personal-cabinet/provider/create-workshop/create-about-form/working-hours-form-wrapper/working-hours-form/working-hours-form.component.scss @@ -65,10 +65,14 @@ overflow: hidden; } -::ng-deep div.ngx-mat-timepicker-dialog > mat-dialog-container div[mat-dialog-actions] { - justify-content: center !important; - flex-flow: wrap-reverse; - row-gap: 1rem; +::ng-deep div.ngx-mat-timepicker-dialog .mat-mdc-dialog-surface { + padding: 0; + + div[mat-dialog-actions] { + justify-content: center !important; + flex-flow: wrap-reverse; + row-gap: 1rem; + } } @media (max-width: 830px) { diff --git a/src/app/shell/personal-cabinet/provider/create-workshop/create-teacher/create-teacher.component.spec.ts b/src/app/shell/personal-cabinet/provider/create-workshop/create-teacher/create-teacher.component.spec.ts index 324f33acd5..9bc01e7e1c 100644 --- a/src/app/shell/personal-cabinet/provider/create-workshop/create-teacher/create-teacher.component.spec.ts +++ b/src/app/shell/personal-cabinet/provider/create-workshop/create-teacher/create-teacher.component.spec.ts @@ -1,13 +1,9 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormArray, FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; +import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; -import { - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialog as MatDialog, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; diff --git a/src/app/shell/personal-cabinet/provider/create-workshop/create-teacher/create-teacher.component.ts b/src/app/shell/personal-cabinet/provider/create-workshop/create-teacher/create-teacher.component.ts index d83dd6fca1..29d2a2453a 100644 --- a/src/app/shell/personal-cabinet/provider/create-workshop/create-teacher/create-teacher.component.ts +++ b/src/app/shell/personal-cabinet/provider/create-workshop/create-teacher/create-teacher.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { AbstractControl, FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ConfirmationModalWindowComponent } from 'shared/components/confirmation-modal-window/confirmation-modal-window.component'; import { Constants } from 'shared/constants/constants'; diff --git a/src/app/shell/personal-cabinet/provider/provider-admins/provider-admins.component.spec.ts b/src/app/shell/personal-cabinet/provider/provider-admins/provider-admins.component.spec.ts index 71fbd5c918..905ef32fc4 100644 --- a/src/app/shell/personal-cabinet/provider/provider-admins/provider-admins.component.spec.ts +++ b/src/app/shell/personal-cabinet/provider/provider-admins/provider-admins.component.spec.ts @@ -1,12 +1,8 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { - MatLegacyDialog as MatDialog, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatMenuModule } from '@angular/material/menu'; diff --git a/src/app/shell/personal-cabinet/provider/provider-admins/provider-admins.component.ts b/src/app/shell/personal-cabinet/provider/provider-admins/provider-admins.component.ts index 9491f79f79..a5eed4286e 100644 --- a/src/app/shell/personal-cabinet/provider/provider-admins/provider-admins.component.ts +++ b/src/app/shell/personal-cabinet/provider/provider-admins/provider-admins.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, HostListener } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { MatLegacyTabChangeEvent as MatTabChangeEvent } from '@angular/material/legacy-tabs'; import { ActivatedRoute, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; diff --git a/src/app/shell/personal-cabinet/provider/provider-applications/provider-applications.component.spec.ts b/src/app/shell/personal-cabinet/provider/provider-applications/provider-applications.component.spec.ts index 9ef81c6ce4..3190300ea9 100644 --- a/src/app/shell/personal-cabinet/provider/provider-applications/provider-applications.component.spec.ts +++ b/src/app/shell/personal-cabinet/provider/provider-applications/provider-applications.component.spec.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { NgxsModule } from '@ngxs/store'; import { ReasonModalWindowComponent } from 'shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component'; diff --git a/src/app/shell/personal-cabinet/provider/provider-applications/provider-applications.component.ts b/src/app/shell/personal-cabinet/provider/provider-applications/provider-applications.component.ts index 1de0504cb3..cf8935d2b7 100644 --- a/src/app/shell/personal-cabinet/provider/provider-applications/provider-applications.component.ts +++ b/src/app/shell/personal-cabinet/provider/provider-applications/provider-applications.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { Actions, Select, Store, ofActionSuccessful } from '@ngxs/store'; import { Observable } from 'rxjs'; diff --git a/src/app/shell/personal-cabinet/provider/provider-org-info/provider-org-info.component.spec.ts b/src/app/shell/personal-cabinet/provider/provider-org-info/provider-org-info.component.spec.ts index f1d1c69053..53ea4f038e 100644 --- a/src/app/shell/personal-cabinet/provider/provider-org-info/provider-org-info.component.spec.ts +++ b/src/app/shell/personal-cabinet/provider/provider-org-info/provider-org-info.component.spec.ts @@ -1,7 +1,7 @@ import { Component, Input, Provider } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatTabsModule } from '@angular/material/tabs'; import { RouterTestingModule } from '@angular/router/testing'; import { NgxsModule } from '@ngxs/store'; diff --git a/src/app/shell/personal-cabinet/provider/provider-org-info/provider-org-info.component.ts b/src/app/shell/personal-cabinet/provider/provider-org-info/provider-org-info.component.ts index cdf1b89cae..313f56e72c 100644 --- a/src/app/shell/personal-cabinet/provider/provider-org-info/provider-org-info.component.ts +++ b/src/app/shell/personal-cabinet/provider/provider-org-info/provider-org-info.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Store } from '@ngxs/store'; import { NavBarName } from 'shared/enum/enumUA/navigation-bar'; diff --git a/src/app/shell/personal-cabinet/provider/provider-workshops/provider-workshops.component.spec.ts b/src/app/shell/personal-cabinet/provider/provider-workshops/provider-workshops.component.spec.ts index 1f6eca5346..4a83f0e44d 100644 --- a/src/app/shell/personal-cabinet/provider/provider-workshops/provider-workshops.component.spec.ts +++ b/src/app/shell/personal-cabinet/provider/provider-workshops/provider-workshops.component.spec.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatTabsModule } from '@angular/material/tabs'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/src/app/shell/personal-cabinet/provider/provider-workshops/provider-workshops.component.ts b/src/app/shell/personal-cabinet/provider/provider-workshops/provider-workshops.component.ts index 07723bf17c..070e762271 100644 --- a/src/app/shell/personal-cabinet/provider/provider-workshops/provider-workshops.component.ts +++ b/src/app/shell/personal-cabinet/provider/provider-workshops/provider-workshops.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Actions, Select, Store, ofAction } from '@ngxs/store'; import { Observable, filter } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/src/app/shell/personal-cabinet/provider/provider.component.ts b/src/app/shell/personal-cabinet/provider/provider.component.ts index 8afc68bb33..b0fee880f9 100644 --- a/src/app/shell/personal-cabinet/provider/provider.component.ts +++ b/src/app/shell/personal-cabinet/provider/provider.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Select, Store } from '@ngxs/store'; import { Observable } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/src/app/shell/personal-cabinet/shared-cabinet/cabinet-data.component.ts b/src/app/shell/personal-cabinet/shared-cabinet/cabinet-data.component.ts index 36bf1a3616..e863a4a5bd 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/cabinet-data.component.ts +++ b/src/app/shell/personal-cabinet/shared-cabinet/cabinet-data.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Select, Store } from '@ngxs/store'; import { Observable, Subject, combineLatest } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/src/app/shell/personal-cabinet/shared-cabinet/create-form/create.guard.spec.ts b/src/app/shell/personal-cabinet/shared-cabinet/create-form/create.guard.spec.ts index d9c12ae123..7c085ef8af 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/create-form/create.guard.spec.ts +++ b/src/app/shell/personal-cabinet/shared-cabinet/create-form/create.guard.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { NgxsModule } from '@ngxs/store'; import { CreateGuard } from './create.guard'; diff --git a/src/app/shell/personal-cabinet/shared-cabinet/create-form/create.guard.ts b/src/app/shell/personal-cabinet/shared-cabinet/create-form/create.guard.ts index 28cd16be97..4f88a6db36 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/create-form/create.guard.ts +++ b/src/app/shell/personal-cabinet/shared-cabinet/create-form/create.guard.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Store } from '@ngxs/store'; import { Observable } from 'rxjs'; import { takeWhile } from 'rxjs/operators'; diff --git a/src/app/shell/personal-cabinet/shared-cabinet/messages/messages.component.spec.ts b/src/app/shell/personal-cabinet/shared-cabinet/messages/messages.component.spec.ts index edd0f00c59..95d9a8dad8 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/messages/messages.component.spec.ts +++ b/src/app/shell/personal-cabinet/shared-cabinet/messages/messages.component.spec.ts @@ -1,12 +1,8 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { - MatLegacyDialog as MatDialog, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; import { TranslateModule } from '@ngx-translate/core'; import { NgxsModule, Store } from '@ngxs/store'; import { of } from 'rxjs'; diff --git a/src/app/shell/personal-cabinet/shared-cabinet/messages/messages.component.ts b/src/app/shell/personal-cabinet/shared-cabinet/messages/messages.component.ts index 59341182df..5949e28706 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/messages/messages.component.ts +++ b/src/app/shell/personal-cabinet/shared-cabinet/messages/messages.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Select, Store } from '@ngxs/store'; import { Observable, debounceTime, distinctUntilChanged, filter, switchMap, takeUntil } from 'rxjs'; diff --git a/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.spec.ts b/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.spec.ts index 5fbe0d71b2..719ae678e2 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.spec.ts +++ b/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.spec.ts @@ -2,8 +2,8 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatRadioModule } from '@angular/material/radio'; diff --git a/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.ts b/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.ts index c7daf1e397..f54c8c0bb6 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.ts +++ b/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { Select, Store } from '@ngxs/store'; import { Observable } from 'rxjs'; diff --git a/src/styles.scss b/src/styles.scss index c9eb08803d..4bbb6503b2 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -78,11 +78,13 @@ $theme: mat.define-light-theme( ) ); -@include mat.core(); +/* TODO(mdc-migration): Remove legacy-core once all legacy components are migrated */ @include mat.legacy-core(); +@include mat.core(); -@include mat.all-component-themes($theme); +/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated */ @include mat.all-legacy-component-themes($theme); +@include mat.all-component-themes($theme); @include mat.button-toggle-typography($config); @include mat.legacy-button-typography($config); @@ -216,6 +218,15 @@ a { opacity: 0.3; } +.mat-mdc-dialog-surface { + --mdc-dialog-supporting-text-font: 'Open Sans', serif; + padding: 10px 24px 24px; + + .mdc-dialog__title { + margin-bottom: 11px; + } +} + .mat-checkbox-inner-container { height: 18px !important; width: 18px !important;