fix args All and add trans

gocrane · Mar 17, 2023 · 2bcefab · 2bcefab
1 parent 0f59777
commit 2bcefab
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 9 deletions.
diff --git a/pkg/web/src/i18n/resources/en/translation.json b/pkg/web/src/i18n/resources/en/translation.json
@@ -162,5 +162,13 @@
   "节点名": "Node Name",
   "闲置节点": "Idle Node",
   "采纳推荐": "Adopt Recommendation",
-  "查看采纳命令": "View Adoption Command"
+  "查看采纳命令": "View Adoption Command",
+  "Workload类型": "Workload Type",
+  "Workload": "Workload",
+  "查看监控": "View Metrics",
+  "采纳推荐成功": "Adopt Recommendation Successful",
+  "采纳推荐失败": "Adopt Recommendation Failed",
+  "应用总览": "Workload Overview",
+  "应用洞察": "Workload Insight",
+  "应用成本分布": "Workload Cost Dimension"
 }
diff --git a/pkg/web/src/i18n/resources/zh/translation.json b/pkg/web/src/i18n/resources/zh/translation.json
@@ -162,5 +162,13 @@
   "节点名": "节点名",
   "闲置节点": "闲置节点",
   "采纳推荐": "采纳推荐",
-  "查看采纳命令": "查看采纳命令"
+  "查看采纳命令": "查看采纳命令",
+  "Workload类型": "Workload类型",
+  "Workload": "Workload",
+  "查看监控": "查看监控",
+  "采纳推荐成功": "采纳推荐成功",
+  "采纳推荐失败": "采纳推荐失败",
+  "应用总览": "应用总览",
+  "应用洞察": "应用洞察",
+  "应用成本分布": "应用成本分布"
 }
diff --git a/pkg/web/src/pages/Cost/NamespaceCosts/NamespaceCostSearchPanel.tsx b/pkg/web/src/pages/Cost/NamespaceCosts/NamespaceCostSearchPanel.tsx
@@ -89,6 +89,26 @@ export const NamespaceCostSearchPanel = React.memo(() => {
            }}
           />
         </div>
+        <div
+          style={{
+            display: 'flex',
+            flexDirection: 'row',
+            alignItems: 'center',
+            marginRight: '1rem',
+            marginTop: 5,
+            marginBottom: 5,
+          }}
+        >
+          <div style={{marginRight: '1rem', width: '70px'}}>{t('Discount')}</div>
+          <InputNumber
+            min={0}
+            theme='column'
+            value={discount}
+            onChange={(value) => {
+              dispatch(insightAction.discount(value));
+            }}
+          />
+        </div>
       </Card>
     </div>
   );

diff --git a/pkg/web/src/pages/Cost/WorkloadOverview/OverviewSearchPanel.tsx b/pkg/web/src/pages/Cost/WorkloadOverview/OverviewSearchPanel.tsx
@@ -15,7 +15,7 @@ import {nanoid} from '@reduxjs/toolkit';
 import dayjs from 'dayjs';
 import _ from 'lodash';
 
-const ALL_NAMESPACE_VALUE = "ALL";
+const ALL_NAMESPACE_VALUE = "All";
 
 export const OverviewSearchPanel = React.memo(() => {
   const dispatch = useDispatch();
@@ -39,7 +39,7 @@ export const OverviewSearchPanel = React.memo(() => {
     () => [
       {
         value: ALL_NAMESPACE_VALUE,
-        label: 'ALL',
+        label: 'All',
      },
       ...(namespaceList?.data?.data?.items ?? []).map((namespace) => ({
         label: namespace,
@@ -55,7 +55,7 @@ export const OverviewSearchPanel = React.memo(() => {
       start: (Date.parse(customRange.start)/1000).toString(),
       end: (Date.parse(customRange.end)/1000).toString(),
       match: `crane_analysis_resource_recommendation{namespace=~"(${
-        selectedNamespace === "ALL"
+        selectedNamespace === "All"
           ? namespaceOptions
               .filter((option) => option.label !== ALL_NAMESPACE_VALUE)
               .map((option) => option.label)
@@ -83,7 +83,7 @@ export const OverviewSearchPanel = React.memo(() => {
     start: (Date.parse(customRange.start)/1000).toString(),
     end: (Date.parse(customRange.end)/1000).toString(),
     match: `crane_analysis_resource_recommendation{namespace=~"(${
-      selectedNamespace === "ALL"
+      selectedNamespace === "All"
         ? namespaceOptions
             .filter((option) => option.label !== ALL_NAMESPACE_VALUE)
             .map((option) => option.label)
@@ -95,7 +95,7 @@ export const OverviewSearchPanel = React.memo(() => {
   const workloadOptions: any[] = React.useMemo(() => {
     const options = _.uniqBy(
       [
-        { label: 'ALL', value: 'ALL' },
+        { label: 'All', value: 'All' },
         ...(workloadList.data?.data ?? []).map((data: any) => ({
           label: data.owner_name,
           value: data.owner_name,

diff --git a/pkg/web/vite.config.js b/pkg/web/vite.config.js
@@ -57,12 +57,12 @@ export default (params) => ({
         // 用于开发环境下的转发请求
         // 更多请参考：https://vitejs.dev/config/#server-proxy
         // Set to your craned address
-        target: 'http://localhost:8082',
+        target: 'http://localhost:9090',
         changeOrigin: true,
       },
       '/grafana': {
         // Set to your craned address
-        target: 'http://localhost:8082',
+        target: 'http://localhost:9090',
         changeOrigin: true,
       },
     },