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

[feature] Add pagination and name-based search functionality in notification module #2948

Merged
merged 8 commits into from
Jan 27, 2025

Conversation

yunfan24
Copy link
Member

@yunfan24 yunfan24 commented Jan 4, 2025

…hree lists in the notification module.

What's changed?

Add pagination and name-based search functionality to the three lists: Notice Receiver, Notice Policy, and Notice Template.

Because some of the notification templates are predefined and cannot use the database's pagination functionality, a dropdown option has been added to the frontend page to distinguish between system predefined templates and custom templates.

image

Checklist

  • I have read the Contributing Guide
  • I have written the necessary doc or comment.
  • I have added the necessary unit tests and all cases have passed.

Add or update API

  • I have added the necessary e2e tests and all cases have passed.

@github-actions github-actions bot added the webapp label Jan 4, 2025
@tomsun28 tomsun28 added the good first pull request Good for newcomers label Jan 5, 2025
@yunfan24
Copy link
Member Author

hi,Do I need to resubmit a PR to resolve conflicts? @tomsun28

@Aias00
Copy link
Contributor

Aias00 commented Jan 21, 2025

hi,Do I need to resubmit a PR to resolve conflicts? @tomsun28

no, just resolve conflicts on your own branch, and push it.

@yunfan24
Copy link
Member Author

hi,Do I need to resubmit a PR to resolve conflicts? @tomsun28

no, just resolve conflicts on your own branch, and push it.

Thank you, I'll give it a try.

# Conflicts:
#	hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/NoticeConfigService.java
#	hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/NoticeConfigServiceTest.java
#	web-app/src/app/routes/alert/alert-notice/alert-notice-rule/alert-notice-rule.component.ts
@Aias00
Copy link
Contributor

Aias00 commented Jan 22, 2025

hi,Do I need to resubmit a PR to resolve conflicts? @tomsun28

no, just resolve conflicts on your own branch, and push it.

Thank you, I'll give it a try.

hi, fix the checkstyle error pls

@yunfan24
Copy link
Member Author

hi,Do I need to resubmit a PR to resolve conflicts? @tomsun28

no, just resolve conflicts on your own branch, and push it.

Thank you, I'll give it a try.

hi, fix the checkstyle error pls

hi,It should work now.

Copy link
Contributor

@tomsun28 tomsun28 left a comment

Choose a reason for hiding this comment

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

LGTM!👍

@tomsun28 tomsun28 added this to the 1.7.0 milestone Jan 27, 2025
@tomsun28 tomsun28 changed the title [feature] Add pagination and name-based search functionality to the t… [feature] Add pagination and name-based search functionality in notification module Jan 27, 2025
@tomsun28 tomsun28 merged commit 5e01482 into apache:master Jan 27, 2025
4 checks passed
@yunfan24 yunfan24 deleted the page branch January 29, 2025 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

3 participants