feat: enhance import handling with detailed conflict resolution and UI updates

2025-11-24 23:48:25 +00:00
parent e4b737710c
commit 897959a621
8 changed files with 327 additions and 42 deletions
--- a/frontend/src/api/import.ts
+++ b/frontend/src/api/import.ts
@@ -16,6 +16,23 @@ export interface ImportPreview {
    errors: string[];
  };
  caddyfile_content?: string;
+  conflict_details?: Record<string, {
+    existing: {
+      forward_scheme: string;
+      forward_host: string;
+      forward_port: number;
+      ssl_forced: boolean;
+      websocket: boolean;
+      enabled: boolean;
+    };
+    imported: {
+      forward_scheme: string;
+      forward_host: string;
+      forward_port: number;
+      ssl_forced: boolean;
+      websocket: boolean;
+    };
+  }>;
 }

 export const uploadCaddyfile = async (content: string): Promise<ImportPreview> => {