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

@@ -420,7 +420,6 @@ export default class VersionEditDialogComponent implements OnInit {
 
   async saveVersion() {
     if (this.versionForm.invalid || !this.selectedVersion) {
-      // Hangi alanların invalid olduğunu göster
       const invalidFields: string[] = [];
       Object.keys(this.versionForm.controls).forEach(key => {
         const control = this.versionForm.get(key);
@@ -429,7 +428,6 @@ export default class VersionEditDialogComponent implements OnInit {
         }
       });
       
-      // Intents içindeki hataları kontrol et
       this.intents.controls.forEach((intent, index) => {
         if (intent.invalid) {
           invalidFields.push(`Intent ${index + 1}`);
@@ -446,7 +444,8 @@ export default class VersionEditDialogComponent implements OnInit {
     
     try {
       const formValue = this.versionForm.getRawValue();
-
+      
+      // LLM config'i düzgün formatta hazırla
       const llmConfig = {
         repo_id: formValue.llm.repo_id,
         generation_config: formValue.llm.generation_config,
@@ -454,6 +453,7 @@ export default class VersionEditDialogComponent implements OnInit {
         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,
@@ -476,19 +476,20 @@ export default class VersionEditDialogComponent implements OnInit {
         fallback_error_prompt: intent.fallback_error_prompt
       }));
   
+      // updateData'yı burada tanımla
       const updateData = {
         caption: formValue.caption,
-        description: formValue.caption,  // description eksikti
+        description: formValue.caption,
         default_api: this.selectedVersion.default_api || '',
         published: this.selectedVersion.published,
         llm: llmConfig,
         intents: intents,
-        parameters: [],  // Global parameters, genelde boş
+        parameters: [],
         last_update_date: this.selectedVersion.last_update_date
       };
   
       console.log('Saving version data:', JSON.stringify(updateData, null, 2));
-
+  
       const result = await this.apiService.updateVersion(
         this.project.id, 
         this.selectedVersion.id, 
@@ -511,45 +512,86 @@ export default class VersionEditDialogComponent implements OnInit {
     } catch (error: any) {
       console.error('Save error:', error);
       
-    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'
-      });
+      if (error.status === 409) {
+        // updateData'ya burada da ihtiyacımız var, yukarıdan taşıyalım
+        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
+        };
+        
+        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.filter((ex: any) => ex) : [],
+          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 retryUpdateData = {
+          caption: formValue.caption,
+          description: formValue.caption,
+          default_api: this.selectedVersion.default_api || '',
+          published: this.selectedVersion.published,
+          llm: llmConfig,
+          intents: intents,
+          parameters: [],
+          last_update_date: this.selectedVersion.last_update_date
+        };
+  
+        const { default: ConfirmDialogComponent } = await import('../confirm-dialog/confirm-dialog.component');
+        
+        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
+            try {
+              await this.apiService.updateVersion(
+                this.project.id, 
+                this.selectedVersion!.id, 
+                retryUpdateData,
+                true  // force flag
+              ).toPromise();
+              this.snackBar.open('Version force saved', 'Close', { duration: 3000 });
+              await this.loadVersions();
+            } catch (err: any) {
+              this.snackBar.open(err.error?.detail || 'Force save failed', 'Close', { 
+                duration: 5000,
+                panelClass: 'error-snackbar'
+              });
+            }
+          } 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;
     }
-  } finally {
-    this.saving = false;
   }
-}
 
   async publishVersion() {
     if (!this.selectedVersion) return;