feat(service): align list/detail response and ui mocks

Author: mochengqian

docs/swagger/swagger.json

@@ -3691,18 +3691,6 @@
     "model.ServiceDetailResp": {
       "type": "object",
       "properties": {
-        "serviceName": {
-          "type": "string"
-        },
-        "serviceKey": {
-          "type": "string"
-        },
-        "version": {
-          "type": "string"
-        },
-        "group": {
-          "type": "string"
-        },
         "language": {
           "type": "string"
         },

pkg/console/model/service.go

@@ -54,12 +54,8 @@ type ServiceSearchResp struct {
 }
 
 type ServiceDetailResp struct {
-	ServiceName string   `json:"serviceName"`
-	ServiceKey  string   `json:"serviceKey"`
-	Version     string   `json:"version"`
-	Group       string   `json:"group"`
-	Language    string   `json:"language"`
-	Methods     []string `json:"methods"`
+	Language string   `json:"language"`
+	Methods  []string `json:"methods"`
 }
 
 type ByServiceName []*ServiceSearchResp

pkg/console/service/service.go

@@ -193,12 +193,8 @@ func GetServiceDetail(ctx consolectx.Context, req model.BaseServiceReq) (*model.
 		methods = []string{}
 	}
 	return &model.ServiceDetailResp{
-		ServiceName: svcRes.Spec.Name,
-		ServiceKey:  req.ServiceKey(),
-		Version:     svcRes.Spec.Version,
-		Group:       svcRes.Spec.Group,
-		Language:    svcRes.Spec.Language,
-		Methods:     methods,
+		Language: svcRes.Spec.Language,
+		Methods:  methods,
 	}, nil
 }
 

pkg/console/service/service_test.go

@@ -171,7 +171,6 @@ func TestGetServiceDetail_ReturnsLanguageAndMethods(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 
-	assert.Equal(t, model.BuildServiceKey("org.apache.dubbo.samples.UserService", "1.0.0", "gray"), resp.ServiceKey)
 	assert.Equal(t, "", resp.Language)
 	assert.Equal(t, []string{"getUserById", "listUsers"}, resp.Methods)
 }

ui-vue3/src/api/mock/mockApp.ts

@@ -212,13 +212,22 @@ Mock.mock('/mock/application/event', 'get', () => {
 
 Mock.mock(devTool.mockUrl('/mock/application/service/form'), 'get', () => {
   return {
-    code: 200,
+    code: 'Success',
     message: 'success',
     data: {
-      list: [],
+      list: [
+        {
+          serviceName: 'org.apache.dubbo.samples.CommentService',
+          serviceKey: 'org.apache.dubbo.samples.CommentService:1.0.0:group1',
+          version: '1.0.0',
+          group: 'group1',
+          providerAppName: 'shop-comment'
+        }
+      ],
       pageInfo: {
-        Total: 0,
-        NextOffset: ''
+        total: 1,
+        pageSize: 15,
+        pageOffset: 0
       }
     }
   }

ui-vue3/src/api/mock/mockService.ts

@@ -78,12 +78,13 @@ Mock.mock(devTool.mockUrl('/service/graph'), 'get', () => {
 })
 
 Mock.mock(devTool.mockUrl('/mock/service/search'), 'get', {
-  code: 200,
-  msg: 'success',
+  code: 'Success',
+  message: 'success',
   data: {
     pageInfo: {
-      Total: 8,
-      NextOffset: '0'
+      total: 8,
+      pageSize: 15,
+      pageOffset: 0
     },
     list: [
       {

ui-vue3/src/api/mock/mockServiceDetail.ts

@@ -19,16 +19,10 @@ import Mock from 'mockjs'
 import devTool from '@/utils/DevToolUtil'
 
 Mock.mock(devTool.mockUrl('/mock/service/detail'), 'get', {
-  code: 200,
+  code: 'Success',
   message: 'success',
   data: {
-    data: {
-      serviceName: 'org.apache.dubbo.samples.UserService',
-      serviceKey: 'org.apache.dubbo.samples.UserService:1.0.0:group1',
-      version: '1.0.0',
-      group: 'group1',
-      providers: ['provider-app-1', 'provider-app-2'],
-      consumers: ['consumer-app-1']
-    }
+    language: 'Java',
+    methods: ['getUserById', 'listUsers', 'createUser', 'updateUser', 'deleteUser']
   }
 })

ui-vue3/src/views/resources/applications/tabs/service.vue

@@ -141,15 +141,6 @@ const appName = computed(() => {
 function serviceInfo(params: any) {
   return getApplicationServiceForm(params).then(async (res) => {
     return promQueryList(res, ['qps', 'rt', 'request'], async (service: any) => {
-      service.versionGroupSelect = {}
-      service.versionGroupSelect.versionGroupArr = (service.versionGroups || []).map(
-        (item: any) => {
-          return (item.versionGroup =
-            (item.version ? 'version: ' + item.version + ', ' : '') +
-              (item.group ? 'group: ' + item.group : '') || '无')
-        }
-      )
-      service.versionGroupSelect.versionGroupValue = service.versionGroupSelect.versionGroupArr[0]
       let qps = await queryMetrics(
         `sum (dubbo_provider_qps_total{interface='${service.serviceName}'}) by (interface)`
       )

ui-vue3/src/views/resources/services/tabs/detail.vue

@@ -20,13 +20,13 @@
       <a-card title="服务详情">
         <a-descriptions :column="1" layout="vertical">
           <a-descriptions-item label="服务名称">
-            <p class="description-item-content">{{ serviceDetail.serviceName }}</p>
+            <p class="description-item-content">{{ serviceIdentity.serviceName }}</p>
           </a-descriptions-item>
           <a-descriptions-item label="版本">
-            <p class="description-item-content">{{ serviceDetail.version }}</p>
+            <p class="description-item-content">{{ serviceIdentity.version }}</p>
           </a-descriptions-item>
           <a-descriptions-item label="分组">
-            <p class="description-item-content">{{ serviceDetail.group }}</p>
+            <p class="description-item-content">{{ serviceIdentity.group }}</p>
           </a-descriptions-item>
           <a-descriptions-item label="语言">
             <p class="description-item-content">{{ serviceDetail.language }}</p>
@@ -45,27 +45,24 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { getServiceDetail } from '@/api/service/service'
 import { parseServiceKey } from '../serviceIdentity'
 
 const route = useRoute()
+const serviceIdentity = computed(() => parseServiceKey(route.params.pathId))
 
 const serviceDetail = ref<{
-  serviceName?: string
-  version?: string
-  group?: string
   language?: string
   methods?: string[]
 }>({})
 
 const onSearch = async () => {
-  const serviceIdentity = parseServiceKey(route.params.pathId)
   const { data } = await getServiceDetail({
-    serviceKey: serviceIdentity.serviceKey
+    serviceKey: serviceIdentity.value.serviceKey
   })
-  serviceDetail.value = data.data
+  serviceDetail.value = data
 }
 
 onSearch()