Skip to content

Merge branch rel-10.5 with rel-10.4#25552

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

Merge branch rel-10.5 with rel-10.4#25552
voloagent merged 4 commits into
rel-10.5from
auto-merge/rel-10-4/4613

Conversation

@github-actions

@github-actions github-actions Bot commented Jun 4, 2026

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.

maliming and others added 4 commits June 3, 2026 11:48
@maliming
Render empty state on Settings page when no group is available
89abf41 
When all setting groups are hidden by contributors or permissions
(e.g. tenant users in Shared user accounts mode), the Settings page
went completely blank. Show a small empty state across MVC, Blazor
and Angular, plus a localizable string in all locales.
@maliming
Mark decorative empty-state icon as aria-hidden
33e7f32
@maliming
Mark decorative empty-state icon as aria-hidden in Angular
d233b44
@sumeyyeKurtulus
Merge pull request #25541 from abpframework/maliming/setting-manageme…
9e63359 
…nt-empty-state

Render empty state on Settings page when no group is available
@voloagent voloagent marked this pull request as ready for review June 4, 2026 11:46
Copilot AI review requested due to automatic review settings June 4, 2026 11:46
@voloagent voloagent merged commit 52e82b7 into rel-10.5 Jun 4, 2026
1 check passed
@voloagent voloagent deleted the auto-merge/rel-10-4/4613 branch June 4, 2026 11:46
Copilot AI reviewed Jun 4, 2026
View reviewed changes

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 auto-generated branch merge brings an “empty state” UX to the Setting Management UI across Angular, MVC (Razor Pages), and Blazor, and adds the corresponding localization key to the Setting Management resource files.

Changes:

  • Show a localized “No settings available” placeholder when no setting groups/tabs are available (Angular + MVC + Blazor).
  • Add NoSettingsAvailable localization text to Setting Management resource JSON files across supported cultures.
  • Minor JSON formatting fixes (commas/braces) where needed while adding the new key.

Reviewed changes

Copilot reviewed 31 out of 31 changed files in this pull request and generated no comments.

Show a summary per file
File Description
npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html Adds an Angular empty-state placeholder when no setting tabs are available.
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml Adds an MVC empty-state placeholder when no setting groups exist.
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor Adds a Blazor empty-state placeholder when no setting group is selectable.
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json Adds NoSettingsAvailable translation (en).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en-GB.json Adds NoSettingsAvailable translation (en-GB).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json Adds NoSettingsAvailable translation (ar).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json Adds NoSettingsAvailable translation (cs).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de.json Adds NoSettingsAvailable translation (de).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json Adds NoSettingsAvailable translation (de-DE).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json Adds NoSettingsAvailable translation (el).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json Adds NoSettingsAvailable translation (es).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fa.json Adds NoSettingsAvailable translation (fa).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json Adds NoSettingsAvailable translation (fi).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json Adds NoSettingsAvailable translation (fr).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hi.json Adds NoSettingsAvailable translation (hi).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hr.json Adds NoSettingsAvailable translation (hr).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hu.json Adds NoSettingsAvailable translation (hu).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/is.json Adds NoSettingsAvailable translation (is).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json Adds NoSettingsAvailable translation (it).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/nl.json Adds NoSettingsAvailable translation (nl).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json Adds NoSettingsAvailable translation (pl-PL).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json Adds NoSettingsAvailable translation (pt-BR).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json Adds NoSettingsAvailable translation (ro-RO).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ru.json Adds NoSettingsAvailable translation (ru).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json Adds NoSettingsAvailable translation (sk).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json Adds NoSettingsAvailable translation (sl).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sv.json Adds NoSettingsAvailable translation (sv).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json Adds NoSettingsAvailable translation (tr).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json Adds NoSettingsAvailable translation (vi).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json Adds NoSettingsAvailable translation (zh-Hans).
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json Adds NoSettingsAvailable translation (zh-Hant).

@codecov

codecov Bot commented Jun 4, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (rel-10.5@a60153f). Learn more about missing BASE report.

Additional details and impacted files 
@@             Coverage Diff             @@
##             rel-10.5   #25552   +/-   ##
===========================================
  Coverage            ?   49.41%           
===========================================
  Files               ?     3674           
  Lines               ?   124021           
  Branches            ?     9477           
===========================================
  Hits                ?    61280           
  Misses              ?    60919           
  Partials            ?     1822

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@voloagent voloagent voloagent approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@voloagent @maliming @sumeyyeKurtulus