Refactor role and user pages.

Author: hikalkan

angular/src/app/roles/create-role/create-role.component.html

@@ -47,17 +47,6 @@ <h4 class="modal-title">
                         </div>
                     </div>
 
-                    <div class="row">
-                        <div class="col-sm-12">
-                            <div class="form-group form-float">
-                                <div class="">
-                                    <input id="isactive" type="checkbox" name="IsActive" [(ngModel)]="role.isActive" checked class="form-control" />
-                                    <label for="isactive" class="form-label">{{l("IsActive")}}</label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
                     <div class="row clearfix">
                         <div class="col-sm-12">
                             <h4>Permissions</h4>

angular/src/app/roles/create-role/create-role.component.ts

@@ -35,7 +35,7 @@ export class CreateRoleComponent extends AppComponentBase implements OnInit {
 
     show(): void {
         this.active = true;
-        this.role = new CreateRoleDto({ isActive: true, isStatic: false });
+        this.role = new CreateRoleDto({ isStatic: false });
 
         this.modal.show();
     }

angular/src/app/roles/edit-role/edit-role.component.html

@@ -48,17 +48,6 @@ <h4 class="modal-title">
                         </div>
                     </div>
 
-                    <div class="row">
-                        <div class="col-sm-12">
-                            <div class="form-group form-float">
-                                <div class="">
-                                    <input id="isactive" [disabled]="role.isStatic" type="checkbox" name="IsActive" [(ngModel)]="role.isActive" checked class="form-control" />
-                                    <label for="isactive" class="form-label">{{l("IsActive")}}</label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
                     <div class="row" *ngIf="role.isStatic">
                         <div class="col-sm-12">
                             <p style="color:red">Static Role</p>

angular/src/app/users/create-user/create-user.component.ts

@@ -1,6 +1,6 @@
 import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef, OnInit } from '@angular/core';
 import { ModalDirective } from 'ngx-bootstrap';
-import { UserServiceProxy, RoleServiceProxy, CreateUserDto, RoleDto } from '@shared/service-proxies/service-proxies';
+import { UserServiceProxy, CreateUserDto, RoleDto } from '@shared/service-proxies/service-proxies';
 import { AppComponentBase } from '@shared/app-component-base';
 
 import * as _ from "lodash";
@@ -24,14 +24,12 @@ export class CreateUserComponent extends AppComponentBase implements OnInit {
     constructor(
         injector: Injector,
         private _userService: UserServiceProxy,
-        private _roleService: RoleServiceProxy
     ) {
         super(injector);
     }
 
     ngOnInit(): void {
-        //max of 1000 roles, todo: change to -1 for all
-        this._roleService.getAll(0,1000)
+        this._userService.getRoles()
         .subscribe((result) => {
             this.roles = result.items;
         });
@@ -60,6 +58,7 @@ export class CreateUserComponent extends AppComponentBase implements OnInit {
     }
 
     save(): void {
+        //TODO: Refactor this, don't use jQuery style code
         var roles = [];
         $(this.modalContent.nativeElement).find("[name=role]").each((ind:number, elem:Element) => {
             if($(elem).is(":checked") == true){

angular/src/app/users/edit-user/edit-user.component.ts

@@ -1,6 +1,6 @@
 import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef } from '@angular/core';
 import { ModalDirective } from 'ngx-bootstrap';
-import { UserServiceProxy, RoleServiceProxy, UserDto, RoleDto } from '@shared/service-proxies/service-proxies';
+import { UserServiceProxy, UserDto, RoleDto } from '@shared/service-proxies/service-proxies';
 import { AppComponentBase } from '@shared/app-component-base';
 
 import * as _ from "lodash";
@@ -24,8 +24,7 @@ export class EditUserComponent extends AppComponentBase {
 
     constructor(
         injector: Injector,
-        private _userService: UserServiceProxy,
-        private _roleService: RoleServiceProxy
+        private _userService: UserServiceProxy
     ) {
         super(injector);
     }
@@ -40,7 +39,7 @@ export class EditUserComponent extends AppComponentBase {
 	}
 
     show(id:number): void {
-        this._roleService.getAll(0,1000)
+        this._userService.getRoles()
             .subscribe((result) => {
                 this.roles = result.items;
             });

angular/src/shared/paged-listing-component-base.ts

@@ -1,6 +1,5 @@
-
-import { AppComponentBase } from "shared/app-component-base";
-import { Injector, Component, ViewEncapsulation, OnInit } from '@angular/core';
+import { AppComponentBase } from "shared/app-component-base";
+import { Injector, OnInit } from '@angular/core';
 
 export class PagedResultDto {
     items: any[];