Skip to content

Commit c3cd249

Browse files
committed
fix some issue of getting static files
1 parent 9d688d3 commit c3cd249

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed

cmd/server.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,14 @@ func (o *serverOption) dataFromExtension(extServer server.UIExtensionServer) fun
542542
}
543543
ctx = context.WithValue(ctx, k, v)
544544
}
545-
extServer.GetPageOfStatic(ctx, &server.SimpleName{
545+
result, err := extServer.GetPageOfStatic(ctx, &server.SimpleName{
546546
Name: pathParams["data"],
547547
})
548+
if err == nil {
549+
w.Write([]byte(result.GetMessage()))
550+
} else {
551+
w.Write([]byte(err.Error()))
552+
}
548553
}
549554
}
550555

console/atest-ui/vite.config.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ export default defineConfig({
6868
target: 'http://127.0.0.1:8080',
6969
changeOrigin: true,
7070
},
71+
'/data': {
72+
target: 'http://127.0.0.1:8080',
73+
changeOrigin: true,
74+
},
7175
},
7276
},
7377
})

pkg/server/remote_server.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,16 +1533,30 @@ func (s *server) GetPageOfCSS(ctx context.Context, in *SimpleName) (result *Comm
15331533

15341534
func (s *server) GetPageOfStatic(ctx context.Context, in *SimpleName) (result *CommonResult, err error) {
15351535
result = &CommonResult{}
1536-
extName := ctx.Value("X-Extension-Name")
1537-
if loader, ok := uiExtensionLoaders[extName.(string)]; ok {
1536+
extNameInter := ctx.Value("X-Extension-Name")
1537+
if extNameInter == nil {
1538+
result.Message = "X-Extension-Name is required"
1539+
result.Success = false
1540+
return
1541+
}
1542+
1543+
var extName string
1544+
switch v := extNameInter.(type) {
1545+
case []string:
1546+
extName = v[0]
1547+
case string:
1548+
extName = v
1549+
}
1550+
1551+
if loader, ok := uiExtensionLoaders[extName]; ok {
15381552
if js, err := loader.GetPageOfStatic(in.Name); err == nil {
15391553
result.Message = js
15401554
result.Success = true
15411555
} else {
15421556
result.Message = err.Error()
15431557
}
15441558
} else {
1545-
result.Message = fmt.Sprintf("not found loader for %s", in.Name)
1559+
result.Message = fmt.Sprintf("not found loader for %s", extName)
15461560
}
15471561
return
15481562
}

0 commit comments

Comments
 (0)