feat(system): view, edit, delete code (#380)

- Add view code component
- Add edit code component

Fixes: #379
This commit is contained in:
Chirag Gupta
2019-05-21 20:19:41 +05:30
committed by Abhay Chawla
parent fbb7a1583a
commit e766a91ecf
16 changed files with 625 additions and 3 deletions
+31
View File
@@ -0,0 +1,31 @@
/** Angular Imports */
import { Injectable } from '@angular/core';
import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
import { Observable } from 'rxjs';
/** Custom Services */
import { SystemService } from '../system.service';
/**
* Code data resolver.
*/
@Injectable()
export class CodeResolver implements Resolve<Object> {
/**
* @param {SystemService} systemService System service.
*/
constructor(private systemService: SystemService) {}
/**
* Returns the Code data.
* @returns {Observable<any>}
*/
resolve(route: ActivatedRouteSnapshot): Observable<any> {
const id = route.paramMap.get('id');
return this.systemService.getCode(id);
}
}
+1 -1
View File
@@ -30,7 +30,7 @@
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="['view', row.id]" class="select-row"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="[row.id]" class="select-row"></tr>
</table>
<mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
@@ -1,5 +1,9 @@
table {
width: 100%;
.select-row:hover {
cursor: pointer;
}
}
// TODO: CONFIGURE THESE CLASSES GLOBALLY
@@ -45,12 +45,12 @@ export class CreateCodeComponent implements OnInit {
/**
* Submits the code form and creates a code,
* if successful redirects to view code.
* if successful redirects to view created code.
*/
submit() {
this.systemService.createCode(this.codeForm.value)
.subscribe((response: any) => {
this.router.navigate(['/system/codes'], { relativeTo: this.route });
this.router.navigate(['../', response.resourceId], { relativeTo: this.route });
});
}
@@ -0,0 +1,32 @@
<div class="container">
<mat-card>
<form [formGroup]="codeForm" (ngSubmit)="submit()">
<mat-card-content>
<div fxLayout="column">
<mat-form-field>
<mat-label>Code Name</mat-label>
<input matInput required formControlName="name">
<mat-error *ngIf="codeForm.controls.name.hasError('required')">
Code Name is <strong>required</strong>
</mat-error>
</mat-form-field>
</div>
</mat-card-content>
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
<button mat-raised-button color="primary" [disabled]="!codeForm.valid || codeForm.pristine">Submit</button>
</mat-card-actions>
</form>
</mat-card>
</div>
@@ -0,0 +1,3 @@
.container {
max-width: 37rem;
}
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { EditCodeComponent } from './edit-code.component';
describe('EditCodeComponent', () => {
let component: EditCodeComponent;
let fixture: ComponentFixture<EditCodeComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ EditCodeComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(EditCodeComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,67 @@
/** Angular Imports */
import { Component, OnInit } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { SystemService } from '../../system.service';
/**
* Edit Code Component.
*/
@Component({
selector: 'mifosx-edit-code',
templateUrl: './edit-code.component.html',
styleUrls: ['./edit-code.component.scss']
})
export class EditCodeComponent implements OnInit {
/** Code Form */
codeForm: FormGroup;
/** Code Data */
codeData: any;
/**
* Retrieves the code data from `resolve`.
* @param {FormBuilder} formBuilder Form Builder.
* @param {SystemService} systemService System Service.
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
*/
constructor(private formBuilder: FormBuilder,
private systemService: SystemService,
private route: ActivatedRoute,
private router: Router) {
this.route.data.subscribe((data: { code: any }) => {
this.codeData = data.code;
});
}
/**
* Creates and sets the code form.
*/
ngOnInit() {
this.createCodeForm();
}
/**
* Creates and sets code form.
*/
createCodeForm() {
this.codeForm = this.formBuilder.group({
'name': [this.codeData.name, Validators.required]
});
}
/**
* Submits the code form and updates code,
* if successful redirects to view updated code.
*/
submit() {
this.systemService.updateCode(this.codeForm.value, this.codeData.id)
.subscribe((response: any) => {
this.router.navigate(['../../', response.resourceId], { relativeTo: this.route });
});
}
}
@@ -0,0 +1,31 @@
/** Angular Imports */
import { Injectable } from '@angular/core';
import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
import { Observable } from 'rxjs';
/** Custom Services */
import { SystemService } from '../../system.service';
/**
* Code Values data resolver.
*/
@Injectable()
export class CodeValuesResolver implements Resolve<Object> {
/**
* @param {SystemService} systemService System service.
*/
constructor(private systemService: SystemService) {}
/**
* Returns the Code Values data.
* @returns {Observable<any>}
*/
resolve(route: ActivatedRouteSnapshot): Observable<any> {
const codeId = route.paramMap.get('id');
return this.systemService.getCodeValues(codeId);
}
}
@@ -0,0 +1,87 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px" fxLayout.xs="column">
<button mat-raised-button color="primary" (click)="addCodeValueRow()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
Add Code Value
</button>
<button mat-raised-button color="primary" [routerLink]="['edit']" *ngIf="!codeData.systemDefined">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
Edit Code
</button>
<button mat-raised-button color="warn" (click)="delete()" *ngIf="!codeData.systemDefined">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
Delete Code
</button>
</div>
<div class="container">
<mat-card>
<mat-card-title>{{ codeData.name }}</mat-card-title>
<form [formGroup]="codeValuesForm">
<mat-card-content>
<div formArrayName="codeValues" *ngFor="let codeValue of codeValues.controls; let i = index;">
<div fxFlexFill fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column" [formGroupName]="i">
<mat-form-field fxFlex="20%">
<mat-label>Name</mat-label>
<input required matInput formControlName="name">
<mat-error *ngIf="codeValues.at(i).controls.name.hasError('required')">
Name is <strong>required</strong>
</mat-error>
</mat-form-field>
<mat-form-field fxFlex="22%">
<mat-label>Description</mat-label>
<input matInput formControlName="description">
</mat-form-field>
<mat-form-field fxFlex="18%">
<mat-label>Position</mat-label>
<input required matInput formControlName="position" type="number">
<mat-error *ngIf="codeValues.at(i).controls.position.hasError('required')">
Name is <strong>required</strong>
</mat-error>
</mat-form-field>
<div class="active-wrapper" fxFlex="8%">
<mat-checkbox formControlName="isActive" class="active">Active</mat-checkbox>
</div>
<div fxLayoutGap="2%" fxFlex="22%" class="options-wrapper">
<button mat-stroked-button color="primary" *ngIf="codeValueRowStatus[i] === 'edit'" [disabled]="codeValues.at(i).pristine" (click)="updateCodeValue(i)">
Submit
</button>
<button mat-button *ngIf="codeValueRowStatus[i] === 'edit'" (click)="disableRow(i)">
Cancel
</button>
<button mat-icon-button color="primary" [disabled]="!codeValuesForm.get('codeValues').at(i).valid" *ngIf="codeValueRowStatus[i] === 'new'" matTooltip="Add" matTooltipPosition="above" (click)="addCodeValue(i)">
<fa-icon icon="plus" size="lg"></fa-icon>
</button>
<button type="button" color="primary" *ngIf="codeValueRowStatus[i] === 'disabled'" mat-icon-button matTooltip="Edit" matTooltipPosition="above" (click)="enableRow(i)">
<fa-icon icon="edit" size="lg"></fa-icon>
</button>
<button type="button" color="warn" mat-icon-button matTooltip="Delete" matTooltipPosition="above" (click)="codeValueRowStatus[i] === 'new' ? removeNewCodeValue(i) : deleteCodeValue(i)">
<fa-icon icon="trash" size="lg"></fa-icon>
</button>
</div>
</div>
</div>
</mat-card-content>
</form>
</mat-card>
</div>
@@ -0,0 +1,18 @@
@media (min-width: 992px) {
.active-wrapper {
position: relative;
.active {
padding: 0 0 17.5px 0;
position: absolute;
bottom: 0;
right: 0;
}
}
}
.options-wrapper {
padding: 18px 0 0 0;
}
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ViewCodeComponent } from './view-code.component';
describe('ViewCodeComponent', () => {
let component: ViewCodeComponent;
let fixture: ComponentFixture<ViewCodeComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ViewCodeComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ViewCodeComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,206 @@
/** Angular Imports */
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { FormGroup, FormBuilder, Validators, FormArray } from '@angular/forms';
import { MatDialog } from '@angular/material';
/** Custom Services */
import { SystemService } from 'app/system/system.service';
/** Custom Components */
import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
/**
* View Code Component.
*/
@Component({
selector: 'mifosx-view-code',
templateUrl: './view-code.component.html',
styleUrls: ['./view-code.component.scss']
})
export class ViewCodeComponent implements OnInit {
/** Code Data */
codeData: any;
/** Code Values Data */
codeValuesData: any[];
/** Code Values Form */
codeValuesForm: FormGroup;
/** Code Value Row Status */
codeValueRowStatus: string[] = [];
/**
* Retrieves the codes and code values data from `resolve`.
* @param {ActivatedRoute} route Activated Route.
* @param {SystemService} systemService System Service.
* @param {Router} router Router for navigation.
* @param {FormBuilder} formBuilder Form Builder.
* @param {MatDialog} dialog Dialog reference.
*/
constructor(private route: ActivatedRoute,
private systemService: SystemService,
private router: Router,
private formBuilder: FormBuilder,
private dialog: MatDialog) {
this.route.data.subscribe((data: { code: any, codeValues: any }) => {
this.codeData = data.code;
this.codeValuesData = data.codeValues;
});
}
/**
* Creates and initializes the code values form.
*/
ngOnInit() {
this.createCodeValuesForm();
this.initCodeValuesForm();
}
/**
* Initializes the code values form.
*/
initCodeValuesForm() {
this.codeValuesData.forEach((codeValue: any) => {
this.codeValues.push(this.createCodeValuesRow(codeValue));
this.codeValueRowStatus.push('disabled');
});
}
/**
* Gets the code values form array.
* @returns {FormArray} Code values form array.
*/
get codeValues(): FormArray {
return this.codeValuesForm.get('codeValues') as FormArray;
}
/**
* Creates the code values form.
*/
createCodeValuesForm() {
this.codeValuesForm = this.formBuilder.group({
'codeValues': this.formBuilder.array([])
});
}
/**
* Adds a row to the code values form.
*/
addCodeValueRow() {
this.codeValues.push(this.createCodeValuesRow());
this.codeValues.at(this.codeValues.length - 1).enable();
this.codeValueRowStatus.push('new');
}
/**
* Creates a code value row in code values form.
* @param {any} codeValue Code value.
*/
createCodeValuesRow(codeValue?: any): FormGroup {
return this.formBuilder.group({
'name': [{ value: codeValue ? codeValue.name : '', disabled: true }, Validators.required],
'description': [{ value: codeValue ? codeValue.description : '', disabled: true }],
'position': [{ value: codeValue ? codeValue.position : 0, disabled: true }, Validators.required],
'isActive': [{ value: codeValue ? codeValue.active : false, disabled: true }]
});
}
/**
* Deletes the particular code value.
* @param {number} index Index of the row.
*/
deleteCodeValue(index: number) {
const codeValueId = this.codeValuesData[index].id;
this.systemService.deleteCodeValue(this.codeData.id, codeValueId)
.subscribe((response: any) => {
this.codeValuesData.splice(index, 1);
this.codeValues.removeAt(index);
this.codeValueRowStatus.splice(index, 1);
});
}
/**
* Removes/Deletes the particular code value which has not been intialised.
* @param {number} index Index of the row.
*/
removeNewCodeValue(index: number) {
this.codeValues.removeAt(index);
this.codeValueRowStatus.splice(index, 1);
}
/**
* Updates the particular code value.
* @param {number} index Index of the row.
*/
updateCodeValue(index: number) {
const updatedCodeValue: { name: string, description: string, position: number, isActive: boolean } = this.codeValues.at(index).value;
this.systemService.updateCodeValue(this.codeData.id, this.codeValuesData[index].id, updatedCodeValue)
.subscribe((response: any) => {
this.codeValues.at(index).disable();
this.codeValueRowStatus[index] = 'disabled';
this.codeValues.at(index).markAsPristine();
});
}
/**
* Deletes the code.
*/
delete() {
const deleteCodeDialogRef = this.dialog.open(DeleteDialogComponent, {
data: { deleteContext: `code ${this.codeData.name}` }
});
deleteCodeDialogRef.afterClosed().subscribe((response: any) => {
if (response.delete) {
this.systemService.deleteCode(this.codeData.id)
.subscribe(() => {
this.router.navigate(['/system/codes']);
});
}
});
}
/**
* Disables the particular row.
* @param {number} index Index of the row.
*/
disableRow(index: number) {
this.codeValues.at(index).get('name').setValue(this.codeValuesData[index].name);
this.codeValues.at(index).get('description').setValue(this.codeValuesData[index].description);
this.codeValues.at(index).get('position').setValue(this.codeValuesData[index].position);
this.codeValues.at(index).get('isActive').setValue(this.codeValuesData[index].isActive);
this.codeValues.at(index).disable();
this.codeValueRowStatus[index] = 'disabled';
this.codeValues.at(index).markAsPristine();
}
/**
* Adds the given code value.
* @param {number} index Index of the row.
*/
addCodeValue(index: number) {
const newCodeValue: { name: string, description: string, position: string, isActive: boolean } = this.codeValues.at(index).value;
this.systemService.createCodeValue(this.codeData.id, newCodeValue)
.subscribe((response: any) => {
this.codeValues.at(index).disable();
this.codeValueRowStatus[index] = 'disabled';
this.codeValuesData.push({
id: response.subResourceId,
name: this.codeValues.at(index).get('name').value,
description: this.codeValues.at(index).get('description').value,
position: this.codeValues.at(index).get('position').value,
isActive: this.codeValues.at(index).get('isActive').value
});
this.codeValues.at(index).markAsPristine();
});
}
/**
* Enables the given row.
* @param {number} index Index of the row.
*/
enableRow(index: number) {
this.codeValues.at(index).enable();
this.codeValueRowStatus[index] = 'edit';
}
}
+28
View File
@@ -9,6 +9,8 @@ import { extract } from '../core/i18n/i18n.service';
import { SystemComponent } from './system.component';
import { CodesComponent } from './codes/codes.component';
import { CreateCodeComponent } from './codes/create-code/create-code.component';
import { ViewCodeComponent } from './codes/view-code/view-code.component';
import { EditCodeComponent } from './codes/edit-code/edit-code.component';
import { ExternalServicesComponent } from './external-services/external-services.component';
import { ManageDataTablesComponent } from './manage-data-tables/manage-data-tables.component';
import { ManageHooksComponent } from './manage-hooks/manage-hooks.component';
@@ -28,6 +30,8 @@ import { EditSMSComponent } from './external-services/sms/edit-sms/edit-sms.comp
/** Custom Resolvers */
import { CodesResolver } from './codes/codes.resolver';
import { CodeResolver } from './codes/code.resolver';
import { CodeValuesResolver } from './codes/view-code/code-values.resolver';
import { ManageDataTablesResolver } from './manage-data-tables/manage-data-tables.resolver';
import { ManageHooksResolver } from './manage-hooks/manage-hooks.resolver';
import { RolesAndPermissionsResolver } from './roles-and-permissions/roles-and-permissions.resolver';
@@ -65,6 +69,28 @@ const routes: Routes = [
path: 'create',
component: CreateCodeComponent,
data: { title: extract('Create Code'), breadcrumb: 'Create' }
},
{
path: ':id',
data: { title: extract('View Code'), routeParamBreadcrumb: 'id' },
children: [
{
path: '',
component: ViewCodeComponent,
resolve: {
code: CodeResolver,
codeValues: CodeValuesResolver
}
},
{
path: 'edit',
component: EditCodeComponent,
data: { title: extract('Edit Code'), breadcrumb: 'Edit', routeParamBreadcrumb: false },
resolve: {
code: CodeResolver
}
}
]
}
],
@@ -235,6 +261,8 @@ const routes: Routes = [
exports: [RouterModule],
providers: [
CodesResolver,
CodeResolver,
CodeValuesResolver,
ManageDataTablesResolver,
ManageHooksResolver,
RolesAndPermissionsResolver,
+4
View File
@@ -25,6 +25,8 @@ import { EditAmazonS3Component } from './external-services/amazon-s3/edit-amazon
import { EditEmailComponent } from './external-services/email/edit-email/edit-email.component';
import { EditNotificationComponent } from './external-services/notification/edit-notification/edit-notification.component';
import { EditSMSComponent } from './external-services/sms/edit-sms/edit-sms.component';
import { ViewCodeComponent } from './codes/view-code/view-code.component';
import { EditCodeComponent } from './codes/edit-code/edit-code.component';
@NgModule({
imports: [
@@ -34,7 +36,9 @@ import { EditSMSComponent } from './external-services/sms/edit-sms/edit-sms.comp
declarations: [
SystemComponent,
CodesComponent,
ViewCodeComponent,
CreateCodeComponent,
EditCodeComponent,
ExternalServicesComponent,
ManageDataTablesComponent,
ManageHooksComponent,
+61
View File
@@ -46,6 +46,67 @@ export class SystemService {
return this.http.get('/codes');
}
/**
* @param codeId Code ID.
* @returns {Observable<any>} Fetches Code.
*/
getCode(codeId: string): Observable<any> {
return this.http.get(`/codes/${codeId}`);
}
/**
* @param code Code.
* @param codeId Code ID.
* @returns {Observable<any>}
*/
updateCode(code: any, codeId: string): Observable<any> {
return this.http.put(`/codes/${codeId}`, code);
}
/**
* @param codeId Code ID.
* @returns {Observable<any>} Code Values.
*/
getCodeValues(codeId: string): Observable<any> {
return this.http.get(`/codes/${codeId}/codevalues`);
}
/**
* @param codeId Code ID.
* @param codeValueId Code value ID.
* @returns {Observable<any>}
*/
deleteCodeValue(codeId: string, codeValueId: string): Observable<any> {
return this.http.delete(`/codes/${codeId}/codevalues/${codeValueId}`);
}
/**
* @param codeId Code ID.
* @param codeValueId Code value ID.
* @param codeValueChanges Code value changes.
* @returns {Observable<any>}
*/
updateCodeValue(codeId: string, codeValueId: string, codeValueChanges: any): Observable<any> {
return this.http.put(`/codes/${codeId}/codevalues/${codeValueId}`, codeValueChanges);
}
/**
* @param codeId Code ID.
* @param codeValueId Code value.
* @returns {Observable<any>}
*/
createCodeValue(codeId: string, codeValue: any): Observable<any> {
return this.http.post(`/codes/${codeId}/codevalues`, codeValue);
}
/**
* @param codeId Code ID.
* @returns {Observable<any>}
*/
deleteCode(codeId: string): Observable<any> {
return this.http.delete(`/codes/${codeId}`);
}
/**
* @returns {Observable<any>} Fetches Surveys.
*/