From 1049551bb149e8805081acf040532c4a7f4bd021 Mon Sep 17 00:00:00 2001 From: halimekarayay Date: Wed, 25 Sep 2024 16:52:51 +0300 Subject: [PATCH 1/5] Update PermissionManagementModal.cshtml --- .../PermissionManagementModal.cshtml | 103 +++++++++++------- 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml index 15fbc9b1f8..b840ab595e 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml @@ -11,48 +11,73 @@ Layout = null; } -
+ - - - -
- - - - @for (var i = 0; i < Model.Groups.Count; i++) - { - var group = Model.Groups[i]; - -
-
- -
- @for (var j = 0; j < group.Permissions.Count; j++) - { - var permission = group.Permissions[j]; - - - } + + + + +
+
+
+ + +
+
+
+ +
+
+
+ Permission Group + + + @for (var i = 0; i < Model.Groups.Count; i++) + { + var group = Model.Groups[i]; + +
+
+ +
+ @for (var j = 0; j < group.Permissions.Count; j++) + { + var permission = group.Permissions[j]; + + + } +
-
- - } - + + } + + + + + + + + \ No newline at end of file From 502c9f5cf69f30764f6155e110d11943d9cc8bf7 Mon Sep 17 00:00:00 2001 From: halimekarayay Date: Wed, 25 Sep 2024 16:52:57 +0300 Subject: [PATCH 2/5] Update permission-management-modal.css --- .../permission-management-modal.css | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.css b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.css index 2d47ccd927..004ae2cf27 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.css +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.css @@ -1,12 +1,31 @@ -.custom-scroll-container > .col-4 { - overflow: hidden; - overflow-y: auto; - max-height: 499px; +fieldset legend { + float: none; + width: auto; +} + +.lpx-scroll-pills-container ul { display: block; - position: relative; - z-index: 123; + max-height: 500px; + overflow-y: auto; +} + +.lpx-scroll-pills-container .tab-content { + padding-top: 0 !important; + padding-bottom: 0 !important; +} + +.lpx-scroll-pills-container ul li { + border: 1px solid #e8eef3; + margin-bottom: 10px; + border-radius: 10px; +} + +.lpx-scroll-pills-container ul li a.active { + color: #fff !important; + border-color: #6c5dd3 !important; + background-color: #6c5dd3 !important; } -.custom-scroll-content { - max-height: 440px; +.lpx-theme-dark .lpx-scroll-pills-container ul li { + border: 1px solid #23262a; } From d4c3ab5ddff9be472fddc999052759b1893ddaba Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 26 Sep 2024 11:38:57 +0300 Subject: [PATCH 3/5] Add filtering logic to permissions --- .../PermissionManagementModal.cshtml | 5 +- .../permission-management-modal.js | 52 +++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml index b840ab595e..387f4ff647 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml @@ -23,7 +23,7 @@
-
@@ -42,7 +42,7 @@ @for (var i = 0; i < Model.Groups.Count; i++) { var group = Model.Groups[i]; - +
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js index 298ad3791f..759ee82922 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js @@ -286,6 +286,58 @@ var abp = abp || {}; }); } + $permissionSearchInput = $('#permission-search'); + + $permissionSearchInput.keyup(throttle(function() { + var value = $permissionSearchInput.val().toLowerCase(); + filterTabs(value); + }, 300)); + + function filterTabs(value) { + var $tabs = $('#PermissionsTabs .nav-link'); + $tabs.each(function(i) { + var $tabItem = $(this); + var $tab = $tabItem.parent(); + + if (!value) { + $tab.show(); + return; + } + + var tabName = $tabItem.find('small').text().toLowerCase(); + + var tabContentFilters = $($tabItem.attr('href')).find('[data-filter-text]'); + let includedInTabContent = false; + tabContentFilters.each(function(i) { + var permissionName = $(this).attr('data-filter-text').toLowerCase(); + includedInTabContent = permissionName.includes(value); + if (includedInTabContent === true) { + return false; + } + }); + + if(includedInTabContent || tabName.includes(value)) { + $tab.show(); + } else { + $tab.hide(); + } + }); + } + + function throttle(mainFunction, delay) { + let timerFlag = null; // Variable to keep track of the timer + + // Returning a throttled version + return (...args) => { + if (timerFlag === null) { // If there is no timer currently running + mainFunction(...args); // Execute the main function + timerFlag = setTimeout(() => { // Set a timer to clear the timerFlag after the specified delay + timerFlag = null; // Clear the timerFlag to allow the main function to be executed again + }, delay); + } + }; + } + }; }; })(jQuery); From e49a64b168f15ea704c7d2b65288782cb1f694e0 Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 26 Sep 2024 11:39:49 +0300 Subject: [PATCH 4/5] Rename variables --- .../permission-management-modal.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js index 759ee82922..3723eda932 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js @@ -289,17 +289,17 @@ var abp = abp || {}; $permissionSearchInput = $('#permission-search'); $permissionSearchInput.keyup(throttle(function() { - var value = $permissionSearchInput.val().toLowerCase(); - filterTabs(value); + var searchTerm = $permissionSearchInput.val().toLowerCase(); + filterTabs(searchTerm); }, 300)); - function filterTabs(value) { + function filterTabs(searchTerm) { var $tabs = $('#PermissionsTabs .nav-link'); $tabs.each(function(i) { var $tabItem = $(this); var $tab = $tabItem.parent(); - if (!value) { + if (!searchTerm) { $tab.show(); return; } @@ -310,13 +310,13 @@ var abp = abp || {}; let includedInTabContent = false; tabContentFilters.each(function(i) { var permissionName = $(this).attr('data-filter-text').toLowerCase(); - includedInTabContent = permissionName.includes(value); + includedInTabContent = permissionName.includes(searchTerm); if (includedInTabContent === true) { return false; } }); - if(includedInTabContent || tabName.includes(value)) { + if(includedInTabContent || tabName.includes(searchTerm)) { $tab.show(); } else { $tab.hide(); From 303b9fb3e9fe0a4718fc9f71e9258322f85900f9 Mon Sep 17 00:00:00 2001 From: enisn Date: Thu, 26 Sep 2024 11:43:30 +0300 Subject: [PATCH 5/5] Remove unused data from cshtml --- .../AbpPermissionManagement/PermissionManagementModal.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml index 387f4ff647..08ab0910df 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml @@ -42,7 +42,7 @@ @for (var i = 0; i < Model.Groups.Count; i++) { var group = Model.Groups[i]; - +