Skip to content

Commit 664a559

Browse files
committed
fix the issue that extesion js cannot be loaded
1 parent f8547ca commit 664a559

File tree

4 files changed

+33
-20
lines changed

4 files changed

+33
-20
lines changed

console/atest-ui/src/App.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ API.GetMenus((menus) => {
153153
<el-icon><Guide /></el-icon>
154154
<template #title>{{ t('title.mock' )}}</template>
155155
</el-menu-item>
156+
<el-menu-item index="data" test-id="data-menu">
157+
<el-icon><DataAnalysis /></el-icon>
158+
<template #title>{{ t('title.data' )}}</template>
159+
</el-menu-item>
156160
<el-menu-item index="store">
157161
<el-icon><location /></el-icon>
158162
<template #title>{{ t('title.stores') }}</template>

console/atest-ui/src/views/Extension.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<script setup lang="ts">
2+
import { ref } from 'vue'
23
import { API } from './net';
34
45
interface Props {
56
name: string
67
}
78
const props = defineProps<Props>()
8-
9+
const loading = ref(true)
910
const loadPlugin = async (): Promise<void> => {
1011
try {
1112
API.GetPageOfCSS(props.name, (d) => {
@@ -45,7 +46,8 @@ try {
4546
</script>
4647

4748
<template>
48-
<div id="plugin-container">
49-
{{ props.name }}
49+
<div id="plugin-container"
50+
v-loading="loading"
51+
:element-loading-text="props.name + ' is loading...'">
5052
</div>
5153
</template>

pkg/server/remote_server.go

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,6 +1385,8 @@ func (s *server) GetBinding(ctx context.Context, in *SimpleName) (result *Common
13851385
return
13861386
}
13871387

1388+
var uiExtensionLoaders = make(map[string]testing.Writer)
1389+
13881390
func (s *server) GetMenus(ctx context.Context, _ *Empty) (result *MenuList, err error) {
13891391
loader := s.getLoader(ctx)
13901392
defer loader.Close()
@@ -1412,6 +1414,7 @@ func (s *server) GetMenus(ctx context.Context, _ *Empty) (result *MenuList, err
14121414
Icon: menu.Icon,
14131415
Index: menu.Index,
14141416
}
1417+
uiExtensionLoaders[menu.Index] = loader
14151418
}
14161419
continue
14171420
}
@@ -1422,6 +1425,7 @@ func (s *server) GetMenus(ctx context.Context, _ *Empty) (result *MenuList, err
14221425
Icon: menu.Icon,
14231426
Index: menu.Index,
14241427
})
1428+
uiExtensionLoaders[menu.Index] = loader
14251429
}
14261430
}
14271431
}
@@ -1441,27 +1445,31 @@ func isSystemMenu(index string) bool {
14411445
}
14421446

14431447
func (s *server) GetPageOfJS(ctx context.Context, in *SimpleName) (result *CommonResult, err error) {
1444-
loader := s.getLoader(ctx)
1445-
defer loader.Close()
1446-
1447-
result = &CommonResult{
1448-
Success: true,
1449-
}
1450-
if js, err := loader.GetPageOfJS(in.Name); err == nil {
1451-
result.Message = js
1448+
result = &CommonResult{}
1449+
if loader, ok := uiExtensionLoaders[in.Name]; ok {
1450+
if js, err := loader.GetPageOfJS(in.Name); err == nil {
1451+
result.Message = js
1452+
result.Success = true
1453+
} else {
1454+
result.Message = err.Error()
1455+
}
1456+
} else {
1457+
result.Message = fmt.Sprintf("not found loader for %s", in.Name)
14521458
}
14531459
return
14541460
}
14551461

14561462
func (s *server) GetPageOfCSS(ctx context.Context, in *SimpleName) (result *CommonResult, err error) {
1457-
loader := s.getLoader(ctx)
1458-
defer loader.Close()
1459-
1460-
result = &CommonResult{
1461-
Success: true,
1462-
}
1463-
if css, err := loader.GetPageOfCSS(in.Name); err == nil {
1464-
result.Message = css
1463+
result = &CommonResult{}
1464+
if loader, ok := uiExtensionLoaders[in.Name]; ok {
1465+
if js, err := loader.GetPageOfCSS(in.Name); err == nil {
1466+
result.Message = js
1467+
result.Success = true
1468+
} else {
1469+
result.Message = err.Error()
1470+
}
1471+
} else {
1472+
result.Message = fmt.Sprintf("not found loader for %s", in.Name)
14651473
}
14661474
return
14671475
}

pkg/testing/remote/grpc_store.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ func (g *gRPCLoader) GetMenus() (result []*testing.Menu, err error) {
389389
})
390390
}
391391
}
392-
fmt.Println("get menus, error", err)
393392
return
394393
}
395394

0 commit comments

Comments
 (0)