From fbe9ae851497968fff6eeb930b217e8a2a9c4f44 Mon Sep 17 00:00:00 2001 From: Morten Vestergaard Hansen Date: Thu, 3 Aug 2023 12:23:44 +0200 Subject: [PATCH] Removed legacy dialog (#1933) * Removed legacy dialog * Chore: bump version to 0.3.310 for build/infrastructure/eo/chart/Chart.yaml * Chore: bump version to 0.3.310 for build/infrastructure/eo/chart/values.yaml --------- Co-authored-by: github-actions[bot] --- .../src/app/energy-origin-app.component.ts | 2 +- build/infrastructure/eo/chart/Chart.yaml | 2 +- build/infrastructure/eo/chart/values.yaml | 2 +- .../shell/src/lib/eo-core-shell.providers.ts | 4 ++-- .../shell/src/lib/eo-shell.component.spec.ts | 2 +- .../eo-date-picker-dialog.component.ts | 5 +---- .../eo-date-picker.component.ts | 6 +---- .../idle-timer-countdown.component.ts | 2 +- .../idle-timer-logged-out.component.ts | 2 +- .../src/idle-timer/idle-timer.service.ts | 5 +---- .../modal/watt-modal.component.scss | 22 ++++++++++--------- .../components/modal/watt-modal.component.ts | 6 +---- .../watt/theme/light-theme.scss | 2 +- 13 files changed, 25 insertions(+), 37 deletions(-) diff --git a/apps/eo/app-eo/src/app/energy-origin-app.component.ts b/apps/eo/app-eo/src/app/energy-origin-app.component.ts index d67eaae154..de61bbf5c4 100644 --- a/apps/eo/app-eo/src/app/energy-origin-app.component.ts +++ b/apps/eo/app-eo/src/app/energy-origin-app.component.ts @@ -20,7 +20,7 @@ import { MatDatepickerModule } from '@angular/material/datepicker'; import { RouterOutlet } from '@angular/router'; // eslint-disable-next-line @nx/enforce-module-boundaries import { EoAuthService } from '@energinet-datahub/eo/shared/services'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; @Component({ diff --git a/build/infrastructure/eo/chart/Chart.yaml b/build/infrastructure/eo/chart/Chart.yaml index cd89874202..e601d51caa 100644 --- a/build/infrastructure/eo/chart/Chart.yaml +++ b/build/infrastructure/eo/chart/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: eo-frontend description: A Helm chart for Kubernetes type: application -version: 0.3.309 +version: 0.3.310 diff --git a/build/infrastructure/eo/chart/values.yaml b/build/infrastructure/eo/chart/values.yaml index ecde371f16..2eb9bd14d9 100644 --- a/build/infrastructure/eo/chart/values.yaml +++ b/build/infrastructure/eo/chart/values.yaml @@ -2,4 +2,4 @@ app: replicaCount: 2 image: name: ghcr.io/energinet-datahub/eo-frontend-app - tag: 0.3.309 + tag: 0.3.310 diff --git a/libs/eo/core/shell/src/lib/eo-core-shell.providers.ts b/libs/eo/core/shell/src/lib/eo-core-shell.providers.ts index 8e0e742411..aab30f9f5e 100644 --- a/libs/eo/core/shell/src/lib/eo-core-shell.providers.ts +++ b/libs/eo/core/shell/src/lib/eo-core-shell.providers.ts @@ -15,7 +15,7 @@ * limitations under the License. */ import { importProvidersFrom } from '@angular/core'; -import { MatLegacyDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatLegacySnackBarModule } from '@angular/material/legacy-snack-bar'; import { eoAuthorizationInterceptorProvider } from '@energinet-datahub/eo/shared/services'; @@ -27,6 +27,6 @@ export const eoCoreShellProviders = [ browserConfigurationProviders, danishLocalProviders, danishDatetimeProviders, - importProvidersFrom(MatLegacyDialogModule, MatLegacySnackBarModule), + importProvidersFrom(MatDialogModule, MatLegacySnackBarModule), eoAuthorizationInterceptorProvider, ]; diff --git a/libs/eo/core/shell/src/lib/eo-shell.component.spec.ts b/libs/eo/core/shell/src/lib/eo-shell.component.spec.ts index 8201993927..88d66b26bf 100644 --- a/libs/eo/core/shell/src/lib/eo-shell.component.spec.ts +++ b/libs/eo/core/shell/src/lib/eo-shell.component.spec.ts @@ -16,7 +16,7 @@ */ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { By } from '@angular/platform-browser'; import { WattShellComponent } from '@energinet-datahub/watt/shell'; import { EoShellComponent } from './eo-shell.component'; diff --git a/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-date-picker/eo-date-picker-dialog.component.ts b/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-date-picker/eo-date-picker-dialog.component.ts index ac28fd671e..8203acc516 100644 --- a/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-date-picker/eo-date-picker-dialog.component.ts +++ b/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-date-picker/eo-date-picker-dialog.component.ts @@ -18,10 +18,7 @@ import { Component, Inject, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { DateRange, MatCalendar, MatDatepickerModule } from '@angular/material/datepicker'; -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 { MatLegacyRadioChange as MatRadioChange, MatLegacyRadioModule as MatRadioModule, diff --git a/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-date-picker/eo-date-picker.component.ts b/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-date-picker/eo-date-picker.component.ts index 5088468689..9a41b360ad 100644 --- a/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-date-picker/eo-date-picker.component.ts +++ b/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-date-picker/eo-date-picker.component.ts @@ -28,11 +28,7 @@ import { ViewEncapsulation, } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; -import { - MatLegacyDialog as MatDialog, - MatLegacyDialogConfig as MatDialogConfig, - MatLegacyDialogModule as MatDialogModule, -} from '@angular/material/legacy-dialog'; +import { MatDialog, MatDialogConfig, MatDialogModule } from '@angular/material/dialog'; import { CalendarDateRange } from '@energinet-datahub/eo/shared/services'; import { EoDatePickerDialogComponent } from './eo-date-picker-dialog.component'; diff --git a/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-idle-timer/idle-timer-countdown.component.ts b/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-idle-timer/idle-timer-countdown.component.ts index f32f925267..d175854944 100644 --- a/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-idle-timer/idle-timer-countdown.component.ts +++ b/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-idle-timer/idle-timer-countdown.component.ts @@ -16,7 +16,7 @@ */ import { AsyncPipe, DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MatDialogRef } from '@angular/material/dialog'; import { WattButtonComponent } from '@energinet-datahub/watt/button'; import { WATT_MODAL } from '@energinet-datahub/watt/modal'; import { map, take, tap, timer } from 'rxjs'; diff --git a/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-idle-timer/idle-timer-logged-out.component.ts b/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-idle-timer/idle-timer-logged-out.component.ts index 82fe84a0c1..1275513898 100644 --- a/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-idle-timer/idle-timer-logged-out.component.ts +++ b/libs/eo/shared/atomic-design/ui-atoms/src/lib/eo-idle-timer/idle-timer-logged-out.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MatDialogRef } from '@angular/material/dialog'; import { WattButtonComponent } from '@energinet-datahub/watt/button'; import { WATT_MODAL } from '@energinet-datahub/watt/modal'; diff --git a/libs/eo/shared/services/src/idle-timer/idle-timer.service.ts b/libs/eo/shared/services/src/idle-timer/idle-timer.service.ts index 0b507eb4a7..708c071167 100644 --- a/libs/eo/shared/services/src/idle-timer/idle-timer.service.ts +++ b/libs/eo/shared/services/src/idle-timer/idle-timer.service.ts @@ -16,10 +16,7 @@ */ /* eslint-disable @nx/enforce-module-boundaries */ import { Injectable } from '@angular/core'; -import { - MatLegacyDialog as MatDialog, - MatLegacyDialogRef as MatDialogRef, -} from '@angular/material/legacy-dialog'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { EoIdleTimerCountdownModalComponent, EoIdleTimerLoggedOutModalComponent, diff --git a/libs/ui-watt/src/lib/components/modal/watt-modal.component.scss b/libs/ui-watt/src/lib/components/modal/watt-modal.component.scss index a1d53cd4fb..3b7732654f 100644 --- a/libs/ui-watt/src/lib/components/modal/watt-modal.component.scss +++ b/libs/ui-watt/src/lib/components/modal/watt-modal.component.scss @@ -26,16 +26,18 @@ // TODO: Implement sizes variants and breakpoints mat-dialog-container { - position: relative; - display: grid; - padding: 0; - align-items: center; - grid-template-columns: 1fr auto; - grid-template-rows: 60px 1fr auto; - grid-template-areas: - "title close" - "content content" - "actions actions"; + div.mat-mdc-dialog-surface { + position: relative; + display: grid; + padding: 0; + align-items: center; + grid-template-columns: 1fr auto; + grid-template-rows: 60px 1fr auto; + grid-template-areas: + "title close" + "content content" + "actions actions"; + } } .watt-modal-close { diff --git a/libs/ui-watt/src/lib/components/modal/watt-modal.component.ts b/libs/ui-watt/src/lib/components/modal/watt-modal.component.ts index 3b142492e1..40a53f792f 100644 --- a/libs/ui-watt/src/lib/components/modal/watt-modal.component.ts +++ b/libs/ui-watt/src/lib/components/modal/watt-modal.component.ts @@ -25,11 +25,7 @@ import { ViewChild, ViewEncapsulation, } from '@angular/core'; -import { - MatLegacyDialog as MatDialog, - MatLegacyDialogConfig as MatDialogConfig, - MatLegacyDialogModule as MatDialogModule, -} from '@angular/material/legacy-dialog'; +import { MatDialog, MatDialogConfig, MatDialogModule } from '@angular/material/dialog'; import { CommonModule } from '@angular/common'; import { WattResizeObserverDirective } from '../../utils/resize-observer'; diff --git a/libs/ui-watt/src/lib/styles/@energinet-datahub/watt/theme/light-theme.scss b/libs/ui-watt/src/lib/styles/@energinet-datahub/watt/theme/light-theme.scss index 25bb680e12..6f80187017 100644 --- a/libs/ui-watt/src/lib/styles/@energinet-datahub/watt/theme/light-theme.scss +++ b/libs/ui-watt/src/lib/styles/@energinet-datahub/watt/theme/light-theme.scss @@ -59,7 +59,7 @@ $watt-theme: mat.define-light-theme( @include mat.legacy-chips-theme($watt-theme); @include mat.legacy-core-theme($watt-theme); @include mat.datepicker-theme($watt-theme); -@include mat.legacy-dialog-theme($watt-theme); +@include mat.dialog-theme($watt-theme); @include mat.expansion-theme($watt-theme); @include mat.legacy-form-field-theme($watt-theme); @include mat.icon-theme($watt-theme);