Fix merge

Author: gschier

src-web/components/WorkspaceActionsDropdown.tsx

@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import { memo, useCallback, useMemo } from 'react';
 import { useActiveWorkspace } from '../hooks/useActiveWorkspace';
 import { useCreateWorkspace } from '../hooks/useCreateWorkspace';
-import {useDeleteSendHistory} from "../hooks/useDeleteSendHistory";
+import { useDeleteSendHistory } from '../hooks/useDeleteSendHistory';
 import { useDialog } from '../hooks/useDialog';
 import { useOpenWorkspace } from '../hooks/useOpenWorkspace';
 import { useSettings } from '../hooks/useSettings';
@@ -16,8 +16,6 @@ import type { RadioDropdownItem } from './core/RadioDropdown';
 import { RadioDropdown } from './core/RadioDropdown';
 import { OpenWorkspaceDialog } from './OpenWorkspaceDialog';
 import { WorkspaceSettingsDialog } from './WorkpaceSettingsDialog';
-import { usePrompt } from '../hooks/usePrompt';
-import { InlineCode } from './core/InlineCode';
 
 type Props = Pick<ButtonProps, 'className' | 'justify' | 'forDropdown' | 'leftSlot'>;
 
@@ -31,7 +29,6 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
   const { mutate: createWorkspace } = useCreateWorkspace();
   const { mutate: deleteSendHistory } = useDeleteSendHistory();
   const dialog = useDialog();
-  const prompt = usePrompt();
   const settings = useSettings();
   const openWorkspace = useOpenWorkspace();
   const openWorkspaceNewWindow = settings?.openWorkspaceNewWindow ?? null;
@@ -66,34 +63,12 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
           });
         },
       },
-      {
-        key: 'sync-dir',
-        label: 'Directory Sync',
-        leftSlot: <Icon icon="folder_sync" />,
-        onSelect: async () => {
-          const settingSyncDir = await prompt({
-            id: 'workspace-sync-dir',
-            title: 'Select sync dir',
-            description: (
-              <>
-                Select a sync dir for <InlineCode>{activeWorkspace?.name}</InlineCode>
-              </>
-            ),
-            label: 'Directory',
-            placeholder: '/User/foo',
-            defaultValue: activeWorkspace?.settingSyncDir ?? undefined,
-          });
-          if (settingSyncDir == null) return;
-          updateWorkspace({ settingSyncDir });
-        },
-      },
       {
         key: 'delete-responses',
         label: 'Clear Send History',
         leftSlot: <Icon icon="history" />,
         onSelect: deleteSendHistory,
       },
-      },
       { type: 'separator' },
       {
         key: 'create-workspace',
@@ -106,15 +81,11 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
     return { workspaceItems, extraItems };
   }, [
     activeWorkspace?.id,
-    activeWorkspace?.name,
-    activeWorkspace?.settingSyncDir,
     activeWorkspaceId,
     dialog,
     createWorkspace,
     deleteSendHistory,
     orderedWorkspaces,
-    prompt,
-    updateWorkspace,
   ]);
 
   const handleChange = useCallback(

src-web/components/core/Editor/extensions.ts

@@ -35,7 +35,6 @@ import {
 } from '@codemirror/view';
 import { tags as t } from '@lezer/highlight';
 import type { EnvironmentVariable } from '@yaakapp-internal/models';
-import type { TemplateFunction } from '@yaakapp-internal/plugins';
 import { graphql } from 'cm6-graphql';
 import { EditorView } from 'codemirror';
 import { pluralizeCount } from '../../../lib/pluralize';

src-web/components/core/Editor/twig/extension.ts

@@ -3,7 +3,6 @@ import { LRLanguage } from '@codemirror/language';
 import type { Extension } from '@codemirror/state';
 import { parseMixed } from '@lezer/common';
 import type { EnvironmentVariable } from '@yaakapp-internal/models';
-import type { TemplateFunction } from '@yaakapp-internal/plugins';
 import type { GenericCompletionConfig } from '../genericCompletion';
 import { genericCompletion } from '../genericCompletion';
 import { textLanguageName } from '../text/extension';