github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(applications): show status indication [EE-1623] (#5614) 

* feat(applications): show status indication

* feat(k8s/applications): move colors to theme

* fix helm application indicator for main header

* refactor(k8s/apps): receive more general ok status

Co-authored-by: waysonwei <degui.wei@gmail.com>
pull/5790/head
Chaim Lev-Ari 2021-09-29 03:10:51 +03:00 committed by GitHub
parent 7b72130433
commit 50f63ae865
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/css/theme.css
View File

@ -88,6 +88,7 @@ html {
--green-1: #164; --green-1: #164;
--green-2: #1ec863; --green-2: #1ec863;
--green-3: #23ae89;
} }
:root { :root {

1
app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
View File

@ -201,6 +201,7 @@
> >
<td>{{ item.ApplicationType | kubernetesApplicationTypeText }}</td> <td>{{ item.ApplicationType | kubernetesApplicationTypeText }}</td>
<td ng-if="item.ApplicationType !== $ctrl.KubernetesApplicationTypes.POD"> <td ng-if="item.ApplicationType !== $ctrl.KubernetesApplicationTypes.POD">
<status-indicator ok="(item.TotalPodsCount > 0 && item.TotalPodsCount === item.RunningPodsCount) || item.Status === 'Ready'"></status-indicator>
<span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.REPLICATED">Replicated</span> <span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.REPLICATED">Replicated</span>
<span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.GLOBAL">Global</span> <span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.GLOBAL">Global</span>
<span ng-if="item.RunningPodsCount >= 0 && item.TotalPodsCount >= 0"> <span ng-if="item.RunningPodsCount >= 0 && item.TotalPodsCount >= 0">

12
app/portainer/components/status-indicator/index.js Normal file
View File

@ -0,0 +1,12 @@
import angular from 'angular';
import './status-indicator.css';
export const statusIndicator = {
templateUrl: './status-indicator.html',
bindings: {
ok: '<',
},
};
angular.module('portainer.app').component('statusIndicator', statusIndicator);

13
app/portainer/components/status-indicator/status-indicator.css Normal file
View File

@ -0,0 +1,13 @@
.status-indicator {
padding: 0 !important;
margin-right: 1ch;
border-radius: 50%;
background-color: var(--red-3);
height: 10px;
width: 10px;
display: inline-block;
}
.ok {
background-color: var(--green-3);
}

1
app/portainer/components/status-indicator/status-indicator.html Normal file
View File

@ -0,0 +1 @@
<i aria-hidden="true" ng-class="['status-indicator', { ok: $ctrl.ok }]"></i>