Skip to content

Commit f9608c4

Browse files
hikalkanhikalkan
committed
Refactor user, role and tenant management.
1 parent 3da38ec commit f9608c4

28 files changed

+326
-672
lines changed

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

Lines changed: 45 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div bsModal #createRoleModal="bs-modal" class="modal fade" (onShown)="onShown()" tabindex="-1" role="dialog" aria-labelledby="createRoleModal" aria-hidden="true" [config]="{backdrop: 'static'}">
1+
<div bsModal #createRoleModal="bs-modal" class="modal fade" (onShown)="onShown()" tabindex="-1" role="dialog" aria-labelledby="createRoleModal" aria-hidden="true" [config]="{backdrop: 'static'}">
22
<div class="modal-dialog">
33

44
<div #modalContent class="modal-content">
@@ -14,80 +14,69 @@ <h4 class="modal-title">
1414
</h4>
1515
</div>
1616
<div class="modal-body">
17-
<ul class="nav nav-tabs tab-nav-right" role="tablist">
18-
<li role="presentation" class="active"><a href="#role-details" data-toggle="tab">Role Details</a></li>
19-
<li role="presentation"><a href="#role-description" data-toggle="tab">Role Description</a></li>
20-
</ul>
21-
<div class="tab-content">
22-
<div role="tabpanel" class="tab-pane animated fadeIn active" id="role-details">
23-
24-
<div class="row clearfix" style="margin-top:20px;">
25-
<div class="col-sm-6">
26-
<div class="form-group form-float">
27-
<div class="form-line">
28-
<input id="rolename" type="text" name="RoleName" [(ngModel)]="role.name" required maxlength="32" minlength="2" class="validate form-control">
29-
<label for="username" class="form-label">{{l("RoleName")}}</label>
30-
</div>
31-
</div>
32-
</div>
33-
<div class="col-sm-6">
34-
<div class="form-group form-float">
35-
<div class="">
36-
<input id="isactive" type="checkbox" name="IsActive" [(ngModel)]="role.isActive" checked class="form-control"/>
37-
<label for="isactive" class="form-label">{{l("IsActive")}}</label>
38-
</div>
39-
</div>
17+
<div class="row clearfix">
18+
<div class="col-sm-12">
19+
<div class="form-group form-float">
20+
<div class="form-line">
21+
<input id="rolename" type="text" name="RoleName" [(ngModel)]="role.name" required maxlength="32" minlength="2" class="validate form-control">
22+
<label for="username" class="form-label">{{l("RoleName")}}</label>
4023
</div>
4124
</div>
25+
</div>
26+
</div>
4227

43-
<div class="row clearfix" style="margin-top:20px;">
44-
<div class="col-sm-12">
45-
<div class="form-group form-float">
46-
<div class="form-line">
47-
<input id="displayname" type="text" name="DisplayName" [(ngModel)]="role.displayName" required maxlength="32" minlength="2" class="validate form-control">
48-
<label for="displayname" class="form-label">{{l("DisplayName")}}</label>
49-
</div>
50-
</div>
28+
<div class="row clearfix">
29+
<div class="col-sm-12">
30+
<div class="form-group form-float">
31+
<div class="form-line">
32+
<input id="displayname" type="text" name="DisplayName" [(ngModel)]="role.displayName" required maxlength="32" minlength="2" class="validate form-control">
33+
<label for="displayname" class="form-label">{{l("DisplayName")}}</label>
5134
</div>
5235
</div>
36+
</div>
37+
</div>
5338

