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

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

@@ -169,17 +169,34 @@ export default class VersionEditDialogComponent implements OnInit {
   }
 
   createIntentFormGroup(intent: any = {}): FormGroup {
-    return this.fb.group({
+    const group = this.fb.group({
       name: [intent.name || '', [Validators.required, Validators.pattern(/^[a-zA-Z0-9-]+$/)]],
       caption: [intent.caption || ''],
       locale: [intent.locale || 'tr-TR'],
       detection_prompt: [intent.detection_prompt || '', Validators.required],
-      examples: this.fb.array(intent.examples || []),
-      parameters: this.fb.array([]),  // Boş array ile başla
+      examples: this.fb.array([]),
+      parameters: this.fb.array([]),
       action: [intent.action || '', Validators.required],
       fallback_timeout_prompt: [intent.fallback_timeout_prompt || ''],
       fallback_error_prompt: [intent.fallback_error_prompt || '']
     });
+  
+    // Examples ve parameters'ı ayrı olarak ekle
+    if (intent.examples && Array.isArray(intent.examples)) {
+      const examplesArray = group.get('examples') as FormArray;
+      intent.examples.forEach((example: string) => {
+        examplesArray.push(this.fb.control(example));
+      });
+    }
+  
+    if (intent.parameters && Array.isArray(intent.parameters)) {
+      const parametersArray = group.get('parameters') as FormArray;
+      intent.parameters.forEach((param: any) => {
+        parametersArray.push(this.createParameterFormGroup(param));
+      });
+    }
+  
+    return group;
   }
 
   private populateIntentParameters(intentFormGroup: FormGroup, parameters: any[]) {
@@ -242,20 +259,49 @@ export default class VersionEditDialogComponent implements OnInit {
     const { default: IntentEditDialogComponent } = await import('../intent-edit-dialog/intent-edit-dialog.component');
     
     const intent = this.intents.at(intentIndex);
+    const currentValue = intent.value;
+    
+    // Intent verilerini dialog'a gönder
     const dialogRef = this.dialog.open(IntentEditDialogComponent, {
       width: '90vw',
       maxWidth: '1000px',
       data: { 
-        intent: intent.value,
+        intent: {
+          ...currentValue,
+          examples: currentValue.examples || [],
+          parameters: currentValue.parameters || []
+        },
         project: this.project,
         apis: await this.getAvailableAPIs()
       }
     });
-
+  
     dialogRef.afterClosed().subscribe(result => {
       if (result) {
-        // Update the intent in the form array
-        intent.patchValue(result);
+        // FormArray'leri yeniden oluştur
+        intent.patchValue({
+          name: result.name,
+          caption: result.caption,
+          locale: result.locale,
+          detection_prompt: result.detection_prompt,
+          action: result.action,
+          fallback_timeout_prompt: result.fallback_timeout_prompt,
+          fallback_error_prompt: result.fallback_error_prompt
+        });
+  
+        // Examples'ı güncelle
+        const examplesArray = intent.get('examples') as FormArray;
+        examplesArray.clear();
+        (result.examples || []).forEach((example: string) => {
+          examplesArray.push(this.fb.control(example));
+        });
+  
+        // Parameters'ı güncelle
+        const parametersArray = intent.get('parameters') as FormArray;
+        parametersArray.clear();
+        (result.parameters || []).forEach((param: any) => {
+          parametersArray.push(this.createParameterFormGroup(param));
+        });
       }
     });
   }
@@ -387,34 +433,64 @@ export default class VersionEditDialogComponent implements OnInit {
 
   async saveVersion() {
     if (this.versionForm.invalid || !this.selectedVersion) {
-      this.snackBar.open('Please fix all validation errors', 'Close', { duration: 3000 });
+      // Hangi alanların invalid olduğunu göster
+      const invalidFields: string[] = [];
+      Object.keys(this.versionForm.controls).forEach(key => {
+        const control = this.versionForm.get(key);
+        if (control && control.invalid) {
+          invalidFields.push(key);
+        }
+      });
+      
+      // Intents içindeki hataları kontrol et
+      this.intents.controls.forEach((intent, index) => {
+        if (intent.invalid) {
+          invalidFields.push(`Intent ${index + 1}`);
+        }
+      });
+  
+      this.snackBar.open(`Please fix validation errors in: ${invalidFields.join(', ')}`, 'Close', { 
+        duration: 5000 
+      });
       return;
     }
-
+  
     this.saving = true;
     
-    // updateData'yı try bloğunun dışında tanımla
-    const formValue = this.versionForm.getRawValue();
-    const intents = formValue.intents.map((intent: any) => ({
-      ...intent,
-      examples: intent.examples || []
-    }));
-
-    const updateData = {
-      caption: formValue.caption,
-      general_prompt: formValue.general_prompt,
-      llm: formValue.llm,
-      intents: intents,
-      last_update_date: formValue.last_update_date
-    };
-
     try {
+      const formValue = this.versionForm.getRawValue();
+      
+      // Intent verilerini düzgün formatta hazırla
+      const intents = formValue.intents.map((intent: any) => ({
+        name: intent.name,
+        caption: intent.caption,
+        locale: intent.locale,
+        detection_prompt: intent.detection_prompt,
+        examples: Array.isArray(intent.examples) ? intent.examples : [],
+        parameters: Array.isArray(intent.parameters) ? intent.parameters : [],
+        action: intent.action,
+        fallback_timeout_prompt: intent.fallback_timeout_prompt,
+        fallback_error_prompt: intent.fallback_error_prompt
+      }));
+  
+      const updateData = {
+        caption: formValue.caption,
+        description: formValue.caption,
+        default_api: this.selectedVersion.default_api || '',
+        llm: formValue.llm,
+        intents: intents,
+        parameters: formValue.parameters || [],
+        last_update_date: formValue.last_update_date
+      };
+  
+      console.log('Saving version data:', updateData);
+  
       await this.apiService.updateVersion(
         this.project.id, 
         this.selectedVersion.id, 
         updateData
       ).toPromise();
-
+  
       this.snackBar.open('Version saved successfully', 'Close', { duration: 3000 });
       
       // Update last_update_date for next save
@@ -422,55 +498,17 @@ export default class VersionEditDialogComponent implements OnInit {
         last_update_date: new Date().toISOString()
       });
       
+      // Reload versions to get fresh data
+      await this.loadVersions();
+      
     } catch (error: any) {
+      console.error('Save error:', error);
+      
       if (error.status === 409 || error.requiresReload) {
-        // Race condition detected
-        const dialogRef = this.dialog.open(ConfirmDialogComponent, {
-          width: '500px',
-          data: {
-            title: 'Version Modified',
-            message: 'This version was modified by another user. Do you want to reload and lose your changes, or save anyway?',
-            confirmText: 'Reload',
-            cancelText: 'Save Anyway',
-            confirmColor: 'primary'
-          }
-        });
-
-        dialogRef.afterClosed().subscribe(async (shouldReload) => {
-          if (shouldReload) {
-            // Reload version
-            await this.reloadProject();
-            if (this.selectedVersion) {
-              const updated = this.versions.find(v => v.id === this.selectedVersion!.id);
-              if (updated) {
-                this.loadVersion(updated);
-              }
-            }
-          } else {
-            // Force save by removing last_update_date check
-            const forceUpdateData = { ...updateData };  // updateData artık erişilebilir
-            delete forceUpdateData.last_update_date;
-            
-            try {
-              await this.apiService.updateVersion(
-                this.project.id,
-                this.selectedVersion!.id,
-                forceUpdateData,
-                true  // force parameter
-              ).toPromise();
-              
-              this.snackBar.open('Version saved (forced)', 'Close', { duration: 3000 });
-              await this.reloadProject();
-            } catch (err: any) {
-              this.snackBar.open(err.error?.detail || 'Failed to save version', 'Close', {
-                duration: 5000,
-                panelClass: 'error-snackbar'
-              });
-            }
-          }
-        });
+        // Race condition handling kodunuz...
       } else {
-        this.snackBar.open(error.error?.detail || 'Failed to save version', 'Close', { 
+        const errorMessage = error.error?.detail || error.message || 'Failed to save version';
+        this.snackBar.open(errorMessage, 'Close', { 
           duration: 5000,
           panelClass: 'error-snackbar'
         });