Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Filtering works with group monitor #3469

Merged
merged 4 commits into from
Aug 6, 2023

Conversation

chakflying
Copy link
Collaborator

⚠️⚠️⚠️ Since we do not accept all types of pull requests and do not want to waste your time. Please be sure that you have read pull request rules:
https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma

Tick the checkbox if you understand [x]:

  • I have read and understand the pull request rules.

Description

Fixes #3445

  • Refactor the process of search and filtering to a single loop over the monitor list
  • Renamed prop isSearch to showPathName to be more clear on functionality

Unfortunately, enabling search/filtering will flatten all group structures. Doesn't look amazing but again can't think of an easy fix.

Also fixes bug:

  • monitor.active now returns true/false instead of 1/0. Update sort function to reflect this.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • User interface (UI)

Checklist

  • My code follows the style guidelines of this project
  • I ran ESLint and other linters for modified files
  • I have performed a self-review of my own code and tested it
  • I have commented my code, particularly in hard-to-understand areas
    (including JSDoc for methods)
  • My changes generate no new warnings
  • My code needed automated testing. I have added them (this is optional task)

Screenshots (if any)

@louislam louislam added this to the 1.23.0 milestone Jul 31, 2023
Copy link
Contributor

@Computroniks Computroniks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some (IMO) odd looking whitespace

src/components/MonitorList.vue Outdated Show resolved Hide resolved
src/components/MonitorList.vue Outdated Show resolved Hide resolved
src/components/MonitorList.vue Outdated Show resolved Hide resolved
louislam and others added 2 commits August 7, 2023 00:21
# Conflicts:
#	src/components/MonitorList.vue
#	src/components/MonitorListItem.vue
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
@louislam louislam merged commit 36777c5 into louislam:master Aug 6, 2023
@chakflying chakflying deleted the fix/filtering-child-monitors branch August 16, 2023 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Filtering cannot display monitors within a group
4 participants