54-
<div class="row clearfix">
55-
<div class="col-sm-12">
56-
<fieldset class="show-fieldset col s12">
57-
<legend class="show-legend">Permissions</legend>
58-
59-
<ng-template ngFor let-permission [ngForOf]="permissions.items" let-permissionIndex="index">
60-
<div class="col-sm-6">
61-
<input type="checkbox" name="permission" value="{{permission.name}}" class="filled-in" id="permission-{{permissionIndex}}" checked="checked" />
62-
<label for="permission-{{permissionIndex}}">{{permission.displayName}}</label>
63-
</div>
64-
</ng-template>
65-
</fieldset>
66-
</div>
39+
<div class="row">
40+
<div class="col-sm-12">
41+
<div class="form-group form-float">
42+
<div class="form-line">
43+
<textarea id="role-description" name="Description" [(ngModel)]="role.description" required class="validate form-control"></textarea>
44+
<label for="role-description" class="form-label">Role Description</label>
45+
</div>
6746
</div>
6847
</div>
69-
<div role="tabpanel" class="tab-pane animated fadeIn" id="role-description">
48+
</div>
7049

71-
<div class="row" style="margin-top:20px;">
72-
<div class="col-sm-12">
73-
<div class="form-group form-float">
74-
<div class="form-line">
75-
<textarea id="role-description" name="Description" [(ngModel)]="role.description" required class="validate form-control"></textarea>
76-
<label for="role-description" class="form-label">Role Description</label>
77-
</div>
78-
</div>
50+
<div class="row">
51+
<div class="col-sm-12">
52+
<div class="form-group form-float">
53+
<div class="">
54+
<input id="isactive" type="checkbox" name="IsActive" [(ngModel)]="role.isActive" checked class="form-control" />
55+
<label for="isactive" class="form-label">{{l("IsActive")}}</label>
7956
</div>
8057
</div>
58+
</div>
59+
</div>
8160

61+
<div class="row clearfix">
62+
<div class="col-sm-12">
63+
<h4>Permissions</h4>
64+
<ng-template ngFor let-permission [ngForOf]="permissions.items" let-permissionIndex="index">
65+
<div class="col-sm-6">
66+
<input type="checkbox" name="permission" value="{{permission.name}}" class="filled-in" id="permission-{{permissionIndex}}" checked="checked" />
67+
<label for="permission-{{permissionIndex}}">{{permission.displayName}}</label>
68+
</div>
69+
</ng-template>
8270
</div>
8371
</div>
8472
</div>
73+
8574
<div class="modal-footer">
8675
<button [disabled]="saving" type="button" class="btn btn-default waves-effect" (click)="close()">
87-
<i class="material-icons">clear</i>{{l("Cancel")}}
76+
{{l("Cancel")}}
8877
</button>
8978
<button [disabled]="!createRoleForm.form.valid || saving" type="submit" class="btn btn-primary waves-effect">
90-
<i class="material-icons">check</i>{{l("Save")}}
79+
{{l("Save")}}
9180
</button>
9281
</div>
9382

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef, OnInit } from '@angular/core';
1+
import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef, OnInit } from '@angular/core';
22
import { ModalDirective } from 'ngx-bootstrap';
33
import { RoleServiceProxy, CreateRoleDto, RoleDto, ListResultDtoOfPermissionDto } from '@shared/service-proxies/service-proxies';
44
import { AppComponentBase } from '@shared/app-component-base';
@@ -30,7 +30,6 @@ export class CreateRoleComponent extends AppComponentBase implements OnInit {
3030
.subscribe((permissions:ListResultDtoOfPermissionDto) =>
3131
{
3232
this.permissions = permissions;
33-
console.log(permissions);
3433
});
3534
}
3635

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

Lines changed: 52 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div bsModal #editRoleModal="bs-modal" class="modal fade" (onShown)="onShown()" tabindex="-1" role="dialog" aria-labelledby="edidtRoleModal" aria-hidden="true" [config]="{backdrop: 'static'}">
1+
<div bsModal #editRoleModal="bs-modal" class="modal fade" (onShown)="onShown()" tabindex="-1" role="dialog" aria-labelledby="edidtRoleModal" aria-hidden="true" [config]="{backdrop: 'static'}">
22
<div class="modal-dialog">
33

44
<div #modalContent class="modal-content">
@@ -15,84 +15,76 @@ <h4 class="modal-title">
1515
</div>
1616
<div class="modal-body">
1717

