Fix workspace creation, reveal sync dir, and don't update timestamps on sync/import

This commit is contained in:
Gregory Schier
2025-01-09 07:50:23 -08:00
parent 0a7257c55a
commit f694456ddc
33 changed files with 312 additions and 219 deletions

View File

@@ -1,13 +1,17 @@
import { revealItemInDir } from '@tauri-apps/plugin-opener';
import classNames from 'classnames';
import { memo, useCallback, useMemo } from 'react';
import {openWorkspace} from "../commands/openWorkspace";
import { openWorkspaceFromSyncDir } from '../commands/openWorkspaceFromSyncDir';
import { switchWorkspace } from '../commands/switchWorkspace';
import { useActiveWorkspace } from '../hooks/useActiveWorkspace';
import { useCreateWorkspace } from '../hooks/useCreateWorkspace';
import { useDeleteSendHistory } from '../hooks/useDeleteSendHistory';
import { useSwitchWorkspace } from '../hooks/useSwitchWorkspace';
import { useSettings } from '../hooks/useSettings';
import { settingsAtom } from '../hooks/useSettings';
import { useWorkspaceMeta } from '../hooks/useWorkspaceMeta';
import { useWorkspaces } from '../hooks/useWorkspaces';
import { showDialog } from '../lib/dialog';
import { jotaiStore } from '../lib/jotai';
import { revealInFinderText } from '../lib/reveal';
import { getWorkspace } from '../lib/store';
import type { ButtonProps } from './core/Button';
import { Button } from './core/Button';
@@ -25,12 +29,10 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
...buttonProps
}: Props) {
const workspaces = useWorkspaces();
const activeWorkspace = useActiveWorkspace();
const workspace = useActiveWorkspace();
const createWorkspace = useCreateWorkspace();
const workspaceMeta = useWorkspaceMeta();
const { mutate: deleteSendHistory } = useDeleteSendHistory();
const settings = useSettings();
const switchWorkspace = useSwitchWorkspace();
const openWorkspaceNewWindow = settings?.openWorkspaceNewWindow ?? null;
const orderedWorkspaces = useMemo(
() => [...workspaces].sort((a, b) => (a.name.localeCompare(b.name) > 0 ? 1 : -1)),
@@ -45,7 +47,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
key: w.id,
label: w.name,
value: w.id,
leftSlot: w.id === activeWorkspace?.id ? <Icon icon="check" /> : <Icon icon="empty" />,
leftSlot: w.id === workspace?.id ? <Icon icon="check" /> : <Icon icon="empty" />,
}));
const extraItems: DropdownItem[] = [
@@ -60,14 +62,25 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
title: 'Workspace Settings',
size: 'md',
render: ({ hide }) => (
<WorkspaceSettingsDialog workspaceId={activeWorkspace?.id ?? null} hide={hide} />
<WorkspaceSettingsDialog workspaceId={workspace?.id ?? null} hide={hide} />
),
});
},
},
{
key: 'reveal-workspace-sync-dir',
label: revealInFinderText,
hidden: workspaceMeta == null || workspaceMeta.settingSyncDir == null,
leftSlot: <Icon icon="folder_open" />,
onSelect: async () => {
if (workspaceMeta?.settingSyncDir == null) return;
await revealItemInDir(workspaceMeta.settingSyncDir);
},
},
{
key: 'delete-responses',
label: 'Clear Send History',
color: 'warning',
leftSlot: <Icon icon="history" />,
onSelect: deleteSendHistory,
},
@@ -82,52 +95,50 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
key: 'open-workspace',
label: 'Open Workspace',
leftSlot: <Icon icon="folder" />,
onSelect: openWorkspace.mutate,
onSelect: openWorkspaceFromSyncDir.mutate,
},
];
return { workspaceItems, extraItems };
}, [orderedWorkspaces, activeWorkspace?.id, deleteSendHistory, createWorkspace]);
}, [orderedWorkspaces, deleteSendHistory, createWorkspace, workspaceMeta, workspace?.id]);
const handleChange = useCallback(
async (workspaceId: string | null) => {
if (workspaceId == null) return;
const handleChangeWorkspace = useCallback(async (workspaceId: string | null) => {
if (workspaceId == null) return;
if (typeof openWorkspaceNewWindow === 'boolean') {
switchWorkspace.mutate({ workspaceId, inNewWindow: openWorkspaceNewWindow });
return;
}
const settings = jotaiStore.get(settingsAtom);
if (typeof settings.openWorkspaceNewWindow === 'boolean') {
switchWorkspace.mutate({ workspaceId, inNewWindow: settings.openWorkspaceNewWindow });
return;
}
const workspace = await getWorkspace(workspaceId);
if (workspace == null) return;
const workspace = await getWorkspace(workspaceId);
if (workspace == null) return;
showDialog({
id: 'switch-workspace',
size: 'sm',
title: 'Switch Workspace',
render: ({ hide }) => <SwitchWorkspaceDialog workspace={workspace} hide={hide} />,
});
},
[switchWorkspace, openWorkspaceNewWindow],
);
showDialog({
id: 'switch-workspace',
size: 'sm',
title: 'Switch Workspace',
render: ({ hide }) => <SwitchWorkspaceDialog workspace={workspace} hide={hide} />,
});
}, []);
return (
<RadioDropdown
items={workspaceItems}
extraItems={extraItems}
onChange={handleChange}
value={activeWorkspace?.id ?? null}
onChange={handleChangeWorkspace}
value={workspace?.id ?? null}
>
<Button
size="sm"
className={classNames(
className,
'text !px-2 truncate',
activeWorkspace === null && 'italic opacity-disabled',
workspace === null && 'italic opacity-disabled',
)}
{...buttonProps}
>
{activeWorkspace?.name ?? 'Workspace'}
{workspace?.name ?? 'Workspace'}
</Button>
</RadioDropdown>
);