Upgrade admin side to ABP 5.0.0-beta.3

src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs

@@ -92,8 +92,8 @@ namespace EventHub.Admin.Web.Components.UserPicker
         private async Task OnDataGridReadAsync(DataGridReadDataEventArgs<UserDto> e)
         {
             CurrentSorting = e.Columns
-                .Where(c => c.Direction != SortDirection.None)
-                .Select(c => c.Field + (c.Direction == SortDirection.Descending ? " DESC" : ""))
+                .Where(c => c.SortDirection != SortDirection.None)
+                .Select(c => c.Field + (c.SortDirection == SortDirection.Descending ? " DESC" : ""))
                 .JoinAsString(",");
             CurrentPage = e.Page - 1;
 

src/EventHub.Admin.Web/EventHub.Admin.Web.csproj

@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.5-preview3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview3" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.5" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0-rc.1.*" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0-rc.1.*" />
   </ItemGroup>

src/EventHub.Admin.Web/Menus/EventHubMenuContributor.cs

@@ -4,7 +4,6 @@ using EventHub.Admin.Permissions;
 using EventHub.Localization;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Localization;
 using Volo.Abp.Account.Localization;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.UI.Navigation;
@@ -33,7 +32,7 @@ namespace EventHub.Admin.Web.Menus
             }
         }
 
-        private async Task ConfigureMainMenuAsync(MenuConfigurationContext context)
+        private Task ConfigureMainMenuAsync(MenuConfigurationContext context)
         {
             var l = context.GetLocalizer<EventHubResource>();
 
@@ -68,6 +67,8 @@ namespace EventHub.Admin.Web.Menus
                         url: "/events"
                     ).RequirePermissions(EventHubPermissions.Events.Default)
                 );
+            
+            return Task.CompletedTask;
         }
 
         private Task ConfigureUserMenuAsync(MenuConfigurationContext context)
