From: Barath Kumar R Date: Tue, 7 Jul 2020 10:42:32 +0000 (+0530) Subject: NG-UI Added support for the quotos X-Git-Tag: v8.0.0rc3~3 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=09cd4ecd880a8c04282cc3388d37d559f07327a9;hp=403234ed6120ba4bc01578b3ec237fa5fd4c0f6d;p=osm%2FNG-UI.git NG-UI Added support for the quotos * Add the quotos limition to be defined from the UI. * Added the checkbox to activate the quote limitation. Change-Id: I3795d00a3615018743449538e232b3bb31591d82 Signed-off-by: Barath Kumar R --- diff --git a/package.json b/package.json index 264dc07..4858905 100644 --- a/package.json +++ b/package.json @@ -57,13 +57,12 @@ "rxjs": "^6.5.4", "rxjs-compat": "^6.5.5", "stream": "0.0.2", - "text-encoding": "^0.7.0", "tslib": "^1.11.1", "web-animations-js": "^2.3.2", "zone.js": "~0.10.3" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.901.0", + "@angular-devkit/build-angular": "^0.901.8", "@angular/cli": "~9.1.0", "@angular/compiler-cli": "~9.1.0", "@angular/language-service": "~9.1.0", diff --git a/src/app/projects/ProjectsComponent.ts b/src/app/projects/ProjectsComponent.ts index 7524994..fe55271 100644 --- a/src/app/projects/ProjectsComponent.ts +++ b/src/app/projects/ProjectsComponent.ts @@ -32,6 +32,7 @@ import { ProjectsActionComponent } from 'ProjectsAction'; import { RestService } from 'RestService'; import { Subscription } from 'rxjs'; import { SharedService } from 'SharedService'; +import { isNullOrUndefined } from 'util'; /** * Creating component @@ -169,10 +170,12 @@ export class ProjectsComponent implements OnInit, OnDestroy { public generateProjectData(projectData: ProjectDetails): ProjectData { return { projectName: projectData.name, - modificationDate: this.sharedService.convertEpochTime(projectData._admin.modified), - creationDate: this.sharedService.convertEpochTime(projectData._admin.created), + modificationDate: this.sharedService.convertEpochTime(!isNullOrUndefined(projectData._admin) + ? projectData._admin.modified : null), + creationDate: this.sharedService.convertEpochTime(!isNullOrUndefined(projectData._admin) ? projectData._admin.created : null), id: projectData._id, - project: projectData._id + project: projectData._id, + quotas: !isNullOrUndefined(projectData.quotas) ? projectData.quotas : null }; } diff --git a/src/app/projects/project-create-update/ProjectCreateUpdateComponent.html b/src/app/projects/project-create-update/ProjectCreateUpdateComponent.html index c327119..8afb727 100644 --- a/src/app/projects/project-create-update/ProjectCreateUpdateComponent.html +++ b/src/app/projects/project-create-update/ProjectCreateUpdateComponent.html @@ -17,30 +17,51 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i -->
- +
-
+
+
+ +
- +
- +
-
+ +
-
- +
+ + +
+
+
+
+ +
+ +
+
+
@@ -48,4 +69,4 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
- + \ No newline at end of file diff --git a/src/app/projects/project-create-update/ProjectCreateUpdateComponent.ts b/src/app/projects/project-create-update/ProjectCreateUpdateComponent.ts index ea0bb8a..ba176e0 100644 --- a/src/app/projects/project-create-update/ProjectCreateUpdateComponent.ts +++ b/src/app/projects/project-create-update/ProjectCreateUpdateComponent.ts @@ -19,14 +19,14 @@ * @file Project Add Modal */ import { Component, Injector, Input, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { AbstractControl, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { NotifierService } from 'angular-notifier'; import { APIURLHEADER, ERRORDATA, MODALCLOSERESPONSEDATA } from 'CommonModel'; import { DataService } from 'DataService'; import { environment } from 'environment'; -import { ProjectData, ProjectDetails } from 'ProjectModel'; +import { ProjectData, ProjectDetails, QUOTA_ITEMS, QUOTAITEM} from 'ProjectModel'; import { ProjectService } from 'ProjectService'; import { RestService } from 'RestService'; import { SharedService } from 'SharedService'; @@ -55,9 +55,6 @@ export class ProjectCreateUpdateComponent implements OnInit { /** Contains the recently created project details @public */ public recentProject: ProjectDetails; - /** Contains project name @public */ - public projectName: string; - /** Contains project create or edit @public */ public getProjectType: string; @@ -79,6 +76,12 @@ export class ProjectCreateUpdateComponent implements OnInit { /** Holds list of domains @public */ public domains: {}[] = []; + /** Holds list of quota items @public */ + public quotaItems: QUOTAITEM[] = QUOTA_ITEMS; + + /** Holds project reference from response @public */ + public quotaRefs: {} = null; + /** FormBuilder instance added to the formBuilder @private */ private formBuilder: FormBuilder; @@ -116,7 +119,8 @@ export class ProjectCreateUpdateComponent implements OnInit { /** Initializing Form Action */ this.projectForm = this.formBuilder.group({ project_name: ['', Validators.required], - domain_name: [null] + domain_name: [null], + enable_quota: [false, Validators.required] }); } @@ -129,11 +133,14 @@ export class ProjectCreateUpdateComponent implements OnInit { if (this.getProjectType === 'Edit') { this.dataService.currentMessage.subscribe((data: ProjectData) => { if (data.projectName !== undefined || data.projectName !== '' || data.projectName !== null) { - this.projectName = data.projectName; + this.projectForm.patchValue({ project_name: data.projectName }); this.projectRef = data.id; + this.quotaRefs = data.quotas; + this.patchQuotaInfo(this.quotaRefs); } }); } else { + this.patchQuotaInfo(); this.getProjects(); } } @@ -172,10 +179,11 @@ export class ProjectCreateUpdateComponent implements OnInit { const apiURLHeader: APIURLHEADER = { url: environment.PROJECTS_URL }; - const projectPayload: {} = { + const projectPayload: ProjectDetails = { name: this.projectForm.value.project_name, domain_name: !isNullOrUndefined(this.projectForm.value.domain_name) ? this.projectForm.value.domain_name : undefined }; + this.addQuotaLimit(projectPayload); this.restService.postResource(apiURLHeader, projectPayload).subscribe(() => { this.activeModal.close(this.modalData); this.isLoadingResults = false; @@ -185,13 +193,29 @@ export class ProjectCreateUpdateComponent implements OnInit { this.isLoadingResults = false; }); } + /** Handle enable quota limit checkbox event @public */ + public checkQuota(): void { + if (this.getFormControl('enable_quota').value) { + this.quotaItems.forEach((quotaItem: QUOTAITEM): void => { + this.projectForm.addControl(quotaItem.value, new FormControl(quotaItem.minValue, Validators.required)); + }); + } else { + this.quotaItems.forEach((quotaItem: QUOTAITEM): void => { + this.getFormControl(quotaItem.value).setValue(quotaItem.minValue); + }); + } + } /** Edit project @public */ public editProject(): void { this.isLoadingResults = true; const apiURLHeader: APIURLHEADER = { url: environment.PROJECTS_URL + '/' + this.projectRef }; - this.restService.patchResource(apiURLHeader, { name: this.projectForm.value.project_name }).subscribe(() => { + const projectPayload: ProjectDetails = { + name: this.projectForm.value.project_name + }; + this.addQuotaLimit(projectPayload); + this.restService.patchResource(apiURLHeader, projectPayload).subscribe(() => { this.activeModal.close(this.modalData); this.isLoadingResults = false; this.projectService.setHeaderProjects(); @@ -230,4 +254,40 @@ export class ProjectCreateUpdateComponent implements OnInit { }); } } + + /** Used to get the AbstractControl of controlName passed @private */ + private getFormControl(controlName: string): AbstractControl { + return this.projectForm.controls[controlName]; + } + + /** Add quota information to payload @private */ + private addQuotaLimit(payload: ProjectDetails): void { + if (this.getFormControl('enable_quota').value) { + payload.quotas = {}; + this.quotaItems.forEach((quotaItem: QUOTAITEM): void => { + payload.quotas[quotaItem.value] = this.getFormControl(quotaItem.value).value; + }); + } + } + + /** Set quota information in project form model @private */ + private patchQuotaInfo(quotaRef?: {}): void { + if (quotaRef !== null && this.getProjectType === 'Edit') { + this.getFormControl('enable_quota').setValue(true); + this.quotaItems.forEach((quotaItem: QUOTAITEM): void => { + if (!isNullOrUndefined(quotaRef[quotaItem.value])) { + this.projectForm.addControl(quotaItem.value, new FormControl(quotaRef[quotaItem.value], + [Validators.required, Validators.min(quotaItem.minValue), Validators.max(quotaItem.maxValue)])); + } else { + this.projectForm.addControl(quotaItem.value, new FormControl(quotaItem.minValue, [Validators.required, + Validators.min(quotaItem.minValue), Validators.max(quotaItem.maxValue)])); + } + }); + } else { + this.quotaItems.forEach((quotaItem: QUOTAITEM): void => { + this.projectForm.addControl(quotaItem.value, new FormControl(quotaItem.minValue, [Validators.required, + Validators.min(quotaItem.minValue), Validators.max(quotaItem.maxValue)])); + }); + } + } } diff --git a/src/app/roles/roles-details/RolesDetailsComponent.ts b/src/app/roles/roles-details/RolesDetailsComponent.ts index 2568f5a..89affae 100644 --- a/src/app/roles/roles-details/RolesDetailsComponent.ts +++ b/src/app/roles/roles-details/RolesDetailsComponent.ts @@ -30,6 +30,7 @@ import { RolesActionComponent } from 'RolesAction'; import { RoleData, RoleDetails } from 'RolesModel'; import { Subscription } from 'rxjs'; import { SharedService } from 'SharedService'; +import { isNullOrUndefined } from 'util'; /** * Creating component @@ -170,8 +171,8 @@ export class RolesDetailsComponent implements OnInit { return { name: roleData.name, identifier: roleData._id, - modified: this.sharedService.convertEpochTime(Number(roleData._admin.modified)), - created: this.sharedService.convertEpochTime(Number(roleData._admin.created)), + modified: this.sharedService.convertEpochTime(!isNullOrUndefined(roleData._admin) ? Number(roleData._admin.modified) : null), + created: this.sharedService.convertEpochTime(!isNullOrUndefined(roleData._admin) ? Number(roleData._admin.created) : null), permissions: roleData.permissions }; } diff --git a/src/app/users/user-details/UserDetailsComponent.ts b/src/app/users/user-details/UserDetailsComponent.ts index a4bedd5..aede6e2 100644 --- a/src/app/users/user-details/UserDetailsComponent.ts +++ b/src/app/users/user-details/UserDetailsComponent.ts @@ -32,6 +32,7 @@ import { Subscription } from 'rxjs'; import { SharedService } from 'SharedService'; import { UserData, UserDetail } from 'UserModel'; import { UsersActionComponent } from 'UsersActionComponent'; +import { isNullOrUndefined } from 'util'; /** * Creating component @@ -170,8 +171,8 @@ export class UserDetailsComponent implements OnInit, OnDestroy { public setUserDetails(userData: UserDetail): void { const userDataObj: UserData = { username: userData.username, - modified: this.sharedService.convertEpochTime(userData._admin.modified), - created: this.sharedService.convertEpochTime(userData._admin.created), + modified: this.sharedService.convertEpochTime(!isNullOrUndefined(userData._admin) ? userData._admin.modified : null), + created: this.sharedService.convertEpochTime(!isNullOrUndefined(userData._admin) ? userData._admin.created : null), projects: userData.projectListName, identifier: userData._id }; diff --git a/src/app/utilities/projects-action/ProjectsActionComponent.html b/src/app/utilities/projects-action/ProjectsActionComponent.html index d105846..3f193c2 100644 --- a/src/app/utilities/projects-action/ProjectsActionComponent.html +++ b/src/app/utilities/projects-action/ProjectsActionComponent.html @@ -22,8 +22,8 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i