From 6d5fcbb402a9fb3f082816b944e507663abc8041 Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Tue, 15 Mar 2022 11:11:39 +0800 Subject: [PATCH] set service list --- src/locales/lang/en.ts | 6 +- src/locales/lang/zh.ts | 6 +- src/router/database.ts | 12 +-- src/router/generalService.ts | 22 ++--- src/router/index.ts | 2 +- src/router/serviceMesh.ts | 39 +------- src/store/modules/dashboard.ts | 3 +- src/views/Service.vue | 144 +++++++++++++++++++++++++++++ src/views/dashboard/List.vue | 2 +- src/views/dashboard/panel/Tool.vue | 3 +- src/views/service/Endpoints.vue | 23 ----- src/views/service/Metrics.vue | 24 ----- src/views/service/Panel.vue | 110 ---------------------- src/views/service/Profiles.vue | 31 ------- src/views/service/Service.vue | 131 -------------------------- src/views/service/Topology.vue | 30 ------ src/views/service/Traces.vue | 31 ------- src/views/service/data.ts | 41 -------- 18 files changed, 167 insertions(+), 493 deletions(-) create mode 100644 src/views/Service.vue delete mode 100644 src/views/service/Endpoints.vue delete mode 100644 src/views/service/Metrics.vue delete mode 100644 src/views/service/Panel.vue delete mode 100644 src/views/service/Profiles.vue delete mode 100644 src/views/service/Service.vue delete mode 100644 src/views/service/Topology.vue delete mode 100644 src/views/service/Traces.vue delete mode 100644 src/views/service/data.ts diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 1fdb5bf9..e764c8fd 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -15,7 +15,7 @@ * limitations under the License. */ const msg = { - generalService: "General Service", + general: "General Service", services: "Services", service: "Service", traces: "Traces", @@ -96,6 +96,8 @@ const msg = { taskList: "Task List", sampledTraces: "Sampled Traces", editTab: "Enable editing tab names", + label: "Name", + id: "ID", hourTip: "Select Hour", minuteTip: "Select Minute", secondTip: "Select Second", @@ -234,7 +236,7 @@ const msg = { parentService: "Parent Service", isParentService: "Set Parent Service", noneParentService: "No Parent Service", - serviceGroup: "Service Group", + group: "Service Group", endpointFilter: "Endpoint Filter", databaseView: "Database", browserView: "Browser", diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index cd2c99e0..ab3e8a0e 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -15,7 +15,7 @@ * limitations under the License. */ const msg = { - generalService: "普通服务", + general: "普通服务", services: "服务", traces: "跟踪", metrics: "指标", @@ -96,6 +96,8 @@ const msg = { taskList: "任务列表", sampledTraces: "采样的追踪", editTab: "开启编辑Tab的名称", + label: "名称", + id: "ID", hourTip: "选择小时", minuteTip: "选择分钟", secondTip: "选择秒数", @@ -236,7 +238,7 @@ const msg = { parentService: "父级服务", isParentService: "设置父服务", noneParentService: "不设置父服务", - serviceGroup: "服务组", + group: "服务组", endpointFilter: "端点过滤器", databaseView: "数据库视图", browserView: "浏览器视图", diff --git a/src/router/database.ts b/src/router/database.ts index 2b08c1f7..6c2be6ec 100644 --- a/src/router/database.ts +++ b/src/router/database.ts @@ -36,17 +36,7 @@ export const routesDatabase: Array = [ headPath: "/database", exact: true, }, - component: () => import("@/views/service/Service.vue"), - }, - { - path: "/database/:id/:type", - name: "DatabasePanel", - meta: { - title: "databasePanel", - headPath: "/database", - exact: true, - }, - component: () => import("@/views/service/Panel.vue"), + component: () => import("@/views/Service.vue"), }, ], }, diff --git a/src/router/generalService.ts b/src/router/generalService.ts index 358b6224..4d8f4710 100644 --- a/src/router/generalService.ts +++ b/src/router/generalService.ts @@ -20,9 +20,9 @@ import Layout from "@/layout/Index.vue"; export const routesGen: Array = [ { path: "", - name: "GeneralService", + name: "General", meta: { - title: "generalService", + title: "general", icon: "chart", hasGroup: false, exact: true, @@ -30,24 +30,14 @@ export const routesGen: Array = [ component: Layout, children: [ { - path: "/generalService", - name: "Services", + path: "/general", + name: "GeneralServices", meta: { title: "services", - headPath: "/generalService/service", + headPath: "/general/service", exact: true, }, - component: () => import("@/views/service/Service.vue"), - }, - { - path: "/generalService/service/:id/:type", - name: "GeneralServicePanel", - meta: { - title: "generalServicePanel", - headPath: "/generalService/service", - exact: true, - }, - component: () => import("@/views/service/Panel.vue"), + component: () => import("@/views/Service.vue"), }, ], }, diff --git a/src/router/index.ts b/src/router/index.ts index 52c8c34e..732e14ac 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -52,7 +52,7 @@ router.beforeEach((to, from, next) => { (window as any).axiosCancel = []; } if (to.path === "/") { - next({ path: "/generalService" }); + next({ path: "/general" }); } else { next(); } diff --git a/src/router/serviceMesh.ts b/src/router/serviceMesh.ts index 1f9e674b..e8b536c2 100644 --- a/src/router/serviceMesh.ts +++ b/src/router/serviceMesh.ts @@ -36,7 +36,7 @@ export const routesMesh: Array = [ title: "services", headPath: "/mesh/services", }, - component: () => import("@/views/service/Service.vue"), + component: () => import("@/views/Service.vue"), }, { path: "/mesh/controlPanel", @@ -45,7 +45,7 @@ export const routesMesh: Array = [ title: "controlPanel", headPath: "/mesh/controlPanel", }, - component: () => import("@/views/service/Service.vue"), + component: () => import("@/views/Service.vue"), }, { path: "/mesh/dataPanel", @@ -54,40 +54,7 @@ export const routesMesh: Array = [ title: "dataPanel", headPath: "/mesh/dataPanel", }, - component: () => import("@/views/service/Service.vue"), - }, - { - path: "/mesh/services/:id/:type", - name: "MeshServicePanel", - meta: { - title: "meshServicePanel", - headPath: "/mesh/services", - exact: true, - notShow: true, - }, - component: () => import("@/views/service/Panel.vue"), - }, - { - path: "/mesh/controlPanel/:id/:type", - name: "MeshControlPanel", - meta: { - title: "controlPanel", - headPath: "/mesh/controlPanel", - exact: true, - notShow: true, - }, - component: () => import("@/views/service/Panel.vue"), - }, - { - path: "/mesh/dataPanel/:id/:type", - name: "MeshDataPanel", - meta: { - title: "dataPanel", - headPath: "/mesh/dataPanel", - exact: true, - notShow: true, - }, - component: () => import("@/views/service/Panel.vue"), + component: () => import("@/views/Service.vue"), }, ], }, diff --git a/src/store/modules/dashboard.ts b/src/store/modules/dashboard.ts index 5fbd859c..5612fc60 100644 --- a/src/store/modules/dashboard.ts +++ b/src/store/modules/dashboard.ts @@ -317,9 +317,8 @@ export const dashboardStore = defineStore({ layer: c.layer, entity: c.entity, name: c.name, - date: c.date, + isRoot: c.isRoot, }); - console.log(key); sessionStorage.setItem(key, JSON.stringify(t)); } sessionStorage.setItem("dashboards", JSON.stringify(list)); diff --git a/src/views/Service.vue b/src/views/Service.vue new file mode 100644 index 00000000..f0045f78 --- /dev/null +++ b/src/views/Service.vue @@ -0,0 +1,144 @@ + + + + + diff --git a/src/views/dashboard/List.vue b/src/views/dashboard/List.vue index 5308da8e..c04908fb 100644 --- a/src/views/dashboard/List.vue +++ b/src/views/dashboard/List.vue @@ -95,7 +95,7 @@ appStore.setPageTitle("Dashboard List"); // # - browser // # - skywalking const { t } = useI18n(); -const dashboards = ref([]); +const dashboards = ref<{ name: string; layer: string; entity: string }[]>([]); const searchText = ref(""); setList(); diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue index e90f30cd..2c494b69 100644 --- a/src/views/dashboard/panel/Tool.vue +++ b/src/views/dashboard/panel/Tool.vue @@ -177,7 +177,8 @@ async function setSelector() { selectorStore.setCurrentService(currentService); selectorStore.setCurrentDestService(currentDestService); states.currentService = selectorStore.currentService.value; - states.currentDestService = selectorStore.currentDestService.value; + states.currentDestService = + selectorStore.currentDestService && selectorStore.currentDestService.value; } async function setSourceSelector() { diff --git a/src/views/service/Endpoints.vue b/src/views/service/Endpoints.vue deleted file mode 100644 index 756d095f..00000000 --- a/src/views/service/Endpoints.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - - diff --git a/src/views/service/Metrics.vue b/src/views/service/Metrics.vue deleted file mode 100644 index 5798a99b..00000000 --- a/src/views/service/Metrics.vue +++ /dev/null @@ -1,24 +0,0 @@ - - - - diff --git a/src/views/service/Panel.vue b/src/views/service/Panel.vue deleted file mode 100644 index bb51cc47..00000000 --- a/src/views/service/Panel.vue +++ /dev/null @@ -1,110 +0,0 @@ - - - - diff --git a/src/views/service/Profiles.vue b/src/views/service/Profiles.vue deleted file mode 100644 index e6e75b93..00000000 --- a/src/views/service/Profiles.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - diff --git a/src/views/service/Service.vue b/src/views/service/Service.vue deleted file mode 100644 index c18ff2a9..00000000 --- a/src/views/service/Service.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - - diff --git a/src/views/service/Topology.vue b/src/views/service/Topology.vue deleted file mode 100644 index 6e497094..00000000 --- a/src/views/service/Topology.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/src/views/service/Traces.vue b/src/views/service/Traces.vue deleted file mode 100644 index d043eb75..00000000 --- a/src/views/service/Traces.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - diff --git a/src/views/service/data.ts b/src/views/service/data.ts deleted file mode 100644 index d87431a9..00000000 --- a/src/views/service/data.ts +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ -export const TabsConfig: { [key: string]: any } = { - GeneralService: [ - { name: "metrics", path: "/generalService/metrics" }, - { name: "traces", path: "/generalService/traces" }, - { name: "profiles", path: "/generalService/profiles" }, - { name: "services", path: "/generalService" }, - ], - ServiceMesh: [ - { name: "services", path: "/serviceMesh" }, - { name: "metrics", path: "/serviceMesh/metrics" }, - { name: "traces", path: "/serviceMesh/traces" }, - { name: "profiles", path: "/serviceMesh/profiles" }, - ], -}; -export const PagesConfig = [ - { label: "generalService", name: "GeneralService" }, - { label: "serviceMesh", name: "ServiceMesh" }, - { label: "virtualMachine", name: "VirtualMachine" }, - { label: "dashboardHome", name: "DashboardHome" }, - { label: "dashboardList", name: "DashboardList" }, - { label: "logs", name: "Logs" }, - { label: "settings", name: "Settings" }, - { label: "events", name: "Events" }, - { label: "alerts", name: "Alerts" }, -];