From: elinuxhenrik Date: Tue, 13 Apr 2021 12:58:39 +0000 (+0200) Subject: Remove unused ErrorDialogService and dialog X-Git-Tag: 2.2.0~34 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=eb4892585eac42745b0393cc1a27205b1d32fc36;p=portal%2Fnonrtric-controlpanel.git Remove unused ErrorDialogService and dialog Since the HttpRequestInterceptor now handles errors from the server, this service and dialog are no longer needed. Change-Id: I9e3979ca07ac02bfeadecb2e2ca27bb671a815a7 Issue-ID: NONRTRIC-474 Signed-off-by: elinuxhenrik --- diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/app.module.ts index 46948c3..a8cbb2c 100644 --- a/webapp-frontend/src/app/app.module.ts +++ b/webapp-frontend/src/app/app.module.ts @@ -30,8 +30,6 @@ import { NgModule } from '@angular/core'; import { MDBBootstrapModule } from 'angular-bootstrap-md'; import { ToastrModule } from 'ngx-toastr'; import { ConfirmDialogComponent } from '@ui/confirm-dialog/confirm-dialog.component'; -import { ErrorDialogComponent } from '@ui/error-dialog/error-dialog.component'; -import { ErrorDialogService } from '@services/ui/error-dialog.service'; import { FooterComponent } from './footer/footer.component'; import { MainComponent } from './main/main.component'; import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form'; @@ -53,7 +51,6 @@ export const isMock = environment.mock; declarations: [ AppComponent, ConfirmDialogComponent, - ErrorDialogComponent, FooterComponent, MainComponent, SidenavListComponent, @@ -76,11 +73,9 @@ export const isMock = environment.mock; ], entryComponents: [ ConfirmDialogComponent, - ErrorDialogComponent, ], providers: [ CookieService, - ErrorDialogService, UiService, { provide: HTTP_INTERCEPTORS, diff --git a/webapp-frontend/src/app/services/ui/error-dialog.service.ts b/webapp-frontend/src/app/services/ui/error-dialog.service.ts deleted file mode 100644 index eafc9e5..0000000 --- a/webapp-frontend/src/app/services/ui/error-dialog.service.ts +++ /dev/null @@ -1,52 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2019 AT&T Intellectual Property - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================LICENSE_END=================================== - */ -import { ErrorDialogComponent } from '@ui/error-dialog/error-dialog.component'; -import { MatDialog } from '@angular/material/dialog'; -import { Injectable } from '@angular/core'; -import { UiService } from './ui.service'; - -@Injectable() -export class ErrorDialogService { - - darkMode: boolean; - panelClass = ''; - public errorMessage = ''; - - constructor(private dialog: MatDialog, - private ui: UiService) { } - - public displayError(error: string) { - this.ui.darkModeState.subscribe((isDark) => { - this.darkMode = isDark; - }); - if (this.darkMode) { - this.panelClass = 'dark-theme'; - } else { - this.panelClass = ''; - } - return this.dialog.open(ErrorDialogComponent, { - panelClass: this.panelClass, - width: '400px', - position: { top: '100px' }, - disableClose: true, - data: { 'errorMessage': error } - }); - } -} diff --git a/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.html b/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.html deleted file mode 100644 index 2b44f0f..0000000 --- a/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.html +++ /dev/null @@ -1,27 +0,0 @@ - - -
-
{{data.errorMessage}}
-
-
- -
- diff --git a/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.scss b/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.scss deleted file mode 100644 index 93c0e83..0000000 --- a/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.scss +++ /dev/null @@ -1,24 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2019 AT&T Intellectual Property - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================LICENSE_END=================================== - */ - - .error_message_text { - overflow-y: overlay; - max-height: 150px; - } diff --git a/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.ts b/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.ts deleted file mode 100644 index 197cfd8..0000000 --- a/webapp-frontend/src/app/ui/error-dialog/error-dialog.component.ts +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2019 AT&T Intellectual Property - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================LICENSE_END=================================== - */ -import { Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; - -export interface ErrorData { - errorMessage: string; -} - -@Component({ - selector: 'nrcp-error-dialog', - templateUrl: './error-dialog.component.html', - styleUrls: ['./error-dialog.component.scss'] -}) - -export class ErrorDialogComponent { - - constructor(private dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: ErrorData) { } - - public closeDialog = () => { - this.dialogRef.close(); - } -}