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

@@ -42,18 +42,13 @@ export default class ApiEditDialogComponent implements OnInit {
   saving = false;
   testing = false;
   testResult: any = null;
+  testRequestJson = '{}';
+  allIntentParameters: string[] = [];
+  responseMappingVariables: string[] = [];
 
   httpMethods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'];
   retryStrategies = ['static', 'exponential'];
-
-  // Template variable helpers
-  templateVariables = [
-    { key: 'variables.origin', desc: 'Origin city from session' },
-    { key: 'variables.destination', desc: 'Destination city from session' },
-    { key: 'variables.flight_date', desc: 'Flight date from session' },
-    { key: 'auth_tokens.api_name.token', desc: 'Auth token for this API' },
-    { key: 'config.work_mode', desc: 'Current work mode' }
-  ];
+  variableTypes = ['str', 'int', 'float', 'bool', 'date'];
 
   constructor(
     private fb: FormBuilder,
@@ -65,6 +60,7 @@ export default class ApiEditDialogComponent implements OnInit {
 
   ngOnInit() {
     this.initializeForm();
+    this.loadIntentParameters();
 
     if (this.data.mode === 'edit' && this.data.api) {
       this.populateForm(this.data.api);
@@ -74,6 +70,11 @@ export default class ApiEditDialogComponent implements OnInit {
       delete duplicateData.last_update_date;
       this.populateForm(duplicateData);
     }
+
+    // Watch response mappings changes
+    this.form.get('response_mappings')?.valueChanges.subscribe(() => {
+      this.updateResponseMappingVariables();
+    });
   }
 
   initializeForm() {
@@ -85,6 +86,7 @@ export default class ApiEditDialogComponent implements OnInit {
       body_template: ['{}'],
       timeout_seconds: [10, [Validators.required, Validators.min(1), Validators.max(300)]],
       response_prompt: [''],
+      response_mappings: this.fb.array([]),
 
       // Headers Tab
       headers: this.fb.array([]),
@@ -139,6 +141,16 @@ export default class ApiEditDialogComponent implements OnInit {
       });
     }
 
+    // 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);
@@ -167,6 +179,10 @@ export default class ApiEditDialogComponent implements OnInit {
     return this.form.get('headers') as FormArray;
   }
 
+  get responseMappings() {
+    return this.form.get('response_mappings') as FormArray;
+  }
+
   createHeaderFormGroup(key = '', value = ''): FormGroup {
     return this.fb.group({
       key: [key, Validators.required],
@@ -174,6 +190,14 @@ export default class ApiEditDialogComponent implements OnInit {
     });
   }
 
+  createResponseMappingFormGroup(data: any = {}): FormGroup {
+    return this.fb.group({
+      variable_name: [data.variable_name || '', [Validators.required, Validators.pattern(/^[a-z_][a-z0-9_]*$/)]],
+      type: [data.type || 'str', Validators.required],
+      json_path: [data.json_path || '', Validators.required]
+    });
+  }
+
   addHeader() {
     this.headers.push(this.createHeaderFormGroup());
   }
@@ -182,6 +206,14 @@ export default class ApiEditDialogComponent implements OnInit {
     this.headers.removeAt(index);
   }
 
+  addResponseMapping() {
+    this.responseMappings.push(this.createResponseMappingFormGroup());
+  }
+
+  removeResponseMapping(index: number) {
+    this.responseMappings.removeAt(index);
+  }
+
   insertTemplateVariable(field: string, variable: string) {
     const control = field.includes('.') 
       ? this.form.get(field)
@@ -194,18 +226,118 @@ export default class ApiEditDialogComponent implements OnInit {
     }
   }
 
+  insertHeaderValue(index: number, variable: string) {
+    const headerGroup = this.headers.at(index);
+    if (headerGroup) {
+      const valueControl = headerGroup.get('value');
+      if (valueControl) {
+        const currentValue = valueControl.value || '';
+        const newValue = currentValue + `{{${variable}}}`;
+        valueControl.setValue(newValue);
+      }
+    }
+  }
+
+  getTemplateVariables(includeResponseMappings = true): string[] {
+    const variables = new Set<string>();
+
+    // Intent parameters
+    this.allIntentParameters.forEach(param => {
+      variables.add(`variables.${param}`);
+    });
+
+    // Auth tokens
+    const apiName = this.form.get('name')?.value || 'api_name';
+    variables.add(`auth_tokens.${apiName}.token`);
+
+    // Response mappings
+    if (includeResponseMappings) {
+      this.responseMappingVariables.forEach(varName => {
+        variables.add(`variables.${varName}`);
+      });
+    }
+
+    // Config variables
+    variables.add('config.work_mode');
+    variables.add('config.cloud_token');
+
+    return Array.from(variables).sort();
+  }
+
+  updateResponseMappingVariables() {
+    this.responseMappingVariables = [];
+    const mappings = this.responseMappings.value;
+    mappings.forEach((mapping: any) => {
+      if (mapping.variable_name) {
+        this.responseMappingVariables.push(mapping.variable_name);
+      }
+    });
+  }
+
+  async loadIntentParameters() {
+    try {
+      // Tüm projeleri al
+      const projects = await this.apiService.getProjects(false).toPromise();
+      const params = new Set<string>();
+
+      projects?.forEach(project => {
+        project.versions?.forEach(version => {
+          version.intents?.forEach(intent => {
+            intent.parameters?.forEach((param: any) => {
+              if (param.variable_name) {
+                params.add(param.variable_name);
+              }
+            });
+          });
+        });
+      });
+
+      this.allIntentParameters = Array.from(params).sort();
+    } catch (error) {
+      console.error('Failed to load intent parameters:', error);
+    }
+  }
+
   validateJSON(field: string): boolean {
     const control = this.form.get(field);
     if (!control || !control.value) return true;
 
     try {
-      JSON.parse(control.value);
+      const jsonStr = control.value;
+      
+      // Template değişkenlerini placeholder değerlerle değiştir
+      const processedJson = this.replaceVariablesForValidation(jsonStr);
+      
+      JSON.parse(processedJson);
       return true;
     } catch {
       return false;
     }
   }
 
+  replaceVariablesForValidation(jsonStr: string): string {
+    let processed = jsonStr;
+
+    // Numeric değişkenler için
+    const numericVars = ['passenger_count', 'count', 'timeout_seconds', 'retry_count'];
+    numericVars.forEach(varName => {
+      const regex = new RegExp(`{{\\s*variables\\.${varName}\\s*}}`, 'g');
+      processed = processed.replace(regex, '1');
+    });
+
+    // Boolean değişkenler için
+    const booleanVars = ['enabled', 'published'];
+    booleanVars.forEach(varName => {
+      const regex = new RegExp(`{{\\s*variables\\.${varName}\\s*}}`, 'g');
+      processed = processed.replace(regex, 'true');
+    });
+
+    // Diğer tüm değişkenler için string değer
+    processed = processed.replace(/\{\{[^}]+\}\}/g, '"placeholder"');
+
+    return processed;
+  }
+
   async testAPI() {
     // Validate form first
     const generalValid = this.form.get('url')?.valid && this.form.get('method')?.valid;
@@ -220,7 +352,10 @@ export default class ApiEditDialogComponent implements OnInit {
     try {
       const testData = this.prepareAPIData();
       
-      // For test, we'll use a sample request
+      // Test için request JSON'ını hazırla
+      const testRequestData = this.prepareTestRequest();
+      testData.test_request = testRequestData;
+      
       const result = await this.apiService.testAPI(testData).toPromise();
       this.testResult = result;
 
@@ -246,6 +381,64 @@ export default class ApiEditDialogComponent implements OnInit {
     }
   }
 
+  prepareTestRequest(): any {
+    try {
+      const requestData = JSON.parse(this.testRequestJson);
+      return requestData;
+    } catch {
+      return {};
+    }
+  }
+
+  updateTestRequestJson() {
+    const formValue = this.form.getRawValue();
+    let bodyTemplate = {};
+
+    try {
+      bodyTemplate = JSON.parse(formValue.body_template);
+    } catch {
+      bodyTemplate = {};
+    }
+
+    // Placeholder değerlerle doldur
+    const testData = this.replacePlaceholdersForTest(bodyTemplate);
+    this.testRequestJson = JSON.stringify(testData, null, 2);
+  }
+
+  replacePlaceholdersForTest(obj: any): any {
+    if (typeof obj === 'string') {
+      // Template değişkenlerini test değerleriyle değiştir
+      let result = obj;
+      
+      // Intent parameters
+      result = result.replace(/\{\{variables\.origin\}\}/g, 'Istanbul');
+      result = result.replace(/\{\{variables\.destination\}\}/g, 'Ankara');
+      result = result.replace(/\{\{variables\.flight_date\}\}/g, '2025-06-15');
+      result = result.replace(/\{\{variables\.passenger_count\}\}/g, '2');
+      result = result.replace(/\{\{variables\.flight_number\}\}/g, 'TK123');
+      result = result.replace(/\{\{variables\.pnr\}\}/g, 'ABC12');
+      result = result.replace(/\{\{variables\.surname\}\}/g, 'Test');
+      
+      // Auth tokens
+      result = result.replace(/\{\{auth_tokens\.[^}]+\.token\}\}/g, 'test_token_123');
+      
+      // Config
+      result = result.replace(/\{\{config\.work_mode\}\}/g, 'hfcloud');
+      
+      // Diğer değişkenler
+      result = result.replace(/\{\{[^}]+\}\}/g, 'test_value');
+      
+      return result;
+    } else if (typeof obj === 'object' && obj !== null) {
+      const result: any = Array.isArray(obj) ? [] : {};
+      for (const key in obj) {
+        result[key] = this.replacePlaceholdersForTest(obj[key]);
+      }
+      return result;
+    }
+    return obj;
+  }
+
   prepareAPIData(): any {
     const formValue = this.form.getRawValue();
 
@@ -285,11 +478,12 @@ export default class ApiEditDialogComponent implements OnInit {
       name: formValue.name,
       url: formValue.url,
       method: formValue.method,
-      headers,  // Now it's a dictionary object
+      headers,
       body_template,
       timeout_seconds: formValue.timeout_seconds,
       retry: formValue.retry,
-      response_prompt: formValue.response_prompt
+      response_prompt: formValue.response_prompt,
+      response_mappings: formValue.response_mappings || []
     };
 
     // Add proxy if specified