Update flare-ui/src/app/dialogs/api-edit-dialog/api-edit-dialog.component.ts

flare-ui/src/app/dialogs/api-edit-dialog/api-edit-dialog.component.ts

@@ -47,6 +47,7 @@ export default class ApiEditDialogComponent implements OnInit {
   testRequestJson = '{}';
   allIntentParameters: { name: string; type: string }[] = [];
   responseMappingVariables: { name: string; type: string }[] = [];
+  activeTabIndex = 0;  
 
   httpMethods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'];
   retryStrategies = ['static', 'exponential'];
@@ -67,7 +68,12 @@ export default class ApiEditDialogComponent implements OnInit {
     this.initializeForm();
     this.loadIntentParameters();
 
-    if (this.data.mode === 'edit' && this.data.api) {
+    // Aktif tab'ı ayarla
+    if (this.data.activeTab !== undefined) {
+      this.activeTabIndex = this.data.activeTab;
+    }
+
+    if ((this.data.mode === 'edit' || this.data.mode === 'test') && this.data.api) {
       this.populateForm(this.data.api);
     } else if (this.data.mode === 'duplicate' && this.data.api) {
       const duplicateData = { ...this.data.api };
@@ -76,12 +82,82 @@ export default class ApiEditDialogComponent implements OnInit {
       this.populateForm(duplicateData);
     }
 
+    // Test modunda açıldıysa test JSON'ını hazırla
+    if (this.data.mode === 'test') {
+      setTimeout(() => {
+        this.updateTestRequestJson();
+      }, 100);
+    }
+
     // Watch response mappings changes
     this.form.get('response_mappings')?.valueChanges.subscribe(() => {
       this.updateResponseMappingVariables();
     });
   }
 
+  populateForm(api: any) {
+    console.log('Populating form with API:', api); // Debug için
+    
+    // Convert headers object to FormArray
+    const headersArray = this.form.get('headers') as FormArray;
+    headersArray.clear();
+  
+    if (api.headers) {
+      // ✅ Array veya Object olabilir, kontrol edelim
+      if (Array.isArray(api.headers)) {
+        // Eğer array ise direkt kullan
+        api.headers.forEach((header: any) => {
+          headersArray.push(this.createHeaderFormGroup(header.key || '', header.value || ''));
+        });
+      } else if (typeof api.headers === 'object') {
+        // Eğer object ise entries ile dönüştür
+        Object.entries(api.headers).forEach(([key, value]) => {
+          headersArray.push(this.createHeaderFormGroup(key, value as string));
+        });
+      }
+    }
+  
+    // Convert response_mappings to FormArray
+    const responseMappingsArray = this.form.get('response_mappings') as FormArray;
+    responseMappingsArray.clear();
+  
+    if (api.response_mappings && Array.isArray(api.response_mappings)) {
+      api.response_mappings.forEach((mapping: any) => {
+        responseMappingsArray.push(this.createResponseMappingFormGroup(mapping));
+      });
+    }
+  
+    // Convert body_template to JSON string if it's an object
+    if (api.body_template && typeof api.body_template === 'object') {
+      api.body_template = JSON.stringify(api.body_template, null, 2);
+    }
+  
+    // Convert auth bodies to JSON strings  
+    if (api.auth) {
+      if (api.auth.token_request_body && typeof api.auth.token_request_body === 'object') {
+        api.auth.token_request_body = JSON.stringify(api.auth.token_request_body, null, 2);
+      }
+      if (api.auth.token_refresh_body && typeof api.auth.token_refresh_body === 'object') {
+        api.auth.token_refresh_body = JSON.stringify(api.auth.token_refresh_body, null, 2);
+      }
+    }
+  
+    // ✅ patchValue'dan önce form değerlerini düzelt
+    const formData = { ...api };
+    
+    // headers array'ini kaldır çünkü zaten FormArray'e ekledik
+    delete formData.headers;
+    delete formData.response_mappings;
+  
+    // Patch form values
+    this.form.patchValue(formData);
+  
+    // Disable name field if editing or testing
+    if (this.data.mode === 'edit' || this.data.mode === 'test') {
+      this.form.get('name')?.disable();
+    }
+  }
+
   initializeForm() {
     this.form = this.fb.group({
       // General Tab
@@ -598,6 +674,11 @@ export default class ApiEditDialogComponent implements OnInit {
   }
 
   async save() {
+    if (this.data.mode === 'test') {
+      this.cancel();
+      return;
+    }
+    
     if (this.form.invalid) {
       // Mark all fields as touched to show validation errors
       Object.keys(this.form.controls).forEach(key => {