18-
<ul class="nav nav-tabs tab-nav-right" role="tablist">
19-
<li role="presentation" class="active"><a href="#role-details" data-toggle="tab">Role Details</a></li>
20-
<li role="presentation"><a href="#role-description" data-toggle="tab">Role Description</a></li>
21-
</ul>
22-
<div class="tab-content">
23-
24-
<div role="tabpanel" class="tab-pane animated fadeIn active" id="role-details">
25-
<div *ngIf="role.isStatic">
26-
<h5 style="color:red">Static Role</h5>
27-
</div>
28-
<div class="row clearfix" style="margin-top:20px;">
29-
<div class="col-sm-6">
30-
<div class="form-group form-float">
31-
<div class="form-line">
32-
<input id="rolename" [disabled]="role.isStatic" type="text" name="RoleName" [(ngModel)]="role.name" required maxlength="32" minlength="2" class="validate form-control">
33-
<label for="username" class="form-label">{{l("RoleName")}}</label>
34-
</div>
35-
</div>
36-
</div>
37-
<div class="col-sm-6">
38-
<div class="form-group form-float">
39-
<div class="">
40-
<input id="isactive" [disabled]="role.isStatic" type="checkbox" name="IsActive" [(ngModel)]="role.isActive" checked class="form-control"/>
41-
<label for="isactive" class="form-label">{{l("IsActive")}}</label>
42-
</div>
43-
</div>
18+
<div class="row clearfix">
19+
<div class="col-sm-12">
20+
<div class="form-group form-float">
21+
<div class="form-line">
22+
<input id="rolename" [disabled]="role.isStatic" type="text" name="RoleName" [(ngModel)]="role.name" required maxlength="32" minlength="2" class="validate form-control">
23+
<label for="username" class="form-label">{{l("RoleName")}}</label>
4424
</div>
4525
</div>
26+
</div>
27+
</div>
4628

47-
<div class="row clearfix" style="margin-top:20px;">
48-
<div class="col-sm-12">
49-
<div class="form-group form-float">
50-
<div class="form-line">
51-
<input id="displayname" type="text" name="DisplayName" [(ngModel)]="role.displayName" required maxlength="32" minlength="2" class="validate form-control">
52-
<label for="displayname" class="form-label">{{l("DisplayName")}}</label>
53-
</div>
54-
</div>
29+
<div class="row clearfix">
30+
<div class="col-sm-12">
31+
<div class="form-group form-float">
32+
<div class="form-line">
33+
<input id="displayname" type="text" name="DisplayName" [(ngModel)]="role.displayName" required maxlength="32" minlength="2" class="validate form-control">
34+
<label for="displayname" class="form-label">{{l("DisplayName")}}</label>
5535
</div>
5636
</div>
37+
</div>
38+
</div>
5739

58-
<div class="row clearfix">
59-
<div class="col-sm-12">
60-
<fieldset class="show-fieldset col s12">
61-
<legend class="show-legend">Permissions</legend>
62-
63-
<ng-template ngFor let-permission [ngForOf]="permissions.items" let-permissionIndex="index">
64-
<div class="col-sm-6">
65-
<input [disabled]="role.isStatic" type="checkbox" name="permission" value="{{permission.name}}" class="filled-in" id="permission-{{permissionIndex}}" checked="{{checkPermission(permission.name)}}" />
66-
<label for="permission-{{permissionIndex}}">{{permission.displayName}}</label>
67-
</div>
68-
</ng-template>
69-
70-
</fieldset>
71-
</div>
40+
<div class="row">
41+
<div class="col-sm-12">
42+
<div class="form-group form-float">
43+
<div class="form-line">
44+
<textarea id="role-description" name="Description" [(ngModel)]="role.description" required class="validate form-control"></textarea>
45+
<label for="role-description" class="form-label">Role Description</label>
46+
</div>
7247
</div>
7348
</div>
74-
<div role="tabpanel" class="tab-pane animated fadeIn" id="role-description">
49+
</div>
7550

