Merge branch dev with rel-10.1 #24525

github-actions · 2026-01-02T07:53:42Z

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

…sion-modal-problems Angular - Fixing resource based permission modal problems

Copilot

Pull request overview

This PR merges changes from the dev branch into rel-10.1, incorporating code formatting updates (indentation standardization) and several functional changes to the permission management and lookup components.

Key Changes:

Updated code formatting to use consistent 2-space indentation across all TypeScript and HTML files
Modified localization keys for error messages and confirmation dialogs
Changed lookup dropdown initialization and styling (z-index, CSS variables, showDropdown state)

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
resource-permission-management.component.ts	Reformatted indentation; updated localization keys for delete confirmation and success messages
resource-permission-management.component.html	Reformatted indentation to 2-space standard
resource-permission-form.component.html	Reformatted indentation to 2-space standard
provider-key-search.component.ts	Reformatted indentation and import statements
provider-key-search.component.html	Reformatted indentation to 2-space standard
permission-checkbox-list.component.html	Reformatted indentation to 2-space standard
lookup-search.component.ts	Reformatted indentation; changed showDropdown signal initialization from false to true
lookup-search.component.html	Reformatted indentation; updated localization key for no results message; removed shadow class
lookup-search.component.scss	Increased z-index from 1050 to 1060; added positioning and background-color styles

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-02T07:56:48Z

...rc/lib/components/resource-permission-management/resource-permission-management.component.ts

