Merge pull request #9361 from abpframework/cotur/feature-management-b…

…lazor-ui-fix Fix Feature Management Blazor UI
abpframework · Jun 17, 2021 · afc16f7 · afc16f7
2 parents ba7a2c7 + d86da31
commit afc16f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor b/...-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
@@ -10,7 +10,7 @@
             <CloseButton Clicked="CloseModal" />
         </ModalHeader>
         <ModalBody MaxHeight="50">
-            @if (Groups == null)
+            @if (Groups == null || !Groups.Any())
             {
                 <span>@L["NoFeatureFoundMessage"]</span>
             }

diff --git a/...nagement/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs b/...nagement/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
@@ -47,9 +47,14 @@ public virtual async Task OpenAsync([NotNull]string providerName, string provide
                 ToggleValues = new Dictionary<string, bool>();
                 SelectionStringValues = new Dictionary<string, string>();
 
-                Groups = (await FeatureAppService.GetAsync(ProviderName, ProviderKey)).Groups;
+                Groups = (await FeatureAppService.GetAsync(ProviderName, ProviderKey))?.Groups;
 
-                SelectedTabName = GetNormalizedGroupName(Groups.First().Name);
+                Groups ??= new List<FeatureGroupDto>();
+
+                if (Groups.Any())
+                {
+                    SelectedTabName = GetNormalizedGroupName(Groups.First().Name);
+                }
 
                 foreach (var featureGroupDto in Groups)
                 {