From bc57e2e368f015429c3dc733a2fe5b784f86bd33 Mon Sep 17 00:00:00 2001
From: Qiuxia Fan <fine0830@outlook.com>
Date: Mon, 21 Mar 2022 21:12:56 +0800
Subject: [PATCH] fix entity

---
 src/locales/lang/zh.ts                                   | 2 +-
 src/views/dashboard/graphs/EndpointList.vue              | 2 +-
 src/views/dashboard/graphs/InstanceList.vue              | 2 +-
 src/views/dashboard/related/topology/Index.vue           | 9 ++++-----
 .../dashboard/related/topology/components/Graph.vue      | 7 ++++++-
 .../related/topology/components/PodTopology.vue          | 9 +++++++--
 .../dashboard/related/topology/components/Sankey.vue     | 1 +
 .../dashboard/related/topology/components/Settings.vue   | 1 -
 8 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 445c5c58..a4acc1f2 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -115,7 +115,7 @@ const msg = {
   rename: "重命名",
   selfObservability: "自观性",
   satellite: "Satellite",
-  skyWalkingServer: "Sky Walking服务",
+  skyWalkingServer: "SkyWalking服务",
   functions: "Functions",
   linux: "Linux",
   browser: "浏览器",
diff --git a/src/views/dashboard/graphs/EndpointList.vue b/src/views/dashboard/graphs/EndpointList.vue
index d3b09a02..3efea0c2 100644
--- a/src/views/dashboard/graphs/EndpointList.vue
+++ b/src/views/dashboard/graphs/EndpointList.vue
@@ -35,7 +35,7 @@ limitations under the License. -->
           <template #default="scope">
             <span
               class="link"
-              @click="clickEndpoint"
+              @click="clickEndpoint(scope)"
               :style="{ fontSize: `${config.fontSize}px` }"
             >
               {{ scope.row.label }}
diff --git a/src/views/dashboard/graphs/InstanceList.vue b/src/views/dashboard/graphs/InstanceList.vue
index 584fc615..cd5fd0dc 100644
--- a/src/views/dashboard/graphs/InstanceList.vue
+++ b/src/views/dashboard/graphs/InstanceList.vue
@@ -35,7 +35,7 @@ limitations under the License. -->
           <template #default="scope">
             <span
               class="link"
-              @click="clickInstance"
+              @click="clickInstance(scope)"
               :style="{ fontSize: `${config.fontSize}px` }"
             >
               {{ scope.row.label }}
diff --git a/src/views/dashboard/related/topology/Index.vue b/src/views/dashboard/related/topology/Index.vue
index 087e834c..9d450cac 100644
--- a/src/views/dashboard/related/topology/Index.vue
+++ b/src/views/dashboard/related/topology/Index.vue
@@ -13,12 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. -->
 <template>
-  <PodTopology :config="config" v-if="isSankey" />
-  <Graph :config="config" v-else />
+  <Graph :config="config" v-if="isService" />
+  <PodTopology :config="config" v-else />
 </template>
 <script lang="ts" setup>
 import type { PropType } from "vue";
-import { ref } from "vue";
 import Graph from "./components/Graph.vue";
 import PodTopology from "./components/PodTopology.vue";
 import { EntityType } from "../../data";
@@ -32,7 +31,7 @@ defineProps({
   },
 });
 const dashboardStore = useDashboardStore();
-const isSankey = ref<boolean>(
-  [EntityType[2].value, EntityType[3].value].includes(dashboardStore.entity)
+const isService = [EntityType[0].value, EntityType[1].value].includes(
+  dashboardStore.entity
 );
 </script>
diff --git a/src/views/dashboard/related/topology/components/Graph.vue b/src/views/dashboard/related/topology/components/Graph.vue
index 3f1baf67..f6765b47 100644
--- a/src/views/dashboard/related/topology/components/Graph.vue
+++ b/src/views/dashboard/related/topology/components/Graph.vue
@@ -34,7 +34,12 @@ limitations under the License. -->
           @change="changeDepth"
         />
       </span>
-      <span class="switch-icon ml-5" title="Settings" @click="setConfig">
+      <span
+        class="switch-icon ml-5"
+        title="Settings"
+        @click="setConfig"
+        v-if="dashboardStore.editMode"
+      >
         <Icon size="middle" iconName="settings" />
       </span>
       <span
diff --git a/src/views/dashboard/related/topology/components/PodTopology.vue b/src/views/dashboard/related/topology/components/PodTopology.vue
index 83e9fbf4..c951eb5f 100644
--- a/src/views/dashboard/related/topology/components/PodTopology.vue
+++ b/src/views/dashboard/related/topology/components/PodTopology.vue
@@ -28,7 +28,12 @@ limitations under the License. -->
         @change="changeDepth"
       />
     </span>
-    <span class="switch-icon ml-5" title="Settings" @click="setConfig">
+    <span
+      class="switch-icon ml-5"
+      title="Settings"
+      @click="setConfig"
+      v-if="dashboardStore.editMode"
+    >
       <Icon size="middle" iconName="settings" />
     </span>
     <span
@@ -221,7 +226,7 @@ async function getTopology(id: string) {
         Number(depth.value)
       );
       break;
-    case EntityType[3].value:
+    case EntityType[4].value:
       resp = await topologyStore.getInstanceTopology();
       break;
   }
diff --git a/src/views/dashboard/related/topology/components/Sankey.vue b/src/views/dashboard/related/topology/components/Sankey.vue
index 4aa6a656..3740a4d7 100644
--- a/src/views/dashboard/related/topology/components/Sankey.vue
+++ b/src/views/dashboard/related/topology/components/Sankey.vue
@@ -26,6 +26,7 @@ const emit = defineEmits(["click"]);
 const topologyStore = useTopologyStore();
 const option = computed(() => getOption());
 
+console.log(topologyStore.nodes);
 function getOption() {
   return {
     tooltip: {
diff --git a/src/views/dashboard/related/topology/components/Settings.vue b/src/views/dashboard/related/topology/components/Settings.vue
index 55895ab4..3d5e6585 100644
--- a/src/views/dashboard/related/topology/components/Settings.vue
+++ b/src/views/dashboard/related/topology/components/Settings.vue
@@ -225,7 +225,6 @@ const states = reactive<{
   linkDashboards: [],
   nodeDashboards: [],
 });
-console.log(dashboardStore.selectedGrid);
 const isService = [EntityType[0].value, EntityType[1].value].includes(
   dashboardStore.entity
 );