[Haik]: refactor: relocate onboarding, element selection, and toolkit modules into proper directories and update all import paths

2026-09-12 04:37:44 +02:00 · 2026-04-18 17:28:15 -07:00
parent b74bd2a006
commit 433c10c993
22 changed files with 19 additions and 19 deletions
@@ -22,7 +22,7 @@ import Tools from './pages/Tools/Tools';
 import Modes from './pages/Modes/Modes';
 import Views from './pages/Views/Views';
 import Customization from './pages/Customization/Customization';
-import OnboardingModal from './components/OnboardingModal';
+import OnboardingModal from './components/OnboardingModal/OnboardingModal';
 import { useKeyboardShortcuts } from '@/shared/hooks/useKeyboardShortcuts';
 import KeyboardShortcutsHelp from './components/KeyboardShortcutsHelp';
 import { ThemeProvider, useThemeMode, useClaudeTokens } from '@/shared/styles/ThemeContext';
@@ -9,7 +9,7 @@ import CheckIcon from '@mui/icons-material/Check';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import { motion } from 'framer-motion';
 import { parseMcpToolName } from '@/app/pages/AgentChat/toolkit/approvalToolkit/utils';
-import { useMcpToolMeta } from '@/app/pages/AgentChat/toolkit/approvalToolkit/components/useMcpToolMeta';
+import { useMcpToolMeta } from '@/app/pages/AgentChat/toolkit/approvalToolkit/utils/useMcpToolMeta';
 import { SPRING_BOUNCE } from './islandTypes';
 import type { ClaudeTokens } from './islandTypes';
 import type { ApprovalRequest } from '@/shared/state/agentsSlice';
@@ -10,7 +10,7 @@ import OpenSwarmThread from './OpenSwarmThread/OpenSwarmThread';
 import ChatInput from './ChatInput/ChatInput';
 import { useAgentChat } from './hooks/useAgentChat';
 import { useOpenSwarmRuntime, type ComposerExtras, type DispatchableMessage } from './runtime/useOpenSwarmRuntime';
-import { toolkit } from './toolkit';
+import { toolkit } from './toolkit/toolkit';
 import type { ContextPath } from '@/shared/state/agentsTypes';
 import { useClaudeTokens } from '@/shared/styles/ThemeContext';

@@ -18,7 +18,7 @@ import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward';
 import StopIcon from '@mui/icons-material/Stop';
 import AttachFileIcon from '@mui/icons-material/AttachFile';
 import AdsClickIcon from '@mui/icons-material/AdsClick';
-import { useElementSelection } from '@/app/components/ElementSelectionContext';
+import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection';
 import { useAppDispatch, useAppSelector } from '@/shared/hooks';
 import { LIST_MODES } from '@/shared/state/modesSlice';
 import { useClaudeTokens } from '@/shared/styles/ThemeContext';
@@ -1,7 +1,7 @@
 import React from 'react';
 import type { ApprovalRequest } from '@/shared/state/agentsSlice';
 import { ToolQuestion } from './components/ToolQuestion/ToolQuestion';
