Commit c47f6946 authored by lukas.burgey's avatar lukas.burgey

Merge branch 'dev'

parents 8c28aca2 3295985e
{
"name": "feudal-webpage",
"version": "1.1.1",
"version": "1.2.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
{
"name": "feudal-webpage",
"version": "1.1.1",
"version": "1.2.0",
"license": "MIT",
"scripts": {
"ng": "ng",
......
......@@ -41,6 +41,7 @@
<mat-progress-spinner *ngSwitchCase="'removal_pending'" diameter="24" mode="indeterminate"></mat-progress-spinner>
<mat-icon *ngSwitchCase="'not_deployed'" mat-icon-button>call_received</mat-icon>
<mat-icon *ngSwitchCase="'failed'" mat-icon-button>error</mat-icon>
<mat-icon *ngSwitchCase="'failed_permanently'" mat-icon-button>error</mat-icon>
<mat-icon *ngSwitchCase="'rejected'" mat-icon-button>error</mat-icon>
<mat-icon *ngSwitchDefault mat-icon-button>call_received</mat-icon>
</span>
......
......@@ -4,6 +4,9 @@
<p *ngSwitchCase="'failed'">
The deployment of your credentials failed:
</p>
<p *ngSwitchCase="'failed_permanently'">
The deployment of your credentials failed too many times:
</p>
<p *ngSwitchCase="'rejected'">
The deployment of your credentials was rejected:
</p>
......
......@@ -20,6 +20,8 @@ export class LanguageService {
return 'Removal pending';
case 'failed':
return 'Failed';
case 'failed_permanently':
return 'Failed Permanently';
case 'rejected':
return 'Rejected';
case 'questionnaire':
......
......@@ -22,6 +22,7 @@
<mat-progress-spinner *ngSwitchCase="'removal_pending'" diameter="15" mode="indeterminate"></mat-progress-spinner>
<mat-icon *ngSwitchCase="'not_deployed'">call_received</mat-icon>
<mat-icon *ngSwitchCase="'failed'">error</mat-icon>
<mat-icon *ngSwitchCase="'failed_permanently'">error</mat-icon>
<mat-icon *ngSwitchCase="'rejected'">error</mat-icon>
<mat-icon *ngSwitchDefault>call_received</mat-icon>
</span>
......
......@@ -5,7 +5,7 @@ import { Observable } from 'rxjs';
import { UserService } from '../user.service';
import { LanguageService } from '../language.service';
import { DialogService } from '../dialogues/dialog.service';
import { Site, Service, DeploymentState, StateID } from '../types/types.module';
import { Service, DeploymentState, StateID } from '../types/types.module';
interface Button {
text: string;
......@@ -41,6 +41,11 @@ export class StateComponent implements OnInit {
text: 'Show Error',
tooltip: 'Show more details on the error',
},
'failed_permanently': {
color: 'warn',
text: 'Show Error',
tooltip: 'Show more details on the error',
},
'rejected': {
color: 'warn',
text: 'Show Message',
......@@ -78,9 +83,14 @@ export class StateComponent implements OnInit {
Please click "${ this.buttons['questionnaire'].text }" to submit the missing data.
`,
'failed': `
The deployment of your credentials failed, but will be tried again.
The deployment of your credentials failed, but will be tried again soon.
Please click "${ this.buttons['failed'].text }" for more details concerning this error.
`,
'failed_permanently': `
The deployment of your credentials failed too many times.
It will be retried if something changes at the site.
Please click "${ this.buttons['failed_permanently'].text }" for more details concerning this error.
`,
'rejected': `
The deployment of your credentials was rejected.
Please click "${ this.buttons['rejected'].text }" to show more details.
......@@ -106,6 +116,8 @@ export class StateComponent implements OnInit {
return this.dialog.openQuestionnaire(this.state$);
case 'failed':
return this.dialog.openMessage(state);
case 'failed_permanently':
return this.dialog.openMessage(state);
case 'rejected':
return this.dialog.openMessage(state);
}
......
......@@ -10,6 +10,7 @@ const states = [
'not_deployed',
'questionnaire',
'failed',
'failed_permanently',
'rejected',
] as const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment