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

@@ -459,15 +459,31 @@ export default class VersionEditDialogComponent implements OnInit {
     
     try {
       const formValue = this.versionForm.getRawValue();
+
+      const llmConfig = {
+        repo_id: formValue.llm.repo_id,
+        generation_config: formValue.llm.generation_config,
+        use_fine_tune: formValue.llm.use_fine_tune,
+        fine_tune_zip: formValue.llm.fine_tune_zip
+      };
       
-      // 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 : [],
+        examples: Array.isArray(intent.examples) ? intent.examples.filter((ex: any) => ex) : [],
+        parameters: Array.isArray(intent.parameters) ? intent.parameters.map((param: any) => ({
+          name: param.name,
+          caption: param.caption,
+          type: param.type,
+          required: param.required,
+          variable_name: param.variable_name,
+          extraction_prompt: param.extraction_prompt,
+          validation_regex: param.validation_regex,
+          invalid_prompt: param.invalid_prompt,
+          type_error_prompt: param.type_error_prompt
+        })) : [],
         action: intent.action,
         fallback_timeout_prompt: intent.fallback_timeout_prompt,
         fallback_error_prompt: intent.fallback_error_prompt
@@ -475,17 +491,18 @@ export default class VersionEditDialogComponent implements OnInit {
   
       const updateData = {
         caption: formValue.caption,
-        description: formValue.caption,
+        description: formValue.caption,  // description eksikti
         default_api: this.selectedVersion.default_api || '',
-        llm: formValue.llm,
+        published: this.selectedVersion.published,
+        llm: llmConfig,
         intents: intents,
-        parameters: formValue.parameters || [],
-        last_update_date: formValue.last_update_date
+        parameters: [],  // Global parameters, genelde boş
+        last_update_date: this.selectedVersion.last_update_date
       };
   
-      console.log('Saving version data:', updateData);
-  
-      await this.apiService.updateVersion(
+      console.log('Saving version data:', JSON.stringify(updateData, null, 2));
+
+      const result = await this.apiService.updateVersion(
         this.project.id, 
         this.selectedVersion.id, 
         updateData
@@ -493,30 +510,59 @@ export default class VersionEditDialogComponent implements OnInit {
   
       this.snackBar.open('Version saved successfully', 'Close', { duration: 3000 });
       
-      // Update last_update_date for next save
-      this.versionForm.patchValue({
-        last_update_date: new Date().toISOString()
-      });
+      // Update version data locally
+      if (result) {
+        this.selectedVersion = result;
+        this.versionForm.patchValue({
+          last_update_date: result.last_update_date
+        });
+      }
       
-      // Reload versions to get fresh data
+      // Reload versions
       await this.loadVersions();
       
     } catch (error: any) {
       console.error('Save error:', error);
       
-      if (error.status === 409 || error.requiresReload) {
-        // Race condition handling kodunuz...
-      } else {
-        const errorMessage = error.error?.detail || error.message || 'Failed to save version';
-        this.snackBar.open(errorMessage, 'Close', { 
-          duration: 5000,
-          panelClass: 'error-snackbar'
-        });
-      }
-    } finally {
-      this.saving = false;
+    if (error.status === 409) {
+      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 force save?',
+          confirmText: 'Force Save',
+          cancelText: 'Reload',
+          confirmColor: 'warn'
+        }
+      });
+
+      dialogRef.afterClosed().subscribe(async (forceSave) => {
+        if (forceSave) {
+          // Force save
+          await this.apiService.updateVersion(
+            this.project.id, 
+            this.selectedVersion!.id, 
+            updateData,
+            true  // force flag
+          ).toPromise();
+          this.snackBar.open('Version force saved', 'Close', { duration: 3000 });
+          await this.loadVersions();
+        } else {
+          // Reload
+          await this.loadVersions();
+        }
+      });
+    } else {
+      const errorMessage = error.error?.detail || error.message || 'Failed to save version';
+      this.snackBar.open(errorMessage, 'Close', { 
+        duration: 5000,
+        panelClass: 'error-snackbar'
+      });
     }
+  } finally {
+    this.saving = false;
   }
+}
 
   async publishVersion() {
     if (!this.selectedVersion) return;