-import { ToolApproval } from './components/ToolApproval';
+import { ToolApproval } from './components/ToolApproval/ToolApproval';

 interface ApprovalRouterProps {
  request: ApprovalRequest;
@@ -1,7 +1,7 @@
 import React, { useMemo, useCallback } from 'react';
 import type { ApprovalRequest } from '@/shared/state/agentsSlice';
 import { ToolQuestion } from './components/ToolQuestion/ToolQuestion';
-import { ToolApproval } from './components/ToolApproval';
+import { ToolApproval } from './components/ToolApproval/ToolApproval';
 import { ApprovalRouter } from './ApprovalRouter';

 interface BatchApprovalWrapperProps {
@@ -18,7 +18,7 @@ import {
  normalizeSelectionForOptions,
  parseSelectionToIdSet,
 } from "./selection";
-import { ActionButtons } from "../../ActionButtons";
+import { ActionButtons } from "../../ActionButtons/ActionButtons";
 import { normalizeActionsConfig } from "./utils/actions-config";
 import type { Action } from "../../../utils/types";

@@ -5,8 +5,8 @@ import { toggleExpandSession } from '@/shared/state/agentsSlice';
 import { UPDATE_DASHBOARD } from '@/shared/backend-bridge/apps/dashboards';
 import { useCanvasControls } from './hooks/useCanvasControls/useCanvasControls';
 import { useDashboardSelection } from './hooks/useDashboardSelection';
-import { ElementSelectionProvider } from './_shared/element_selection/ElementSelectionProvider';
-import { useElementSelection } from './_shared/element_selection/useElementSelection';
+import { ElementSelectionProvider } from '@/app/pages/_shared/element_selection/ElementSelectionProvider';
+import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection';
 import { useDomElementSelector } from './hooks/useDomElementSelector/useDomElementSelector';
 import SelectionOverlay from './SelectionOverlay';
 import { useDashboardDrag } from './hooks/useDashboardDrag';
@@ -8,7 +8,7 @@ import { useBrowserActivity } from '@/shared/useBrowserActivity';
 import { resolveInput, isGoogleSearch } from '@/shared/resolveUrl';
 import BrowserAgentOverlay from './components/BrowserAgentOverlay/BrowserAgentOverlay';
 import { useOverlayScrollPassthrough } from '../shared/useOverlayScrollPassthrough';
-import { useElementSelection } from '@/app/pages/Dashboard/_shared/element_selection/useElementSelection';
+import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection';
 import { type ResizeDir, CURSOR_MAP, HANDLE_DEFS, DRAG_THRESHOLD } from '../shared/cardLayoutConstants';
 import { useWebviewLifecycle, isElectron, chromeUserAgent, webviewPreloadPath, type WebviewElement } from './hooks/useWebviewLifecycle';
 import type { TabLocalState } from './TabLocalState';
@@ -5,7 +5,7 @@ import InputBase from '@mui/material/InputBase';
 import CircularProgress from '@mui/material/CircularProgress';
 import SearchIcon from '@mui/icons-material/Search';
 import type { ClaudeTokens } from '@/shared/styles/claudeTokens';
-import { formatRelativeTime } from '@/app/pages/Dashboard/utils/formatRelativeTime';
+import { formatRelativeTime } from '@/app/pages/Dashboard/_shared/formatRelativeTime';

 interface HistoryPanelProps {
  historyInputRef: React.RefObject<HTMLInputElement>;
@@ -1,6 +1,6 @@
 import { useState, useRef, useEffect, useCallback, useMemo } from 'react';
 import type { ContextPath } from '@/shared/state/agentsTypes';
-import { useElementSelection } from '@/app/components/ElementSelectionContext';
+import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection';
 import { useClaudeTokens } from '@/shared/styles/ThemeContext';
 import { useAppDispatch, useAppSelector } from '@/shared/hooks';
 import { clearHistorySearch } from '@/shared/state/agentsSlice';
@@ -1,7 +1,7 @@
 import React, { useEffect, useState, useRef } from 'react';
 import ReactDOM from 'react-dom';
 import { type OverlayState, type DragRect, type DragPreviewElement } from './_shared/types';
-import { useElementSelection } from './_shared/useElementSelection';
+import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection';

 const HIGHLIGHT_COLOR = '#3b82f6';
 const HIGHLIGHT_BG = 'rgba(59, 130, 246, 0.08)';
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState, useCallback } from 'react';
-import { useElementSelection } from '@/app/pages/Dashboard/_shared/element_selection/useElementSelection';
+import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection';
 import {
  type SelectMeta,
  type DomSelectorState,
@@ -8,7 +8,7 @@ import DashboardIcon from '@mui/icons-material/Dashboard';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
 import { Dashboard } from '@/shared/state/dashboardsSlice';
 import { useClaudeTokens } from '@/shared/styles/ThemeContext';
-import { formatRelativeTime } from '@/app/pages/Dashboard/utils/formatRelativeTime';
+import { formatRelativeTime } from '@/app/pages/Dashboard/_shared/formatRelativeTime';

 interface DashboardCardProps {
  dashboard: Dashboard;
@@ -8,7 +8,7 @@ import ViewPreview, { ViewPreviewHandle } from './ViewPreview';
 import InputSchemaForm, { getDefault, getStubbed } from './InputSchemaForm';
 import CodeEditor from './CodeEditor';
 // TODO: Fix this import, also the the element selection in this component doesnt seem to work so for now its chillin
-import { ElementSelectionProvider } from '@/app/pages/Dashboard/_shared/element_selection/ElementSelectionProvider';
+import { ElementSelectionProvider } from '@/app/pages/_shared/element_selection/ElementSelectionProvider';
 import { FileTreeItem, getEditorLanguage } from './FileTree';
 import { ConsolePanel } from './ConsolePanel';
 import { useViewWorkspace } from './hooks/useViewWorkspace';
@@ -1,6 +1,6 @@
 import React, { useRef, useEffect, useMemo, forwardRef, useImperativeHandle, useState } from 'react';
 import Box from '@mui/material/Box';
-import { useElementSelection } from '@/app/components/ElementSelectionContext';
+import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection';
 import { useIframeElementSelector } from './useIframeElementSelector';

 export interface ViewPreviewHandle {
@@ -1,6 +1,6 @@
 import { useEffect, useRef, useCallback, RefObject } from 'react';
-import { useElementSelection } from '@/app/pages/Dashboard/_shared/element_selection/useElementSelection';
-import { type SelectedElement } from '@/app/pages/Dashboard/_shared/element_selection/SelectedElement';
+import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection';
+import { type SelectedElement } from '@/app/pages/_shared/element_selection/SelectedElement';
 import {
  OVERLAY_ID, LABEL_ID, STYLE_ID,
  HIGHLIGHT_COLOR, HIGHLIGHT_BG, FLASH_COLOR, SELECTED_CLASS,