PullRequest: 474 fix/.dev-4.3.1-2884

yezaoshu · yezaoshu · commit 834eadbdc965 · 2024-07-22T15:23:28.000+08:00
Merge branch 'fix/dev-4.3.1-2884 of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.3.1 https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/474 Signed-off-by: 晓康 <xxk268858@oceanbase.com> * fix: add traceEmptyReason in profile trace tab * fix: rename the traceComponent * fix: resultSet log with [withQueryProfile] params limits * Fixes oceanbase/odc#2884 * style: update object search Locate description
diff --git a/src/component/ExecuteSqlDetailModal/index.tsx b/src/component/ExecuteSqlDetailModal/index.tsx
@@ -15,7 +15,7 @@ import { handleShowOutputFilter } from '@/page/Workspace/components/SQLExplain';
 import { formatMessage } from '@/util/intl';
 import { getFullLinkTraceDownloadUrl } from '@/common/network/sql';
 import { downloadFile } from '@/util/utils';
-import TraceComp from '@/page/Workspace/components/Trace/TraceComp';
+import TraceComp from '@/page/Workspace/components/Trace/TraceComponent';
 import { TraceTabsType } from '@/page/Workspace/components/Trace';
 import {
   ProfileType,
@@ -49,6 +49,8 @@ const ExecuteSQLDetailModal: React.FC<IProps> = ({ modalStore }: IProps) => {
   const [pageLoading, setPageLoading] = useState<boolean>(false);
   const [searchValue, setSearchValue] = useState<string>(null);
   const finished = !!data?.graph?.status && data?.graph?.status === IProfileStatus.FINISHED;
+  const enableTrace =
+    finished && modalStore?.executeSqlDetailData?.session?.params?.fullLinkTraceEnabled;
   const getExecuteRadioOption = () => {
     return [
       {
@@ -71,7 +73,7 @@ const ExecuteSQLDetailModal: React.FC<IProps> = ({ modalStore }: IProps) => {
           id: 'src.component.ExecuteSqlDetailModal.0B221F0A',
           defaultMessage: '全链路诊断',
         }),
-        disabled: !finished,
+        disabled: !enableTrace,
       },
     ];
   };
@@ -87,6 +89,9 @@ const ExecuteSQLDetailModal: React.FC<IProps> = ({ modalStore }: IProps) => {
   ];
 
   const getDisabledTooltip = (val) => {
+    if (modalStore?.executeSqlDetailData?.traceEmptyReason) {
+      return modalStore?.executeSqlDetailData?.traceEmptyReason;
+    }
     if (finished || !data?.graph?.status) {
       return val;
     }
diff --git a/src/component/Task/component/TableSelecter/index.tsx b/src/component/Task/component/TableSelecter/index.tsx
@@ -191,6 +191,7 @@ const getTreeData = (validTableList: IDataBaseWithTable[], isSourceTree = false)
       disabled: hasGetTableList && tableList.length === 0,
       expandable: true,
       children,
+      isLeaf: false,
     };
   });
   return allTreeData;
