Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Global dialog service #200

Merged
merged 3 commits into from
Oct 19, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<h1 mat-dialog-title>{{title}}</h1>
<div mat-dialog-content>
<p>
{{content}}
</p>
<div *ngIf="alert" class="rounded-lg bg-indigo-700 leading-normal p-5 overflow-auto">
<p *ngIf="!isInstanceOfError()">
{{alert.message}}
</p>
<pre *ngIf="isInstanceOfError()">
{{alert.message | json}}
</pre>
</div>
</div>
<mat-dialog-actions align="end">
<button mat-button [mat-dialog-close]="true" cdkFocusInitial>Close</button>
</mat-dialog-actions>
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { HttpErrorResponse } from '@angular/common/http';
import { Component, Inject, OnInit } from '@angular/core';
import { MAT_DIALOG_DATA } from '@angular/material/dialog';
import { DialogConfig, DialogConfigMessage, DialogContentAlert } from './model/interfaces';

@Component({
selector: 'app-global-dialog',
templateUrl: 'global-dialog.component.html'
})
export class GlobalDialogComponent implements OnInit {
constructor(@Inject(MAT_DIALOG_DATA) public data: DialogConfigMessage) { }

title = '';
content = '';

alert: DialogContentAlert | null | undefined = null;

ngOnInit(): void {
const dialogConfig: DialogConfig = this.data.payload;
this.title = dialogConfig.title;
this.content = dialogConfig.content;
this.alert = dialogConfig.alert;

console.log(dialogConfig.alert);
}

isInstanceOfError(): boolean {
if (this.alert){
return this.alert.message instanceof Error || this.alert.message instanceof HttpErrorResponse;
}
return false;
}


rauljordan marked this conversation as resolved.
Show resolved Hide resolved
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { Injectable } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { GlobalDialogComponent } from './global-dialog.component';
import { DialogConfigMessage } from './model/interfaces';
@Injectable()
export class GlobalDialogService {

constructor(public dialog: MatDialog) { }

open(message: DialogConfigMessage): void {
this.dialog.open(GlobalDialogComponent, {
data: message
});
}

close(): void {
this.dialog.closeAll();
}
}
17 changes: 17 additions & 0 deletions src/app/modules/core/components/global-dialog/model/interfaces.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { HttpErrorResponse } from '@angular/common/http';
import { DialogContentAlertType } from './types';

export interface DialogConfigMessage {
payload: DialogConfig;
}

export interface DialogConfig {
title: string;
content: string;
alert?: DialogContentAlert;
}

export interface DialogContentAlert {
type: DialogContentAlertType;
message: string | Error | HttpErrorResponse;
}
5 changes: 5 additions & 0 deletions src/app/modules/core/components/global-dialog/model/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export enum DialogContentAlertType {
ERROR = 'ERROR',
WARNING = 'WARNING',
INFO = 'INFO'
}
30 changes: 23 additions & 7 deletions src/app/modules/core/core.module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
import { ErrorHandler, NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';

import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
import { ENVIRONMENT } from '../../../environments/token';
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { environment } from '../../../environments/environment';
import { ENVIRONMENT } from '../../../environments/token';
import { JwtInterceptor } from './interceptors/jwt.interceptor';
import { MockInterceptor } from './interceptors/mock.interceptor';

import { GlobalDialogComponent } from './components/global-dialog/global-dialog.component';

import { GlobalDialogService } from './components/global-dialog/global-dialog.service';
import { SharedModule } from '../shared/shared.module';

const components = [
GlobalDialogComponent
];

const commonProviders = [
GlobalDialogService,
{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
{ provide: ENVIRONMENT, useValue: environment },
];
Expand All @@ -16,15 +25,22 @@ const mockProviders = [
{ provide: HTTP_INTERCEPTORS, useClass: MockInterceptor, multi: true }
];

const prysmModules = [
SharedModule
];

@NgModule({
declarations: [],
declarations: [
...components
],
imports: [
CommonModule,
HttpClientModule
HttpClientModule,
... prysmModules
],
providers: [
... commonProviders,
... environment.mockInterceptor ? mockProviders : [],
... environment.mockInterceptor ? mockProviders : []
],
})
export class CoreModule {}
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { LatestGistFeatureComponent } from './latest-gist-feature.component';
import { SharedModule } from '../../../shared/shared.module';
import { HttpClientTestingModule } from '@angular/common/http/testing';


describe('LatestGistFeatureComponent', () => {
let component: LatestGistFeatureComponent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MockService } from 'ng-mocks';
import { of } from 'rxjs';
import { ValidatorService } from 'src/app/modules/core/services/validator.service';
import { SharedModule } from '../../../shared/shared.module';
import { VersionComponent } from './version.component';

describe('VersionComponent', () => {
const validatorService = MockService(ValidatorService);
let component: VersionComponent;
let fixture: ComponentFixture<VersionComponent>;

Expand All @@ -13,6 +17,9 @@ describe('VersionComponent', () => {
SharedModule,
BrowserAnimationsModule
],
providers: [
{provide: ValidatorService, useValue: validatorService}
],
declarations: [
VersionComponent,
]
Expand All @@ -21,6 +28,7 @@ describe('VersionComponent', () => {
}));

beforeEach(() => {
validatorService.version$ = of({beacon: 'test', validator: 'test'});
fixture = TestBed.createComponent(VersionComponent);
component = fixture.componentInstance;
fixture.detectChanges();
Expand Down
5 changes: 0 additions & 5 deletions src/app/modules/dashboard/dashboard.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ export class DashboardComponent implements OnInit, OnDestroy {
icon: 'list',
path: '/dashboard/wallet/accounts',
},
{
name: 'Slashing Protection',
icon: 'shield',
path: '/dashboard/wallet/slashing-protection',
},
{
name: 'Wallet Information',
path: '/dashboard/wallet/details',
Expand Down
7 changes: 0 additions & 7 deletions src/app/modules/wallet/wallet.routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ const routes: Routes = [
},
],
},
{
path: 'slashing-protection',
data: {
breadcrumb: 'Slashin Protection',
},
component: SlashingProtectionComponent,
},
{
path: 'details',
data: {
Expand Down