mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-11-24 07:14:04 +00:00
Merge 9c50d709f1
into 79a26180af
This commit is contained in:
commit
3b6b76c724
2 changed files with 59 additions and 8 deletions
|
@ -89,17 +89,11 @@ export default {
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
searchText: "",
|
|
||||||
selectMode: false,
|
selectMode: false,
|
||||||
selectAll: false,
|
selectAll: false,
|
||||||
disableSelectAllWatcher: false,
|
disableSelectAllWatcher: false,
|
||||||
selectedMonitors: {},
|
selectedMonitors: {},
|
||||||
windowTop: 0,
|
windowTop: 0,
|
||||||
filterState: {
|
|
||||||
status: null,
|
|
||||||
active: null,
|
|
||||||
tags: null,
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
@ -164,6 +158,55 @@ export default {
|
||||||
return Object.keys(this.selectedMonitors).length;
|
return Object.keys(this.selectedMonitors).length;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns applied filters based on query params.
|
||||||
|
* @returns {object} The current filter state.
|
||||||
|
*/
|
||||||
|
filterState() {
|
||||||
|
// Since query params are always strings, convert them to the correct type
|
||||||
|
let status = this.$route.query["status"] || null;
|
||||||
|
if (status) {
|
||||||
|
if (!Array.isArray(status)) {
|
||||||
|
status = [ status ];
|
||||||
|
}
|
||||||
|
status = status.map(Number);
|
||||||
|
}
|
||||||
|
// Casting to boolean does not work here as Boolean("false") === true
|
||||||
|
let active = this.$route.query["active"] || null;
|
||||||
|
if (active) {
|
||||||
|
if (!Array.isArray(active)) {
|
||||||
|
active = [ active ];
|
||||||
|
}
|
||||||
|
active = active.map(val => val === "true");
|
||||||
|
}
|
||||||
|
let tags = this.$route.query["tags"] || null;
|
||||||
|
if (tags) {
|
||||||
|
if (!Array.isArray(tags)) {
|
||||||
|
tags = [ tags ];
|
||||||
|
}
|
||||||
|
tags = tags.map(Number);
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
status,
|
||||||
|
active,
|
||||||
|
tags,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
searchText: {
|
||||||
|
get() {
|
||||||
|
return this.$route.query.searchText || "";
|
||||||
|
},
|
||||||
|
set(value) {
|
||||||
|
this.$router.replace({
|
||||||
|
query: {
|
||||||
|
...this.$route.query,
|
||||||
|
searchText: value,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines if any filters are active.
|
* Determines if any filters are active.
|
||||||
* @returns {boolean} True if any filter is active, false otherwise.
|
* @returns {boolean} True if any filter is active, false otherwise.
|
||||||
|
@ -243,7 +286,14 @@ export default {
|
||||||
* @returns {void}
|
* @returns {void}
|
||||||
*/
|
*/
|
||||||
updateFilter(newFilter) {
|
updateFilter(newFilter) {
|
||||||
this.filterState = newFilter;
|
this.$router.replace({
|
||||||
|
query: {
|
||||||
|
...this.$route.query,
|
||||||
|
status: newFilter.status,
|
||||||
|
active: newFilter.active,
|
||||||
|
tags: newFilter.tags,
|
||||||
|
},
|
||||||
|
});
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Deselect a monitor
|
* Deselect a monitor
|
||||||
|
|
|
@ -118,8 +118,9 @@
|
||||||
</MonitorListFilterDropdown>
|
</MonitorListFilterDropdown>
|
||||||
<MonitorListFilterDropdown :filterActive="filterState.tags?.length > 0">
|
<MonitorListFilterDropdown :filterActive="filterState.tags?.length > 0">
|
||||||
<template #status>
|
<template #status>
|
||||||
|
<!-- Prevent rendering Tag component if tagsList has not been fetched or filterState contains invalid tag -->
|
||||||
<Tag
|
<Tag
|
||||||
v-if="filterState.tags?.length === 1"
|
v-if="filterState.tags?.length === 1 && tagsList.find(tag => tag.id === filterState.tags[0])"
|
||||||
:item="tagsList.find(tag => tag.id === filterState.tags[0])"
|
:item="tagsList.find(tag => tag.id === filterState.tags[0])"
|
||||||
:size="'sm'"
|
:size="'sm'"
|
||||||
/>
|
/>
|
||||||
|
|
Loading…
Reference in a new issue