Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
feudal
feudalWebpage
Commits
8e65c8f3
Commit
8e65c8f3
authored
Jun 19, 2020
by
lukas.burgey
Browse files
Add failed permanently state
parent
8c28aca2
Changes
6
Show whitespace changes
Inline
Side-by-side
src/app/dialogues/credentials/credentials.component.html
View file @
8e65c8f3
...
...
@@ -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>
...
...
src/app/dialogues/message/message.component.html
View file @
8e65c8f3
...
...
@@ -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>
...
...
src/app/language.service.ts
View file @
8e65c8f3
...
...
@@ -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
'
:
...
...
src/app/state/state.component.html
View file @
8e65c8f3
...
...
@@ -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>
...
...
src/app/state/state.component.ts
View file @
8e65c8f3
...
...
@@ -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
);
}
...
...
src/app/types/types.module.ts
View file @
8e65c8f3
...
...
@@ -10,6 +10,7 @@ const states = [
'
not_deployed
'
,
'
questionnaire
'
,
'
failed
'
,
'
failed_permanently
'
,
'
rejected
'
,
]
as
const
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment