Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
feudalWebpage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
feudal
feudalWebpage
Commits
db59f40d
Commit
db59f40d
authored
Jun 21, 2018
by
Lukas Burgey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
The deployment state items are now displayed in a table
parent
b53457d3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
55 additions
and
42 deletions
+55
-42
src/app/service/service.component.html
src/app/service/service.component.html
+55
-42
No files found.
src/app/service/service.component.html
View file @
db59f40d
...
...
@@ -3,53 +3,66 @@
<mat-panel-title>
{{ service.name }}
</mat-panel-title>
<mat-panel-description>
{{ service.description }}
</mat-panel-description>
</mat-expansion-panel-header>
<table>
<tr
style=
"margin-bottom: 25px;"
>
<table
style=
"margin-bottom: 30px;"
>
<thead>
<tr>
<td></td>
<td>
SSH Keys
</td>
</tr>
<tr>
<td
style=
"min-width: 120px;"
>
Sites
</td>
<td
*ngFor=
"let key of userService.user.ssh_keys"
style=
"width: 75px;"
>
{{key.name}}
</td>
</tr>
</thead>
<tbody>
<tr
*ngFor=
"let site of service.site"
style=
"height: 42px;"
>
<td>
<span
*ngFor=
"let site of service.site"
style=
"margin-right: 15px;"
>
<span
matTooltip=
"Provided at site {{ site.name }}"
style=
"margin-right: 10px;"
>
<mat-icon
style=
"vertical-align: middle; padding-right: 5px;"
>
storage
</mat-icon>
{{ site.name }}
<span
matTooltip=
"Provided at site {{ site.name }}"
style=
"margin-right: 10px;"
>
<mat-icon
style=
"vertical-align: middle; padding-right: 5px;"
>
storage
</mat-icon>
{{ site.name }}
</span>
</td>
<td
*ngFor=
"let key of userService.user.ssh_keys"
>
<span
[ngSwitch]=
"taskState(site, key)"
class=
"childs-inline"
>
<!-- states with actions -->
<button
*ngSwitchCase=
"'deployed'"
mat-button
mat-icon-button
(click)=
"dialog.openCredentials(taskItem(site, key))"
matTooltip=
"The key {{key.name}} is deployed to the site. Click to see details."
>
<mat-icon
style=
"vertical-align: middle"
>
call_made
</mat-icon>
</button>
<button
*ngSwitchCase=
"'questionnaire'"
mat-button
mat-icon-button
(click)=
"dialog.openQuestionnaire(taskItem(site, y))"
matTooltip=
"This site needs more data to deploy the keys. Please click to submit the data."
>
<mat-icon>
warning
</mat-icon>
</button>
<!-- states without actions -->
<span
*ngSwitchCase=
"'deployment_pending'"
mat-icon-button
matTooltip=
"Waiting for the deployment of the key {{ key.name }} by the site"
>
<mat-progress-spinner
diameter=
"24"
mode=
"indeterminate"
></mat-progress-spinner>
</span>
<span
*ngIf=
"userService.user.ssh_keys.length > 0"
style=
"margin-right: 10px;"
>
<span
*ngFor=
"let key of userService.user.ssh_keys"
[ngSwitch]=
"taskState(site, key)"
class=
"childs-inline"
>
<!-- states with actions -->
<button
*ngSwitchCase=
"'deployed'"
mat-button
mat-icon-button
(click)=
"dialog.openCredentials(taskItem(site, key))"
matTooltip=
"The key {{key.name}} is deployed to the site. Click to see details."
>
<mat-icon
style=
"vertical-align: middle"
>
call_made
</mat-icon>
</button>
<button
*ngSwitchCase=
"'questionnaire'"
mat-button
mat-icon-button
(click)=
"dialog.openQuestionnaire(taskItem(site, y))"
matTooltip=
"This site needs more data to deploy the keys. Please click to submit the data."
>
<mat-icon>
warning
</mat-icon>
</button>
<!-- states without actions -->
<span
*ngSwitchCase=
"'deployment_pending'"
mat-icon-button
matTooltip=
"Waiting for the deployment of the key {{ key.name }} by the site"
>
<mat-progress-spinner
diameter=
"24"
mode=
"indeterminate"
></mat-progress-spinner>
</span>
<span
*ngSwitchCase=
"'removal_pending'"
mat-icon-button
matTooltip=
"Waiting for the removal of the key {{ key.name }} from the site"
>
<mat-progress-spinner
diameter=
"24"
mode=
"indeterminate"
></mat-progress-spinner>
</span>
<button
*ngSwitchCase=
"'not_deployed'"
mat-icon-button
matTooltip=
"The key {{ key.name }} is not deployed to this site."
>
<mat-icon
style=
"vertical-align: middle"
>
call_received
</mat-icon>
</button>
<button
*ngSwitchCase=
"'failed'"
mat-icon-button
matTooltip=
"This site failed to deploy the credentials. The deployment will be retried."
>
<mat-icon
style=
"vertical-align: middle"
>
error
</mat-icon>
</button>
<button
*ngSwitchCase=
"'rejected'"
mat-icon-button
matTooltip=
"This site rejected the deployment of the key {{ key.name }}."
>
<mat-icon
style=
"vertical-align: middle"
>
error
</mat-icon>
</button>
<!-- if we have no deployment -> assume state == not_deployed -->
<span
*ngSwitchDefault
mat-icon-button
matTooltip=
"The key {{ key.name }} is not deployed to this site."
>
<mat-icon
style=
"vertical-align: middle"
>
call_received
</mat-icon>
</span>
</span>
<span
*ngSwitchCase=
"'removal_pending'"
mat-icon-button
matTooltip=
"Waiting for the removal of the key {{ key.name }} from the site"
>
<mat-progress-spinner
diameter=
"24"
mode=
"indeterminate"
></mat-progress-spinner>
</span>
<button
*ngSwitchCase=
"'not_deployed'"
mat-icon-button
matTooltip=
"The key {{ key.name }} is not deployed to this site."
>
<mat-icon
style=
"vertical-align: middle"
>
call_received
</mat-icon>
</button>
<button
*ngSwitchCase=
"'failed'"
mat-icon-button
matTooltip=
"This site failed to deploy the credentials. The deployment will be retried."
>
<mat-icon
style=
"vertical-align: middle"
>
error
</mat-icon>
</button>
<button
*ngSwitchCase=
"'rejected'"
mat-icon-button
matTooltip=
"This site rejected the deployment of the key {{ key.name }}."
>
<mat-icon
style=
"vertical-align: middle"
>
error
</mat-icon>
</button>
<!-- if we have no deployment -> assume state == not_deployed -->
<span
*ngSwitchDefault
mat-icon-button
matTooltip=
"The key {{ key.name }} is not deployed to this site."
>
<mat-icon
style=
"vertical-align: middle"
>
call_received
</mat-icon>
</span>
</span>
</td>
</tr>
</tbody>
</table>
<table>
<tr>
<td
*ngFor=
"let group of service.groups"
style=
"margin-right: 15px;"
>
<span
matTooltip=
"Can be used with membership of group {{ group.name }}"
>
...
...
@@ -63,7 +76,7 @@
<div
*ngIf=
"userService.user.ssh_keys.length > 0; then boxes else upload"
></div>
<ng-template
#boxes
>
<span
style=
"margin-right: 15px;"
>
SSH Keys
:
Please select SSH Keys to deploy
:
</span>
<mat-checkbox
*ngFor=
"let key of userService.user.ssh_keys"
style=
"margin-right: 8px"
...
...
Write
Preview
Markdown
is supported
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