[PT2025BMHW-119][SuperAdminUI,SharedUI,Backend,Infrastructure] Merge develop and resolve conflicts#156
Merged
Nikutsuki merged 4 commits intoPT2025BMHW-119from Feb 5, 2026
Merged
Conversation
… tenant list sorting and filtering (#148)
…develop and resolve conflicts Merge conflicts resolved: - Accepted tenant sorting implementation from develop (backend + frontend) - Removed vite.config.ts alias (not needed with Yarn workspaces) - Reverted ASPIRE_MOBILE_PLATFORM to 'ios' (default) - Kept our Users Management implementation (UsersPage, UsersController) - Kept our refactored Tenants components (TenantFormDialog, TenantsFilters, etc.) - Kept our tenant admin assignment features (AssignAdminModal, UnassignModal) - Accepted DashboardPage tenant count feature from develop - Kept mobile HTTP support in config for SSL certificate issues
Copilot
AI
changed the title
[WIP] Add global users management page implementation
[PT2025BMHW-119][SuperAdminUI,SharedUI,Backend,Infrastructure] Merge develop and resolve conflicts
Feb 5, 2026
Collaborator
|
@copilot fix the build errors |
Co-authored-by: Nikutsuki <70451760+Nikutsuki@users.noreply.github.com>
Contributor
Author
Build errors fixed in commit 0e9474d. Fixed issues:
All frontend builds now pass successfully. |
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?
Merged latest
developbranch (138 commits) and resolved conflicts between our Users Management implementation and develop's Tenant sorting features. Fixed TypeScript build errors that occurred after the merge.Jira: PT2025BMHW-119
Conflict Resolution Strategy
Accepted from develop:
GetAllTenantsQuery+ frontend API params)DashboardPage@ngo-platform/shared(unnecessary with Yarn workspaces)ASPIRE_MOBILE_PLATFORMtoios(default setting)Preserved from our branch:
UsersPage,UsersController,GetUsersListQuery)TenantFormDialog,DeleteTenantDialog,TenantsFilters,TenantsTable)AssignAdminModal,EditTenantModal)Technical Details
Sorting implementation now flows through entire stack:
Workspace package resolution now relies solely on Yarn (no manual Vite alias needed).
Build Fixes
Fixed TypeScript compilation errors after merge:
@ngo-platform/shared/features/tenants/queries)keyanduserXwith valid iconslockandxCircleTextArea→TextareaTenantFormDatatype for form validation compatibilityfullWidthprop from Textarea componentChecklist
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.