From f0669ba0ebd86cd6028789eca5aca18722d109c6 Mon Sep 17 00:00:00 2001 From: weitong Date: Mon, 6 Nov 2023 10:54:57 +0800 Subject: [PATCH] fix --- kyuubi-server/web-ui/src/api/editor/index.ts | 16 ++++--- kyuubi-server/web-ui/src/api/editor/types.ts | 42 +++++++++++++++++++ .../web-ui/src/locales/en_US/index.ts | 6 ++- .../web-ui/src/locales/zh_CN/index.ts | 4 +- .../src/views/editor/components/Editor.vue | 24 ++++++++--- 5 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 kyuubi-server/web-ui/src/api/editor/types.ts diff --git a/kyuubi-server/web-ui/src/api/editor/index.ts b/kyuubi-server/web-ui/src/api/editor/index.ts index ae91a2ede8d..67163af8782 100644 --- a/kyuubi-server/web-ui/src/api/editor/index.ts +++ b/kyuubi-server/web-ui/src/api/editor/index.ts @@ -16,8 +16,14 @@ */ import request from '@/utils/request' +import type { + IOpenSessionRequest, + IRunSqlRequest, + IGetSqlRowsetRequest, + IGetSqlMetadataRequest +} from './types' -export function openSession(data: Map): any { +export function openSession(data: IOpenSessionRequest): any { return request({ url: 'api/v1/sessions', method: 'post', @@ -32,7 +38,7 @@ export function closeSession(identifier: string): any { }) } -export function runSql(data: any, identifier: string): any { +export function runSql(data: IRunSqlRequest, identifier: string): any { return request({ url: `api/v1/sessions/${identifier}/operations/statement`, method: 'post', @@ -40,7 +46,7 @@ export function runSql(data: any, identifier: string): any { }) } -export function getSqlRowset(params: any): any { +export function getSqlRowset(params: IGetSqlRowsetRequest): any { return request({ url: `api/v1/operations/${params.operationHandleStr}/rowset`, method: 'get', @@ -48,7 +54,7 @@ export function getSqlRowset(params: any): any { }) } -export function getSqlMetadata(params: any): any { +export function getSqlMetadata(params: IGetSqlMetadataRequest): any { return request({ url: `api/v1/operations/${params.operationHandleStr}/resultsetmetadata`, method: 'get', @@ -56,7 +62,7 @@ export function getSqlMetadata(params: any): any { }) } -export function log(identifier: string): any { +export function getLog(identifier: string): any { return request({ url: `api/v1/operations/${identifier}/log`, method: 'get' diff --git a/kyuubi-server/web-ui/src/api/editor/types.ts b/kyuubi-server/web-ui/src/api/editor/types.ts new file mode 100644 index 00000000000..0bc4c2086c6 --- /dev/null +++ b/kyuubi-server/web-ui/src/api/editor/types.ts @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +interface IOpenSessionRequest { + 'kyuubi.engine.type': string +} + +interface IRunSqlRequest { + statement: string + runAsync: boolean +} + +interface IGetSqlRowsetRequest { + operationHandleStr: string + fetchorientation: 'FETCH_NEXT' + maxrows: number +} + +interface IGetSqlMetadataRequest { + operationHandleStr: string +} + +export { + IOpenSessionRequest, + IRunSqlRequest, + IGetSqlRowsetRequest, + IGetSqlMetadataRequest +} diff --git a/kyuubi-server/web-ui/src/locales/en_US/index.ts b/kyuubi-server/web-ui/src/locales/en_US/index.ts index afb751360ef..32c7a1f6175 100644 --- a/kyuubi-server/web-ui/src/locales/en_US/index.ts +++ b/kyuubi-server/web-ui/src/locales/en_US/index.ts @@ -37,7 +37,7 @@ export default { engine_ui: 'Engine UI', failure_reason: 'Failure Reason', session_properties: 'Session Properties', - no_data: 'No data yet', + no_data: 'No data', run_sql_tips: 'Run a sql to get result', operation: { text: 'Operation', @@ -56,6 +56,8 @@ export default { close_failed: 'Close {name} Failed', cancel_succeeded: 'Cancel {name} Succeeded', cancel_failed: 'Cancel {name} Failed', - run_failed: 'Run Sql Failed' + run_failed: 'Run Sql Failed', + get_sql_log_failed: 'Get Sql Log Failed', + get_sql_result_failed: 'Get Sql Result Failed' } } diff --git a/kyuubi-server/web-ui/src/locales/zh_CN/index.ts b/kyuubi-server/web-ui/src/locales/zh_CN/index.ts index be709978219..baffd6fb129 100644 --- a/kyuubi-server/web-ui/src/locales/zh_CN/index.ts +++ b/kyuubi-server/web-ui/src/locales/zh_CN/index.ts @@ -56,6 +56,8 @@ export default { close_failed: '关闭 {name} 失败', cancel_succeeded: '取消 {name} 成功', cancel_failed: '取消 {name} 失败', - run_failed: '运行失败' + run_failed: '运行失败', + get_sql_log_failed: '获取sql日志失败', + get_sql_result_failed: '获取sql结果失败' } } diff --git a/kyuubi-server/web-ui/src/views/editor/components/Editor.vue b/kyuubi-server/web-ui/src/views/editor/components/Editor.vue index 90da7ad84e7..695674340b0 100644 --- a/kyuubi-server/web-ui/src/views/editor/components/Editor.vue +++ b/kyuubi-server/web-ui/src/views/editor/components/Editor.vue @@ -19,7 +19,10 @@