diff --git a/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/DatabaseList.tsx b/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/DatabaseList.tsx
@@ -99,13 +99,11 @@ const DatabaseList = ({
 
   if (database && !searchKey) {
     return (
-      <Button
-        type="link"
-        style={{ padding: '4px 12px', height: 28, display: 'inline-block' }}
-        onClick={(e) => openSql(e, database)}
-      >
-        定位到当前数据库
-      </Button>
+      <div className={styles.content}>
+        <div className={styles.databaseItem} onClick={(e) => openSql(e, database)}>
+          {`定位到数据库 "${database?.name}"`}
+        </div>
+      </div>
     );
   }
   return (
diff --git a/src/page/Workspace/components/DDLResultSet/index.tsx b/src/page/Workspace/components/DDLResultSet/index.tsx
@@ -166,7 +166,12 @@ interface IProps {
   onShowExecuteDetail?: () => void;
   onShowTrace?: () => void;
   onUpdateEditing?: (editing: boolean) => void;
-  onOpenExecutingDetailModal?: (traceId: string, sql?: string) => void;
+  onOpenExecutingDetailModal?: (
+    traceId: string,
+    sql?: string,
+    sessionId?: string,
+    traceEmptyReason?: string,
+  ) => void;
 }
 const DDLResultSet: React.FC<IProps> = function (props) {
   const {
@@ -708,7 +713,7 @@ const DDLResultSet: React.FC<IProps> = function (props) {
         icon={<Icon component={SqlProfile} />}
         onClick={() => {
           updateExecutePlanGuideCache();
-          onOpenExecutingDetailModal?.(traceId, originSql);
+          onOpenExecutingDetailModal?.(traceId, originSql, null, traceEmptyReason);
         }}
         tip={executeGuideTipContent()}
         overlayInnerStyle={{ width: 300 }}
diff --git a/src/page/Workspace/components/SQLResultSet/ExecuteHistory.tsx b/src/page/Workspace/components/SQLResultSet/ExecuteHistory.tsx
@@ -41,7 +41,12 @@ interface IProps {
   onShowExecuteDetail: (sql: string, tag: string) => void;
   resultHeight: number;
   sqlStore?: SQLStore;
-  onOpenExecutingDetailModal?: (traceId: string, sql?: string, sessionId?: string) => void;
+  onOpenExecutingDetailModal?: (
+    traceId: string,
+    sql?: string,
+    sessionId?: string,
+    traceEmptyReason?: string,
+  ) => void;
 }
 
 function getResultText(rs: ISqlExecuteResult) {
@@ -199,7 +204,16 @@ const ExecuteHistory: React.FC<IProps> = function (props) {
         render: (value: string, row: any) => {
           if (!value) return '-';
           return row?.isSupportProfile ? (
-            <Link onClick={() => onOpenExecutingDetailModal(value, row?.originSql, row?.sessionId)}>
+            <Link
+              onClick={() =>
+                onOpenExecutingDetailModal(
+                  value,
+                  row?.originSql,
+                  row?.sessionId,
+                  row?.traceEmptyReason,
+                )
+              }
+            >
               {value}
             </Link>
           ) : (
diff --git a/src/page/Workspace/components/SQLResultSet/index.tsx b/src/page/Workspace/components/SQLResultSet/index.tsx
@@ -38,6 +38,7 @@ import SQLResultLog from './SQLResultLog';
 import DBPermissionTable from './DBPermissionTable';
 import { IUnauthorizedDBResources } from '@/d.ts/table';
 import { ProfileType } from '@/component/ExecuteSqlDetailModal/constant';
+import sessionManager from '@/store/sessionManager';
 
 export const recordsTabKey = 'records';
 export const sqlLintTabKey = 'sqlLint';
@@ -236,15 +237,21 @@ const SQLResultSet: React.FC<IProps> = function (props) {
   const stopRunning = () => {
     sqlStore.stopExec(ctx.props.pageKey, ctx?.getSession()?.sessionId);
   };
-  const onOpenExecutingDetailModal = (id: string, sql?: string, sessionId?: string) => {
-    const session = sessionId ? { sessionId: sessionId } : ctx?.getSession();
+  const onOpenExecutingDetailModal = (
+    id: string,
+    sql?: string,
+    sessionId?: string,
+    traceEmptyReason?: string,
+  ) => {
+    const session = sessionId ? sessionManager.sessionMap.get(sessionId) : ctx?.getSession();
     modalStore.changeExecuteSqlDetailModalVisible(
       true,
       id,
       sql,
       session,
       ctx?.editor.getSelectionContent(),
       ProfileType.Execute,
+      traceEmptyReason,
     );
   };
 
@@ -477,7 +484,7 @@ const SQLResultSet: React.FC<IProps> = function (props) {
                       stopRunning={stopRunning}
                       onOpenExecutingDetailModal={onOpenExecutingDetailModal}
                       loading={sqlStore.logLoading}
-                      isSupportProfile={isSupportProfile}
+                      isSupportProfile={isSupportProfile && set?.withQueryProfile}
                     />
                   ),
                 };
diff --git a/src/page/Workspace/components/Trace/TraceComponent.tsx b/src/page/Workspace/components/Trace/TraceComponent.tsx
diff --git a/src/page/Workspace/components/Trace/index.tsx b/src/page/Workspace/components/Trace/index.tsx
@@ -27,7 +27,7 @@ import { getFullLinkTrace, getFullLinkTraceDownloadUrl } from '@/common/network/
 import { downloadFile, formatTimeTemplatMicroSeconds } from '@/util/utils';
 import { TraceSpan } from '@/d.ts';
 import SessionStore from '@/store/sessionManager/session';
-import TraceComp from './TraceComp';
+import TraceComp from './TraceComponent';
 export const InfoRender = ({ infos }) => {
   return (
     <Descriptions column={1}>
diff --git a/src/store/modal.ts b/src/store/modal.ts
@@ -431,6 +431,7 @@ export class ModalStore {
     session?: any;
     selectedSQL?: any;
     profileType?: ProfileType;
+    traceEmptyReason?: string;
   } = null;
 
   @action
@@ -441,6 +442,7 @@ export class ModalStore {
     session?: any,
     selectedSQL?: any,
     profileType?: ProfileType,
+    traceEmptyReason?: string,
   ) {
     this.executeSqlDetailModalVisible = v;
     this.executeSqlDetailData = {
@@ -449,6 +451,7 @@ export class ModalStore {
       session,
       selectedSQL: selectedSQL,
       profileType: profileType,
+      traceEmptyReason: traceEmptyReason,
     };
   }
 
