You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/12/30 08:35:21 UTC
[skywalking-booster-ui] 01/01: Revert "Alert Settings"
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch revert-4-alert
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
commit 95a3cfe715f3fb76b6f580cb0996ffdb91318049
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Dec 30 16:35:18 2021 +0800
Revert "Alert Settings"
---
src/locales/lang/en.ts | 4 ---
src/locales/lang/zh.ts | 7 -----
src/router/alert.ts | 10 +++---
src/views/alert/Settings.vue | 72 --------------------------------------------
src/views/alert/data.ts | 16 ----------
5 files changed, 5 insertions(+), 104 deletions(-)
diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 073b3e2..ca98a81 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -29,10 +29,6 @@ const msg = {
logs: "Logs",
events: "Events",
alerts: "Alerts",
- description: "Description",
- action: "Action",
- createAlert: "Create a alert",
- alertSettings: "Alert setting",
settings: "Settings",
dashboards: "Dashboards",
profiles: "Profiles",
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index f6af6f0..12e6b7f 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -27,14 +27,7 @@ const msg = {
dashboardList: "仪表盘列表",
log: "日志",
events: "事件",
- // 警告
alerts: "警告",
- description: "描述",
- action: "操作",
- createAlert: "创建告警",
- alertSettings: "告警设置",
- alertName: "警告名称",
- startedTime: "开始时间",
settings: "设置",
dashboards: "仪表盘",
profiles: "性能剖析",
diff --git a/src/router/alert.ts b/src/router/alert.ts
index a972e7e..c0e27fb 100644
--- a/src/router/alert.ts
+++ b/src/router/alert.ts
@@ -24,21 +24,21 @@ export const routesAlert: Array<RouteRecordRaw> = [
meta: {
title: "alerts",
icon: "notification_important",
- hasGroup: true,
- exact: true,
+ hasGroup: false,
+ exact: false,
},
component: Layout,
children: [
{
path: "/alerts",
- name: "alertSettings",
+ name: "Alerts",
meta: {
- title: "Alert Settings",
+ title: "alerts",
icon: "notification_important",
hasGroup: false,
exact: false,
},
- component: () => import("@/views/alert/Settings.vue"),
+ component: () => import("@/views/Log.vue"),
},
],
},
diff --git a/src/views/alert/Settings.vue b/src/views/alert/Settings.vue
deleted file mode 100644
index e47cf3e..0000000
--- a/src/views/alert/Settings.vue
+++ /dev/null
@@ -1,72 +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. -->
-<template>
- <div class="alert-table">
- <el-button class="alert-create" type="primary" size="small">{{
- t("createAlert")
- }}</el-button>
- <el-table :data="tableData" border>
- <el-table-column
- v-for="(h, index) in tableHeader"
- :label="t(h)"
- :key="h + index"
- >
- <template #default="scope">
- <span v-if="h !== 'action'">{{ scope.row[h] }}</span>
- <el-button v-else type="danger" size="mini">{{
- t("delete")
- }}</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
-</template>
-
-<script lang="ts" setup>
-import { useI18n } from "vue-i18n";
-import { ElButton, ElTable, ElTableColumn } from "element-plus";
-
-const { t } = useI18n();
-const tableHeader = ["name", "entityType", "description", "status", "action"];
-const tableData = [
- {
- name: "xxxx-name",
- entityType: "Service",
- description: "xxxxxxx",
- status: "Disable",
- },
- {
- name: "xxxx-name",
- entityType: "Service",
- description: "xxxxxxx",
- status: "Disable",
- },
-];
-</script>
-<style lang="scss" scoped>
-.alert-name {
- color: #448edf;
- cursor: pointer;
-}
-
-.alert-table {
- padding: 15px;
-}
-
-.alert-create {
- float: right;
- margin-bottom: 15px;
-}
-</style>
diff --git a/src/views/alert/data.ts b/src/views/alert/data.ts
deleted file mode 100644
index 366cda7..0000000
--- a/src/views/alert/data.ts
+++ /dev/null
@@ -1,16 +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.
- */