Merge pull request #575 from ever-co/feature/ban-improvements

feat(ever-admin): improved ban feature
ever-co · Jun 5, 2019 · 752fdc5 · 752fdc5
2 parents d38e9cd + 2670bdb
commit 752fdc5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/...bsite-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html b/...bsite-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
@@ -3,7 +3,7 @@ <h6 class="warehouse-name-smt">
 		<strong
 			>{{ rowData.name
 			}}<span *ngIf="rowData.isBanned" class="badge badge-danger"
-				>Banned</span
+				>ban</span
 			></strong
 		>
 	</h6>

diff --git a/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.html b/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.html
@@ -30,7 +30,7 @@ <h4 class="modal-title" id="modal-title">Profile Ban</h4>
 		type="button"
 		ngbAutofocus
 		class="btn btn-danger"
-		(click)="modal.close(user.id)"
+		(click)="modal.close(user)"
 	>
 		Ok
 	</button>

diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.html b/admin/website-angular/src/app/pages/+customers/customers.component.html
@@ -35,7 +35,7 @@
 
 		<button
 			class="btn btn-danger mr-2 d-inline-block"
-			[disabled]="!isOnlyOneCustomerSelected"
+			[disabled]="!isOnlyOneCustomerSelected || showBanLoading"
 			[nbSpinner]="showBanLoading"
 			(click)="banSelectedRows()"
 		>

diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.ts b/admin/website-angular/src/app/pages/+customers/customers.component.ts
@@ -143,12 +143,12 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 		});
 		modal.componentInstance.user = this._selectedCustomers[0];
 		modal.result
-			.then(async (id) => {
+			.then(async (user) => {
 				this.showBanLoading = true;
-				await this._usersService.unbanUser(id);
+				await this._usersService.unbanUser(user.id);
 				this._loadDataSmartTable();
 				this.showBanLoading = false;
-				this._notifyService.success('User is unbanned.');
+				this._notifyService.success(`${user.name} is unbanned!`);
 			})
 			.catch((_) => {});
 	}
@@ -162,12 +162,12 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 		});
 		modal.componentInstance.user = this._selectedCustomers[0];
 		modal.result
-			.then(async (id) => {
+			.then(async (user) => {
 				this.showBanLoading = true;
-				await this._usersService.banUser(id);
+				await this._usersService.banUser(user.id);
 				this._loadDataSmartTable();
 				this.showBanLoading = false;
-				this._notifyService.success('User is banned');
+				this._notifyService.success(`${user.name} is banned!`);
 			})
 			.catch((_) => {});
 	}