From e78f1b804fa09e696f1cee69e83e076c370ab7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E6=B4=81?= <yangmengjie@eolink.com>
Date: Thu, 21 Nov 2024 18:37:39 +0800
Subject: [PATCH] fix: Change Dashboard Fields

---
 .../dashboard/src/component/MonitorApiPage.tsx       | 12 ++++++------
 .../dashboard/src/component/MonitorAppPage.tsx       |  8 ++++----
 .../dashboard/src/component/MonitorSubPage.tsx       | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/packages/dashboard/src/component/MonitorApiPage.tsx b/frontend/packages/dashboard/src/component/MonitorApiPage.tsx
index 89b8465d..67d157b8 100644
--- a/frontend/packages/dashboard/src/component/MonitorApiPage.tsx
+++ b/frontend/packages/dashboard/src/component/MonitorApiPage.tsx
@@ -28,7 +28,7 @@ export type MonitorApiPageProps = {
     detailEntityName:string
 }
 
-export type MonitorApiQueryData = SearchBody & { path?:string, apis?:string[], projects?:string[] }
+export type MonitorApiQueryData = SearchBody & { path?:string, apis?:string[], services?:string[] }
 
 export default function MonitorApiPage(props:MonitorApiPageProps){
     const {fetchTableData,detailDrawerContent,fullScreen,setFullScreen,setDetailId,timeButton,setTimeButton,detailEntityName,setDetailEntityName} = props
@@ -51,7 +51,7 @@ export default function MonitorApiPage(props:MonitorApiPageProps){
       }, []);
 
     const getApiList = (projectIds?:string[])=>{
-      return fetchData<{apis:EntityItem[]}>('simple/project/apis',{method:'POST',eoBody:({projects:projectIds || queryData?.projects})}).then((resp) => {
+      return fetchData<{apis:EntityItem[]}>('simple/service/apis',{method:'POST',eoBody:({services:projectIds || queryData?.services})}).then((resp) => {
         const {code,data,msg} = resp
         if(code === STATUS_CODE.SUCCESS){
             setApiOptionList(data.apis?.map((x:EntityItem)=>({label:x.name, value:x.id})))
@@ -65,10 +65,10 @@ export default function MonitorApiPage(props:MonitorApiPageProps){
     }
 
     const getProjectList = ()=>{
-      return fetchData<{projects:EntityItem[]}>('simple/projects',{method:'GET'}).then((resp) => {
+      return fetchData<{services:EntityItem[]}>('simple/services',{method:'GET'}).then((resp) => {
         const {code,data,msg} = resp
         if(code === STATUS_CODE.SUCCESS){
-            setProjectOptionList(data.projects?.map((x:EntityItem)=>({label:x.name, value:x.id})))
+            setProjectOptionList(data.services?.map((x:EntityItem)=>({label:x.name, value:x.id})))
         }else{
             message.error(msg || $t(RESPONSE_TIPS.dataError))
             return setProjectOptionList([])
@@ -164,13 +164,13 @@ export default function MonitorApiPage(props:MonitorApiPageProps){
               <label className=" whitespace-nowrap inline-block">{$t('服务')}：</label>
               <Select
                 className="w-[346px]"
-                value={queryData?.projects}
+                value={queryData?.services}
                 options={projectOptionList}
                 mode="multiple"
                 allowClear
                 maxCount={3}
                 placeholder={$t("选择服务")}
-                onChange={(value)=>{setQueryData(prevData=>({...prevData || {}, projects:value}));getApiList(value)}}
+                onChange={(value)=>{setQueryData(prevData=>({...prevData || {}, services:value}));getApiList(value)}}
               />
               </div>
             <div className="flex flex-nowrap items-center  pt-btnybase mr-btnybase">
diff --git a/frontend/packages/dashboard/src/component/MonitorAppPage.tsx b/frontend/packages/dashboard/src/component/MonitorAppPage.tsx
index 1d3e45aa..a618e75a 100644
--- a/frontend/packages/dashboard/src/component/MonitorAppPage.tsx
+++ b/frontend/packages/dashboard/src/component/MonitorAppPage.tsx
@@ -56,10 +56,10 @@ export default function MonitorAppPage(props:MonitorAppPageProps){
     };
 
     const getAppList = ()=>{
-      return fetchData<{projects:EntityItem[]}>('simple/apps/mine',{method:'GET'}).then((resp) => {
+      return fetchData<{apps:EntityItem[]}>('simple/apps/mine',{method:'GET'}).then((resp) => {
         const {code,data,msg} = resp
         if(code === STATUS_CODE.SUCCESS){
-          setListOfApps(data.projects?.map((x:EntityItem)=>({label:x.name, value:x.id})))
+          setListOfApps(data.apps?.map((x:EntityItem)=>({label:x.name, value:x.id})))
         }else{
             message.error(msg || $t(RESPONSE_TIPS.dataError))
             return setListOfApps([])
@@ -151,9 +151,9 @@ export default function MonitorAppPage(props:MonitorAppPageProps){
                   maxTagCount={1}
                   // maxTagPlaceholder={(selectedList) => `and ${selectedList.length} more selected`}
                   placeholder={$t("请选择消费者")}
-                  value={queryData?.projects}
+                  value={queryData?.apps}
                   options={listOfApps}
-                  onChange={(value)=>{setQueryData(prevData=>({...prevData || {}, projects:value}))}}
+                  onChange={(value)=>{setQueryData(prevData=>({...prevData || {},apps :value}))}}
                 />
               </div>
               <div>
diff --git a/frontend/packages/dashboard/src/component/MonitorSubPage.tsx b/frontend/packages/dashboard/src/component/MonitorSubPage.tsx
index fcd7340c..44f51390 100644
--- a/frontend/packages/dashboard/src/component/MonitorSubPage.tsx
+++ b/frontend/packages/dashboard/src/component/MonitorSubPage.tsx
@@ -15,7 +15,7 @@ import { CloseOutlined, ExpandOutlined } from "@ant-design/icons";
 import { useFetch } from "@common/hooks/http";
 import { $t } from "@common/locales";
 
-export type MonitorSubQueryData = SearchBody & { projects?:string[] ,type?:'subscriber'|'provider'}
+export type MonitorSubQueryData = SearchBody & { services?:string[] , apps?:string[],type?:'subscriber'|'provider'}
 
 
 export type MonitorSubPageProps = {
@@ -60,10 +60,10 @@ export default function MonitorSubPage(props:MonitorSubPageProps){
     };
 
     const getProjectList = ()=>{
-      return fetchData<{projects:EntityItem[]}>('simple/projects',{method:'GET'}).then((resp) => {
+      return fetchData<{services:EntityItem[]}>('simple/services',{method:'GET'}).then((resp) => {
         const {code,data,msg} = resp
         if(code === STATUS_CODE.SUCCESS){
-          setListOfProjects(data.projects?.map((x:EntityItem)=>({label:x.name, value:x.id})))
+          setListOfProjects(data.services?.map((x:EntityItem)=>({label:x.name, value:x.id})))
         }else{
             message.error(msg || $t(RESPONSE_TIPS.dataError))
             return setListOfProjects([])
@@ -154,9 +154,9 @@ export default function MonitorSubPage(props:MonitorSubPageProps){
                   mode="multiple"
                   maxTagCount={1}
                   placeholder={$t("请选择服务")}
-                  value={queryData?.projects}
+                  value={queryData?.services}
                   options={listOfProjects}
-                  onChange={(value)=>{setQueryData(prevData=>({...prevData || {}, projects:value}))}}
+                  onChange={(value)=>{setQueryData(prevData=>({...prevData || {}, services:value}))}}
                 />
               </div>
               <div>