mirrors/Remotely
3
0
Fork 0
mirror of https://github.com/immense/Remotely.git synced 2025-10-26 11:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix re-rendering of devices when they go offline.

Browse Source
This commit is contained in:
Jared 2020-09-25 23:11:32 -07:00 committed by Jared Goodwin
parent 0a637351a7
commit 8be89121aa
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Server/wwwroot/src/Main/DataGrid.ts
View File

@ -72,27 +72,18 @@ export function ApplyFilterToAll() {
}
export function ApplyFilterToDevice(device: Device) {
var existingDevice = FilteredDevices.findIndex(x => x.ID == device.ID);
if (GridState.HideOffline && !device.IsOnline) {
return;
}
if (!GridState.ShowAllGroups &&
(device.DeviceGroupID || "") != (GridState.GroupFilter || "")) {
return;
}
if (deviceMatchesSearchFilter(device)) {
var existingIndex = FilteredDevices.findIndex(x => x.ID == device.ID);
if (existingIndex > -1) {
FilteredDevices[existingIndex] = device;
if (shouldDeviceBeShown(device)) {
if (existingDevice > -1) {
FilteredDevices[existingDevice] = device;
}
else {
FilteredDevices.push(device);
}
return;
}
else if (existingDevice > -1) {
FilteredDevices.splice(existingDevice, 1);
}
}
@ -276,7 +267,18 @@ export function UpdateDeviceCounts() {
}
}
function deviceMatchesSearchFilter(device: Device) {
function shouldDeviceBeShown(device: Device) {
if (GridState.HideOffline && !device.IsOnline) {
return false;
}
if (!GridState.ShowAllGroups &&
(device.DeviceGroupID || "") != (GridState.GroupFilter || "")) {
return false;
}
if (!GridState.SearchFilter) {
return true;
}