This commit is contained in:
Amritanshu
2019-06-20 00:17:44 +05:30
parent 2b2624c9c2
commit 93743bdc8e
27 changed files with 171 additions and 133 deletions

View File

@ -0,0 +1,3 @@
.example-card {
max-width: 400px;
}

View File

@ -0,0 +1,42 @@
<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card">
<mat-card fxFlex>
<mat-card-title-group>
<mat-card-title>User</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex>
<mat-label>Name</mat-label>
<input matInput #nameElement placeholder="Name" formControlName="name">
</mat-form-field>
</div>
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex>
<mat-label>Password</mat-label>
<input matInput placeholder="Password" formControlName="password" [type]="hide ? 'password' : 'text'">
<mat-icon matSuffix (click)="hide = !hide">{{hide ? 'visibility' : 'visibility_off'}}</mat-icon>
</mat-form-field>
</div>
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<mat-checkbox formControlName="lockedOut">Is Locked Out?</mat-checkbox>
</div>
<mat-divider></mat-divider>
<div formArrayName="groups">
<div fxLayout="row" *ngFor="let g of item.groups; index as i" [formGroupName]="i" fxLayout="row"
fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<mat-checkbox formControlName="group" fxFlex>{{g.name}}</mat-checkbox>
</div>
</div>
</form>
</mat-card-content>
<mat-card-actions>
<button mat-raised-button color="primary" (click)="save()">Save</button>
<button mat-raised-button color="warn" (click)="confirmDelete()">Delete</button>
</mat-card-actions>
</mat-card>
</div>

View File

@ -0,0 +1,25 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {UserDetailComponent} from './user-detail.component';
describe('UserDetailComponent', () => {
let component: UserDetailComponent;
let fixture: ComponentFixture<UserDetailComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [UserDetailComponent]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(UserDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,121 @@
import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
import {UserService} from '../user.service';
import {User} from '../../core/user';
import {ToasterService} from '../../core/toaster.service';
import {ConfirmDialogComponent} from '../../shared/confirm-dialog/confirm-dialog.component';
import { MatDialog } from '@angular/material/dialog';
import {FormArray, FormBuilder, FormGroup} from '@angular/forms';
@Component({
selector: 'app-user-detail',
templateUrl: './user-detail.component.html',
styleUrls: ['./user-detail.component.css']
})
export class UserDetailComponent implements OnInit, AfterViewInit {
@ViewChild('nameElement', { static: true }) nameElement: ElementRef;
form: FormGroup;
item: User;
hide: boolean;
constructor(
private route: ActivatedRoute,
private router: Router,
private fb: FormBuilder,
private toaster: ToasterService,
private dialog: MatDialog,
private ser: UserService
) {
this.hide = true;
this.createForm();
}
createForm() {
this.form = this.fb.group({
name: '',
password: '',
lockedOut: '',
roles: this.fb.array([])
});
}
ngOnInit() {
this.route.data
.subscribe((data: { item: User }) => {
this.showItem(data.item);
});
}
showItem(item: User) {
this.item = item;
this.form.get('name').setValue(item.name);
this.form.get('password').setValue('');
this.form.get('lockedOut').setValue(item.lockedOut);
this.form.setControl('roles', this.fb.array(
item.roles.map(
x => this.fb.group({
role: x.enabled
})
)
));
}
ngAfterViewInit() {
setTimeout(() => {
this.nameElement.nativeElement.focus();
}, 0);
}
save() {
this.ser.saveOrUpdate(this.getItem())
.subscribe(
(result) => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/users');
},
(error) => {
this.toaster.show('Danger', error.error);
}
);
}
delete() {
this.ser.delete(this.item.id)
.subscribe(
(result) => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/users');
},
(error) => {
this.toaster.show('Danger', error.error);
}
);
}
confirmDelete(): void {
const dialogRef = this.dialog.open(ConfirmDialogComponent, {
width: '250px',
data: {title: 'Delete User?', content: 'Are you sure? This cannot be undone.'}
});
dialogRef.afterClosed().subscribe((result: boolean) => {
if (result) {
this.delete();
}
});
}
getItem(): User {
const formModel = this.form.value;
this.item.name = formModel.name;
this.item.password = formModel.password;
this.item.lockedOut = formModel.lockedOut;
const array = this.form.get('roles') as FormArray;
this.item.roles.forEach((item, index) => {
item.enabled = array.controls[index].value.role;
});
return this.item;
}
}

View File

@ -0,0 +1,15 @@
import {inject, TestBed} from '@angular/core/testing';
import {UserListResolver} from './user-list-resolver.service';
describe('UserListResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [UserListResolver]
});
});
it('should be created', inject([UserListResolver], (service: UserListResolver) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,18 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot} from '@angular/router';
import {User} from '../core/user';
import {Observable} from 'rxjs/internal/Observable';
import {UserService} from './user.service';
@Injectable({
providedIn: 'root'
})
export class UserListResolver implements Resolve<User[]> {
constructor(private ser: UserService, private router: Router) {
}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<User[]> {
return this.ser.list();
}
}

View File

@ -0,0 +1,17 @@
import { DataSource } from '@angular/cdk/collections';
import { Observable, of as observableOf } from 'rxjs';
import { User } from '../../core/user';
export class UserListDataSource extends DataSource<User> {
constructor(public data: User[]) {
super();
}
connect(): Observable<User[]> {
return observableOf(this.data);
}
disconnect() {
}
}

View File

@ -0,0 +1,38 @@
<mat-card>
<mat-card-title-group>
<mat-card-title>Users</mat-card-title>
<a mat-button [routerLink]="['/users', 'new']">
<mat-icon>add_box</mat-icon>
Add
</a>
</mat-card-title-group>
<mat-card-content>
<mat-table #table [dataSource]="dataSource" aria-label="Elements">
<!-- Name Column -->
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
<mat-cell *matCellDef="let row"><a [routerLink]="['/users', row.name]">{{row.name}}</a></mat-cell>
</ng-container>
<!-- Locked Out Column -->
<ng-container matColumnDef="lockedOut">
<mat-header-cell *matHeaderCellDef>Is Locked Out?</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.lockedOut}}</mat-cell>
</ng-container>
<!-- Groups Column -->
<ng-container matColumnDef="roles">
<mat-header-cell *matHeaderCellDef>Roles</mat-header-cell>
<mat-cell *matCellDef="let row">
<ul>
<li *ngFor="let role of row.roles">{{role}}</li>
</ul>
</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
</mat-table>
</mat-card-content>
</mat-card>

