d1s 0.2.11 → 0.2.12

package/src/components/editable-row.jsx

@@ -1,169 +0,0 @@
-// components/editable-row.jsx
-'use client';
-
-import React, { useState } from 'react';
-import { TableRow, TableCell } from '@/components/ui/table';
-import { Input } from '@/components/ui/input';
-import { Checkbox } from '@/components/ui/checkbox';
-import { Trash2 } from 'lucide-react';
-import { Button } from '@/components/ui/button';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-
-function cleanValue(value) {
-  return typeof value === 'string' ? value.replace(/^'|'$/g, '') : value;
-}
-
-export function EditableRow({ 
-  schema,
-  onRemove,
-  onChange,
-  showCheckbox = false,
-  initialData = {}
-}) {
-  const [rowData, setRowData] = useState(() => {
-    return schema.reduce((acc, col) => {
-      let defaultValue = initialData[col.name] ?? null;
-      defaultValue = cleanValue(defaultValue);
-      
-      if (defaultValue === null) {
-        if (col.dflt_value) {
-          defaultValue = cleanValue(col.dflt_value);
-        } else if (col.type.toUpperCase() === 'INTEGER') {
-          defaultValue = '';
-        } else if (col.type.toUpperCase() === 'TEXT') {
-          defaultValue = '';
-        }
-      }
-
-      acc[col.name] = defaultValue;
-      return acc;
-    }, {});
-  });
-
-  const handleChange = (column, value) => {
-    const newData = { ...rowData, [column]: value };
-    setRowData(newData);
-    onChange?.(newData);
-  };
-
-  const isBoolean = (col) => {
-    const type = col.type?.toLowerCase() || '';
-    return type === 'boolean' || 
-           type === 'bool' || 
-           (type === 'integer' && col.name.toLowerCase().startsWith('is_'));
-  };
-
-  return (
-    <TableRow className="bg-orange-50/50">
-      <TableCell className="w-10 p-0">
-        <div className="pl-1 flex items-center">
-          {showCheckbox ? (
-            <Checkbox disabled />
-          ) : (
-            <Button 
-              variant="ghost" 
-              size="icon"
-              className="h-8 w-8 text-orange-700 hover:text-orange-800"
-              onClick={onRemove}
-            >
-              <Trash2 className="h-4 w-4" />
-            </Button>
-          )}
-        </div>
-      </TableCell>
-      {schema.map((col) => {
-        const isPrimaryKey = col.pk === 1;
-        const allowedValues = col.check || null;
-
-        // Handle boolean fields
-        if (isBoolean(col)) {
-          // Parse default value from schema
-          let defaultBoolValue = 'false';
-          if (col.dflt_value !== null && col.dflt_value !== undefined) {
-            // Handle different formats of default values
-            const dfltVal = col.dflt_value.toString().toLowerCase();
-            defaultBoolValue = (
-              dfltVal === '1' || 
-              dfltVal === 'true' || 
-              dfltVal === "'true'" || 
-              dfltVal === '"true"'
-            ) ? 'true' : 'false';
-          }
-
-          // Use rowData if it exists, otherwise use default
-          const currentValue = rowData[col.name] !== null && rowData[col.name] !== undefined
-            ? (rowData[col.name] === 1 || rowData[col.name] === true || rowData[col.name] === 'true' ? 'true' : 'false')
-            : defaultBoolValue;
-
-          return (
-            <TableCell key={col.name} className="border-x border-neutral-200 p-0">
-              <div className="w-full">
-                <Select
-                  value={currentValue}
-                  onValueChange={(value) => handleChange(col.name, value === 'true' ? 1 : 0)}
-                  // Removed disabled={isPrimaryKey} to allow editing
-                >
-                  <SelectTrigger 
-                    className="w-full h-9 min-w-0 rounded-none border-0 bg-orange-50 text-orange-900"
-                    title={`Default: ${defaultBoolValue}`}
-                  >
-                    <SelectValue placeholder={`Select ${col.name}`} />
-                  </SelectTrigger>
-                  <SelectContent className="min-w-[8rem]">
-                    <SelectItem value="true">true</SelectItem>
-                    <SelectItem value="false">false</SelectItem>
-                  </SelectContent>
-                </Select>
-              </div>
-            </TableCell>
-          );
-        }
-        
-        // Handle fields with check constraints
-        if (allowedValues?.length > 0) {
-          return (
-            <TableCell key={col.name} className="border-x border-neutral-200 p-0">
-              <div className="w-full">
-                <Select
-                  value={rowData[col.name] ?? allowedValues[0]}
-                  onValueChange={(value) => handleChange(col.name, value)}
-                  // Removed disabled={isPrimaryKey} to allow editing
-                >
-                  <SelectTrigger className="w-full h-9 min-w-0 rounded-none border-0 bg-orange-50 text-orange-900">
-                    <SelectValue placeholder={`Select ${col.name}`} />
-                  </SelectTrigger>
-                  <SelectContent className="min-w-[8rem]">
-                    {allowedValues.map(value => (
-                      <SelectItem key={value} value={value}>
-                        {value}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              </div>
-            </TableCell>
-          );
-        }
-
-        // Default input for other fields (primary key input is now editable)
-        return (
-          <TableCell key={col.name} className="border-x border-neutral-200 p-0">
-            <Input
-              value={rowData[col.name] ?? ''}
-              onChange={(e) => handleChange(col.name, e.target.value)}
-              className="w-full min-w-0 rounded-none border-0 px-2 bg-orange-50 text-orange-900"
-              placeholder={isPrimaryKey ? 'Auto-generated' : `Enter ${col.name}`}
-              // Removed disabled={isPrimaryKey} so primary key can be edited
-            />
-          </TableCell>
-        );
-      })}
-    </TableRow>
-  );
-}

package/src/components/environment-handler.jsx

@@ -1,332 +0,0 @@
-// components/environemtn-handler.jsx
-"use client";
-
-import { useState } from "react";
-import { useToast } from "@/hooks/use-toast";
-import { useDatabase } from "@/context/database-context";
-import PushPreviewToast from "./push-preview-toast";
-import PullPreviewToast from "./pull-preview-toast";
-
-const ErrorTypes = {
-  FOREIGN_KEY_ERROR: "FOREIGN_KEY_ERROR",
-  TABLE_EXISTS: "TABLE_EXISTS",
-  CONNECTION_ERROR: "CONNECTION_ERROR",
-  CONFIG_ERROR: "CONFIG_ERROR",
-  PULL_ERROR: "PULL_ERROR"
-};
-
-export function useEnvironmentController() {
-  const [isConnecting, setIsConnecting] = useState(false);
-  const [isPushing, setIsPushing] = useState(false);
-  // New state for data pull status
-  const [isDataPulling, setIsDataPulling] = useState(false);
-  const [showPreview, setShowPreview] = useState(false);
-  const [previewData, setPreviewData] = useState(null);
-  const [previewError, setPreviewError] = useState(null);
-  const [previewType, setPreviewType] = useState(null);
-  const [previewSuccess, setPreviewSuccess] = useState(null);
-  const [environment, setEnvironment] = useState('local');
-  const { toast } = useToast();
-  const { refreshTables } = useDatabase();
-
-  const clearPreviewState = () => {
-    setShowPreview(false);
-    setPreviewData(null);
-    setPreviewError(null);
-    setPreviewType(null);
-    setPreviewSuccess(null);
-  };
-
-  // Validate stored credentials
-  const validateStoredCredentials = async () => {
-    const storedCreds = localStorage.getItem("cf_credentials");
-    if (!storedCreds) return null;
-    try {
-      const credentials = JSON.parse(storedCreds);
-      const response = await fetch("/api/cloudflare", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(credentials)
-      });
-      if (!response.ok) throw new Error("Invalid stored credentials");
-      const data = await response.json();
-      return { ...credentials, databaseId: data.database.id };
-    } catch (error) {
-      console.error("Failed to validate stored credentials:", error);
-      localStorage.removeItem("cf_credentials");
-      return null;
-    }
-  };
-
-  // Push to remote preview
-  const pushToRemote = async () => {
-    try {
-      setPreviewType("push");
-      setShowPreview(true);
-      setIsPushing(true);
-      setPreviewError(null);
-      setPreviewSuccess(null);
-      setPreviewData({ preview: [] }); // show loading state
-      
-      const credentials = await validateStoredCredentials();
-      if (!credentials) throw new Error('No valid credentials found');
-      
-      const response = await fetch('/api/push-remote/preview', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(credentials)
-      });
-      
-      const data = await response.json();
-      if (!data.success) {
-        throw new Error(data.error?.message || 'Failed to generate preview');
-      }
-      
-      setPreviewData(data.details.details);
-    } catch (error) {
-      console.error('Push to remote preview failed:', error);
-      setPreviewError(error);
-      toast({
-        title: "Preview Failed",
-        description: error.message || 'Failed to generate preview',
-        variant: "destructive",
-      });
-    } finally {
-      setIsPushing(false);
-    }
-  };
-
-  // Update the confirmPush function:
-  const confirmPush = async () => {
-    try {
-      setIsPushing(true);
-      setPreviewError(null);
-      setPreviewSuccess(null);
-      
-      const credentials = await validateStoredCredentials();
-      if (!credentials) throw new Error("No valid credentials found");
-  
-      const response = await fetch("/api/push-remote/confirm", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(credentials)
-      });
-      
-      const data = await response.json();
-      if (!data.success) {
-        throw new Error(data.error?.message || 'Failed to confirm push');
-      }
-  
-      // Update the preview data to show applied status
-      setPreviewData(prev => ({
-        ...prev,
-        preview: prev.preview.map(item => ({
-          ...item,
-          action: item.action === 'will be applied' ? 'applied' : item.action
-        }))
-      }));
-  
-      setPreviewSuccess(`Applied ${data.details.applied} migration(s), skipped ${data.details.skipped}.`);
-      
-      // Reset environment after success
-      setEnvironment('local');
-    } catch (error) {
-      console.error("Push to remote confirm failed:", error);
-      setPreviewError(error);
-      // Reset environment after error
-      setEnvironment('local');
-    } finally {
-      setIsPushing(false);
-    }
-  };
-
-  // Pull to remote preview
-  const pullToRemotePreview = async () => {
-    try {
-      setPreviewType("pull");
-      setShowPreview(true);
-      setIsPushing(true);
-      setPreviewError(null);
-      setPreviewSuccess(null);
-      setPreviewData({ preview: [] }); // show loading state
-
-      const credentials = await validateStoredCredentials();
-      if (!credentials) throw new Error("No valid credentials found");
-      
-      const response = await fetch('/api/pull-remote/preview', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(credentials)
-      });
-      const data = await response.json();
-      if (!data.success) {
-        throw new Error(data.error?.message || 'Failed to generate pull preview');
-      }
-      setPreviewData(data.details);
-    } catch (error) {
-      console.error('Pull to remote preview failed:', error);
-      setPreviewError(error);
-      toast({
-        title: "Preview Failed",
-        description: error.message || 'Failed to generate pull preview',
-        variant: "destructive",
-      });
-    } finally {
-      setIsPushing(false);
-    }
-  };
-
-  // In confirmPull function, add environment reset:
-  const confirmPull = async () => {
-    try {
-      setIsPushing(true);
-      setEnvironment('pull'); // Ensure correct state during pull
-      setPreviewError(null);
-      setPreviewSuccess(null);
-      
-      const credentials = await validateStoredCredentials();
-      if (!credentials) throw new Error("No valid credentials found");
-  
-      const response = await fetch("/api/pull-remote/confirm", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(credentials)
-      });
-      
-      const data = await response.json();
-      if (!data.success) {
-        throw new Error(data.error?.message || 'Failed to confirm pull');
-      }
-  
-      setPreviewSuccess(`Pull migrations applied successfully.`);
-      
-      setPreviewData(prev => ({
-        ...prev,
-        preview: prev.preview.map(item => ({
-          ...item,
-          action: item.action === 'will be applied' ? 'applied' : item.action
-        }))
-      }));
-  
-      await refreshTables();
-      
-    } catch (error) {
-      console.error("Pull to remote confirm failed:", error);
-      setPreviewError(error);
-    } finally {
-      setIsPushing(false);
-      setEnvironment('local'); // Reset to local regardless of success/failure
-    }
-  };
-
-    // In confirmDataPull function, add syncing state:
-    const confirmDataPull = async () => {
-      try {
-        setIsDataPulling(true);
-        setEnvironment('syncing'); // Set environment to syncing during data pull
-        setPreviewError(null);
-        setPreviewSuccess(null);
-        
-        const credentials = await validateStoredCredentials();
-        if (!credentials) throw new Error("No valid credentials found");
-    
-        const response = await fetch("/api/pull-data/confirm", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify(credentials)
-        });
-        
-        const data = await response.json();
-        if (!data.success) {
-          throw new Error(data.error?.message || 'Failed to confirm data pull');
-        }
-    
-        setPreviewSuccess("Remote data synced successfully.");
-        await refreshTables();
-        
-      } catch (error) {
-        console.error("Data pull confirm failed:", error);
-        setPreviewError(error);
-      } finally {
-        setIsDataPulling(false);
-        setEnvironment('local'); // Reset to local regardless of success/failure
-      }
-    };
-
-  // Connect to Cloudflare
-  async function connectToCloudflare(credentials) {
-    try {
-      setIsConnecting(true);
-      const response = await fetch("/api/cloudflare", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(credentials)
-      });
-      const data = await response.json();
-      if (!response.ok) throw new Error(data.error || "Failed to connect to Cloudflare");
-      localStorage.setItem("cf_credentials", JSON.stringify({
-        ...credentials,
-        databaseId: data.database.id
-      }));
-      toast({
-        title: "Connected to Cloudflare",
-        description: `Connected to database: ${data.database.name}`,
-        variant: "default"
-      });
-    } catch (error) {
-      toast({
-        title: "Connection Failed",
-        description: error.message || "Failed to connect to Cloudflare",
-        variant: "destructive"
-      });
-      throw error;
-    } finally {
-      setIsConnecting(false);
-    }
-  }
-
-  // Update PreviewUI to pass onDataPull and isDataPulling for pull previews.
-  const PreviewUI = showPreview && (
-    previewType === "pull" ? (
-      <PullPreviewToast
-        preview={previewData?.preview || []}
-        onConfirm={confirmPull}
-        onDataPull={confirmDataPull} // pass the new data pull handler
-        onCancel={clearPreviewState}
-        isConfirming={isPushing}
-        isDataPulling={isDataPulling}
-        error={previewError}
-        success={previewSuccess}
-        isLoading={isPushing && !previewData?.preview?.length}
-      />
-    ) : (
-      <PushPreviewToast
-        preview={previewData?.preview || []}
-        onConfirm={confirmPush}
-        onCancel={clearPreviewState}
-        isConfirming={isPushing}
-        error={previewError}
-        success={previewSuccess}
-        isLoading={isPushing && !previewData?.preview?.length}
-      />
-    )
-  );
-
-  return {
-    isConnecting,
-    isPushing,
-    isDataPulling,
-    showPreview,
-    previewError,
-    environment, // Add this
-    setEnvironment, // Add this if needed
-    pushToRemote,
-    pullToRemotePreview,
-    confirmPull,
-    confirmDataPull, // export the new function
-    connectToCloudflare,
-    validateStoredCredentials,
-    PreviewUI
-  };
-}
-

