diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue index 1219f68f03..9e30c8af08 100644 --- a/apps/desktop/src/components/layout/ContentArea.vue +++ b/apps/desktop/src/components/layout/ContentArea.vue @@ -96,6 +96,7 @@ function preloadDataGridComponent() { const QueryEditor = defineAsyncComponent({ loader: () => import("@/components/editor/QueryEditor.vue"), loadingComponent: QueryLoadingState, delay: 0 }); const DataGrid = defineAsyncComponent(loadDataGridComponent); const RedisKeyBrowser = defineAsyncComponent(() => import("@/components/redis/RedisKeyBrowser.vue")); +const RedisQueryConsoleOutput = defineAsyncComponent(() => import("@/components/redis/RedisQueryConsoleOutput.vue")); const RedisDashboard = defineAsyncComponent(() => import("@/components/redis/RedisDashboard.vue")); const EtcdKeyBrowser = defineAsyncComponent(() => import("@/components/etcd/EtcdKeyBrowser.vue")); const EtcdDashboard = defineAsyncComponent(() => import("@/components/etcd/EtcdDashboard.vue")); @@ -186,7 +187,7 @@ import { loadObjectDdl } from "@/lib/metadata/objectDdlCache"; import { formatDdlForDisplay } from "@/lib/sql/ddlDisplay"; import { sqlObjectNavigationTypeFromTableType } from "@/lib/sql/sqlNavigation"; import type { CustomSaveHandler } from "@/composables/useDataGridEditor"; -import type { QueryMessage, QueryTab, TableInfoTab, TreeNode, VectorCollectionMeta } from "@/types/database"; +import type { QueryMessage, QueryTab, RedisResultViewMode, TableInfoTab, TreeNode, VectorCollectionMeta } from "@/types/database"; import type { SqlObjectNavigationTarget } from "@/lib/sql/sqlNavigation"; import { sqlFormatDialectForDbType, type SqlFormatDialect } from "@/lib/sql/sqlFormatter"; import { productionContextForDatabase } from "@/lib/database/productionSafety"; @@ -613,6 +614,9 @@ const hasTabularResult = computed(() => { if (props.activeTab.result?.columns.length && props.activeTab.result.server_message !== true) return true; return visibleResultItems.value.length > 0; }); +const redisConsoleResults = computed(() => (props.activeTab.results?.length ? props.activeTab.results : props.activeTab.result ? [props.activeTab.result] : [])); +const canShowRedisConsoleOutput = computed(() => activeEffectiveDatabaseType.value === "redis" && (props.activeTab.isExecuting || redisConsoleResults.value.some((result) => result.execution_error === true || typeof result.redis_console_output === "string"))); +const redisResultViewMode = computed(() => (activeEffectiveDatabaseType.value === "redis" ? (props.activeTab.uiState?.redisResultViewMode ?? "grid") : "grid")); const canShowResultOutput = computed(() => hasTabularResult.value || props.activeTab.isExecuting); const canShowExplainOutput = computed(() => !!props.activeTab.explainPlan || !!props.activeTab.explainError || !!props.activeTab.explainTableResult || !!props.activeTab.explainTableError || props.activeTab.isExplaining === true); // A batch can attach server messages to more than one statement result (for @@ -626,7 +630,7 @@ const resultMessages = computed(() => { }); const resultMessageCount = computed(() => resultMessages.value.length); const canShowMessagesOutput = computed(() => resultMessageCount.value > 0); -const showStandaloneResultToolbar = computed(() => activeElasticsearchJsonResponse.value || props.activeOutputView !== "result" || !props.activeTab.result || !hasTabularResult.value); +const showStandaloneResultToolbar = computed(() => activeElasticsearchJsonResponse.value || props.activeOutputView !== "result" || (redisResultViewMode.value === "console" && canShowRedisConsoleOutput.value) || !props.activeTab.result || !hasTabularResult.value); const standaloneResultToolbarCompact = computed(() => isDataGridToolbarCompact(standaloneResultToolbarWidth.value, standaloneResultToolbarViewportWidth.value)); let standaloneResultToolbarResizeObserver: ResizeObserver | undefined; @@ -635,6 +639,11 @@ function updateStandaloneResultToolbarDimensions() { standaloneResultToolbarViewportWidth.value = typeof window === "undefined" ? 0 : window.innerWidth; } +function setRedisResultViewMode(mode: RedisResultViewMode) { + if (activeEffectiveDatabaseType.value !== "redis") return; + queryStore.updateTabUiState(props.activeTab.id, { redisResultViewMode: mode }); +} + function observeStandaloneResultToolbar() { standaloneResultToolbarResizeObserver?.disconnect(); standaloneResultToolbarResizeObserver = undefined; @@ -1817,7 +1826,7 @@ defineExpose({
- +
+ +