fix edge heartbeat show red when use search filter (#5682)

pull/5685/head
Richard Wei 2021-09-21 10:19:22 +12:00 committed by GitHub
parent a50795063c
commit 4d63459d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 2 deletions

View File

@ -35,10 +35,9 @@ class EndpointItemController {
return false; return false;
} }
const checkInInterval = this.model.EdgeCheckinInterval; const checkInInterval = this.model.EdgeCheckinInterval;
const now = Math.floor(Date.now() / 1000);
// give checkIn some wiggle room // give checkIn some wiggle room
return now - this.model.LastCheckInDate <= checkInInterval * 2 + 20; return this.endpointInitTime - this.model.LastCheckInDate <= checkInInterval * 2;
} }
$onInit() { $onInit() {

View File

@ -10,6 +10,7 @@ angular.module('portainer.app').component('endpointItem', {
onEdit: '<', onEdit: '<',
isAdmin: '<', isAdmin: '<',
tags: '<', tags: '<',
endpointInitTime: '<',
}, },
controller: EndpointItemController, controller: EndpointItemController,
}); });

View File

@ -14,5 +14,6 @@ angular.module('portainer.app').component('endpointList', {
isAdmin: '<', isAdmin: '<',
totalCount: '<', totalCount: '<',
retrievePage: '<', retrievePage: '<',
endpointInitTime: '<',
}, },
}); });

View File

@ -38,6 +38,7 @@
on-edit="($ctrl.editAction)" on-edit="($ctrl.editAction)"
is-admin="$ctrl.isAdmin" is-admin="$ctrl.isAdmin"
tags="$ctrl.tags" tags="$ctrl.tags"
endpoint-init-time="$ctrl.endpointInitTime"
></endpoint-item> ></endpoint-item>
<endpoint-item <endpoint-item
ng-if="!$ctrl.hasBackendPagination()" ng-if="!$ctrl.hasBackendPagination()"
@ -47,6 +48,7 @@
on-edit="($ctrl.editAction)" on-edit="($ctrl.editAction)"
is-admin="$ctrl.isAdmin" is-admin="$ctrl.isAdmin"
tags="$ctrl.tags" tags="$ctrl.tags"
endpoint-init-time="$ctrl.endpointInitTime"
></endpoint-item> ></endpoint-item>
<div ng-if="$ctrl.state.loading" class="text-center text-muted" data-cy="home-loadingEndpoints"> <div ng-if="$ctrl.state.loading" class="text-center text-muted" data-cy="home-loadingEndpoints">
Loading... Loading...

View File

@ -56,6 +56,7 @@
is-admin="isAdmin" is-admin="isAdmin"
total-count="totalCount" total-count="totalCount"
retrieve-page="getPaginatedEndpoints" retrieve-page="getPaginatedEndpoints"
endpoint-init-time="state.homepageLoadTime"
></endpoint-list> ></endpoint-list>
</div> </div>
</div> </div>

View File

@ -18,6 +18,7 @@ angular
) { ) {
$scope.state = { $scope.state = {
connectingToEdgeEndpoint: false, connectingToEdgeEndpoint: false,
homepageLoadTime: '',
}; };
$scope.goToEdit = function (id) { $scope.goToEdit = function (id) {
@ -92,6 +93,7 @@ angular
} }
async function initView() { async function initView() {
$scope.state.homepageLoadTime = Math.floor(Date.now() / 1000);
$scope.isAdmin = Authentication.isAdmin(); $scope.isAdmin = Authentication.isAdmin();
MotdService.motd().then(function success(data) { MotdService.motd().then(function success(data) {