Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,14 @@ import {
} from "@superset/ui/resizable";
import { eq } from "@tanstack/db";
import { useLiveQuery } from "@tanstack/react-db";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { useCallback, useMemo } from "react";
import { createFileRoute } from "@tanstack/react-router";
import { useCallback, useMemo, useState } from "react";
import { HiMiniXMark } from "react-icons/hi2";
import { TbLayoutColumns, TbLayoutRows } from "react-icons/tb";
import { HotkeyTooltipContent } from "renderer/components/HotkeyTooltipContent";
import { electronTrpc } from "renderer/lib/electron-trpc";
import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
import {
CommandPalette,
useCommandPalette,
} from "renderer/screens/main/components/CommandPalette";
import { CommandPalette } from "renderer/screens/main/components/CommandPalette";
import { PresetsBar } from "renderer/screens/main/components/WorkspaceView/ContentView/components/PresetsBar";
import { useAppHotkey } from "renderer/stores/hotkeys";
import { useStore } from "zustand";
Expand Down Expand Up @@ -80,7 +77,6 @@ function WorkspaceContent({
workspaceId: string;
workspaceName: string;
}) {
const navigate = useNavigate();
const { localWorkspaceState, store } = useV2WorkspacePaneLayout({
projectId,
workspaceId,
Expand Down Expand Up @@ -186,25 +182,8 @@ function WorkspaceContent({
});
}, [store]);

const commandPalette = useCommandPalette({
workspaceId,
navigate,
onSelectFile: ({ close, filePath, targetWorkspaceId }) => {
close();
if (targetWorkspaceId !== workspaceId) {
void navigate({
to: "/v2-workspace/$workspaceId",
params: { workspaceId: targetWorkspaceId },
});
return;
}
openFilePane(filePath);
},
});

const handleQuickOpen = useCallback(() => {
commandPalette.toggle();
}, [commandPalette]);
const [quickOpenOpen, setQuickOpenOpen] = useState(false);
const handleQuickOpen = useCallback(() => setQuickOpenOpen(true), []);

const defaultPaneActions = useMemo<PaneActionConfig<PaneViewerData>[]>(
() => [
Expand Down Expand Up @@ -349,22 +328,11 @@ function WorkspaceContent({
)}
</ResizablePanelGroup>
<CommandPalette
excludePattern={commandPalette.excludePattern}
filtersOpen={commandPalette.filtersOpen}
includePattern={commandPalette.includePattern}
isLoading={commandPalette.isFetching}
onExcludePatternChange={commandPalette.setExcludePattern}
onFiltersOpenChange={commandPalette.setFiltersOpen}
onIncludePatternChange={commandPalette.setIncludePattern}
onOpenChange={commandPalette.handleOpenChange}
onQueryChange={commandPalette.setQuery}
onScopeChange={commandPalette.setScope}
onSelectFile={commandPalette.selectFile}
open={commandPalette.open}
query={commandPalette.query}
scope={commandPalette.scope}
searchResults={commandPalette.searchResults}
workspaceName={workspaceName}
workspaceId={workspaceId}
open={quickOpenOpen}
onOpenChange={setQuickOpenOpen}
onSelectFile={openFilePane}
variant="v2"
/>
</>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import type { ExternalApp } from "@superset/local-db";
import { createFileRoute, notFound, useNavigate } from "@tanstack/react-router";
import { useCallback, useEffect, useMemo } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { useCopyToClipboard } from "renderer/hooks/useCopyToClipboard";
import { useFileOpenMode } from "renderer/hooks/useFileOpenMode";
import { electronTrpc } from "renderer/lib/electron-trpc";
import { getWorkspaceDisplayName } from "renderer/lib/getWorkspaceDisplayName";
import { electronTrpcClient as trpcClient } from "renderer/lib/trpc-client";
import { usePresets } from "renderer/react-query/presets";
import type { WorkspaceSearchParams } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
import { navigateToWorkspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
import { usePresetHotkeys } from "renderer/routes/_authenticated/_dashboard/workspace/$workspaceId/hooks/usePresetHotkeys";
import { useWorkspaceRunCommand } from "renderer/routes/_authenticated/_dashboard/workspace/$workspaceId/hooks/useWorkspaceRunCommand";
import { NotFound } from "renderer/routes/not-found";
import {
CommandPalette,
useCommandPalette,
} from "renderer/screens/main/components/CommandPalette";
import { CommandPalette } from "renderer/screens/main/components/CommandPalette";
import { UnsavedChangesDialog } from "renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/FileViewerPane/UnsavedChangesDialog";
import { useWorkspaceFileEventBridge } from "renderer/screens/main/components/WorkspaceView/hooks/useWorkspaceFileEvents";
import { useWorkspaceRenameReconciliation } from "renderer/screens/main/components/WorkspaceView/hooks/useWorkspaceRenameReconciliation";
Expand Down Expand Up @@ -412,13 +408,8 @@ function WorkspacePage() {
[pr?.url, createOrOpenPR],
);

const commandPalette = useCommandPalette({
workspaceId,
navigate,
});
const handleQuickOpen = useCallback(() => {
commandPalette.toggle();
}, [commandPalette.toggle]);
const [quickOpenOpen, setQuickOpenOpen] = useState(false);
const handleQuickOpen = useCallback(() => setQuickOpenOpen(true), []);
useAppHotkey("QUICK_OPEN", handleQuickOpen, undefined, [handleQuickOpen]);

// Toggle changes sidebar (⌘L)
Expand Down Expand Up @@ -638,29 +629,11 @@ function WorkspacePage() {
)}
</div>
<CommandPalette
open={commandPalette.open}
onOpenChange={commandPalette.handleOpenChange}
query={commandPalette.query}
onQueryChange={commandPalette.setQuery}
filtersOpen={commandPalette.filtersOpen}
onFiltersOpenChange={commandPalette.setFiltersOpen}
includePattern={commandPalette.includePattern}
onIncludePatternChange={commandPalette.setIncludePattern}
excludePattern={commandPalette.excludePattern}
onExcludePatternChange={commandPalette.setExcludePattern}
isLoading={commandPalette.isFetching}
searchResults={commandPalette.searchResults}
onSelectFile={commandPalette.selectFile}
scope={commandPalette.scope}
onScopeChange={commandPalette.setScope}
workspaceName={
workspace
? getWorkspaceDisplayName(
workspace.name,
workspace.type,
workspace.project?.name,
)
: undefined
workspaceId={workspaceId}
open={quickOpenOpen}
onOpenChange={setQuickOpenOpen}
onSelectFile={(filePath) =>
useTabsStore.getState().addFileViewerPane(workspaceId, { filePath })
}
/>
<UnsavedChangesDialog
Expand Down
Loading
Loading