From 3ee3a49c202d3bb42e8e1079ab27e15c7c9ed0cc Mon Sep 17 00:00:00 2001 From: qijianshuai Date: Tue, 28 Mar 2023 18:28:55 +0800 Subject: [PATCH 1/2] Modify Sample shape check Signed-off-by: qijianshuai --- .../openfl/create-openfl-fed/create-openfl-fed.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/view/openfl/create-openfl-fed/create-openfl-fed.component.ts b/frontend/src/app/view/openfl/create-openfl-fed/create-openfl-fed.component.ts index 77deafb4..abc05df5 100644 --- a/frontend/src/app/view/openfl/create-openfl-fed/create-openfl-fed.component.ts +++ b/frontend/src/app/view/openfl/create-openfl-fed/create-openfl-fed.component.ts @@ -50,7 +50,7 @@ export class CreateOpenflComponent implements OnInit { { name: 'sample', value: '', - type: ['number-list'] + type: ['require'] }, { name: 'envoyYaml', From 76280fc13f24fa2b4b145f60ca719adb45bfda64 Mon Sep 17 00:00:00 2001 From: qijianshuai Date: Thu, 4 May 2023 11:57:32 +0800 Subject: [PATCH 2/2] When creating a cluster, you can choose other clusters whose fede status is active as a template Signed-off-by: qijianshuai --- .../cluster-new/cluster-new.component.html | 52 ++++++++++- .../cluster-new/cluster-new.component.scss | 11 +++ .../cluster-new/cluster-new.component.ts | 93 ++++++++++++++++++- .../fed-detail-fate.component.ts | 4 +- .../federation/fed-mg/fed-mg.component.ts | 10 +- frontend/src/assets/i18n/en.json | 3 +- frontend/src/assets/i18n/zh_CN.json | 3 +- 7 files changed, 159 insertions(+), 17 deletions(-) diff --git a/frontend/src/app/view/federation/cluster-new/cluster-new.component.html b/frontend/src/app/view/federation/cluster-new/cluster-new.component.html index eaa8eafd..b4faf501 100644 --- a/frontend/src/app/view/federation/cluster-new/cluster-new.component.html +++ b/frontend/src/app/view/federation/cluster-new/cluster-new.component.html @@ -21,6 +21,50 @@

{{'NewCluster.name'| translate}}

+ + + + + + + + + +
+
+ + + + + +
+
+ + + + + +
+ + + {{errorMessage}} + + + +
+ + @@ -231,12 +275,12 @@
1. {{'NewCluster.pulsarServerCertificate'|translate}}:
- - + @@ -281,12 +325,12 @@
2. {{'NewCluster.certificate'|translate}}:
- - diff --git a/frontend/src/app/view/federation/cluster-new/cluster-new.component.scss b/frontend/src/app/view/federation/cluster-new/cluster-new.component.scss index c877fa2c..f5ec046a 100644 --- a/frontend/src/app/view/federation/cluster-new/cluster-new.component.scss +++ b/frontend/src/app/view/federation/cluster-new/cluster-new.component.scss @@ -85,4 +85,15 @@ clr-stepper-panel{ } } } +} +.template-list { + .fed-select { + display: flex; + align-items: center; + .spinner { + position: relative; + top: 12px; + margin-left: 15px; + } + } } \ No newline at end of file diff --git a/frontend/src/app/view/federation/cluster-new/cluster-new.component.ts b/frontend/src/app/view/federation/cluster-new/cluster-new.component.ts index 32bd2bfc..8332eacf 100644 --- a/frontend/src/app/view/federation/cluster-new/cluster-new.component.ts +++ b/frontend/src/app/view/federation/cluster-new/cluster-new.component.ts @@ -34,6 +34,9 @@ export class ClusterNewComponent implements OnInit { name: [''], description: [''], clusterType: [''], + enableTemplate: [false], + federationName: [''], + clusterName: [''] }), external: this.formBuilder.group( ValidatorGroup([ @@ -86,14 +89,14 @@ export class ClusterNewComponent implements OnInit { cert: ['use'], site_portal_client_cert_mode: ['1'], site_portal_client_cert_uuid: [''], - site_portal_client_cert_mode_radio: {value: 'new'}, + site_portal_client_cert_mode_radio: {value: true}, site_portal_server_cert_mode: ['1'], site_portal_server_cert_uuid: [''], - site_portal_server_cert_mode_radio: {value: 'new'}, + site_portal_server_cert_mode_radio: {value: true}, pulsar_server_cert_info: ['1'], pulsar_server_cert_uuid: [''], - pulsar_server_cert_info_radio: {value: 'new'}, + pulsar_server_cert_info_radio: [true], }), serviceType: this.formBuilder.group({ serviceType: [null], @@ -241,7 +244,6 @@ export class ClusterNewComponent implements OnInit { value: '' } ])), - yaml: this.formBuilder.group({ yaml: [''], }) @@ -253,6 +255,7 @@ export class ClusterNewComponent implements OnInit { } ngOnInit(): void { + this.getFedList() } //support to create two type of exchange: create a new one or add an cluster @@ -1076,5 +1079,87 @@ export class ClusterNewComponent implements OnInit { } + + // Whether to enable template selection + get templateListFlag() { + return this.form.controls['info'].get('enableTemplate')?.value + } + fedList!:any + clusterList!: any + fedUUID = '' + templateFedLoading = false + templateClusterLoading = false + templateErrorFlag = false + // This method is used to get the list of existing fed + getFedList() { + this.templateFedLoading = true + this.templateErrorFlag = false + this.fedservice.getFedList() + .subscribe((data: any) => { + this.fedList = data.data.filter((fed: {type: string}) => fed.type === 'FATE') + this.templateFedLoading = false + }, + err => { + if (err.error.message) this.errorMessage = err.error.message + this.templateFedLoading = false + this.templateErrorFlag = true + }); + } + + // This method gets the following cluster list according to the currently selected fed + getFedClusterAll(fed_uuid: string) { + this.fedUUID = fed_uuid + this.templateClusterLoading = true + this.templateErrorFlag = false + this.fedservice.getFedParticipantList(fed_uuid) + .subscribe((data: any) => { + this.clusterList = data.data.clusters || []; + this.templateClusterLoading = false + }, + err => { + if (err.error.message) this.errorMessage = err.error.message + this.templateClusterLoading = false + this.templateErrorFlag = true + } + ); + } + // This method obtains details based on the currently selected cluster and fills in the form + getClusterDetail(cluster_uuid: string) { + this.fedservice.getClusterInfo(this.fedUUID, cluster_uuid).subscribe( + data => { + const detailInfo = data.data + if (detailInfo) { + // set form + this.form.controls['info'].get('description')?.setValue(detailInfo.description) + + this.form.controls['external'].get('pulsarHost')?.setValue(detailInfo.access_info?.['pulsar-public-tls']?.host) + this.form.controls['external'].get('pulsarPort')?.setValue(detailInfo.access_info?.['pulsar-public-tls']?.port) + this.form.controls['external'].get('nginxHost')?.setValue(detailInfo.access_info?.nginx?.host) + this.form.controls['external'].get('nginxPort')?.setValue(detailInfo.access_info?.nginx?.port) + + this.form.controls['endpoint'].get('endpoint_uuid')?.setValue(detailInfo.endpoint_uuid) + const endpoint = this.endpointlist.filter((ep: any) => ep.uuid === detailInfo.endpoint_uuid) + if (endpoint[0]) this.selectedEndpoint = endpoint[0] + + this.form.controls['chart'].get('chart_uuid')?.setValue(detailInfo.chart_uuid) + this.form.controls['namespace'].get('namespace')?.setValue(detailInfo.chart_uuid) + this.form.controls['certificate'].get('site_portal_client_cert_mode')?.setValue(detailInfo.site_portal_client_cert_info?.binding_mode) + this.form.controls['certificate'].get('site_portal_client_cert_uuid')?.setValue(detailInfo.site_portal_client_cert_info?.uuid) + this.form.controls['certificate'].get('site_portal_server_cert_mode')?.setValue(detailInfo.site_portal_server_cert_info?.binding_mode) + this.form.controls['certificate'].get('site_portal_server_cert_uuid')?.setValue(detailInfo.site_portal_server_cert_info?.uuid) + this.form.controls['certificate'].get('pulsar_server_cert_info')?.setValue(detailInfo.pulsar_server_cert_info?.binding_mode) + this.form.controls['certificate'].get('pulsar_server_cert_uuid')?.setValue(detailInfo.pulsar_server_cert_info?.uuid) + this.form.controls['serviceType'].get('serviceType')?.setValue(detailInfo.type) + } + + }, + err => { + if (err.error.message) this.errorMessage = err.error.message + this.templateErrorFlag = true + } + ) + } + + } diff --git a/frontend/src/app/view/federation/fed-detail-fate/fed-detail-fate.component.ts b/frontend/src/app/view/federation/fed-detail-fate/fed-detail-fate.component.ts index baf83147..26cbfcc1 100644 --- a/frontend/src/app/view/federation/fed-detail-fate/fed-detail-fate.component.ts +++ b/frontend/src/app/view/federation/fed-detail-fate/fed-detail-fate.component.ts @@ -70,7 +70,7 @@ export class FedDetailFateComponent implements OnInit { this.exchange = this.participantList.exchange; this.exchangeInfoList = [] if (this.exchange) { - const exchangeVersion = this.exchange.version.split('-')[0] || '' + const exchangeVersion = this.exchange.version?.split('-')[0] || '' for (const key in this.exchange.access_info) { const obj: any = { @@ -86,7 +86,7 @@ export class FedDetailFateComponent implements OnInit { } this.clusterlist.forEach(cluster => { cluster.clusterList = [] - const clusterVersion = cluster.version.split('-')[0] + const clusterVersion = cluster.version?.split('-')[0] if (clusterVersion !== exchangeVersion) { cluster.flag = true } else { diff --git a/frontend/src/app/view/federation/fed-mg/fed-mg.component.ts b/frontend/src/app/view/federation/fed-mg/fed-mg.component.ts index f4a2a09b..5db282de 100644 --- a/frontend/src/app/view/federation/fed-mg/fed-mg.component.ts +++ b/frontend/src/app/view/federation/fed-mg/fed-mg.component.ts @@ -96,11 +96,11 @@ export class FedMgComponent implements OnInit { this.federationList = data.data; this.isPageLoading = false; }, - err => { - if (err.error.message) this.errorMessage = err.error.message - this.isShowFedFailed = true - this.isPageLoading = false - }); + err => { + if (err.error.message) this.errorMessage = err.error.message + this.isShowFedFailed = true + this.isPageLoading = false + }); } isCreatedSubmit = false; diff --git a/frontend/src/assets/i18n/en.json b/frontend/src/assets/i18n/en.json index dbc2ef5c..8608abe2 100644 --- a/frontend/src/assets/i18n/en.json +++ b/frontend/src/assets/i18n/en.json @@ -270,7 +270,8 @@ "pulsarMngPort": "Manager Port", "pulsarPort": "Port", "sslPort": "SSL Port", - "coresPerNode": "Cores Per Node" + "coresPerNode": "Cores Per Node", + "chooseTemplate": "Enable select an existing template" }, "ExchangeNew": { "name": "Create a New Exchange", diff --git a/frontend/src/assets/i18n/zh_CN.json b/frontend/src/assets/i18n/zh_CN.json index 0d09d1c2..13dfe66c 100644 --- a/frontend/src/assets/i18n/zh_CN.json +++ b/frontend/src/assets/i18n/zh_CN.json @@ -270,7 +270,8 @@ "pulsarMngPort": "管理端口", "pulsarPort": "端口", "sslPort": "SSL 端口", - "coresPerNode": "单个节点核心数" + "coresPerNode": "单个节点核心数", + "chooseTemplate": "启用选择现有模板" }, "ExchangeNew": { "name": "创建Exchange",