Merge pull request #380 from personball/master

Fix issue #379 angular template report error after running NSwag\refresh.bat

Author: alirizaadiyahsi

angular/src/app/roles/roles.component.ts

@@ -6,57 +6,60 @@ import { CreateRoleComponent } from 'app/roles/create-role/create-role.component
 import { EditRoleComponent } from 'app/roles/edit-role/edit-role.component';
 import { finalize } from 'rxjs/operators';
 
+class PagedRolesRequestDto extends PagedRequestDto{
+    keyword: string;
+}
+
 @Component({
-  templateUrl: './roles.component.html',
-  animations: [appModuleAnimation()]
+    templateUrl: './roles.component.html',
+    animations: [appModuleAnimation()]
 })
 export class RolesComponent extends PagedListingComponentBase<RoleDto> {
 
-	@ViewChild('createRoleModal') createRoleModal: CreateRoleComponent;
-	@ViewChild('editRoleModal') editRoleModal: EditRoleComponent;
-	
-	roles: RoleDto[] = [];
-
-	constructor(
-		private injector:Injector,
-		private rolesService: RoleServiceProxy
-	) {
-		super(injector);
-	}
-    
-	list(request: PagedRequestDto, pageNumber: number, finishedCallback: Function): void {
-        this.rolesService.getAll(request.skipCount, request.maxResultCount)
+    @ViewChild('createRoleModal') createRoleModal: CreateRoleComponent;
+    @ViewChild('editRoleModal') editRoleModal: EditRoleComponent;
+
+    roles: RoleDto[] = [];
+
+    constructor(
+        private injector: Injector,
+        private rolesService: RoleServiceProxy
+    ) {
+        super(injector);
+    }
+
+    list(request: PagedRolesRequestDto, pageNumber: number, finishedCallback: Function): void {
+        this.rolesService.getAll(request.keyword, request.skipCount, request.maxResultCount)
             .pipe(finalize(() => { finishedCallback() }))
-            .subscribe((result: PagedResultDtoOfRoleDto)=>{
-				this.roles = result.items;
-				this.showPaging(result, pageNumber);
-		});
-	}
-
-	delete(role: RoleDto): void {
-		abp.message.confirm(
-			"Remove Users from Role and delete Role '"+ role.displayName +"'?",
-			"Permanently delete this Role",
-			(result:boolean) =>{
-				if(result)
-				{
+            .subscribe((result: PagedResultDtoOfRoleDto) => {
+                this.roles = result.items;
+                this.showPaging(result, pageNumber);
+            });
+    }
+
+    delete(role: RoleDto): void {
+        abp.message.confirm(
+            "Remove Users from Role and delete Role '" + role.displayName + "'?",
+            "Permanently delete this Role",
+            (result: boolean) => {
+                if (result) {
                     this.rolesService.delete(role.id)
                         .pipe(finalize(() => {
                             abp.notify.info("Deleted Role: " + role.displayName);
                             this.refresh();
                         }))
-						.subscribe(() => { });
-				}
-			}
-		);
-	}
-
-	// Show Modals
-	createRole(): void {
-		this.createRoleModal.show();
-	}
-
-	editRole(role:RoleDto): void {
-		this.editRoleModal.show(role.id);
-	}
+                        .subscribe(() => { });
+                }
+            }
+        );
+    }
+
+    // Show Modals
+    createRole(): void {
+        this.createRoleModal.show();
+    }
+
+    editRole(role: RoleDto): void {
+        this.editRoleModal.show(role.id);
+    }
 }

angular/src/app/tenants/tenants.component.ts

@@ -7,6 +7,11 @@ import { EditTenantComponent } from 'app/tenants/edit-tenant/edit-tenant.compone
 import { CreateTenantComponent } from 'app/tenants/create-tenant/create-tenant.component';
 import { finalize } from 'rxjs/operators';
 
+class PagedTenantsRequestDto extends PagedRequestDto{
+    keyword: string;
+    isActive: boolean | null;
+}
+
 @Component({
     templateUrl: './tenants.component.html',
     animations: [appModuleAnimation()]
@@ -25,8 +30,8 @@ export class TenantsComponent extends PagedListingComponentBase<TenantDto> {
         super(injector);
     }
 
-    list(request:PagedRequestDto, pageNumber:number, finishedCallback: Function): void {
-        this._tenantService.getAll(request.skipCount, request.maxResultCount)
+    list(request:PagedTenantsRequestDto, pageNumber:number, finishedCallback: Function): void {
+        this._tenantService.getAll(request.keyword, request.isActive, request.skipCount, request.maxResultCount)
             .pipe(finalize(() => { finishedCallback() }))
             .subscribe((result:PagedResultDtoOfTenantDto)=>{
 				this.tenants = result.items;

angular/src/app/users/users.component.ts

@@ -5,6 +5,14 @@ import { PagedListingComponentBase, PagedRequestDto } from 'shared/paged-listing
 import { CreateUserComponent } from 'app/users/create-user/create-user.component';
 import { EditUserComponent } from 'app/users/edit-user/edit-user.component';
 import { finalize } from 'rxjs/operators';
+import { Moment } from 'moment';
+
+class PagedUsersRequestDto extends PagedRequestDto {
+    keyword: string;
+    isActive: boolean|null;
+    from: Moment|null;
+    to: Moment|null;
+}
 
 @Component({
     templateUrl: './users.component.html',
@@ -25,8 +33,8 @@ export class UsersComponent extends PagedListingComponentBase<UserDto> {
         super(injector);
     }
 
-    protected list(request: PagedRequestDto, pageNumber: number, finishedCallback: Function): void {
-        this._userService.getAll(request.skipCount, request.maxResultCount)
+    protected list(request: PagedUsersRequestDto, pageNumber: number, finishedCallback: Function): void {
+        this._userService.getAll(request.keyword, request.isActive, request.from, request.to, request.skipCount, request.maxResultCount)
             .pipe(finalize(() => {
                  finishedCallback()
             }))