insforge 0.3.3 → 1.2.10

package/frontend/src/features/onboard/components/McpConnectionStatus.tsx

@@ -0,0 +1,68 @@
+import { format } from 'date-fns';
+import { Button, Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components';
+import { useMcpUsage } from '@/features/logs/hooks/useMcpUsage';
+import { cn } from '@/lib/utils/utils';
+
+const formatConnectionTime = (timestamp: string) => {
+  return format(new Date(timestamp), 'MMM dd, yyyy, h:mm a');
+};
+
+interface McpConnectionStatusProps {
+  onConnectClick: () => void;
+}
+
+export function McpConnectionStatus({ onConnectClick }: McpConnectionStatusProps) {
+  const { hasCompletedOnboarding, latestRecord, isLoading } = useMcpUsage();
+
+  // Don't render while loading
+  if (isLoading) {
+    return null;
+  }
+
+  // When not connected, show "Connect" with gray dot
+  if (!hasCompletedOnboarding) {
+    return (
+      <Button
+        variant="outline"
+        onClick={onConnectClick}
+        className="h-9 px-4 gap-2 bg-white dark:bg-transparent text-gray-900 dark:text-white border-gray-300 dark:border-neutral-600 hover:bg-gray-100 dark:hover:bg-neutral-900 rounded-full"
+      >
+        <div className="w-2 h-2 rounded-full bg-neutral-400" />
+        <span className="text-sm">Connect</span>
+      </Button>
+    );
+  }
+
+  // When connected, show "Connected" with green dot and tooltip
+  return (
+    <TooltipProvider>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <Button
+            variant="outline"
+            onClick={onConnectClick}
+            className="h-9 px-4 gap-2 bg-white dark:bg-transparent text-gray-900 dark:text-white border-gray-300 dark:border-neutral-600 hover:bg-gray-100 dark:hover:bg-neutral-900 rounded-full"
+          >
+            <div className="w-2 h-2 rounded-full bg-emerald-400" />
+            <span className="text-sm">Connected</span>
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent
+          side="bottom"
+          sideOffset={8}
+          className={cn(
+            'bg-white dark:bg-neutral-800 border border-gray-200 dark:border-neutral-700',
+            'text-gray-700 dark:text-neutral-300 p-3 max-w-[280px]'
+          )}
+        >
+          <p className="text-sm">
+            Last MCP call was at{' '}
+            <span className="text-gray-900 dark:text-white font-medium">
+              {latestRecord ? formatConnectionTime(latestRecord.created_at) : 'Unknown'}
+            </span>
+          </p>
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+}

package/frontend/src/features/onboard/components/OnboardingModal.tsx

@@ -0,0 +1,267 @@
+import { useState, useMemo } from 'react';
+import { ChevronDown, HelpCircle } from 'lucide-react';
+import {
+  Dialog,
+  DialogContent,
+  DialogTitle,
+  Button,
+  CopyButton,
+  CodeBlock,
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from '@/components';
+import { VideoDemoModal } from './VideoDemoModal';
+import { CursorDeeplinkGenerator } from './mcp/CursorDeeplinkGenerator';
+import { MCP_AGENTS, GenerateInstallCommand, createMCPConfig, type MCPAgent } from './mcp/helpers';
+import { useApiKey } from '@/lib/hooks/useMetadata';
+import { cn, getBackendUrl } from '@/lib/utils/utils';
+import DiscordIcon from '@/assets/logos/discord.svg?react';
+
+const ONBOARDING_SKIPPED_KEY = 'insforge_onboarding_skipped';
+
+export function getOnboardingSkipped(): boolean {
+  return localStorage.getItem(ONBOARDING_SKIPPED_KEY) === 'true';
+}
+
+export function setOnboardingSkipped(skipped: boolean): void {
+  if (skipped) {
+    localStorage.setItem(ONBOARDING_SKIPPED_KEY, 'true');
+  } else {
+    localStorage.removeItem(ONBOARDING_SKIPPED_KEY);
+  }
+}
+
+interface OnboardingModalProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+export function OnboardingModal({ open, onOpenChange }: OnboardingModalProps) {
+  const [selectedAgent, setSelectedAgent] = useState<MCPAgent>(MCP_AGENTS[0]);
+  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+  const [isVideoTooltipOpen, setIsVideoTooltipOpen] = useState(false);
+
+  const { apiKey, isLoading } = useApiKey();
+  const appUrl = getBackendUrl();
+
+  const displayApiKey = isLoading ? 'ik_' + '*'.repeat(32) : apiKey || '';
+
+  const installCommand = useMemo(() => {
+    return GenerateInstallCommand(selectedAgent, displayApiKey);
+  }, [selectedAgent, displayApiKey]);
+
+  const mcpJsonConfig = useMemo(() => {
+    const config = createMCPConfig(displayApiKey, 'macos-linux', appUrl);
+    return JSON.stringify(config, null, 2);
+  }, [displayApiKey, appUrl]);
+
+  const testPrompt =
+    "I'm using InsForge as my backend platform, fetch InsForge instruction doc to learn more about InsForge";
+
+  const handleSkipOnboarding = () => {
+    setOnboardingSkipped(true);
+    onOpenChange(false);
+  };
+
+  const handleModalClose = (nextOpen: boolean) => {
+    if (!nextOpen) {
+      handleSkipOnboarding();
+    }
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={handleModalClose}>
+      <TooltipProvider>
+        <DialogContent className="max-w-[640px] bg-white dark:bg-neutral-800 dark:border-neutral-700 p-6 gap-10">
+          <DialogTitle className="sr-only">Connect Project</DialogTitle>
+
+          {/* Header Section */}
+          <div className="flex flex-col gap-6">
+            <div className="flex flex-col gap-3">
+              <h3 className="text-gray-900 dark:text-white text-2xl font-semibold leading-8 tracking-[-0.144px]">
+                Connect Project
+              </h3>
+              <div className="flex items-center gap-1">
+                <p className="text-gray-500 dark:text-neutral-400 text-base leading-7">
+                  Connect your AI agent by installing the MCP server. The installation completes
+                  automatically when we receive the first MCP call.
+                </p>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <div
+                      onMouseEnter={() => setIsVideoTooltipOpen(true)}
+                      onMouseLeave={() => setIsVideoTooltipOpen(false)}
+                      className="cursor-help"
+                    >
+                      <HelpCircle className="w-5 h-5 text-gray-400 dark:text-neutral-400 shrink-0" />
+                    </div>
+                  </TooltipTrigger>
+                  <TooltipContent
+                    portal
+                    side="bottom"
+                    sideOffset={10}
+                    className="p-0 bg-transparent border-0 shadow-none z-[100]"
+                  >
+                    <VideoDemoModal open={isVideoTooltipOpen} className="w-[580px]" />
+                  </TooltipContent>
+                </Tooltip>
+              </div>
+            </div>
+
+            {/* Agent Selector Dropdown */}
+            <div className="relative">
+              <button
+                onClick={() => setIsDropdownOpen(!isDropdownOpen)}
+                className="w-40 bg-gray-100 dark:bg-[rgba(0,0,0,0.12)] border border-gray-300 dark:border-[rgba(255,255,255,0.24)] rounded flex items-center justify-between px-2 py-1"
+              >
+                <div className="flex items-center gap-2">
+                  {selectedAgent.logo && (
+                    <div className="w-6 h-6 flex items-center justify-center">
+                      {selectedAgent.logo}
+                    </div>
+                  )}
+                  <span className="text-gray-900 dark:text-white text-sm font-medium">
+                    {selectedAgent.displayName}
+                  </span>
+                </div>
+                <ChevronDown className="w-5 h-5 text-gray-400 dark:text-neutral-400" />
+              </button>
+
+              {/* Dropdown Menu */}
+              {isDropdownOpen && (
+                <div className="absolute top-full left-0 mt-1 w-40 bg-white dark:bg-neutral-800 border border-gray-200 dark:border-neutral-700 rounded shadow-lg z-50">
+                  {MCP_AGENTS.map((agent) => (
+                    <button
+                      key={agent.id}
+                      onClick={() => {
+                        setSelectedAgent(agent);
+                        setIsDropdownOpen(false);
+                      }}
+                      className="w-full flex items-center gap-2 px-2 py-2 text-gray-900 dark:text-white text-sm hover:bg-gray-100 dark:hover:bg-neutral-700 transition-colors"
+                    >
+                      {agent.logo && (
+                        <div className="w-6 h-6 flex items-center justify-center">{agent.logo}</div>
+                      )}
+                      <span className="font-medium">{agent.displayName}</span>
+                    </button>
+                  ))}
+                </div>
+              )}
+            </div>
+
+            {/* Step 1 - Conditional based on agent */}
+            {selectedAgent.id === 'cursor' ? (
+              <div className="flex flex-col gap-3">
+                <p className="text-gray-900 dark:text-white text-sm">
+                  <span className="font-semibold leading-5">Step 1</span>
+                  <span className="leading-6"> - Install in one click</span>
+                </p>
+                <div className="w-fit">
+                  <CursorDeeplinkGenerator apiKey={displayApiKey} os="macos-linux" />
+                </div>
+              </div>
+            ) : selectedAgent.id === 'mcp' ? (
+              <div className="flex flex-col gap-3">
+                <p className="text-gray-900 dark:text-white text-sm">
+                  <span className="font-semibold leading-5">Step 1</span>
+                  <span className="leading-6">
+                    {' '}
+                    - Copy the configuration below and add it to your AI assistant.
+                  </span>
+                </p>
+                <div className="bg-gray-100 dark:bg-neutral-900 rounded overflow-hidden flex flex-col h-[320px] w-full">
+                  {/* Header - fixed at top */}
+                  <div className="bg-gray-100 dark:bg-neutral-900 flex items-center justify-between p-3">
+                    <div className="bg-gray-200 dark:bg-neutral-700 rounded px-2">
+                      <span className="text-gray-700 dark:text-neutral-50 text-xs">
+                        MCP Configuration
+                      </span>
+                    </div>
+                    <CopyButton
+                      text={mcpJsonConfig}
+                      showText={false}
+                      className="h-6 w-6 p-1 bg-white dark:bg-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 border-none rounded-md shadow-sm min-w-0 text-black dark:text-white"
+                    />
+                  </div>
+                  {/* Scrollable content */}
+                  <div className="flex-1 overflow-auto p-3">
+                    <pre className="text-gray-700 dark:text-neutral-300 text-sm leading-6 m-0 whitespace-pre-wrap break-all">
+                      <code>{mcpJsonConfig}</code>
+                    </pre>
+                  </div>
+                </div>
+              </div>
+            ) : (
+              <div className="flex flex-col gap-3">
+                <p className="text-gray-900 dark:text-white text-sm">
+                  <span className="font-semibold leading-5">Step 1</span>
+                  <span className="leading-6"> - Install in one click</span>
+                </p>
+                <CodeBlock
+                  code={installCommand}
+                  label="Terminal Command"
+                  className={cn(isLoading && 'animate-pulse')}
+                />
+              </div>
+            )}
+
+            {/* Step 2 */}
+            <div className="flex flex-col gap-3">
+              <p className="text-gray-900 dark:text-white text-sm">
+                <span className="font-semibold leading-5">Step 2</span>
+                <span className="leading-6">
+                  {' '}
+                  - Send the prompt below in your agent&apos;s chat
+                </span>
+              </p>
+              <CodeBlock
+                code={testPrompt}
+                label="prompt"
+                className="bg-gray-100 dark:bg-neutral-900"
+              />
+            </div>
+          </div>
+
+          {/* Help Section */}
+          <div className="flex items-end justify-between">
+            <div className="flex flex-col gap-2">
+              <div className="flex items-center gap-2">
+                <span className="text-gray-500 dark:text-neutral-400 text-sm leading-6">
+                  Need help?
+                </span>
+              </div>
+              <div className="flex items-center gap-2">
+                <span className="text-gray-500 dark:text-neutral-400 text-sm leading-6">
+                  Join our
+                </span>
+                <a
+                  href="https://discord.gg/DvBtaEc9Jz"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="inline-flex items-center gap-1 hover:underline"
+                >
+                  <DiscordIcon className="w-5 h-5 text-indigo-500 dark:text-indigo-400" />
+                  <span className="text-indigo-500 dark:text-indigo-400 text-sm leading-6 font-medium">
+                    Discord
+                  </span>
+                </a>
+                <span className="text-gray-500 dark:text-neutral-400 text-sm leading-6">
+                  for live support
+                </span>
+              </div>
+            </div>
+            <Button
+              variant="outline"
+              onClick={handleSkipOnboarding}
+              className="px-3 h-8 bg-gray-100 dark:bg-neutral-700 hover:bg-gray-200 dark:hover:bg-neutral-600 text-gray-700 dark:text-white border-gray-300 dark:border-neutral-600 text-sm font-medium"
+            >
+              I&apos;ll connect later
+            </Button>
+          </div>
+        </DialogContent>
+      </TooltipProvider>
+    </Dialog>
+  );
+}

package/frontend/src/features/onboard/components/VideoDemoModal.tsx

@@ -0,0 +1,38 @@
+import { cn } from '@/lib/utils/utils';
+
+export interface VideoDemoModalProps {
+  open: boolean;
+  className?: string;
+}
+
+export function VideoDemoModal({ open, className }: VideoDemoModalProps) {
+  if (!open) {
+    return null;
+  }
+
+  return (
+    <div
+      className={cn(
+        'bg-gray-100 dark:bg-[#3A3A3A] border border-gray-200 dark:border-neutral-700 rounded-lg p-3 flex flex-col gap-2.5',
+        className
+      )}
+    >
+      <p className="text-gray-900 dark:text-white text-sm leading-6">
+        InsForge MCP lets your coding agent build and control your backend
+      </p>
+      <div className="w-full aspect-video rounded overflow-hidden bg-neutral-800">
+        <video
+          autoPlay
+          muted
+          loop
+          playsInline
+          className="w-full h-full object-cover"
+          controlsList="nodownload"
+        >
+          <source src="https://insforge.dev/assets/videos/database.mp4" type="video/mp4" />
+          Your browser does not support the video tag.
+        </video>
+      </div>
+    </div>
+  );
+}

package/frontend/src/features/onboard/components/index.ts

@@ -0,0 +1,4 @@
+export * from './mcp';
+export { McpConnectionStatus } from './McpConnectionStatus';
+export { OnboardingModal, getOnboardingSkipped, setOnboardingSkipped } from './OnboardingModal';
+export { VideoDemoModal } from './VideoDemoModal';

package/frontend/src/features/onboard/components/mcp/CursorDeeplinkGenerator.tsx

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { createMCPServerConfig, type PlatformType } from './mcp-helper';
+import { createMCPServerConfig, type PlatformType } from './helpers';
 import CursorLogo from '@/assets/logos/cursor.svg?react';
 import { getBackendUrl } from '@/lib/utils/utils';
 
@@ -26,7 +26,7 @@ export function CursorDeeplinkGenerator({
   return (
     <button
       onClick={handleOpenInCursor}
-      className="bg-black py-2 px-4 flex items-center justify-center gap-2.5 rounded-md text-white text-sm font-medium"
+      className="h-8 bg-black dark:bg-white px-4 flex items-center justify-center gap-2.5 rounded text-white dark:text-black text-sm font-medium"
     >
       <CursorLogo className="h-6 w-6" />
       <span>Add to Cursor</span>

package/frontend/src/features/onboard/components/mcp/{mcp-helper.tsx → helpers.tsx}

@@ -21,11 +21,6 @@ export const GenerateInstallCommand = (agent: MCPAgent, apiKey: string) => {
 };
 
 export const MCP_AGENTS: MCPAgent[] = [
-  {
-    id: 'trae',
-    displayName: 'Trae',
-    logo: <TraeLogo className="w-6 h-6" />,
-  },
   {
     id: 'cursor',
     displayName: 'Cursor',
@@ -37,15 +32,20 @@ export const MCP_AGENTS: MCPAgent[] = [
     logo: <ClaudeLogo className="w-6 h-6" />,
   },
   {
-    id: 'windsurf',
-    displayName: 'Windsurf',
-    logo: <WindsurfLogo className="w-6 h-6 dark:text-white" />,
+    id: 'trae',
+    displayName: 'Trae',
+    logo: <TraeLogo className="w-5 h-5" />,
   },
   {
     id: 'cline',
     displayName: 'Cline',
     logo: <ClineLogo className="w-6 h-6 dark:text-white" />,
   },
+  {
+    id: 'windsurf',
+    displayName: 'Windsurf',
+    logo: <WindsurfLogo className="w-6 h-6 dark:text-white" />,
+  },
   {
     id: 'roocode',
     displayName: 'Roo Code',

package/frontend/src/features/onboard/components/mcp/index.ts

@@ -1,4 +1,3 @@
-export { McpInstallation } from './McpInstallation';
 export { CursorDeeplinkGenerator } from './CursorDeeplinkGenerator';
-export type { MCPAgent, PlatformType } from './mcp-helper';
-export { MCP_AGENTS, createMCPConfig, createMCPServerConfig } from './mcp-helper';
+export type { MCPAgent, PlatformType } from './helpers';
+export { MCP_AGENTS, createMCPConfig, createMCPServerConfig } from './helpers';

package/frontend/src/features/onboard/index.ts

@@ -1,3 +1,13 @@
-export { OnboardStep } from './types';
-export { StepContent } from './components/StepContent';
-export { TestConnectionStep } from './components/TestConnectionStep';
+// Onboard components
+export { McpConnectionStatus } from './components/McpConnectionStatus';
+export {
+  OnboardingModal,
+  getOnboardingSkipped,
+  setOnboardingSkipped,
+} from './components/OnboardingModal';
+export { VideoDemoModal } from './components/VideoDemoModal';
+
+// MCP helpers
+export { CursorDeeplinkGenerator } from './components/mcp/CursorDeeplinkGenerator';
+export type { MCPAgent, PlatformType } from './components/mcp/helpers';
+export { MCP_AGENTS, createMCPConfig, createMCPServerConfig } from './components/mcp/helpers';

package/frontend/src/features/storage/components/BucketEmptyState.tsx

@@ -1,4 +1,5 @@
 import { Folder } from 'lucide-react';
+import { ConnectCTA } from '@/components/ConnectCTA';
 
 interface BucketEmptyStateProps {
   searchTerm: string;
@@ -6,14 +7,16 @@ interface BucketEmptyStateProps {
 
 export function BucketEmptyState({ searchTerm }: BucketEmptyStateProps) {
   return (
-    <div className="flex flex-col items-center justify-center py-8 px-4 text-center">
-      <Folder className="h-10 w-10 text-gray-400 dark:text-zinc-300 mb-2.5" />
-      <p className="text-sm text-gray-600 dark:text-zinc-300 font-medium">
+    <div className="flex flex-col items-center justify-center py-4 text-center">
+      <Folder className="h-10 w-10 text-gray-400 dark:text-neutral-600 mb-3" />
+      <p className="text-sm text-gray-600 dark:text-neutral-400 font-medium">
         {searchTerm ? 'No buckets found' : 'No buckets yet'}
       </p>
-      <p className="text-xs text-gray-500 dark:text-zinc-300 mt-2.5">
-        {searchTerm ? 'Try a different search term' : 'Create your first bucket to get started'}
-      </p>
+      {!searchTerm && (
+        <p className="text-xs text-gray-500 dark:text-neutral-400 font-medium mt-1 mx-10">
+          <ConnectCTA fallback="Create your first bucket to get started" />
+        </p>
+      )}
     </div>
   );
 }

package/frontend/src/features/storage/components/BucketFormDialog.tsx

@@ -1,19 +1,17 @@
 import React, { useState, useEffect } from 'react';
-import { useMutation } from '@tanstack/react-query';
-import { storageService } from '@/features/storage/services/storage.service';
+import { useStorage } from '@/features/storage/hooks/useStorage';
 import {
+  Button,
   Dialog,
   DialogContent,
   DialogDescription,
   DialogFooter,
   DialogHeader,
   DialogTitle,
-} from '@/components/radix/Dialog';
-import { Button } from '@/components/radix/Button';
-import { Input } from '@/components/radix/Input';
-import { Label } from '@/components/radix/Label';
-import { Switch } from '@/components/radix/Switch';
-import { useToast } from '@/lib/hooks/useToast';
+  Input,
+  Label,
+  Switch,
+} from '@/components';
 
 interface BucketFormDialogProps {
   open: boolean;
@@ -35,7 +33,8 @@ export function BucketFormDialog({
   const [bucketName, setBucketName] = useState(initialBucketName);
   const [isPublic, setIsPublic] = useState(initialIsPublic);
   const [error, setError] = useState('');
-  const { showToast } = useToast();
+
+  const { createBucket, editBucket, isCreatingBucket, isEditingBucket } = useStorage();
 
   useEffect(() => {
     if (open) {
@@ -50,33 +49,7 @@ export function BucketFormDialog({
     }
   }, [open, mode, initialBucketName, initialIsPublic]);
 
-  const createBucketMutation = useMutation({
-    mutationFn: ({ name, isPublic }: { name: string; isPublic: boolean }) =>
-      storageService.createBucket(name, isPublic),
-    onSuccess: () => {
-      onSuccess(bucketName);
-      showToast('Bucket created successfully', 'success');
-      handleClose();
-    },
-    onError: (error: Error) => {
-      setError(error.message || 'Failed to create bucket');
-    },
-  });
-
-  const editBucketMutation = useMutation({
-    mutationFn: ({ name, isPublic }: { name: string; isPublic: boolean }) =>
-      storageService.editBucket(name, { isPublic: isPublic }),
-    onSuccess: () => {
-      onSuccess();
-      showToast('Bucket updated successfully', 'success');
-      handleClose();
-    },
-    onError: (error: Error) => {
-      setError(error.message || 'Failed to update bucket');
-    },
-  });
-
-  const handleSubmit = (e: React.FormEvent) => {
+  const handleSubmit = async (e: React.FormEvent): Promise<void> => {
     e.preventDefault();
 
     if (mode === 'create') {
@@ -84,9 +57,21 @@ export function BucketFormDialog({
         setError('Bucket name is required');
         return;
       }
-      createBucketMutation.mutate({ name: bucketName.trim(), isPublic });
+      try {
+        await createBucket({ bucketName: bucketName.trim(), isPublic });
+        onSuccess(bucketName);
+        handleClose();
+      } catch (error) {
+        setError(error instanceof Error ? error.message : 'Failed to create bucket');
+      }
     } else {
-      editBucketMutation.mutate({ name: bucketName, isPublic });
+      try {
+        await editBucket({ bucketName, config: { isPublic } });
+        onSuccess();
+        handleClose();
+      } catch (error) {
+        setError(error instanceof Error ? error.message : 'Failed to update bucket');
+      }
     }
   };
 
@@ -94,8 +79,7 @@ export function BucketFormDialog({
     onOpenChange(false);
   };
 
-  const isLoading =
-    mode === 'create' ? createBucketMutation.isPending : editBucketMutation.isPending;
+  const isLoading = mode === 'create' ? isCreatingBucket : isEditingBucket;
   const submitButtonText =
     mode === 'create'
       ? isLoading
@@ -108,7 +92,7 @@ export function BucketFormDialog({
   return (
     <Dialog open={open} onOpenChange={handleClose}>
       <DialogContent className="w-[480px] p-0 border-zinc-200 shadow-[0px_1px_3px_0px_rgba(0,0,0,0.1)]">
-        <form onSubmit={handleSubmit} className="flex flex-col">
+        <form onSubmit={(e) => void handleSubmit(e)} className="flex flex-col">
           <DialogHeader className="px-6 py-3 flex flex-col gap-1 justify-start border-b border-zinc-200 dark:border-neutral-700">
             <DialogTitle className="text-lg font-semibold text-zinc-950 dark:text-white">
               {mode === 'create' ? 'Create New Bucket' : 'Edit Bucket'}

package/frontend/src/features/storage/components/FilePreviewDialog.tsx

@@ -1,11 +1,8 @@
 import { useState, useEffect } from 'react';
 import { Download, ExternalLink } from 'lucide-react';
-import { Dialog, DialogContent } from '@/components/radix/Dialog';
-import { Button } from '@/components/radix/Button';
-import { LoadingState } from '@/components';
-import { storageService } from '@/features/storage/services/storage.service';
+import { Button, Dialog, DialogContent, LoadingState, TypeBadge } from '@/components';
+import { useStorage } from '@/features/storage/hooks/useStorage';
 import { StorageFileSchema } from '@insforge/shared-schemas';
-import { TypeBadge } from '@/components/TypeBadge';
 
 interface FilePreviewDialogProps {
   open: boolean;
@@ -19,6 +16,8 @@ export function FilePreviewDialog({ open, onOpenChange, file, bucket }: FilePrev
   const [previewUrl, setPreviewUrl] = useState<string | null>(null);
   const [error, setError] = useState<string | null>(null);
 
+  const { downloadObject } = useStorage();
+
   // Reset state when file changes
   useEffect(() => {
     if (!file || !open) {
@@ -27,7 +26,9 @@ export function FilePreviewDialog({ open, onOpenChange, file, bucket }: FilePrev
       return;
     }
 
-    const loadPreview = () => {
+    let currentUrl: string | null = null;
+
+    const loadPreview = async () => {
       if (!file) {
         return;
       }
@@ -37,7 +38,10 @@ export function FilePreviewDialog({ open, onOpenChange, file, bucket }: FilePrev
 
       try {
         const fileBucket = file.bucket || bucket;
-        const url = storageService.getDownloadUrl(fileBucket, file.key);
+        // Fetch file with authentication and create blob URL
+        const blob = await downloadObject(fileBucket, file.key);
+        const url = URL.createObjectURL(blob);
+        currentUrl = url;
         setPreviewUrl(url);
       } catch (err) {
         const errorMessage = err instanceof Error ? err.message : 'Failed to load preview';
@@ -48,7 +52,14 @@ export function FilePreviewDialog({ open, onOpenChange, file, bucket }: FilePrev
     };
 
     void loadPreview();
-  }, [file, open, bucket]);
+
+    // Cleanup: Revoke blob URL when component unmounts or file changes
+    return () => {
+      if (currentUrl) {
+        URL.revokeObjectURL(currentUrl);
+      }
+    };
+  }, [file, open, bucket, downloadObject]);
 
   const handleDownload = () => {
     if (!file || !previewUrl) {
@@ -250,6 +261,7 @@ function TextPreview({ url }: { url: string }) {
     const loadTextContent = async () => {
       try {
         setLoading(true);
+        // Fetch the blob URL (which is already authenticated)
         const response = await fetch(url);
         if (!response.ok) {
           throw new Error('Failed to load text content');