View File

@ -0,0 +1,27 @@
import { Component, OnInit } from '@angular/core';
import { UserListDataSource } from './user-list-datasource';
import { User } from '../../core/user';
import { ActivatedRoute } from '@angular/router';
@Component({
selector: 'app-user-list',
templateUrl: './user-list.component.html',
styleUrls: ['./user-list.component.css']
})
export class UserListComponent implements OnInit {
dataSource: UserListDataSource;
list: User[];
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
displayedColumns = ['name', 'lockedOut', 'roles'];
constructor(private route: ActivatedRoute) {
}
ngOnInit() {
this.route.data
.subscribe((data: { list: User[] }) => {
this.list = data.list;
});
this.dataSource = new UserListDataSource(this.list);
}
}

View File

@ -0,0 +1,15 @@
import {inject, TestBed} from '@angular/core/testing';
import {UserResolver} from './user-resolver.service';
describe('UserResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [UserResolver]
});
});
it('should be created', inject([UserResolver], (service: UserResolver) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,19 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot} from '@angular/router';
import {User} from '../core/user';
import {Observable} from 'rxjs/internal/Observable';
import {UserService} from './user.service';
@Injectable({
providedIn: 'root'
})
export class UserResolver implements Resolve<User> {
constructor(private ser: UserService, private router: Router) {
}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<User> {
const id = route.paramMap.get('id');
return this.ser.get(id);
}
}

View File

@ -0,0 +1,15 @@
import {inject, TestBed} from '@angular/core/testing';
import {UserService} from './user.service';
describe('UserService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [UserService]
});
});
it('should be created', inject([UserService], (service: UserService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,73 @@
import {Injectable} from '@angular/core';
import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
import {ErrorLoggerService} from '../core/error-logger.service';
import {catchError} from 'rxjs/operators';
import {Observable} from 'rxjs/internal/Observable';
import {User} from '../core/user';
const httpOptions = {
headers: new HttpHeaders({'Content-Type': 'application/json'})
};
const url = '/v1/users';
const serviceName = 'UserService';
@Injectable({
providedIn: 'root'
})
export class UserService {
constructor(private http: HttpClient, private log: ErrorLoggerService) {
}
get(id: string): Observable<User> {
const getUrl: string = (id === null) ? `${url}/new` : `${url}/${id}`;
return <Observable<User>>this.http.get<User>(getUrl)
.pipe(
catchError(this.log.handleError(serviceName, `get id=${id}`))
);
}
list(): Observable<User[]> {
const options = {params: new HttpParams().set('l', '')};
return <Observable<User[]>>this.http.get<User[]>(url, options)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);
}
listOfNames(): Observable<string[]> {
const options = {params: new HttpParams().set('n', '')};
return <Observable<string[]>>this.http.get<string[]>(url, options)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);
}
save(user: User): Observable<User> {
return <Observable<User>>this.http.post<User>(`${url}/new`, user, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'save'))
);
}
update(user: User): Observable<User> {
return <Observable<User>>this.http.put<User>(`${url}/${user.id}`, user, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'update'))
);
}
saveOrUpdate(user: User): Observable<User> {
if (!user.id) {
return this.save(user);
} else {
return this.update(user);
}
}
delete(id: string): Observable<User> {
return <Observable<User>>this.http.delete<User>(`${url}/${id}`, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'delete'))
);
}
}

