Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 5ff9cf79 authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

Small fixes

parent 5cc1156e
No related branches found
No related tags found
No related merge requests found
<div [innerHTML]="innerHtml" <div
[ngClass]="{ 'smp-warning-panel': label, [ngClass]="{ 'smp-warning-panel': label,
'smp-warning-panel-padding': padding && (!!label || !!innerHtml), 'smp-warning-panel-padding': padding && !!label,
'alert-info': type === 'info', 'alert-info': type === 'info',
'alert-success': type === 'success', 'alert-success': type === 'success',
'alert-warning': type === 'warning', 'alert-warning': type === 'warning',
......
...@@ -7,7 +7,6 @@ import { Component, Input } from '@angular/core'; ...@@ -7,7 +7,6 @@ import { Component, Input } from '@angular/core';
export class SmpWarningPanelComponent { export class SmpWarningPanelComponent {
@Input() padding:boolean = true; @Input() padding:boolean = true;
@Input() label:string; @Input() label:string;
@Input() innerHtml:string;
@Input() icon:string; @Input() icon:string;
@Input() type:string = 'warning'; @Input() type:string = 'warning';
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<smp-warning-panel *ngIf="showWarning" <smp-warning-panel *ngIf="showWarning"
icon="warning" icon="warning"
type="warning" type="warning"
[innerHtml]="showWarningMessage"></smp-warning-panel> [label]="showWarningMessage"></smp-warning-panel>
<mat-form-field style="width:100%"> <mat-form-field style="width:100%">
<mat-label>Domain Code</mat-label> <mat-label>Domain Code</mat-label>
<input matInput <input matInput
......
...@@ -10,6 +10,7 @@ import {ConfirmationDialogComponent} from "../../../common/dialogs/confirmation- ...@@ -10,6 +10,7 @@ import {ConfirmationDialogComponent} from "../../../common/dialogs/confirmation-
import {SMLResult} from "../../domain/sml-result.model"; import {SMLResult} from "../../domain/sml-result.model";
import {SmlIntegrationService} from "../../domain/sml-integration.service"; import {SmlIntegrationService} from "../../domain/sml-integration.service";
import {GlobalLookups} from "../../../common/global-lookups"; import {GlobalLookups} from "../../../common/global-lookups";
import {HttpErrorHandlerService} from "../../../common/error/http-error-handler.service";
@Component({ @Component({
...@@ -65,6 +66,7 @@ export class DomainSmlIntegrationPanelComponent implements BeforeLeaveGuard { ...@@ -65,6 +66,7 @@ export class DomainSmlIntegrationPanelComponent implements BeforeLeaveGuard {
constructor(private domainService: AdminDomainService, constructor(private domainService: AdminDomainService,
private alertService: AlertMessageService, private alertService: AlertMessageService,
private httpErrorHandlerService: HttpErrorHandlerService,
protected smlIntegrationService: SmlIntegrationService, protected smlIntegrationService: SmlIntegrationService,
protected lookups: GlobalLookups, protected lookups: GlobalLookups,
private dialog: MatDialog, private dialog: MatDialog,
...@@ -235,6 +237,9 @@ export class DomainSmlIntegrationPanelComponent implements BeforeLeaveGuard { ...@@ -235,6 +237,9 @@ export class DomainSmlIntegrationPanelComponent implements BeforeLeaveGuard {
} }
}, },
err => { err => {
if (this.httpErrorHandlerService.logoutOnInvalidSessionError(err)) {
return;
}
// this.searchTable.showSpinner = false; // this.searchTable.showSpinner = false;
this.alertService.exception('Error occurred while registering domain:' + domain.domainCode, err); this.alertService.exception('Error occurred while registering domain:' + domain.domainCode, err);
} }
...@@ -260,6 +265,9 @@ export class DomainSmlIntegrationPanelComponent implements BeforeLeaveGuard { ...@@ -260,6 +265,9 @@ export class DomainSmlIntegrationPanelComponent implements BeforeLeaveGuard {
} }
, ,
err => { err => {
if (this.httpErrorHandlerService.logoutOnInvalidSessionError(err)) {
return;
}
// this.searchTable.showSpinner = false; // this.searchTable.showSpinner = false;
this.alertService.exception('Error occurred while unregistering domain:' + domain.domainCode, err); this.alertService.exception('Error occurred while unregistering domain:' + domain.domainCode, err);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment