diff --git a/src/views/dashboard/data.ts b/src/views/dashboard/data.ts index 0a57ebe3..11b863ae 100644 --- a/src/views/dashboard/data.ts +++ b/src/views/dashboard/data.ts @@ -167,7 +167,7 @@ export const EntityType = [ }, { value: "EndpointRelation", label: "Endpoint Relation", key: 4 }, { value: "ProcessRelation", label: "Process Relation", key: 5 }, - { value: "Process", label: "Process Relation", key: 3 }, + { value: "Process", label: "Process", key: 6 }, ]; export const ListEntity: any = { InstanceList: EntityType[3].value, diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue index 1ad0a42a..d80e2efd 100644 --- a/src/views/dashboard/panel/Tool.vue +++ b/src/views/dashboard/panel/Tool.vue @@ -27,7 +27,7 @@ limitations under the License. --> class="selectors" /> -
+
{{ ["EndpointRelation", "Endpoint"].includes(dashboardStore.entity) ? "$Endpoint" : "$ServiceInstance" }} @@ -42,7 +42,7 @@ limitations under the License. --> :isRemote="['EndpointRelation', 'Endpoint'].includes(dashboardStore.entity)" />
-
+
$Process EntityType[5].value, EntityType[6].value, EntityType[7].value, + EntityType[8].value, ].includes(String(params.entity)) ) { setSourceSelector(); - if ([EntityType[2].value, EntityType[3].value].includes(String(params.entity))) { + if ([EntityType[2].value, EntityType[3].value, EntityType[8].value].includes(String(params.entity))) { return; } setDestSelector(); @@ -317,6 +318,7 @@ limitations under the License. --> EntityType[5].value, EntityType[6].value, EntityType[7].value, + EntityType[8].value, ].includes(dashboardStore.entity) ) { await fetchPods(e, selectorStore.currentService.id, true); @@ -337,11 +339,8 @@ limitations under the License. --> selectorStore.setCurrentPod(null); states.currentPod = ""; states.currentProcess = ""; - if (dashboardStore.entity === EntityType[7].value) { - fetchPods("Process", selectorStore.currentService.id, true); - } else { - fetchPods(dashboardStore.entity, selectorStore.currentService.id, true); - } + const e = dashboardStore.entity === EntityType[7].value ? EntityType[8].value : dashboardStore.entity; + fetchPods(e, selectorStore.currentService.id, true); } else { selectorStore.setCurrentService(null); } @@ -362,7 +361,7 @@ limitations under the License. --> async function changePods(pod: Option[]) { selectorStore.setCurrentPod(pod[0] || null); - if (dashboardStore.entity === EntityType[7].value) { + if ([EntityType[7].value, EntityType[8].value].includes(dashboardStore.entity)) { selectorStore.setCurrentProcess(null); states.currentProcess = ""; fetchProcess(true); @@ -566,7 +565,7 @@ limitations under the License. --> await fetchPods(EntityType[5].value, serviceId, setPod, param); resp = await fetchDestProcess(setPod); break; - case "Process": + case EntityType[8].value: await fetchPods(EntityType[3].value, serviceId, setPod, param); resp = await fetchProcess(setPod); break;