76-
<div class="row" style="margin-top:20px;">
77-
<div class="col-sm-12">
78-
<div class="form-group form-float">
79-
<div class="form-line">
80-
<textarea id="role-description" name="Description" [(ngModel)]="role.description" required class="validate form-control"></textarea>
81-
<label for="role-description" class="form-label">Role Description</label>
82-
</div>
83-
</div>
51+
<div class="row">
52+
<div class="col-sm-12">
53+
<div class="form-group form-float">
54+
<div class="">
55+
<input id="isactive" [disabled]="role.isStatic" type="checkbox" name="IsActive" [(ngModel)]="role.isActive" checked class="form-control" />
56+
<label for="isactive" class="form-label">{{l("IsActive")}}</label>
8457
</div>
8558
</div>
59+
</div>
60+
</div>
61+
62+
<div class="row" *ngIf="role.isStatic">
63+
<div class="col-sm-12">
64+
<p style="color:red">Static Role</p>
65+
</div>
66+
</div>
67+
68+
<div class="row clearfix">
69+
<div class="col-sm-12">
70+
<h4>Permissions</h4>
8671

72+
<ng-template ngFor let-permission [ngForOf]="permissions.items" let-permissionIndex="index">
73+
<div class="col-sm-6">
74+
<input [disabled]="role.isStatic" type="checkbox" name="permission" value="{{permission.name}}" class="filled-in" id="permission-{{permissionIndex}}" checked="{{checkPermission(permission.name)}}" />
75+
<label for="permission-{{permissionIndex}}">{{permission.displayName}}</label>
76+
</div>
77+
</ng-template>
8778
</div>
8879
</div>
80+
8981
</div>
9082
<div class="modal-footer">
9183
<button [disabled]="saving" type="button" class="btn btn-default waves-effect" (click)="close()">
92-
<i class="material-icons">clear</i>{{l("Cancel")}}
84+
{{l("Cancel")}}
9385
</button>
9486
<button [disabled]="!editRoleForm.form.valid || saving" type="submit" class="btn btn-primary waves-effect">
95-
<i class="material-icons">check</i>{{l("Save")}}
87+
{{l("Save")}}
9688
</button>
9789
</div>
9890

‎angular/src/app/roles/roles.component.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
<div class="row clearfix" [@routerTransition]>
1+
<div class="row clearfix" [@routerTransition]>
22
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
33
<div class="card main-content">
44
<div class="header">
55
<h2>
66
{{l('Roles')}}
77
</h2>
88
<ul class="header-dropdown m-r--5">
9+
<i class="fa fa-spin fa-spinner" *ngIf="isTableLoading"></i>
910
<li class="dropdown">
1011
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
1112
<i class="material-icons">more_vert</i>
@@ -17,8 +18,7 @@ <h2>
1718
</ul>
1819
</div>
1920
<div class="body table-responsive">
20-
21-
<!-- ******************************************************** -->
21+
2222
<table class="table table-hover table-striped">
2323
<thead>
2424
<tr>
@@ -45,13 +45,11 @@ <h2>
4545
<ul class="dropdown-menu pull-right">
4646
<li><a href="javascript:void(0);" class="waves-effect waves-block" (click)="editRole(role)"><i class="material-icons">create</i>Edit</a></li>
4747
<li><a href="javascript:void(0);" class="waves-effect waves-block" (click)="delete(role)"><i class="material-icons">delete_sweep</i>Delete</a></li>
48-
<li *ngIf="!role.isStatic"><a href="javascript:void(0);" class="waves-effect waves-block" (click)="toggleActive(role)"><i class="material-icons">hdr_weak</i>Active/InActive</a></li>
4948
</ul>
5049
</td>
5150
</tr>
5251
</tbody>
5352
</table>
54-
<!-- ******************************************************** -->
5553

5654
<div class="text-align: center;" *ngIf="totalItems > pageSize">
5755
<pagination-controls (pageChange)="getDataPage($event)" id="server"></pagination-controls>

0 commit comments

Comments
 (0)