Skip to content

[PT2025BMHW-119][SuperAdminUI,SharedUI,Backend,Infrastructure] Merge develop and resolve conflicts#156

Merged
Nikutsuki merged 4 commits intoPT2025BMHW-119from
copilot/sub-pr-147
Feb 5, 2026
Merged

[PT2025BMHW-119][SuperAdminUI,SharedUI,Backend,Infrastructure] Merge develop and resolve conflicts#156
Nikutsuki merged 4 commits intoPT2025BMHW-119from
copilot/sub-pr-147

Conversation

Copy link
Contributor

Copilot AI commented Feb 5, 2026

What changed?

Merged latest develop branch (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:

  • Tenant list sorting (backend GetAllTenantsQuery + frontend API params)
  • Tenant count badge in DashboardPage
  • Removed Vite alias for @ngo-platform/shared (unnecessary with Yarn workspaces)
  • Reverted ASPIRE_MOBILE_PLATFORM to ios (default setting)

Preserved from our branch:

  • Complete Users Management implementation (UsersPage, UsersController, GetUsersListQuery)
  • Refactored Tenants components (TenantFormDialog, DeleteTenantDialog, TenantsFilters, TenantsTable)
  • Tenant admin assignment features (AssignAdminModal, EditTenantModal)
  • Mobile HTTP support in config (avoids SSL cert issues in RN development)
  • User list invalidation in tenant admin mutations

Technical Details

Sorting implementation now flows through entire stack:

// Frontend: tenants/queries/index.ts
params: {
  sortBy: params?.sortBy,
  sortOrder: params?.sortOrder,
}

// Backend: GetAllTenantsQuery.cs
dtos = ApplySorting(dtos, request.SortBy, request.SortOrder);

Workspace package resolution now relies solely on Yarn (no manual Vite alias needed).

Build Fixes

Fixed TypeScript compilation errors after merge:

  • Corrected import paths (removed invalid module references like @ngo-platform/shared/features/tenants/queries)
  • Fixed icon names: replaced invalid key and userX with valid icons lock and xCircle
  • Fixed component naming: TextAreaTextarea
  • Added index signature to TenantFormData type for form validation compatibility
  • Fixed Modal title type (string instead of JSX Element)
  • Removed invalid fullWidth prop from Textarea component
  • Fixed Toast type casting for proper type safety

Checklist

  • Tests pass
  • Self-reviewed

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

…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
Copilot AI requested a review from breftejk February 5, 2026 21:58
@Nikutsuki Nikutsuki marked this pull request as ready for review February 5, 2026 22:01
@Nikutsuki
Copy link
Collaborator

@copilot fix the build errors

Co-authored-by: Nikutsuki <70451760+Nikutsuki@users.noreply.github.com>
Copy link
Contributor Author

Copilot AI commented Feb 5, 2026

@copilot fix the build errors

Build errors fixed in commit 0e9474d.

Fixed issues:

  • ✅ Corrected import paths (removed invalid module references)
  • ✅ Fixed icon names: lock instead of key, xCircle instead of userX
  • ✅ Fixed TextAreaTextarea (correct component name)
  • ✅ Added index signature to TenantFormData type
  • ✅ Fixed Modal title type (string instead of JSX Element)
  • ✅ Removed fullWidth prop from Textarea (use className="w-full" instead)
  • ✅ Fixed Toast type casting

All frontend builds now pass successfully.

Copilot AI requested a review from Nikutsuki February 5, 2026 22:11
@Nikutsuki Nikutsuki merged commit 610377c into PT2025BMHW-119 Feb 5, 2026
6 checks passed
@Nikutsuki Nikutsuki deleted the copilot/sub-pr-147 branch February 5, 2026 22:13
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.

4 participants