Skip to content

Merge branch rel-10.5 with rel-10.4#25632

Merged
voloagent merged 2 commits into
rel-10.5from
auto-merge/rel-10-4/4656
Jun 15, 2026
Merged

Merge branch rel-10.5 with rel-10.4#25632
voloagent merged 2 commits into
rel-10.5from
auto-merge/rel-10-4/4656

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

This PR generated automatically to merge rel-10.5 with rel-10.4. Please review the changed files before merging to prevent any errors that may occur.

@voloagent voloagent marked this pull request as ready for review June 15, 2026 10:38
Copilot AI review requested due to automatic review settings June 15, 2026 10:38
@voloagent voloagent merged commit c7e1246 into rel-10.5 Jun 15, 2026
1 check passed
@voloagent voloagent deleted the auto-merge/rel-10-4/4656 branch June 15, 2026 10:38

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This automated merge PR aligns rel-10.4 with updates from rel-10.5, mainly around Angular UI loading behavior and the account “Manage Profile” screen’s state handling.

Changes:

  • Refactored abpLoading directive cleanup logic into a shared clearLoading() helper and adjusted delayed rendering behavior.
  • Updated Manage Profile component to use Angular signals (toSignal, signal) instead of AsyncPipe for profile state + loading state.
  • Adjusted Manage Profile template bindings to use the new signal-based state.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File Description
npm/ng-packs/packages/theme-shared/src/lib/directives/loading.directive.ts Refactors loading cleanup; introduces clearLoading() and changes timer callback behavior.
npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.ts Switches profile state consumption to toSignal and introduces a profileLoading signal for abpLoading.
npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html Updates template to use signal invocations (profile(), profileLoading()) and new conditional blocks.

Comment on lines 61 to +65
.subscribe(() => {
if (!this.loading()) {
return;
}

Comment on lines +88 to +91
if (this.rootNode?.parentElement) {
this.renderer.removeChild(this.rootNode.parentElement, this.rootNode);
this.rootNode = null;
}
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