+  onDeleteClicked(grant: ResourcePermissionGrantInfoDto) {
+    this.confirmationService
+      .warn(
+        'AbpPermissionManagement::ResourcePermissionDeletionConfirmationMessage',


The localization key has been changed from 'AbpPermissionManagement::PermissionDeletionConfirmationMessage' to 'AbpPermissionManagement::ResourcePermissionDeletionConfirmationMessage'. This is a breaking change that will cause the confirmation message to display the raw localization key instead of the translated text if the new key hasn't been added to the localization resources. Ensure this new key exists in all supported language files before merging.

Suggested change

'AbpPermissionManagement::ResourcePermissionDeletionConfirmationMessage',

'AbpPermissionManagement::PermissionDeletionConfirmationMessage',

Copilot · 2026-01-02T07:56:48Z

...rc/lib/components/resource-permission-management/resource-permission-management.component.ts

+              next: res => {
+                this.state.setResourceData(res.permissions || []);
+                this.list.get();
+                this.toasterService.success('AbpUi::DeletedSuccessfully');


The success message localization key has been changed from 'AbpUi::SuccessfullyDeleted' to 'AbpUi::DeletedSuccessfully'. This is a breaking change that will cause the success message to display the raw localization key instead of the translated text if the new key hasn't been added to the localization resources. Ensure this new key exists in all supported language files before merging.

Suggested change

this.toasterService.success('AbpUi::DeletedSuccessfully');

this.toasterService.success('AbpUi::SuccessfullyDeleted');

Copilot · 2026-01-02T07:56:49Z

npm/ng-packs/packages/components/lookup/src/lib/lookup-search.component.html

+          <ng-container *ngTemplateOutlet="noResultsTemplate()!" />
+        } @else {
+          <div class="list-group-item text-muted">
+            {{ 'AbpUi::NoDataAvailableInDatatable' | abpLocalization }}


The localization key has been changed from 'AbpUi::NoRecordsFound' to 'AbpUi::NoDataAvailableInDatatable'. This is a breaking change that will cause the no results message to display the raw localization key instead of the translated text if the new key hasn't been added to the localization resources. Ensure this new key exists in all supported language files before merging.

Suggested change

{{ 'AbpUi::NoDataAvailableInDatatable' | abpLocalization }}

{{ 'AbpUi::NoRecordsFound' | abpLocalization }}

Copilot · 2026-01-02T07:56:49Z

npm/ng-packs/packages/components/lookup/src/lib/lookup-search.component.html

-      <ng-container *ngTemplateOutlet="itemTemplate()!; context: { $implicit: item }" />
-      } @else {
-      {{ getDisplayValue(item) }}
+    <div class="abp-lookup-dropdown list-group position-absolute w-100">


The removal of the 'shadow' CSS class from the dropdown may affect visual consistency if other dropdowns in the application use shadows. Additionally, the new 'background-color: var(--lpx-content-bg)' CSS variable may not be defined in all themes, which could result in the dropdown having a transparent or incorrect background. Verify that this CSS variable is defined across all supported themes.

Suggested change

<div class="abp-lookup-dropdown list-group position-absolute w-100">

<div class="abp-lookup-dropdown list-group position-absolute w-100 shadow" style="background-color: var(--lpx-content-bg, #fff);">

Copilot · 2026-01-02T07:56:49Z

npm/ng-packs/packages/components/lookup/src/lib/lookup-search.component.scss

-    z-index: 1050;
-    max-height: 200px;
-    overflow-y: auto;
+  z-index: 1060;


The z-index has been increased from 1050 to 1060. Verify that this new z-index value doesn't conflict with other UI elements (such as modals, tooltips, or navigation menus) that may have z-index values in this range. Bootstrap modals typically use z-index of 1050-1055, so this change to 1060 should ensure the dropdown appears above modals, but confirm this is the intended behavior.

Suggested change

z-index: 1060;

z-index: 1050;

Copilot · 2026-01-02T07:56:49Z

npm/ng-packs/packages/components/lookup/src/lib/lookup-search.component.ts

+  readonly noResultsTemplate = contentChild<TemplateRef<void>>('noResultsTemplate');
+
+  readonly searchResults = signal<T[]>([]);
+  readonly showDropdown = signal(true);


The showDropdown signal is being initialized to true instead of false. This will cause the dropdown to be visible by default when the component loads, which is likely unintended behavior. Users would see an empty dropdown until they interact with the search input.

Suggested change

readonly showDropdown = signal(true);

readonly showDropdown = signal(false);

sumeyyeKurtulus and others added 3 commits December 30, 2025 14:06

fix: lookup search problems

0f79e23

fix: localization and add some auto save updates

05f7c3c

Merge pull request #24516 from abpframework/fix/resource-based-permis…

306ff23

…sion-modal-problems Angular - Fixing resource based permission modal problems

github-actions bot requested a review from maliming January 2, 2026 07:53

maliming marked this pull request as ready for review January 2, 2026 07:53

Copilot AI review requested due to automatic review settings January 2, 2026 07:53

maliming approved these changes Jan 2, 2026

View reviewed changes

maliming merged commit e67d6ba into dev Jan 2, 2026
2 checks passed

maliming deleted the auto-merge/rel-10-1/4233 branch January 2, 2026 07:53

Copilot started reviewing on behalf of maliming January 2, 2026 07:54 View session

Copilot AI reviewed Jan 2, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge branch dev with rel-10.1 #24525

Merge branch dev with rel-10.1 #24525

Uh oh!

github-actions bot commented Jan 2, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 2, 2026

Uh oh!

Copilot AI Jan 2, 2026

Uh oh!

Copilot AI Jan 2, 2026

Uh oh!

Copilot AI Jan 2, 2026

Uh oh!

Copilot AI Jan 2, 2026

Uh oh!

Copilot AI Jan 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	'AbpPermissionManagement::ResourcePermissionDeletionConfirmationMessage',
	'AbpPermissionManagement::PermissionDeletionConfirmationMessage',

	this.toasterService.success('AbpUi::DeletedSuccessfully');
	this.toasterService.success('AbpUi::SuccessfullyDeleted');

	{{ 'AbpUi::NoDataAvailableInDatatable' \| abpLocalization }}
	{{ 'AbpUi::NoRecordsFound' \| abpLocalization }}

	<div class="abp-lookup-dropdown list-group position-absolute w-100">
	<div class="abp-lookup-dropdown list-group position-absolute w-100 shadow" style="background-color: var(--lpx-content-bg, #fff);">

	readonly showDropdown = signal(true);
	readonly showDropdown = signal(false);

Merge branch dev with rel-10.1 #24525

Merge branch dev with rel-10.1 #24525

Uh oh!

Conversation

github-actions bot commented Jan 2, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 2, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants