-
-
-
@if (_showEditModal)
{
@@ -118,8 +119,6 @@
@code {
-
-
[Parameter]
public EventCallback
- Brands { get; set; }
- [Parameter]
- public IEnumerable Types { get; set; }
-
- [Parameter]
- public EventCallback OnSaveClick { get; set; }
+ [Parameter] public IEnumerable Brands { get; set; }
+ [Parameter] public IEnumerable Types { get; set; }
+ [Parameter] public EventCallback OnSaveClick { get; set; }
private string LoadPicture => string.IsNullOrEmpty(_item.PictureBase64) ? string.IsNullOrEmpty(_item.PictureUri) ? string.Empty : $"{_item.PictureUri}" : $"data:image/png;base64, {_item.PictureBase64}";
private bool HasPicture => !(string.IsNullOrEmpty(_item.PictureBase64) && string.IsNullOrEmpty(_item.PictureUri));
@@ -136,22 +123,19 @@
Logger.LogInformation("Now loading... /Catalog/Edit/{Id}", id);
await new Css(JSRuntime).HideBodyOverflow();
-
_item = await CatalogItemService.GetById(id);
_modalDisplay = "block;";
_modalClass = "Show";
_showEditModal = true;
-
StateHasChanged();
}
private async Task Close()
{
await new Css(JSRuntime).ShowBodyOverflow();
-
_modalDisplay = "none";
_modalClass = "";
_showEditModal = false;
}
-}
+}
\ No newline at end of file
diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/List.razor b/src/BlazorAdmin/Pages/CatalogItemPage/List.razor
index 133bbbd6..d4ee1064 100644
--- a/src/BlazorAdmin/Pages/CatalogItemPage/List.razor
+++ b/src/BlazorAdmin/Pages/CatalogItemPage/List.razor
@@ -1,5 +1,6 @@
@page "/admin"
@attribute [Authorize(Roles = BlazorShared.Authorization.Constants.RoleCombinations.ADMIN_PORTAL_ROLES)]
+@inject DialogService DialogService
@inherits BlazorAdmin.Helpers.BlazorComponent
@namespace BlazorAdmin.Pages.CatalogItemPage
@@ -9,59 +10,43 @@
@if (catalogItems == null)
{
-
+
+
+
+ 
+
+
-
-
-
+
+
+
+
+
catalogGrid;
+}
diff --git a/src/BlazorAdmin/Pages/RolePage/Create.razor b/src/BlazorAdmin/Pages/RolePage/Create.razor
index c894c6e9..5fe02a50 100644
--- a/src/BlazorAdmin/Pages/RolePage/Create.razor
+++ b/src/BlazorAdmin/Pages/RolePage/Create.razor
@@ -1,105 +1,69 @@
@using BlazorAdmin.Interfaces
@using BlazorAdmin.Models
@inject ILogger Logger
-@inject IJSRuntime JSRuntime
@inject IRoleManagementService RoleManagementService
+@inject DialogService DialogService
@namespace BlazorAdmin.Pages.RolePage
-
+
+
+ Create Role
+
+
+
+ @if (_item == null)
+ {
+
+
+
+
+
+
+ }
+
+
+
+
+
+
@code {
+ [Parameter] public EventCallback OnSaveClick { get; set; }
- [Parameter]
- public EventCallback OnSaveClick { get; set; }
-
- private string _modalDisplay = "none;";
- private string _modalClass = "";
- private bool _showCreateModal = false;
private CreateRoleRequest _item = new CreateRoleRequest();
-
- private async Task CreateClick()
- {
- var result = await RoleManagementService.Create(_item);
- if (result != null)
- {
- Logger.LogInformation("Created Role {id}", result.Role.Id);
- await OnSaveClick.InvokeAsync(null);
- await Close();
- }
- }
+ private bool _showDialog = false;
public async Task Open()
{
-
Logger.LogInformation("Now loading... /Roles/Create");
-
- await new Css(JSRuntime).HideBodyOverflow();
-
_item = new CreateRoleRequest();
-
- _modalDisplay = "block;";
- _modalClass = "Show";
- _showCreateModal = true;
-
- StateHasChanged();
+ _showDialog = true;
}
private async Task Close()
{
- await new Css(JSRuntime).ShowBodyOverflow();
- _modalDisplay = "none";
- _modalClass = "";
- _showCreateModal = false;
+ _showDialog = false;
}
-}
+ private async Task CreateClick()
+ {
+ var result = await RoleManagementService.Create(_item);
+ if (result != null)
+ {
+ Logger.LogInformation("Created Role {id}", result.Role.Id);
+ await OnSaveClick.InvokeAsync(null);
+ await Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/BlazorAdmin/Pages/RolePage/Delete.razor b/src/BlazorAdmin/Pages/RolePage/Delete.razor
index c4c07bfe..0e43fc25 100644
--- a/src/BlazorAdmin/Pages/RolePage/Delete.razor
+++ b/src/BlazorAdmin/Pages/RolePage/Delete.razor
@@ -1,93 +1,60 @@
-@inject ILogger Logger
-@inject IJSRuntime JSRuntime
+@using BlazorAdmin.Interfaces
+@using BlazorAdmin.Models
+@inject ILogger Logger
@inject IRoleManagementService RoleManagementService
-
-@inherits BlazorAdmin.Helpers.BlazorComponent
+@inject DialogService DialogService
@namespace BlazorAdmin.Pages.RolePage
-@using BlazorAdmin.Interfaces
-@using BlazorAdmin.Models
-@using Microsoft.AspNetCore.Identity
-
+
+
+
+ Delete Role
+
-
+
+
+
@code {
- [Parameter]
- public EventCallback OnSaveClick { get; set; }
+ [Parameter] public EventCallback OnSaveClick { get; set; }
- private string _modalDisplay = "none;";
- private string _modalClass = "";
- private bool _showDeleteModal = false;
private GetByIdRoleResponse _item = new GetByIdRoleResponse();
-
- private async Task DeleteClick(string id)
- {
- await RoleManagementService.Delete(id);
-
- Logger.LogInformation("Deleted Role Id: {id}", id);
- await OnSaveClick.InvokeAsync(null);
- await Close();
- }
+ private bool _showDialog = false;
public async Task Open(string id)
{
- await new Css(JSRuntime).HideBodyOverflow();
-
_item = await RoleManagementService.GetById(id);
Logger.LogInformation("Loaded role: {id}", id);
-
- _modalDisplay = "block;";
- _modalClass = "Show";
- _showDeleteModal = true;
-
- StateHasChanged();
+ _showDialog = true;
}
private async Task Close()
{
- await new Css(JSRuntime).ShowBodyOverflow();
- _modalDisplay = "none";
- _modalClass = "";
- _showDeleteModal = false;
+ _showDialog = false;
+ }
+
+ private async Task DeleteClick(string id)
+ {
+ await RoleManagementService.Delete(id);
+ Logger.LogInformation("Deleted Role Id: {id}", id);
+ await OnSaveClick.InvokeAsync(null);
+ await Close();
}
-}
+}
\ No newline at end of file
diff --git a/src/BlazorAdmin/Pages/RolePage/DeleteUserFromRole.razor b/src/BlazorAdmin/Pages/RolePage/DeleteUserFromRole.razor
index d6ce1fb9..3d92554b 100644
--- a/src/BlazorAdmin/Pages/RolePage/DeleteUserFromRole.razor
+++ b/src/BlazorAdmin/Pages/RolePage/DeleteUserFromRole.razor
@@ -1,97 +1,61 @@
-@inject ILogger Logger
-@inject IJSRuntime JSRuntime
+@using BlazorAdmin.Interfaces
+@using BlazorAdmin.Models
+@inject ILogger Logger
@inject IRoleManagementService RoleManagementService
-
-@inherits BlazorAdmin.Helpers.BlazorComponent
+@inject DialogService DialogService
@namespace BlazorAdmin.Pages.RolePage
-@using BlazorAdmin.Interfaces
-@using BlazorAdmin.Models
-@using Microsoft.AspNetCore.Identity
-
-
-
+
+
+ Role Membership Update
+
+
+
+
+
+
+
+
+
@code {
- [Parameter]
- public EventCallback OnSaveClick { get; set; }
+ [Parameter] public EventCallback OnSaveClick { get; set; }
- private string _modalDisplay = "none;";
- private string _modalClass = "";
- private bool _showDeleteModal = false;
+ private bool _showDialog = false;
private string _roleName = "";
-
private string _roleId = "";
-
private string _userId = "";
private string _userName = "";
- private async Task DeleteClick()
- {
- Logger.LogInformation("Removing User {userId} from Role {roleId}", _userId, _roleId);
- await RoleManagementService.DeleteUserFromRole(_userId, _roleId);
-
- Logger.LogInformation("Removed User {userId} from {roleId}", _userId, _roleId);
- await OnSaveClick.InvokeAsync(null);
- await Close();
-
- }
-
public async Task Open(string userId, string userName, string roleName, string roleId)
{
- _roleName = roleName;
+ _userId = userId;
_userName = userName;
-
+ _roleName = roleName;
_roleId = roleId;
- _userId = userId;
-
- await new Css(JSRuntime).HideBodyOverflow();
-
- _modalDisplay = "block;";
- _modalClass = "Show";
- _showDeleteModal = true;
-
- StateHasChanged();
+ _showDialog = true;
}
private async Task Close()
{
- await new Css(JSRuntime).ShowBodyOverflow();
- _modalDisplay = "none";
- _modalClass = "";
- _showDeleteModal = false;
+ _showDialog = false;
+ }
+
+ private async Task DeleteClick()
+ {
+ Logger.LogInformation("Removing User {userId} from Role {roleId}", _userId, _roleId);
+ await RoleManagementService.DeleteUserFromRole(_userId, _roleId);
+
+ Logger.LogInformation("Removed User {userId} from {roleId}", _userId, _roleId);
+ await OnSaveClick.InvokeAsync(null);
+ await Close();
}
-}
+}
\ No newline at end of file
diff --git a/src/BlazorAdmin/Pages/RolePage/Details.razor b/src/BlazorAdmin/Pages/RolePage/Details.razor
index cc7d4cc2..24402ab5 100644
--- a/src/BlazorAdmin/Pages/RolePage/Details.razor
+++ b/src/BlazorAdmin/Pages/RolePage/Details.razor
@@ -1,88 +1,56 @@
@using BlazorAdmin.Interfaces
@using BlazorAdmin.Models
@inject ILogger
+
}
@@ -109,8 +112,6 @@
-
-
+
+
+
@code {
+ [Parameter] public IEnumerable Brands { get; set; }
+ [Parameter] public IEnumerable Types { get; set; }
+ [Parameter] public EventCallback OnSaveClick { get; set; }
- [Parameter]
- public IEnumerable Brands { get; set; }
- [Parameter]
- public IEnumerable Types { get; set; }
-
- [Parameter]
- public EventCallback OnSaveClick { get; set; }
-
- private string LoadPicture => string.IsNullOrEmpty(_item.PictureBase64) ? string.Empty : $"data:image/png;base64, {_item.PictureBase64}";
- private bool HasPicture => !string.IsNullOrEmpty(_item.PictureBase64);
- private string _badFileMessage = string.Empty;
- private string _modalDisplay = "none;";
- private string _modalClass = "";
- private bool _showCreateModal = false;
private CreateCatalogItemRequest _item = new CreateCatalogItemRequest();
-
- private async Task CreateClick()
- {
- var result = await CatalogItemService.Create(_item);
- if (result != null)
- {
- await OnSaveClick.InvokeAsync(null);
- await Close();
- }
- }
+ private bool HasPicture => !string.IsNullOrEmpty(_item?.PictureBase64);
+ private string LoadPicture => string.IsNullOrEmpty(_item.PictureBase64) ? string.Empty : $"data:image/png;base64, {_item.PictureBase64}";
+ private bool _showDialog = false;
public async Task Open()
{
-
Logger.LogInformation("Now loading... /Catalog/Create");
- await new Css(JSRuntime).HideBodyOverflow();
-
_item = new CreateCatalogItemRequest
{
CatalogTypeId = Types.First().Id,
CatalogBrandId = Brands.First().Id
};
- _modalDisplay = "block;";
- _modalClass = "Show";
- _showCreateModal = true;
-
- StateHasChanged();
+ _showDialog = true;
}
private async Task Close()
{
- await new Css(JSRuntime).ShowBodyOverflow();
- _modalDisplay = "none";
- _modalClass = "";
- _showCreateModal = false;
+ _showDialog = false;
+ }
+
+ private async Task CreateClick()
+ {
+ var result = await CatalogItemService.Create(_item);
+ if (result != null)
+ {
+ await OnSaveClick.InvokeAsync(null);
+ await Close();
+ }
}
-}
+}
\ No newline at end of file
diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor
index 5791195d..8480a6d9 100644
--- a/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor
+++ b/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor
@@ -6,111 +6,61 @@
@namespace BlazorAdmin.Pages.CatalogItemPage
-
-
-
@if (_showEditModal)
{
}
@code {
- [Parameter]
- public IEnumerable
-
- Create
- -
- @if (_item == null)
- {
-
-
+ }
+
-
-@if (_showCreateModal)
-{
-
-}
+
-
-
- @if (HasPicture)
- {
- 
- }
-
-
-
+
+
+ Create
+
+
+
+ @if (_item == null)
+ {
+
-
-
-
-
-
+
-
-
+
+ @if (HasPicture)
+ {
+
+ }
+
- }
+
+
-
+
+
-
-
-
-
-
-
-
+
-
-
+
-
- @foreach (var brand in Brands)
- {
-
- }
-
-
-
+
+
-
-
-
+
-
- @foreach (var type in Types)
- {
-
- }
-
-
-
+
+
+ @foreach (var brand in Brands)
+ {
+
+ }
+
+
-
-
-
-
-
-
+
+
+ @foreach (var type in Types)
+ {
+
+ }
+
+
+
+
+
+
-
- Brands { get; set; }
- [Parameter]
- public IEnumerable Types { get; set; }
+ [Parameter] public IEnumerable Brands { get; set; }
+ [Parameter] public IEnumerable Types { get; set; }
+ [Parameter] public EventCallback OnSaveClick { get; set; }
- [Parameter]
- public EventCallback OnSaveClick { get; set; }
-
- private bool HasPicture => !string.IsNullOrEmpty(_item.PictureUri);
- private string _modalDisplay = "none;";
- private string _modalClass = "";
+ private bool HasPicture => !string.IsNullOrEmpty(_item?.PictureUri);
private bool _showDeleteModal = false;
private CatalogItem _item = new CatalogItem();
private async Task DeleteClick(int id)
{
- // TODO: Add some kind of "are you sure" check before this
-
await CatalogItemService.Delete(id);
-
await OnSaveClick.InvokeAsync(null);
await Close();
}
@@ -118,23 +68,15 @@
public async Task Open(int id)
{
Logger.LogInformation("Now loading... /Catalog/Delete/{Id}", id);
-
await new Css(JSRuntime).HideBodyOverflow();
-
_item = await CatalogItemService.GetById(id);
-
- _modalDisplay = "block;";
- _modalClass = "Show";
_showDeleteModal = true;
-
StateHasChanged();
}
private async Task Close()
{
await new Css(JSRuntime).ShowBodyOverflow();
- _modalDisplay = "none";
- _modalClass = "";
_showDeleteModal = false;
}
-}
+}
\ No newline at end of file
diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor
index c4883732..ab87464e 100644
--- a/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor
+++ b/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor
@@ -3,110 +3,60 @@
@inject ICatalogItemService CatalogItemService
@inherits BlazorAdmin.Helpers.BlazorComponent
-
@namespace BlazorAdmin.Pages.CatalogItemPage
-
-
-
-@if (_showDeleteModal)
-{
-
-}
-
+
+
@code {
- [Parameter]
- public IEnumerable
-
- Delete @_item.Name
- -
- @if (_item == null)
- {
-
-
-
- }
-
-
- @if (HasPicture)
- {
- 
- }
-
-
- -
-
- - Name - - -
- - @_item.Name - - -
- - Description - - -
- - @_item.Description - - -
- - Brand - - -
- - @_item.CatalogBrand - - -
- - Type - - -
- - @_item.CatalogType - -
- - Price - - -
- - @_item.Price - -
-
-
+
+
+
-
+
- Delete @_item?.Name
+ + @if (_item == null) + { +
+ @if (HasPicture)
+ {
+ 
+ }
+
+ }
+
+ -
+
- Name +
- @_item.Name + +
- Description +
- @_item.Description + +
- Brand +
- @_item.CatalogBrand + +
- Type +
- @_item.CatalogType + +
- Price +
- @_item.Price +
+
-
+
+
@code {
- [Parameter]
- public IEnumerable Brands { get; set; }
- [Parameter]
- public IEnumerable Types { get; set; }
+ [Parameter] public IEnumerable Brands { get; set; }
+ [Parameter] public IEnumerable Types { get; set; }
+ [Parameter] public EventCallback OnEditClick { get; set; }
- [Parameter]
- public EventCallback OnEditClick { get; set; }
-
- private bool HasPicture => !string.IsNullOrEmpty(_item.PictureUri);
- private string _modalDisplay = "none;";
- private string _modalClass = "";
- private bool _showDetailsModal = false;
private CatalogItem _item = new CatalogItem();
+ private bool HasPicture => !string.IsNullOrEmpty(_item?.PictureUri);
+ private bool _showDetailsModal = false;
public async Task EditClick()
{
@@ -116,27 +66,15 @@
public async Task Open(int id)
{
-
Logger.LogInformation("Now loading... /Catalog/Details/{Id}", id);
-
- await new Css(JSRuntime).HideBodyOverflow();
-
_item = await CatalogItemService.GetById(id);
-
- _modalDisplay = "block;";
- _modalClass = "Show";
_showDetailsModal = true;
-
StateHasChanged();
}
- public async Task Close()
+ public Task Close()
{
- await new Css(JSRuntime).ShowBodyOverflow();
-
- _modalDisplay = "none";
- _modalClass = "";
_showDetailsModal = false;
+ return Task.CompletedTask;
}
-
}
diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor
index 9ae161c7..b0f53f18 100644
--- a/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor
+++ b/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor
@@ -3,6 +3,7 @@
@inject ICatalogItemService CatalogItemService
@inherits BlazorAdmin.Helpers.BlazorComponent
+@using Radzen
@namespace BlazorAdmin.Pages.CatalogItemPage
@@ -17,104 +18,90 @@
-
-
-
-@if (_showDetailsModal)
-{
-
-}
+ }
+
+
-
-
-
+ Details @_item?.Name
+
+ @if (_item == null)
+ {
+
- Details @_item.Name
- +@using Radzen +@using Radzen.Blazor + +
+
-
+ @if (HasPicture)
+ {
+
+ }
+
-
+
- Name +
- @_item.Name + +
- Description +
- @_item.Description + +
- Brand +
- @_item.CatalogBrand + +
- Type +
- @_item.CatalogType + +
- Price +
- @_item.Price +
-
- @if (_item == null)
- {
-
-
-
-
- }
-
-
- @if (HasPicture)
- {
-
- }
-
-
-
-
- -
-
- - Name - - -
- - @_item.Name - - -
- - Description - - -
- - @_item.Description - - -
- - Brand - - -
- - @_item.CatalogBrand - - -
- - Type - - -
- - @_item.CatalogType - -
- - Price - - -
- - @_item.Price - - -
+
+
@if (_item == null)
{
-
}
+
@if (HasPicture)
{
}
+
+
-
-
+
-
-
+
+
+
-
-
- @foreach (var brand in Brands)
- {
-
- }
-
-
+
-
-
- @foreach (var type in Types)
- {
-
- }
-
-
+
-
+
-
- - -
+| - | Item Type | -Brand | -Id | -Name | -@nameof(CatalogItem.Description) | -@nameof(CatalogItem.Price) | -Actions | -
|---|---|---|---|---|---|---|---|
|
- |
- @item.CatalogType | -@item.CatalogBrand | -@item.Id | -@item.Name | -@item.Description | -@item.Price | -
-
+ |
-
-
-
-
-
-@if (_showCreateModal)
-{
-
-}
+
-
-
-
-
+
-@if (_showDeleteModal)
-{
-
-}
+
-
-
-
-
-
-@if (_showDeleteModal)
-{
-
-}
+
-
-
-+ Are you sure you want to REMOVE @_userName from @_roleName? +
+ Logger
-@inject IJSRuntime JSRuntime
@inject IRoleManagementService RoleManagementService
+@inject DialogService DialogService
@namespace BlazorAdmin.Pages.RolePage
-
- _members = new List();
+ private RadzenDataGrid membersGrid;
private DeleteUserFromRole DeleteConfirmationComponent { get; set; }
- private async Task DeleteClick(string userId, string userName)
- {
- Logger.LogInformation("Confirming to remove User {userId} from {roleId}",userId, _roleId);
- await DeleteConfirmationComponent.Open(userId, userName, _roleName, _roleId);
- }
-
public async Task Open(string roleId, string roleName)
{
_roleName = roleName;
@@ -90,40 +58,27 @@
Logger.LogInformation("Now loading details... /Role/Details/{Id}", roleName, roleId);
-
_members = (await RoleManagementService.GetMembershipByName(roleName)).RoleMembers;
- await ShowModal();
+ _showDialog = true;
StateHasChanged();
}
- public async Task Close()
+ private async Task Close()
{
- await CloseModal();
+ _showDialog = false;
}
- private async Task ShowModal(){
- await new Css(JSRuntime).HideBodyOverflow();
-
- _modalDisplay = "block;";
- _modalClass = "Show";
- _showDetailsModal = true;
-
- }
-
- private async Task CloseModal(){
- await new Css(JSRuntime).ShowBodyOverflow();
-
- _modalDisplay = "none";
- _modalClass = "";
- _showDetailsModal = false;
+ private async Task DeleteClick(string userId, string userName)
+ {
+ Logger.LogInformation("Confirming to remove User {userId} from {roleId}", userId, _roleId);
+ await DeleteConfirmationComponent.Open(userId, userName, _roleName, _roleId);
}
private async Task RefreshMembers()
{
Logger.LogInformation("Refreshing members after removing a user from a role");
_members = (await RoleManagementService.GetMembershipByName(_roleName)).RoleMembers;
- StateHasChanged();
+ await membersGrid.Reload();
}
-
-}
+}
\ No newline at end of file
diff --git a/src/BlazorAdmin/Pages/RolePage/Edit.razor b/src/BlazorAdmin/Pages/RolePage/Edit.razor
index 671ab71d..af4e58a9 100644
--- a/src/BlazorAdmin/Pages/RolePage/Edit.razor
+++ b/src/BlazorAdmin/Pages/RolePage/Edit.razor
@@ -1,108 +1,68 @@
-@inject ILogger Logger
-@inject IJSRuntime JSRuntime
-@inject IRoleManagementService RoleManagementService
-
-@inherits BlazorAdmin.Helpers.BlazorComponent
-
-@namespace BlazorAdmin.Pages.RolePage
-@using BlazorAdmin.Interfaces
+@using BlazorAdmin.Interfaces
@using BlazorAdmin.Models
@using Microsoft.AspNetCore.Identity
+@inject ILogger Logger
+@inject IRoleManagementService RoleManagementService
+@inject DialogService DialogService
-
+
+
+ Edit @_item?.Name
+
+
+
+ @if (_item == null)
+ {
+
+
+
+
+ }
+
+
+
+
+
+
@code {
-
-
+ private bool _showDialog = false;
+ private IdentityRole _item = new IdentityRole();
[Parameter]
public EventCallback OnSaveClick { get; set; }
- private string _modalDisplay = "none;";
- private string _modalClass = "";
- private bool _showEditModal = false;
- private IdentityRole _item = new IdentityRole();
-
- private async Task SaveClick()
- {
- await RoleManagementService.Edit(_item);
-
- Logger.LogInformation("Updated Role Id: {Id}", _item.Id);
- await OnSaveClick.InvokeAsync(null);
- await Close();
- }
-
public async Task Open(string id)
{
Logger.LogInformation("Now loading... /Roles/Edit/{Id}", id);
-
- await new Css(JSRuntime).HideBodyOverflow();
-
_item = (await RoleManagementService.GetById(id)).Role;
- _modalDisplay = "block;";
- _modalClass = "Show";
- _showEditModal = true;
-
+ _showDialog = true;
StateHasChanged();
}
private async Task Close()
{
- await new Css(JSRuntime).ShowBodyOverflow();
+ _showDialog = false;
+ }
- _modalDisplay = "none";
- _modalClass = "";
- _showEditModal = false;
+ private async Task SaveClick()
+ {
+ await RoleManagementService.Edit(_item);
+ Logger.LogInformation("Updated Role Id: {Id}", _item.Id);
+ await OnSaveClick.InvokeAsync(null);
+ await Close();
}
-}
+}
\ No newline at end of file
diff --git a/src/BlazorAdmin/Pages/UserPage/Create.razor b/src/BlazorAdmin/Pages/UserPage/Create.razor
index 5d98ee3b..1f9ae443 100644
--- a/src/BlazorAdmin/Pages/UserPage/Create.razor
+++ b/src/BlazorAdmin/Pages/UserPage/Create.razor
@@ -8,77 +8,37 @@
@namespace BlazorAdmin.Pages.UserPage
- OnSaveClick { get; set; }
- private string _modalDisplay = "none;";
- private string _modalClass = "";
private bool _showCreateModal = false;
private CreateUserRequest _item;
-
private Dictionary _selectedRoles = new();
- private List _roles;
+ private List _roles;
private async Task CreateClick()
{
@@ -137,16 +77,15 @@
var result = await UserManagementService.Create(_item);
var checkedRoles = _selectedRoles.Where(r => r.Value).Select(r => r.Key).ToList();
if (checkedRoles.Count > 0){
- SaveRolesForUserRequest rolesForUserRequest = new SaveRolesForUserRequest(){
+ var rolesForUserRequest = new SaveRolesForUserRequest(){
UserId = result.UserId,
RolesToAdd = checkedRoles
};
-
await UserManagementService.SaveRolesForUser(rolesForUserRequest);
}
if (result != null)
{
- Logger.LogInformation("Created User {userId}",result.UserId);
+ Logger.LogInformation("Created User {userId}", result.UserId);
await OnSaveClick.InvokeAsync(null);
await Close();
}
@@ -155,19 +94,14 @@
public async Task Open()
{
-
Logger.LogInformation("Now loading... /Users/Create");
-
await new Css(JSRuntime).HideBodyOverflow();
_item = new CreateUserRequest();
-
_roles = (await RoleManagementService.List()).Roles;
-
- _modalDisplay = "block;";
- _modalClass = "Show";
- _showCreateModal = true;
+ _selectedRoles = _roles.ToDictionary(r => r.Name, r => false);
+ _showCreateModal = true;
StateHasChanged();
}
@@ -179,9 +113,6 @@
private async Task Close()
{
await new Css(JSRuntime).ShowBodyOverflow();
- _modalDisplay = "none";
- _modalClass = "";
_showCreateModal = false;
}
-
-}
+}
\ No newline at end of file
diff --git a/src/BlazorAdmin/Pages/UserPage/Delete.razor b/src/BlazorAdmin/Pages/UserPage/Delete.razor
index 51d70d6f..dea9b0cc 100644
--- a/src/BlazorAdmin/Pages/UserPage/Delete.razor
+++ b/src/BlazorAdmin/Pages/UserPage/Delete.razor
@@ -1,72 +1,46 @@
-@inject ILogger Logger
+@using BlazorAdmin.Interfaces
+@using BlazorAdmin.Models
+@inject ILogger Logger
@inject IJSRuntime JSRuntime
@inject IUserManagementService UserManagementService
@inherits BlazorAdmin.Helpers.BlazorComponent
-
@namespace BlazorAdmin.Pages.UserPage
-@using BlazorAdmin.Interfaces
-@using BlazorAdmin.Models
-@using Microsoft.AspNetCore.Identity
-
-
+
+ @if (string.IsNullOrEmpty(_userId) || string.IsNullOrEmpty(_userName))
+ {
+
+ Delete User: @_userName
+
+ }
+
+
@code {
[Parameter]
public EventCallback OnSaveClick { get; set; }
- private string _modalDisplay = "none;";
- private string _modalClass = "";
private bool _showDeleteModal = false;
-
private string _userId = "";
-
private string _userName = "";
private async Task DeleteClick(string id)
{
await UserManagementService.Delete(id);
- Logger.LogInformation("Deleted user Id: {id}",id);
+ Logger.LogInformation("Deleted user Id: {id}", id);
await OnSaveClick.InvokeAsync(null);
await Close();
}
@@ -76,21 +50,15 @@
await new Css(JSRuntime).HideBodyOverflow();
_userId = id;
-
_userName = userName;
- _modalDisplay = "block;";
- _modalClass = "Show";
_showDeleteModal = true;
-
StateHasChanged();
}
private async Task Close()
{
await new Css(JSRuntime).ShowBodyOverflow();
- _modalDisplay = "none";
- _modalClass = "";
_showDeleteModal = false;
}
-}
+}
\ No newline at end of file
diff --git a/src/BlazorAdmin/Pages/UserPage/Edit.razor b/src/BlazorAdmin/Pages/UserPage/Edit.razor
index 4e9dca46..445bda1e 100644
--- a/src/BlazorAdmin/Pages/UserPage/Edit.razor
+++ b/src/BlazorAdmin/Pages/UserPage/Edit.razor
@@ -9,13 +9,14 @@
@using BlazorAdmin.Interfaces
@using BlazorAdmin.Models
@using Microsoft.AspNetCore.Identity
+@using Radzen
+
+
@@ -97,11 +101,10 @@
}
-
+
+
+
+
+ }
+
+
+
-
-
-
-
-
-
+@namespace BlazorAdmin.Pages.RolePage
-@if (_showEditModal)
-{
-
-}
+
-
-
-
-
-
+
-
-@if (_showCreateModal)
-{
-
-}
+
-
-
-
-
-
-@if (_showDeleteModal)
-{
-
-}
+
-
-
-+ Are you sure you want to DELETE this user: @_userName? +
+ +
@@ -78,6 +80,7 @@
Roles
@if (_roles == null || _roles.Count == 0) { @@ -89,7 +92,8 @@ {
-
+
-
+
| Actions | -|
|---|---|
| Actions | +|
| @user.Email | -
- @if (_currentUser is null || _currentUser.Identity is null)
- {
- Unknown current user - } else if (user.UserName != _currentUser.Identity.Name && user.UserName != "admin@microsoft.com") - { - - - - } - |
-
| @user.Email | +
+ @if (_currentUser is null || _currentUser.Identity is null)
+ {
+ Unknown current user + } + else if (user.UserName != _currentUser.Identity.Name && user.UserName != "admin@microsoft.com") + { + |
+