package/src/components/environment-select.jsx

@@ -1,62 +0,0 @@
-import { 
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue
-} from '@/components/ui/select';
-import { HardDrive, Download, Upload, Loader2 } from 'lucide-react';
-
-export function EnvironmentSelect({ 
-  value, 
-  onValueChange, 
-  isLoading, 
-  disabled,
-  showPreview
-}) {
-  return (
-    <Select
-      value={value}
-      onValueChange={onValueChange}
-      disabled={disabled || isLoading || showPreview}
-    >
-      <SelectTrigger className="w-full bg-white border-neutral-200 font-medium">
-        <div className="flex items-center gap-1 text-sm">
-          {isLoading || showPreview ? (
-            <>
-              <Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
-              <span className="text-muted-foreground font-medium">
-                {value === "pull" ? "Pulling..." : 
-                 value === "syncing" ? "Syncing..." :
-                 value === "production" ? "Pushing..." : 
-                 "Loading..."}
-              </span>
-            </>
-          ) : (
-            <SelectValue placeholder="Environment" className="w-full" />
-          )}
-        </div>
-      </SelectTrigger>
-      <SelectContent>
-        <SelectItem value="local">
-          <div className="flex items-center gap-2">
-            <HardDrive className="h-4 w-4" />
-            <span>Local</span>
-          </div>
-        </SelectItem>
-        <SelectItem value="pull">
-          <div className="flex items-center gap-2">  
-            <Download className="h-4 w-4" />
-            <span>Pull remote</span>
-          </div>
-        </SelectItem>
-        <SelectItem value="production">
-          <div className="flex items-center gap-2">
-            <Upload className="h-4 w-4" />
-            <span>Push remote</span>
-          </div>
-        </SelectItem>
-      </SelectContent>
-    </Select>
-  );
-}