alfa

Author: brunobritodev

src/Backend/Jp.Domain/CommandHandlers/RoleCommandHandler.cs

@@ -13,7 +13,7 @@ public class RoleCommandHandler : CommandHandler,
         IRequestHandler<RemoveRoleCommand>,
         IRequestHandler<SaveRoleCommand>,
         IRequestHandler<UpdateRoleCommand>,
-        IRequestHandler<RemoveUserFromRoleCommand> 
+        IRequestHandler<RemoveUserFromRoleCommand>
     {
         private readonly IRoleService _roleService;
         private readonly IUserService _userService;
@@ -38,9 +38,9 @@ public async Task Handle(RemoveRoleCommand request, CancellationToken cancellati
             }
 
             // Businness logic here
-            await _roleService.Remove(request.Name);
+            var result = await _roleService.Remove(request.Name);
 
-            if (Commit())
+            if (result)
             {
                 await Bus.RaiseEvent(new RoleRemovedEvent(request.Name));
             }

src/Backend/Jp.Domain/Interfaces/IRoleService.cs

@@ -7,7 +7,7 @@ namespace Jp.Domain.Interfaces
     public interface IRoleService
     {
         Task<IEnumerable<Role>> GetAllRoles();
-        Task Remove(string name);
+        Task<bool> Remove(string name);
         Task<Role> Details(string name);
         Task<bool> Save(string name);
         Task<bool> Update(string name, string oldName);

src/Backend/Jp.Infra.CrossCutting.Identity/Services/RoleService.cs

@@ -35,11 +35,16 @@ public async Task<IEnumerable<Role>> GetAllRoles()
             return roles.Select(s => new Role() { Id = s.Id, Name = s.Name }).ToList();
         }
 
-        public async Task Remove(string name)
+        public async Task<bool> Remove(string name)
         {
             var roleClaim = await _roleManager.Roles.Where(x => x.Name == name).SingleOrDefaultAsync();
+            var result = await _roleManager.DeleteAsync(roleClaim);
+            foreach (var error in result.Errors)
+            {
+                await _bus.RaiseEvent(new DomainNotification(result.ToString(), error.Description));
+            }
 
-            await _roleManager.DeleteAsync(roleClaim);
+            return result.Succeeded;
         }
 
         public async Task<Role> Details(string name)
@@ -72,6 +77,6 @@ public async Task<bool> Update(string name, string oldName)
             return result.Succeeded;
         }
 
-       
+
     }
 }

src/Backend/Jp.UserManagement/Controllers/RolesController.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Jp.Application.Interfaces;
-using Jp.Application.ViewModels;
 using Jp.Application.ViewModels.RoleViewModels;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Core.Notifications;

src/Backend/Jp.UserManagement/jpProject_sso_log.txt

@@ -16,10 +16,10 @@
 <div class="container-fluid" *ngIf="roles">
     <div class="col-xl-12 col-md-12 col-lg-12">
         <div class="card">
-                <div class="card-header">
-                        <a class="btn btn-outline-primary mb-3" [routerLink]="[ '/roles/add' ]"><i class="fa fa-plus-circle"></i>
-                            {{ 'roles.new-role' | translate }}</a>
-                    </div>
+            <div class="card-header">
+                <a class="btn btn-outline-primary mb-3" [routerLink]="[ '/roles/add' ]"><i class="fa fa-plus-circle"></i>
+                    {{ 'roles.new-role' | translate }}</a>
+            </div>
             <div class="card-body">
                 <div class="table-responsive">
                     <table class="table table-striped">
@@ -56,7 +56,7 @@
 </div>
 
 
-<div class="container-fluid" *ngIf="users$">
+<div class="container-fluid" *ngIf="users$ || selectedRole">
     <div class="col-xl-12 col-md-12 col-lg-12">
         <div class="card">
             <div class="card-header">

src/Frontend/Jp.AdminUI/src/app/panel/roles/list/roles-list.component.html

@@ -57,7 +57,7 @@ export class RolesListComponent implements OnInit {
                 closeOnCancel: false
             }, (isConfirm) => {
                 if (isConfirm) {
-
+                    this.selectedRole = null;
                     this.roleService.remove(name).subscribe(
                         registerResult => {
                             if (registerResult.data) {

src/Frontend/Jp.AdminUI/src/app/panel/roles/list/roles-list.component.ts

@@ -30,7 +30,7 @@ public static void Main(string[] args)
             var host = CreateWebHostBuilder(args).Build();
 
             // Uncomment this to seed upon startup, alternatively pass in `dotnet run / seed` to seed using CLI
-            Task.WaitAll(DbMigrationHelpers.EnsureSeedData(host));
+            //Task.WaitAll(DbMigrationHelpers.EnsureSeedData(host));
 
             host.Run(); 
         }