Skip to content

Commit

Permalink
Removed legacy dialog (#1933)
Browse files Browse the repository at this point in the history
* 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] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
2 people authored and ManBearTM committed Aug 8, 2023
1 parent 5eb227b commit fbe9ae8
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 37 deletions.
2 changes: 1 addition & 1 deletion apps/eo/app-eo/src/app/energy-origin-app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion build/infrastructure/eo/chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/infrastructure/eo/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ app:
replicaCount: 2
image:
name: ghcr.io/energinet-datahub/eo-frontend-app
tag: 0.3.309
tag: 0.3.310
4 changes: 2 additions & 2 deletions libs/eo/core/shell/src/lib/eo-core-shell.providers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -27,6 +27,6 @@ export const eoCoreShellProviders = [
browserConfigurationProviders,
danishLocalProviders,
danishDatetimeProviders,
importProvidersFrom(MatLegacyDialogModule, MatLegacySnackBarModule),
importProvidersFrom(MatDialogModule, MatLegacySnackBarModule),
eoAuthorizationInterceptorProvider,
];
2 changes: 1 addition & 1 deletion libs/eo/core/shell/src/lib/eo-shell.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
5 changes: 1 addition & 4 deletions libs/eo/shared/services/src/idle-timer/idle-timer.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
22 changes: 12 additions & 10 deletions libs/ui-watt/src/lib/components/modal/watt-modal.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit fbe9ae8

Please sign in to comment.