@@ -81,7 +82,7 @@ namespace EventHub.Admin.Web.Menus
             {
                 context.Menu.AddItem(new ApplicationMenuItem(
                     "Account.Manage",
-                    accountStringLocalizer["ManageYourProfile"],
+                    accountStringLocalizer["Manage"],
                     $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}",
                     icon: "fa fa-cog",
                     order: 1000,

src/EventHub.Admin.Web/Pages/AttendeeDetail.razor

@@ -11,7 +11,7 @@
     <CardHeader>
         <h2>@L["Attendees"]</h2>
 
-        <Paragraph Alignment="TextAlignment.Right">
+        <Paragraph Alignment="TextAlignment.End">
             @if (CanAddAttendee)
             {
                 <Button Color="Color.Primary"

src/EventHub.Admin.Web/Pages/AttendeeDetail.razor.cs

@@ -63,8 +63,8 @@ namespace EventHub.Admin.Web.Pages
         private async Task OnDataGridReadAsync(DataGridReadDataEventArgs<EventAttendeeDto> e)
         {
             CurrentSorting = e.Columns
-                .Where(c => c.Direction != SortDirection.None)
-                .Select(c => c.Field + (c.Direction == SortDirection.Descending ? " DESC" : ""))
+                .Where(c => c.SortDirection != SortDirection.None)
+                .Select(c => c.Field + (c.SortDirection == SortDirection.Descending ? " DESC" : ""))
                 .JoinAsString(",");
             CurrentPage = e.Page - 1;
 

src/EventHub.Admin.Web/Pages/EventManagement.razor

@@ -71,7 +71,7 @@
                         <EntityActions TItem="EventInListDto">
                             <EntityAction TItem="EventInListDto"
                                           RequiredPolicy="@EventHubPermissions.Events.Update"
-                                          Clicked="() => OpenEditEventModal(context)"
+                                          Clicked="() => OpenEditEventModalAsync(context)"
                                           Text="@L["Edit"]">
                             </EntityAction>
                             <EntityAction TItem="EventInListDto"

src/EventHub.Admin.Web/Pages/EventManagement.razor.cs

@@ -81,8 +81,8 @@ namespace EventHub.Admin.Web.Pages
         private async Task OnDataGridReadAsync(DataGridReadDataEventArgs<EventInListDto> e)
         {
             CurrentSorting = e.Columns
-                .Where(c => c.Direction != SortDirection.None)
-                .Select(c => c.Field + (c.Direction == SortDirection.Descending ? " DESC" : ""))
+                .Where(c => c.SortDirection != SortDirection.None)
+                .Select(c => c.Field + (c.SortDirection == SortDirection.Descending ? " DESC" : ""))
                 .JoinAsString(",");
             CurrentPage = e.Page - 1;
 
@@ -90,7 +90,7 @@ namespace EventHub.Admin.Web.Pages
             await InvokeAsync(StateHasChanged);
         }
 
-        private async Task OpenEditEventModal(EventInListDto input)
+        private async Task OpenEditEventModalAsync(EventInListDto input)
         {
             EditingEventId = input.Id;
             Event = await EventAppService.GetAsync(EditingEventId);
@@ -99,7 +99,7 @@ namespace EventHub.Admin.Web.Pages
             FileEntry = new FileEntry();
             await SetCoverImageUrlAsync();
 
-            EditEventModal.Show();
+            await EditEventModal.Show();
         }
 
         private Task OnEditModalClosing(CancelEventArgs e)
@@ -125,7 +125,7 @@ namespace EventHub.Admin.Web.Pages
 
             CoverImageUrl = string.Empty;
             DisabledCoverImageButton = false;
-            EditEventModal.Hide();
+            await EditEventModal.Hide();
         }
 
         private async Task OnKeyPress(KeyboardEventArgs e)

src/EventHub.Admin.Web/Pages/OrganizationManagement.razor

@@ -73,7 +73,7 @@
                             </EntityAction>
                             <EntityAction TItem="OrganizationInListDto"
                                           RequiredPolicy="@EventHubPermissions.Organizations.Update"
-                                          Clicked="() => OpenEditOrganizationModal(context)"
+                                          Clicked="() => OpenEditOrganizationModalAsync(context)"
                                           Text="@L["Edit"]">
                             </EntityAction>
                             <EntityAction TItem="OrganizationInListDto"

src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs

@@ -52,8 +52,8 @@ namespace EventHub.Admin.Web.Pages
         private async Task OnDataGridReadAsync(DataGridReadDataEventArgs<OrganizationInListDto> e)
         {
             CurrentSorting = e.Columns
-                .Where(c => c.Direction != SortDirection.None)
-                .Select(c => c.Field + (c.Direction == SortDirection.Descending ? " DESC" : ""))
+                .Where(c => c.SortDirection != SortDirection.None)
+                .Select(c => c.Field + (c.SortDirection == SortDirection.Descending ? " DESC" : ""))
                 .JoinAsString(",");
             CurrentPage = e.Page - 1;
             await GetOrganizationsAsync();
@@ -71,7 +71,7 @@ namespace EventHub.Admin.Web.Pages
             TotalCount = (int) result.TotalCount;
         }
 
-        private async Task OpenEditOrganizationModal(OrganizationInListDto input)
+        private async Task OpenEditOrganizationModalAsync(OrganizationInListDto input)
         {
             EditingOrganizationId = input.Id;
             Organization = await OrganizationAppService.GetAsync(EditingOrganizationId);
@@ -80,14 +80,14 @@ namespace EventHub.Admin.Web.Pages
             await SetProfileImageUrlAsync();
 
             EditingOrganization = ObjectMapper.Map<OrganizationProfileDto, UpdateOrganizationDto>(Organization);
-            EditOrganizationModal.Show();
+            await EditOrganizationModal.Show();
         }
 
         private async Task UpdateOrganizationAsync()
         {
             await OrganizationAppService.UpdateAsync(EditingOrganizationId, EditingOrganization);
             await GetOrganizationsAsync();
-            EditOrganizationModal.Hide();
+            await EditOrganizationModal.Hide();
 
             ProfileImageUrl = null;
             DisabledProfileImageButton = false;

src/EventHub.Admin.Web/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=637722353075208176" rel="stylesheet"/>
+    <link href="global.css?_v=637720550480184672" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
 </head>
@@ -22,7 +22,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=637722353077684977"></script>
+    <script src="global.js?_v=637720550482804343"></script>
     <!--/ABP:Scripts-->
 
 </body>