View File

@ -0,0 +1,13 @@
import {UsersRoutingModule} from './users-routing.module';
describe('UsersRoutingModule', () => {
let userRoutingModule: UsersRoutingModule;
beforeEach(() => {
userRoutingModule = new UsersRoutingModule();
});
it('should create an instance', () => {
expect(userRoutingModule).toBeTruthy();
});
});

View File

@ -0,0 +1,58 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {RouterModule, Routes} from '@angular/router';
import {UserListResolver} from './user-list-resolver.service';
import {UserResolver} from './user-resolver.service';
import {UserListComponent} from './user-list/user-list.component';
import {UserDetailComponent} from './user-detail/user-detail.component';
import {AuthGuard} from '../auth/auth-guard.service';
const userRoutes: Routes = [
{
path: '',
component: UserListComponent,
canActivate: [AuthGuard],
data: {
permission: 'Users'
},
resolve: {
list: UserListResolver
}
},
{
path: 'new',
component: UserDetailComponent,
canActivate: [AuthGuard],
data: {
permission: 'Users'
},
resolve: {
item: UserResolver,
}
},
{
path: ':id',
component: UserDetailComponent,
canActivate: [AuthGuard],
resolve: {
item: UserResolver
}
}
];
@NgModule({
imports: [
CommonModule,
RouterModule.forChild(userRoutes)
],
exports: [
RouterModule
],
providers: [
UserListResolver,
UserResolver
]
})
export class UsersRoutingModule {
}

View File

@ -0,0 +1,13 @@
import {UsersModule} from './users.module';
describe('UsersModule', () => {
let userModule: UsersModule;
beforeEach(() => {
userModule = new UsersModule();
});
it('should create an instance', () => {
expect(userModule).toBeTruthy();
});
});

View File

@ -0,0 +1,47 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {UserListComponent} from './user-list/user-list.component';
import {UserDetailComponent} from './user-detail/user-detail.component';
import {UsersRoutingModule} from './users-routing.module';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatPaginatorModule } from '@angular/material/paginator';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
import {CdkTableModule} from '@angular/cdk/table';
import {ReactiveFormsModule} from '@angular/forms';
import {SharedModule} from '../shared/shared.module';
import {FlexLayoutModule} from '@angular/flex-layout';
@NgModule({
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
MatDividerModule,
MatIconModule,
MatInputModule,
MatPaginatorModule,
MatProgressSpinnerModule,
MatSortModule,
MatTableModule,
ReactiveFormsModule,
SharedModule,
UsersRoutingModule
],
declarations: [
UserListComponent,
UserDetailComponent
]
})
export class UsersModule {
}