From a3ff32a42f2f5064cce0582e5250005c40492ae3 Mon Sep 17 00:00:00 2001 From: "SANDHYA.JS" Date: Thu, 13 Feb 2025 16:24:46 +0530 Subject: [PATCH] Advanced Cluster Enhancements - Added edit cluster, profile type in OKA - State to Git State in all pages - Changed mandatory fields of edit profile - Changed api in cluster page Change-Id: I8a3239f83eb58a3997e4550fc030694c0a2a6c72 Signed-off-by: SANDHYA.JS --- .../k8s/k8s-action/K8sActionComponent.html | 8 +- .../K8sAddClusterComponent.html | 14 ++- .../k8s-add-cluster/K8sAddClusterComponent.ts | 100 +++++++++++++++++- .../k8s/k8s-ksu/ksu-details/KSUComponent.ts | 2 +- .../K8sAppProfileComponent.ts | 2 +- .../K8sInfraConfigAddComponent.html | 22 +++- .../K8sInfraConfigAddComponent.ts | 45 +++++--- .../K8sInfraConfigProfileComponent.ts | 2 +- .../K8sInfraControllerProfileComponent.ts | 2 +- .../K8sResourceProfileComponent.ts | 2 +- src/app/k8s/k8scluster/K8sClusterComponent.ts | 77 ++++---------- .../oka-packages/OKAPackageComponent.ts | 4 +- .../compose-packages/ComposePackages.html | 33 ++++-- .../compose-packages/ComposePackages.ts | 51 ++++++++- .../OkaPackagesActionComponent.ts | 2 +- src/assets/i18n/de.json | 4 +- src/assets/i18n/en.json | 4 +- src/assets/i18n/es.json | 4 +- src/assets/i18n/pt.json | 4 +- src/models/CommonModel.ts | 1 + src/models/K8sModel.ts | 2 + src/models/VNFDModel.ts | 1 + 22 files changed, 286 insertions(+), 100 deletions(-) diff --git a/src/app/k8s/k8s-action/K8sActionComponent.html b/src/app/k8s/k8s-action/K8sActionComponent.html index 5482868..28c3fd8 100644 --- a/src/app/k8s/k8s-action/K8sActionComponent.html +++ b/src/app/k8s/k8s-action/K8sActionComponent.html @@ -42,7 +42,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
- @@ -67,11 +67,15 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
+
+ +
+ +
+
@@ -88,7 +98,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
-
+
+
+
+
diff --git a/src/app/k8s/k8s-profile/k8s-infra-config-add/K8sInfraConfigAddComponent.ts b/src/app/k8s/k8s-profile/k8s-infra-config-add/K8sInfraConfigAddComponent.ts index 5299323..5120f37 100644 --- a/src/app/k8s/k8s-profile/k8s-infra-config-add/K8sInfraConfigAddComponent.ts +++ b/src/app/k8s/k8s-profile/k8s-infra-config-add/K8sInfraConfigAddComponent.ts @@ -19,14 +19,14 @@ * @file K8sInfraConfigAddComponent.ts. */ import { HttpHeaders } from '@angular/common/http'; -import { Component,Injector, Input, OnInit} from '@angular/core'; +import { Component, Injector, Input, OnInit } from '@angular/core'; import { FormBuilder, 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, TYPESECTION, URLPARAMS } from 'CommonModel'; import { environment } from 'environment'; -import { INFRACONFIGPAYLOAD} from 'K8sModel'; +import { INFRACONFIGPAYLOAD } from 'K8sModel'; import { RestService } from 'RestService'; import { SharedService, isNullOrUndefined } from 'SharedService'; /** @@ -73,11 +73,14 @@ export class K8sInfraConfigAddComponent implements OnInit { /** Input contains Modal dialog component Instance @public */ @Input() public profileDescription: string; - /** check Add @public */ - public isAdd = false; + /** check Add @public */ + public isAdd = false; - /** check Edit @public */ - public isEdit = false; + /** check Edit @public */ + public isEdit = false; + + /** Edit Payload @public */ + public payload: INFRACONFIGPAYLOAD; /** FormBuilder instance added to the formBuilder @private */ private formBuilder: FormBuilder; @@ -128,7 +131,9 @@ export class K8sInfraConfigAddComponent implements OnInit { this.profileForm = this.formBuilder.group({ name: ['', [Validators.required]], default: [null], - description: ['', [Validators.required]] + description: ['', [Validators.required]], + updatename: [''], + updatedescription: [''] }); } @@ -168,6 +173,8 @@ export class K8sInfraConfigAddComponent implements OnInit { }; this.isLoadingResults = true; + delete this.profileForm.value.updatename; + delete this.profileForm.value.updatedescription; const payload: INFRACONFIGPAYLOAD = { name: this.profileForm.value.name, description: this.profileForm.value.description @@ -202,12 +209,26 @@ export class K8sInfraConfigAddComponent implements OnInit { url: this.profileUrl, httpOptions: { headers: this.headers } }; - const payload: INFRACONFIGPAYLOAD = { - name: this.profileForm.value.name, - description: this.profileForm.value.description - }; + delete this.profileForm.value.name; + delete this.profileForm.value.description; + if (this.profileForm.value.updatename === '') { + this.payload = { + description: this.profileForm.value.updatedescription + }; + delete this.profileForm.value.updatename; + } else if (this.profileForm.value.updatedescription === '') { + this.payload = { + name: this.profileForm.value.updatename + }; + delete this.profileForm.value.updatedescription; + } else { + this.payload = { + name: this.profileForm.value.updatenamename, + description: this.profileForm.value.updatedescription + }; + } - this.restService.patchResource(apiURLHeader, payload).subscribe((result: {}) => { + this.restService.patchResource(apiURLHeader, this.payload).subscribe((result: {}) => { this.activeModal.close(modalData); this.isLoadingResults = false; this.notifierService.notify('success', diff --git a/src/app/k8s/k8s-profile/k8s-infra-config-details/K8sInfraConfigProfileComponent.ts b/src/app/k8s/k8s-profile/k8s-infra-config-details/K8sInfraConfigProfileComponent.ts index 760124b..2c76dbf 100644 --- a/src/app/k8s/k8s-profile/k8s-infra-config-details/K8sInfraConfigProfileComponent.ts +++ b/src/app/k8s/k8s-profile/k8s-infra-config-details/K8sInfraConfigProfileComponent.ts @@ -121,7 +121,7 @@ export class K8sInfraConfigProfileComponent implements OnInit, OnDestroy { name: { title: this.translateService.instant('NAME'), width: '20%', sortDirection: 'asc' }, identifier: { title: this.translateService.instant('IDENTIFIER'), width: '15%' }, state: { - title: this.translateService.instant('STATE'), width: '15%', type: 'html', + title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html', filter: { type: 'list', config: { diff --git a/src/app/k8s/k8s-profile/k8s-infra-controller-details/K8sInfraControllerProfileComponent.ts b/src/app/k8s/k8s-profile/k8s-infra-controller-details/K8sInfraControllerProfileComponent.ts index 0402acf..f5c93ae 100644 --- a/src/app/k8s/k8s-profile/k8s-infra-controller-details/K8sInfraControllerProfileComponent.ts +++ b/src/app/k8s/k8s-profile/k8s-infra-controller-details/K8sInfraControllerProfileComponent.ts @@ -121,7 +121,7 @@ export class K8sInfraControllerProfileComponent implements OnInit, OnDestroy { name: { title: this.translateService.instant('NAME'), width: '20%', sortDirection: 'asc' }, identifier: { title: this.translateService.instant('IDENTIFIER'), width: '15%' }, state: { - title: this.translateService.instant('STATE'), width: '15%', type: 'html', + title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html', filter: { type: 'list', config: { diff --git a/src/app/k8s/k8s-profile/k8s-resource-profile/K8sResourceProfileComponent.ts b/src/app/k8s/k8s-profile/k8s-resource-profile/K8sResourceProfileComponent.ts index 296b0f6..b1dbf95 100644 --- a/src/app/k8s/k8s-profile/k8s-resource-profile/K8sResourceProfileComponent.ts +++ b/src/app/k8s/k8s-profile/k8s-resource-profile/K8sResourceProfileComponent.ts @@ -121,7 +121,7 @@ export class K8sResourceProfileComponent implements OnInit, OnDestroy { name: { title: this.translateService.instant('NAME'), width: '20%', sortDirection: 'asc' }, identifier: { title: this.translateService.instant('IDENTIFIER'), width: '15%' }, state: { - title: this.translateService.instant('STATE'), width: '15%', type: 'html', + title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html', filter: { type: 'list', config: { diff --git a/src/app/k8s/k8scluster/K8sClusterComponent.ts b/src/app/k8s/k8scluster/K8sClusterComponent.ts index 95c8e88..c79493e 100644 --- a/src/app/k8s/k8scluster/K8sClusterComponent.ts +++ b/src/app/k8s/k8scluster/K8sClusterComponent.ts @@ -165,7 +165,7 @@ export class K8sClusterComponent implements OnInit, OnDestroy { } }, state: { - title: this.translateService.instant('STATE'), width: '15%', type: 'html', + title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html', filter: { type: 'list', config: { @@ -288,66 +288,27 @@ export class K8sClusterComponent implements OnInit, OnDestroy { /** Fetching the data from server to Load in the smarttable @protected */ protected generateData(): void { this.isLoadingResults = true; - const tempURL: Observable[] = []; - const apiUrl1: string = environment.K8SCLUSTER_URL; - const apiUrl2: string = environment.K8SCREATECLUSTER_URL; - const response1$: Observable = this.restService.getResource(apiUrl1).pipe( - map((data: unknown) => - data as K8SCLUSTERDATA[] - ) - ); - const response2$: Observable = this.restService.getResource(apiUrl2).pipe( - map((data: unknown) => - data as K8SCLUSTERDATA[] - ) - ); - tempURL.push(response1$, response2$); - forkJoin(tempURL).subscribe( - ([response1, response2]) => { - if (!isNullOrUndefined(response1) && !isNullOrUndefined(response2)) { - const combinedResponse: K8SCLUSTERDATA[] = [...response1, ...response2]; - const uniqueResponse = this.removeDuplicates(combinedResponse); - this.k8sClusterData = []; - uniqueResponse.forEach((clusterData: K8SCLUSTERDATA) => { - const k8sClusterDataObj: K8SCLUSTERDATADISPLAY = this.generateK8sclusterData(clusterData); - this.k8sClusterData.push(k8sClusterDataObj); - }); - if (this.k8sClusterData.length > 0) { - this.checkDataClass = 'dataTables_present'; - } else { - this.checkDataClass = 'dataTables_empty'; - } - this.dataSource.load(this.k8sClusterData).then((data: boolean) => { - this.isLoadingResults = false; - }).catch(() => { - this.isLoadingResults = false; - }); + this.restService.getResource(environment.K8SCREATECLUSTER_URL).subscribe((k8sClusterDatas: K8SCLUSTERDATA[]) => { + if (!isNullOrUndefined(k8sClusterDatas)) { + this.k8sClusterData = []; + k8sClusterDatas.forEach((clusterData: K8SCLUSTERDATA) => { + const k8sClusterDataObj: K8SCLUSTERDATADISPLAY = this.generateK8sclusterData(clusterData); + this.k8sClusterData.push(k8sClusterDataObj); + }); + if (this.k8sClusterData.length > 0) { + this.checkDataClass = 'dataTables_present'; + } else { + this.checkDataClass = 'dataTables_empty'; } - }, (error: ERRORDATA) => { - this.restService.handleError(error, 'get'); - this.isLoadingResults = false; - }); - } - - /** Removes duplicates based on 'name' and merges them if necessary */ - private removeDuplicates(response: K8SCLUSTERDATA[]): K8SCLUSTERDATA[] { - const seenIds = new Set(); - const uniqueResponse: K8SCLUSTERDATA[] = []; - response.forEach((obj) => { - if (!seenIds.has(obj.name)) { - uniqueResponse.push(obj); - seenIds.add(obj.name); - } else { - const existingObj = uniqueResponse.find((o) => o.name === obj.name); - Object.keys(obj).forEach((key) => { - // eslint-disable-next-line security/detect-object-injection - if (existingObj[key] !== obj[key]) { - // eslint-disable-next-line security/detect-object-injection - existingObj[key] = obj[key]; - } + this.dataSource.load(this.k8sClusterData).then((data: boolean) => { + this.isLoadingResults = false; + }).catch(() => { + this.isLoadingResults = false; }); } + }, (error: ERRORDATA) => { + this.restService.handleError(error, 'get'); + this.isLoadingResults = false; }); - return uniqueResponse; } } diff --git a/src/app/packages/oka-packages/OKAPackageComponent.ts b/src/app/packages/oka-packages/OKAPackageComponent.ts index 061b090..702d8e6 100644 --- a/src/app/packages/oka-packages/OKAPackageComponent.ts +++ b/src/app/packages/oka-packages/OKAPackageComponent.ts @@ -125,7 +125,7 @@ export class OKAPackageComponent implements OnInit { name: { title: this.translateService.instant('NAME'), width: '15%', sortDirection: 'asc' }, identifier: { title: this.translateService.instant('IDENTIFIER'), width: '20%' }, state: { - title: this.translateService.instant('STATE'), width: '15%', type: 'html', + title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html', filter: { type: 'list', config: { @@ -225,7 +225,7 @@ export class OKAPackageComponent implements OnInit { public composeOKAPackage(): void { // eslint-disable-next-line security/detect-non-literal-fs-filename const modalRef: NgbModalRef = this.modalService.open(ComposePackages, { backdrop: 'static' }); - modalRef.componentInstance.params = { page: 'oka-packages' }; + modalRef.componentInstance.params = { page: 'oka-packages', operationType: 'add' }; modalRef.result.then((result: MODALCLOSERESPONSEDATA) => { if (result) { this.sharedService.callData(); diff --git a/src/app/utilities/compose-packages/ComposePackages.html b/src/app/utilities/compose-packages/ComposePackages.html index 048e8cd..007b0ab 100644 --- a/src/app/utilities/compose-packages/ComposePackages.html +++ b/src/app/utilities/compose-packages/ComposePackages.html @@ -17,7 +17,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i -->
- @@ -36,18 +36,32 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i - - - - + + + +
- + + +
+ + +
+
+
+ +