From 253f5c9261957676ad8a927d2613c89deabdad39 Mon Sep 17 00:00:00 2001 From: "pg.yang" Date: Tue, 6 Dec 2022 21:41:15 +0800 Subject: [PATCH 1/3] Add AWS menu for supporting AWS monitoring (#202) --- src/locales/lang/en.ts | 2 ++ src/locales/lang/es.ts | 2 ++ src/locales/lang/zh.ts | 2 ++ src/router/data/aws.ts | 47 ++++++++++++++++++++++++++++++++++++++++ src/router/data/index.ts | 2 ++ 5 files changed, 55 insertions(+) create mode 100644 src/router/data/aws.ts diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 0510d819..b4d22f1b 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -375,5 +375,7 @@ const msg = { language: "Language", gateway: "Gateway", virtualMQ: "Virtual MQ", + AWSCloud: "AWS Cloud", + AWSCloudEKS: "EKS" }; export default msg; diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts index d8bc29c6..675bd1bb 100644 --- a/src/locales/lang/es.ts +++ b/src/locales/lang/es.ts @@ -378,5 +378,7 @@ const msg = { language: "Lenguaje", gateway: "Puerta", virtualMQ: "MQ virtual", + AWSCloud: "AWS Cloud", + AWSCloudEKS: "EKS" }; export default msg; diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 1d1c0301..b89451cd 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -373,5 +373,7 @@ const msg = { language: "语言", gateway: "网关", virtualMQ: "虚拟消息队列", + AWSCloud: "AWS云服务", + AWSCloudEKS: "EKS" }; export default msg; diff --git a/src/router/data/aws.ts b/src/router/data/aws.ts new file mode 100644 index 00000000..2fb16e89 --- /dev/null +++ b/src/router/data/aws.ts @@ -0,0 +1,47 @@ +/** + * 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 default [ + { + path: "", + name: "AWSCloud", + meta: { + title: "AWSCloud", + icon: "aws", + hasGroup: true, + }, + redirect: "/aws-eks", + children: [ + { + path: "/aws-eks", + name: "AWSCloudEKS", + meta: { + title: "AWSCloudEKS", + layer: "AWS_EKS", + }, + }, + { + path: "/aws-eks/tab/:activeTabIndex", + name: "EKSActiveTabIndex", + meta: { + notShow: true, + layer: "AWS_EKS", + }, + }, + ], + }, +]; diff --git a/src/router/data/index.ts b/src/router/data/index.ts index d6965b20..f9a44212 100644 --- a/src/router/data/index.ts +++ b/src/router/data/index.ts @@ -23,6 +23,7 @@ import functions from "./functions"; import browser from "./browser"; import k8s from "./k8s"; import gateway from "./gateway"; +import aws from "./aws"; export default [ ...general, @@ -30,6 +31,7 @@ export default [ ...functions, ...k8s, ...infrastructure, + ...aws, ...browser, ...gateway, ...database, From 154372615e92d486f69c42d661fe7a9ad35f04f0 Mon Sep 17 00:00:00 2001 From: Fine0830 Date: Wed, 7 Dec 2022 11:53:45 +0800 Subject: [PATCH 2/3] update menu icons (#203) --- src/assets/icons/cloud_queue.svg | 2 +- src/assets/icons/functions.svg | 15 +++++++++++++++ src/locales/lang/en.ts | 2 +- src/locales/lang/es.ts | 2 +- src/locales/lang/zh.ts | 2 +- src/router/data/aws.ts | 2 +- src/router/data/functions.ts | 2 +- .../components/NewConditions.vue | 4 ++-- 8 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 src/assets/icons/functions.svg diff --git a/src/assets/icons/cloud_queue.svg b/src/assets/icons/cloud_queue.svg index 4b1da735..9ec18d56 100644 --- a/src/assets/icons/cloud_queue.svg +++ b/src/assets/icons/cloud_queue.svg @@ -12,6 +12,6 @@ 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. --> - + diff --git a/src/assets/icons/functions.svg b/src/assets/icons/functions.svg new file mode 100644 index 00000000..621311fd --- /dev/null +++ b/src/assets/icons/functions.svg @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index b4d22f1b..6681cd97 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -376,6 +376,6 @@ const msg = { gateway: "Gateway", virtualMQ: "Virtual MQ", AWSCloud: "AWS Cloud", - AWSCloudEKS: "EKS" + AWSCloudEKS: "EKS", }; export default msg; diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts index 675bd1bb..d6ef9bf6 100644 --- a/src/locales/lang/es.ts +++ b/src/locales/lang/es.ts @@ -379,6 +379,6 @@ const msg = { gateway: "Puerta", virtualMQ: "MQ virtual", AWSCloud: "AWS Cloud", - AWSCloudEKS: "EKS" + AWSCloudEKS: "EKS", }; export default msg; diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index b89451cd..32252d93 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -374,6 +374,6 @@ const msg = { gateway: "网关", virtualMQ: "虚拟消息队列", AWSCloud: "AWS云服务", - AWSCloudEKS: "EKS" + AWSCloudEKS: "EKS", }; export default msg; diff --git a/src/router/data/aws.ts b/src/router/data/aws.ts index 2fb16e89..208c198f 100644 --- a/src/router/data/aws.ts +++ b/src/router/data/aws.ts @@ -21,7 +21,7 @@ export default [ name: "AWSCloud", meta: { title: "AWSCloud", - icon: "aws", + icon: "cloud_queue", hasGroup: true, }, redirect: "/aws-eks", diff --git a/src/router/data/functions.ts b/src/router/data/functions.ts index 9429b52a..40961041 100644 --- a/src/router/data/functions.ts +++ b/src/router/data/functions.ts @@ -21,7 +21,7 @@ export default [ name: "Functions", meta: { title: "functions", - icon: "cloud_queue", + icon: "functions", layer: "FAAS", }, redirect: "/functions", diff --git a/src/views/dashboard/related/network-profiling/components/NewConditions.vue b/src/views/dashboard/related/network-profiling/components/NewConditions.vue index 1ed8ac66..55d8fe36 100644 --- a/src/views/dashboard/related/network-profiling/components/NewConditions.vue +++ b/src/views/dashboard/related/network-profiling/components/NewConditions.vue @@ -50,13 +50,13 @@ limitations under the License. -->