[PT2025BMHW-118][SuperAdminUI,SharedUI] Merge develop - fix tenant filtering API mismatch#154
Closed
Copilot wants to merge 4 commits intoPT2025BMHW-118from
Closed
[PT2025BMHW-118][SuperAdminUI,SharedUI] Merge develop - fix tenant filtering API mismatch#154Copilot wants to merge 4 commits intoPT2025BMHW-118from
Copilot wants to merge 4 commits intoPT2025BMHW-118from
Conversation
… tenant list sorting and filtering (#148)
…Page - use isActive boolean filter
Co-authored-by: breftejk <62174194+breftejk@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Implement tenant admin assignment and management features
[PT2025BMHW-118][SuperAdminUI,SharedUI] Merge develop - fix tenant filtering API mismatch
Feb 5, 2026
Collaborator
|
@copilot fix the build errors |
Copilot stopped work on behalf of
Nikutsuki due to an error
February 5, 2026 22:15
Copilot stopped work on behalf of
Nikutsuki due to an error
February 5, 2026 22:19
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed?
Resolved merge conflicts with develop branch. Primary issue: tenant filtering API mismatch between frontend and backend.
Key fixes:
status: TenantStatus(string enum) toisActive: booleanto match backend's GetAllTenantsQuerysortBy,sortOrderparameters)Jira: PT2025BMHW-118
Checklist
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.