Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor: simplify the code for sql result panel (#19256)

ecmadaoe42407015638
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue
index 2cf64414d6..c5c3e29981 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue
@@ -24,7 +24,6 @@
setBinaryFormat({
colIndex,
rowIndex,
- setIndex,
format,
})
"
@@ -77,9 +76,7 @@ import { getPlainValue } from "./common/utils";
const props = defineProps<{
value: RowValue;
- setIndex: number;
rowIndex: number;
- originalRowIndex: number;
colIndex: number;
allowSelect?: boolean;
columnType: string; // Column type from QueryResult
@@ -114,7 +111,6 @@ const binaryFormat = computed(() => {
return getBinaryFormat({
rowIndex: props.rowIndex,
colIndex: props.colIndex,
- setIndex: props.setIndex,
});
});
@@ -238,8 +234,7 @@ const handleClick = (e: MouseEvent) => {
const showDetail = () => {
detail.value = {
- set: props.setIndex,
- row: props.originalRowIndex,
+ row: props.rowIndex,
col: props.colIndex,
};
};
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue
index 88881f8170..0025b74963 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue
@@ -15,7 +15,7 @@
<tr>
<!-- header for the index -->
<th
- :key="`${setIndex}-0-index`"
+ :key="`0-index`"
class="group relative py-2 shrink-0 tracking-wider border-x border-block-border dark:border-zinc-500 w-px whitespace-nowrap"
v-bind="tableResize.getColumnProps(0)"
>
@@ -37,7 +37,7 @@
<!-- header for columns -->
<th
v-for="(header, columnIndex) of columns"
- :key="`${setIndex}-${columnIndex + 1}-${header.id}`"
+ :key="`${columnIndex + 1}-${header.id}`"
class="group relative px-3 py-2 min-w-8 text-left text-xs font-medium text-gray-500 dark:text-gray-300 tracking-wider border-block-border dark:border-zinc-500"
:class="{
'border-r': columnIndex < (columns.length - 1),
@@ -81,14 +81,12 @@
:format="
getBinaryFormat({
colIndex: columnIndex,
- setIndex,
})
"
@update:format="
(format: BinaryFormat) =>
setBinaryFormat({
colIndex: columnIndex,
- setIndex,
format,
})
"
@@ -117,7 +115,7 @@
>
<template #default="{ item: row, index: rowIndex }: { item: { key: number; item: QueryRow; }; index: number; }">
<div
- :key="`${setIndex}-${rowIndex}`"
+ :key="rowIndex"
class="flex group"
:data-row-index="rowIndex"
:style="{
@@ -127,7 +125,7 @@
>
<!-- the index cell -->
<div
- :key="`${setIndex}-${rowIndex}-0`"
+ :key="`${rowIndex}-0`"
class="relative flex items-center shrink-0 text-sm dark:text-gray-100 leading-5 whitespace-nowrap break-all border-block-border dark:border-zinc-500 group-even:bg-gray-100/50 dark:group-even:bg-gray-700/50"
:class="{
'border-r': true,
@@ -169,7 +167,7 @@
<!-- other cells -->
<div
v-for="(cell, columnIndex) of row.item.values"
- :key="`${setIndex}-${rowIndex}-${columnIndex + 1}`"
+ :key="`${rowIndex}-${columnIndex + 1}`"
class="relative shrink-0 text-sm dark:text-gray-100 leading-5 whitespace-nowrap break-all border-block-border dark:border-zinc-500 group-even:bg-gray-100/50 dark:group-even:bg-gray-700/50"
:class="{
'border-r': columnIndex < (row.item.values.length - 1),
@@ -188,15 +186,13 @@
:value="cell"
:keyword="search.query"
:scope="search.scopes.find(scope => scope.id === columns[columnIndex]?.id)"
- :set-index="setIndex"
:row-index="rowIndex"
- :original-row-index="row.key"
:col-index="columnIndex"
:allow-select="true"
:column-type="getColumnTypeByIndex(columnIndex)"
- class="h-full w-full truncate"
:database="database"
:class="{
+ 'h-full w-full truncate': true,
'bg-accent/10! dark:bg-accent/40!': activeRowIndex === rowIndex
}"
/>
@@ -241,7 +237,6 @@ import useTableColumnWidthLogic from "./useTableResize";
const props = defineProps<{
rows: ResultTableRow[];
columns: ResultTableColumn[];
- setIndex: number;
activeRowIndex: number;
isSensitiveColumn: (index: number) => boolean;
getMaskingReason?: (index: number) => MaskingReason | undefined;
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/binary-format-store.ts b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/binary-format-store.ts
index 72f90a378f..40c18296c3 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/binary-format-store.ts
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/binary-format-store.ts
@@ -1,12 +1,10 @@
-import type { InjectionKey, Ref } from "vue";
+import type { InjectionKey } from "vue";
import { inject, provide, ref } from "vue";
export type BinaryFormat = "DEFAULT" | "BINARY" | "HEX" | "TEXT" | "BOOLEAN";
interface ColumnKeyParams {
colIndex: number;
- setIndex?: number;
- contextId: string;
}
interface CellKeyParams extends ColumnKeyParams {
@@ -15,20 +13,19 @@ interface CellKeyParams extends ColumnKeyParams {
// Get a unique key for a cell's row/column position
const getCellKey = (params: CellKeyParams): string => {
- const { rowIndex, colIndex, setIndex = 0, contextId } = params;
- return `${contextId}:${setIndex}:${rowIndex}:${colIndex}`;
+ const { rowIndex } = params;
+ return `row_${rowIndex}:${getColumnKey(params)}`;
};
// Get a key for a column
const getColumnKey = (params: ColumnKeyParams): string => {
- const { colIndex, setIndex = 0, contextId } = params;
- return `${contextId}:${setIndex}:col:${colIndex}`;
+ const { colIndex } = params;
+ return `col_${colIndex}`;
};
interface GetBinaryFormatParams {
rowIndex?: number;
colIndex: number;
- setIndex: number;
}
// Parameter interfaces for the public API functions
@@ -36,7 +33,7 @@ interface BinaryFormatParams extends GetBinaryFormatParams {
format: BinaryFormat;
}
-type BinaryFormatContext = {
+export type BinaryFormatContext = {
getBinaryFormat: (params: GetBinaryFormatParams) => BinaryFormat | undefined;
setBinaryFormat: (params: BinaryFormatParams) => void;
};
@@ -45,20 +42,18 @@ const KEY = Symbol(
"bb.sql-editor.result-view.binary-format"
) as InjectionKey<BinaryFormatContext>;
-export const provideBinaryFormatContext = (contextId: Ref<string>) => {
+export const provideBinaryFormatContext = () => {
const formattedBinaryValues = ref<Map<string, BinaryFormat>>(new Map());
const getBinaryFormat = (
params: GetBinaryFormatParams
): BinaryFormat | undefined => {
- const { rowIndex, colIndex, setIndex } = params;
+ const { rowIndex, colIndex } = params;
if (rowIndex !== undefined) {
// find format for a specific cell.
const key = getCellKey({
rowIndex,
colIndex,
- setIndex,
- contextId: contextId.value,
});
if (formattedBinaryValues.value.has(key)) {
return formattedBinaryValues.value.get(key);
@@ -67,26 +62,20 @@ export const provideBinaryFormatContext = (contextId: Ref<string>) => {
// fallback to column format.
const key = getColumnKey({
colIndex,
- setIndex,
- contextId: contextId.value,
});
return formattedBinaryValues.value.get(key);
};
const setBinaryFormat = (params: BinaryFormatParams): void => {
- const { rowIndex, colIndex, format, setIndex } = params;
+ const { rowIndex, colIndex, format } = params;
const key =
rowIndex !== undefined
? getCellKey({
rowIndex,
colIndex,
- setIndex,
- contextId: contextId.value,
})
: getColumnKey({
colIndex,
- setIndex,
- contextId: contextId.value,
});
// If setting to DEFAULT, delete the key so it falls through to column/auto-detect
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts
index b54084a972..503fad675d 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts
@@ -14,11 +14,11 @@ import { useI18n } from "vue-i18n";
import { pushNotification } from "@/store";
import type { QueryRow, RowValue } from "@/types/proto-es/v1/sql_service_pb";
import { extractSQLRowValuePlain, isDescendantOf } from "@/utils";
-import { useSQLResultViewContext } from "../../context";
+import { type SQLResultViewContext } from "../../context";
import {
+ type BinaryFormatContext,
detectBinaryFormat,
formatBinaryValue,
- useBinaryFormatContext,
} from "./binary-format-store";
import type { ResultTableColumn, ResultTableRow } from "./types";
@@ -46,12 +46,16 @@ export const KEY = Symbol(
export const provideSelectionContext = ({
rows,
columns,
+ binaryFormatContext,
+ resultViewContext,
}: {
rows: ComputedRef<ResultTableRow[]>;
columns: ComputedRef<ResultTableColumn[]>;
+ binaryFormatContext: BinaryFormatContext;
+ resultViewContext: SQLResultViewContext;
}) => {
const { t } = useI18n();
- const { getBinaryFormat } = useBinaryFormatContext();
+ const { getBinaryFormat } = binaryFormatContext;
const { copy: copyTextToClipboard, isSupported } = useClipboard({
legacy: true,
@@ -62,7 +66,6 @@ export const provideSelectionContext = ({
rows: [],
columns: [],
});
- const resultViewContext = useSQLResultViewContext();
const disabled = computed(() => {
return resultViewContext.disallowCopyingData.value;
});
@@ -141,14 +144,10 @@ export const provideSelectionContext = ({
}) => {
// Special handling for binary data (proto-es oneof pattern)
if (value && value.kind?.case === "bytesValue") {
- // Get the result set index if available
- const setIndex = resultViewContext.detail?.value?.set ?? 0;
-
// First check if there's a column format override
const binaryFormat = getBinaryFormat({
colIndex,
rowIndex,
- setIndex,
});
if (binaryFormat) {
// Column format overrides take precedence
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DetailPanel/DetailPanel.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/DetailPanel/DetailPanel.vue
index a4bbb9697a..1f240c97cf 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DetailPanel/DetailPanel.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DetailPanel/DetailPanel.vue
@@ -85,7 +85,6 @@
setBinaryFormat({
colIndex: detail!.col,
rowIndex: detail!.row,
- setIndex: detail!.set,
format,
})
"
@@ -158,7 +157,6 @@ import {
import { NButton, NPopover, NScrollbar, NTooltip } from "naive-ui";
import { computed } from "vue";
import { CopyButton, DrawerContent } from "@/components/v2";
-import type { QueryResult } from "@/types/proto-es/v1/sql_service_pb";
import {
STORAGE_KEY_SQL_EDITOR_DETAIL_FORMAT,
STORAGE_KEY_SQL_EDITOR_DETAIL_LINE_WRAP,
@@ -169,11 +167,16 @@ import {
type BinaryFormat,
useBinaryFormatContext,
} from "../DataTable/common/binary-format-store";
+import type {
+ ResultTableColumn,
+ ResultTableRow,
+} from "../DataTable/common/types";
import { getPlainValue } from "../DataTable/common/utils";
import PrettyJSON from "./PrettyJSON.vue";
const props = defineProps<{
- result: QueryResult;
+ rows: ResultTableRow[];
+ columns: ResultTableColumn[];
}>();
const { dark, detail, disallowCopyingData } = useSQLResultViewContext();
@@ -195,14 +198,14 @@ const rawValue = computed(() => {
}
const { row, col } = detail.value;
- return props.result.rows[row].values[col];
+ return props.rows[row].item.values[col];
});
const columnType = computed(() => {
if (!detail.value) {
return "";
}
- return props.result.columnTypeNames[detail.value.col];
+ return props.columns[detail.value.col].columnType;
});
const binaryFormat = computed(() => {
@@ -212,7 +215,6 @@ const binaryFormat = computed(() => {
return getBinaryFormat({
rowIndex: detail.value.row,
colIndex: detail.value.col,
- setIndex: detail.value.set,
});
});
@@ -236,7 +238,7 @@ const guessedIsJSON = computed(() => {
});
const totalCount = computed(() => {
- return props.result.rows.length;
+ return props.rows.length;
});
const contentClass = computed(() => {
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/EmptyView.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/EmptyView.vue
index 6cef98dfe0..ff9f796bd7 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/EmptyView.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/EmptyView.vue
@@ -8,7 +8,7 @@
</template>
<script lang="ts" setup>
-import { useSQLResultViewContext } from "./context";
-
-const { dark } = useSQLResultViewContext();
+defineProps<{
+ dark: boolean;
+}>();
</script>
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/ErrorView/ErrorView.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/ErrorView/ErrorView.vue
index b53cddf315..f4bbc318f6 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/ErrorView/ErrorView.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/ErrorView/ErrorView.vue
@@ -35,17 +35,16 @@ import { positionWithOffset } from "@/components/MonacoEditor/utils";
import type { SQLEditorQueryParams, SQLResultSetV1 } from "@/types";
import { useSQLEditorContext } from "@/views/sql-editor/context";
import { activeSQLEditorRef } from "@/views/sql-editor/EditorPanel/StandardPanel/state";
-import { useSQLResultViewContext } from "../context";
import PostgresError from "./PostgresError.vue";
const props = defineProps<{
+ dark: boolean;
error: string | undefined;
executeParams?: SQLEditorQueryParams;
resultSet?: SQLResultSetV1;
}>();
const { t } = useI18n();
-const { dark } = useSQLResultViewContext();
const { events: editorEvents } = useSQLEditorContext();
// Get the failing statement from the result
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue
index 84e88dc50b..0c1482f3b7 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue
@@ -8,6 +8,7 @@
<template v-if="viewMode === 'SINGLE-RESULT'">
<ErrorView
v-if="resultSet.results[0]?.error"
+ :dark="dark"
:error="resultSet.results[0]?.error"
:execute-params="executeParams"
:result-set="resultSet"
@@ -23,10 +24,11 @@
</ErrorView>
<SingleResultViewV1
v-else
+ :dark="dark"
+ :disallow-copying-data="disallowCopyingData"
:params="executeParams"
:database="database"
:result="resultSet.results[0]"
- :set-index="0"
:show-export="!effectiveQueryDataPolicy.disableExport"
:maximum-export-count="effectiveQueryDataPolicy.maximumResultRows"
@export="handleExportBtnClick"
@@ -61,6 +63,7 @@
</template>
<ErrorView
v-if="result.error"
+ :dark="dark"
:error="result.error"
:execute-params="executeParams"
:result-set="resultSet"
@@ -76,10 +79,11 @@
</ErrorView>
<SingleResultViewV1
v-else
+ :dark="dark"
+ :disallow-copying-data="disallowCopyingData"
:params="executeParams"
:database="database"
:result="result"
- :set-index="i"
:show-export="false"
:maximum-export-count="effectiveQueryDataPolicy.maximumResultRows"
@export="handleExportBtnClick"
@@ -118,10 +122,11 @@
</NTabs>
</template>
<template v-else-if="viewMode === 'EMPTY'">
- <EmptyView />
+ <EmptyView :dark="dark" />
</template>
<template v-else-if="viewMode === 'ERROR'">
<ErrorView
+ :dark="dark"
:error="resultSet.error"
:execute-params="executeParams"
:result-set="resultSet"
@@ -157,10 +162,6 @@
{{ $t("sql-editor.table-empty-placeholder") }}
</template>
</div>
-
- <Drawer v-if="detail && resultSet" :show="!!detail" @close="detail = undefined">
- <DetailPanel :result="viewMode === 'SINGLE-RESULT' ? resultSet.results[0] : filteredResults[detail.set]" />
- </Drawer>
</NConfigProvider>
</template>
@@ -176,7 +177,7 @@ import {
NTabs,
NTooltip,
} from "naive-ui";
-import { computed, ref, toRef } from "vue";
+import { computed } from "vue";
import { useI18n } from "vue-i18n";
import { darkThemeOverrides } from "@/../naive-ui.config";
import { BBSpin } from "@/bbkit";
@@ -187,7 +188,6 @@ import type {
ExportOption,
} from "@/components/DataExportButton.vue";
import DataExportButton from "@/components/DataExportButton.vue";
-import { Drawer } from "@/components/v2";
import { useSQLEditorTabStore, useSQLStore } from "@/store";
import {
usePolicyV1Store,
@@ -201,10 +201,6 @@ import {
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import { ExportRequestSchema } from "@/types/proto-es/v1/sql_service_pb";
import { extractDatabaseResourceName } from "@/utils";
-import type { SQLResultViewContext } from "./context";
-import { provideSQLResultViewContext } from "./context";
-import { provideBinaryFormatContext } from "./DataTable/common/binary-format-store";
-import DetailPanel from "./DetailPanel";
import EmptyView from "./EmptyView.vue";
import ErrorView from "./ErrorView";
import RequestQueryButton from "./RequestQueryButton.vue";
@@ -219,7 +215,6 @@ const props = withDefaults(
resultSet?: SQLResultSetV1;
loading?: boolean;
dark?: boolean;
- contextId: string;
}>(),
{
executeParams: undefined,
@@ -241,10 +236,6 @@ const { policy: effectiveQueryDataPolicy } = useQueryDataPolicy(
computed(() => props.database.project)
);
-const detail: SQLResultViewContext["detail"] = ref(undefined);
-
-provideBinaryFormatContext(computed(() => props.contextId));
-
const permissionDeniedError = computed(
(): PermissionDeniedDetail | undefined => {
for (const result of props.resultSet?.results ?? []) {
@@ -319,12 +310,6 @@ const filteredResults = computed(() => {
});
});
-provideSQLResultViewContext({
- dark: toRef(props, "dark"),
- disallowCopyingData,
- detail,
-});
-
const handleExportBtnClick = async ({
options,
resolve,
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue
index e5fc01174a..9420a2def2 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue
@@ -10,7 +10,7 @@
</template>
<template v-if="viewMode === 'RESULT'">
<BBAttention v-if="result.error" class="w-full mb-2" :type="'error'">
- <ErrorView :error="result.error" />
+ <ErrorView :dark="dark" :error="result.error" />
</BBAttention>
<div
class="result-toolbar relative w-full shrink-0 flex flex-row gap-x-4 justify-between items-center mb-2 hide-scrollbar"
@@ -101,7 +101,6 @@
ref="dataTableRef"
:rows="rows"
:columns="columns"
- :set-index="setIndex"
:is-sensitive-column="isSensitiveColumn"
:get-masking-reason="getMaskingReason"
:database="database"
@@ -113,7 +112,6 @@
ref="dataTableRef"
:rows="rows"
:columns="columns"
- :set-index="setIndex"
:is-sensitive-column="isSensitiveColumn"
:get-masking-reason="getMaskingReason"
:database="database"
@@ -231,8 +229,19 @@
</div>
</template>
<template v-else-if="viewMode === 'EMPTY'">
- <EmptyView />
+ <EmptyView :dark="dark" />
</template>
+
+ <Drawer
+ v-if="detail"
+ :show="!!detail"
+ @close="detail = undefined"
+ >
+ <DetailPanel
+ :columns="columns"
+ :rows="rows"
+ />
+ </Drawer>
</template>
<script lang="ts" setup>
@@ -241,7 +250,7 @@ import { isEmpty } from "lodash-es";
import { ArrowDownIcon, ArrowUpIcon, XIcon } from "lucide-vue-next";
import { NButton, NFormItem, NSwitch, NTooltip } from "naive-ui";
import { v4 as uuidv4 } from "uuid";
-import { computed, nextTick, reactive, ref, watch } from "vue";
+import { computed, nextTick, reactive, ref, toRef, watch } from "vue";
import { useI18n } from "vue-i18n";
import { BBAttention } from "@/bbkit";
import AdvancedSearch from "@/components/AdvancedSearch";
@@ -253,7 +262,7 @@ import type {
} from "@/components/DataExportButton.vue";
import DataExportButton from "@/components/DataExportButton.vue";
import EllipsisText from "@/components/EllipsisText.vue";
-import { CopyButton, RichDatabaseName } from "@/components/v2";
+import { CopyButton, Drawer, RichDatabaseName } from "@/components/v2";
import { useExecuteSQL } from "@/composables/useExecuteSQL";
import { DISMISS_PLACEHOLDER } from "@/plugins/ai/components/state";
import { useSQLEditorStore, useSQLEditorTabStore } from "@/store";
@@ -277,7 +286,11 @@ import {
isNullOrUndefined,
type SearchParams,
} from "@/utils";
-import { useSQLResultViewContext } from "./context";
+import {
+ provideSQLResultViewContext,
+ type SQLResultViewContext,
+} from "./context";
+import { provideBinaryFormatContext } from "./DataTable/common/binary-format-store";
import { provideSelectionContext } from "./DataTable/common/selection-logic";
import type {
ResultTableColumn,
@@ -285,6 +298,7 @@ import type {
SortState,
} from "./DataTable/common/types";
import VirtualDataTable from "./DataTable/VirtualDataTable.vue";
+import DetailPanel from "./DetailPanel";
import EmptyView from "./EmptyView.vue";
import ErrorView from "./ErrorView";
import SelectionCopyTooltips from "./SelectionCopyTooltips.vue";
@@ -301,10 +315,11 @@ type LocalState = {
type ViewMode = "RESULT" | "EMPTY" | "AFFECTED-ROWS" | "ERROR";
const props = defineProps<{
+ dark: boolean;
+ disallowCopyingData: boolean;
params: SQLEditorQueryParams;
database: Database;
result: QueryResult;
- setIndex: number;
showExport: boolean;
maximumExportCount?: number;
}>();
@@ -335,8 +350,16 @@ const state = reactive<LocalState>({
const dataTableRef =
ref<InstanceType<typeof VirtualDataTable | typeof VirtualDataBlock>>();
+const binaryFormatContext = provideBinaryFormatContext();
+
+const detail: SQLResultViewContext["detail"] = ref(undefined);
+const resultViewContext = provideSQLResultViewContext({
+ dark: toRef(props, "dark"),
+ disallowCopyingData: toRef(props, "disallowCopyingData"),
+ detail,
+});
+
const { t } = useI18n();
-const { dark } = useSQLResultViewContext();
const tabStore = useSQLEditorTabStore();
const editorStore = useSQLEditorStore();
const currentTab = computed(() => tabStore.currentTab);
@@ -604,8 +627,10 @@ const getMaskingReason = (columnIndex: number) => {
};
provideSelectionContext({
- columns: columns,
- rows: rows,
+ columns,
+ rows,
+ binaryFormatContext,
+ resultViewContext,
});
const engine = computed(() => getInstanceResource(props.database).engine);
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/VirtualDataBlock.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/VirtualDataBlock.vue
index 5ab07debf0..a578e9614a 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/VirtualDataBlock.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/VirtualDataBlock.vue
@@ -54,9 +54,7 @@
:value="row.item.values[columnIndex]"
:keyword="search.query"
:scope="search.scopes.find(scope => scope.id === columns[columnIndex]?.id)"
- :set-index="setIndex"
:row-index="rowIndex"
- :original-row-index="row.key"
:col-index="columnIndex"
:column-type="column.columnType"
:allow-select="true"
@@ -93,7 +91,6 @@ import TableCell from "./DataTable/TableCell.vue";
const props = defineProps<{
rows: ResultTableRow[];
columns: ResultTableColumn[];
- setIndex: number;
activeRowIndex: number;
isSensitiveColumn: (index: number) => boolean;
getMaskingReason?: (index: number) => MaskingReason | undefined;
@@ -121,7 +118,6 @@ const getContent = (rowIndex: number): string => {
const binaryFormat = getBinaryFormat({
rowIndex: rowIndex,
colIndex: columnIndex,
- setIndex: props.setIndex,
});
obj[`${column.name}`] = getPlainValue(
props.rows[rowIndex].item.values[columnIndex],
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/context.ts b/frontend/src/views/sql-editor/EditorCommon/ResultView/context.ts
index 840742a06b..9f5e860395 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/context.ts
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/context.ts
@@ -5,7 +5,6 @@ export type SQLResultViewContext = {
disallowCopyingData: Ref<boolean>;
detail: Ref<
| {
- set: number; // The index of selected result set.
row: number; // The row index of selected record.
col: number; // The column index of selected cell.
}
@@ -19,6 +18,7 @@ export const KEY = Symbol(
export const provideSQLResultViewContext = (context: SQLResultViewContext) => {
provide(KEY, context);
+ return context;
};
export const useSQLResultViewContext = () => {
diff --git a/frontend/src/views/sql-editor/EditorPanel/ResultPanel/DatabaseQueryContext.vue b/frontend/src/views/sql-editor/EditorPanel/ResultPanel/DatabaseQueryContext.vue
index 7ace13b0dd..b8d3dcc03a 100644
--- a/frontend/src/views/sql-editor/EditorPanel/ResultPanel/DatabaseQueryContext.vue
+++ b/frontend/src/views/sql-editor/EditorPanel/ResultPanel/DatabaseQueryContext.vue
@@ -31,7 +31,6 @@
class="w-full h-auto grow"
:execute-params="context.params"
:database="database"
- :context-id="context.id"
:result-set="context.resultSet"
@execute="execQuery"
/>
diff --git a/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vue b/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vue
index ef2a738e90..0189d89afc 100644
--- a/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vue
+++ b/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vue
@@ -45,7 +45,6 @@
:database="
databaseStore.getDatabaseByName(query.params.connection.database)
"
- :context-id="query.id"
:loading="query.status === 'RUNNING'"
:dark="true"
/>