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

@@ -127,7 +127,7 @@ export default class VersionEditDialogComponent implements OnInit {
       id: version.id,
       caption: version.caption || '',
       published: version.published || false,
-      general_prompt: '', // Bu alan version'da yok, backend'de kontrol edilmeli
+      general_prompt: (version as any).general_prompt || '', // Backend'den gelen general_prompt
       last_update_date: version.last_update_date || ''
     });
   
@@ -154,6 +154,33 @@ export default class VersionEditDialogComponent implements OnInit {
       this.intents.push(this.createIntentFormGroup(intent));
     });
   }
+  
+  async loadVersions() {
+    this.loading = true;
+    try {
+      const project = await this.apiService.getProject(this.project.id).toPromise();
+      if (project) {
+        this.project = project;
+        this.versions = [...project.versions].sort((a, b) => b.id - a.id);
+        
+        // Re-select current version if it still exists
+        if (this.selectedVersion) {
+          const currentVersion = this.versions.find(v => v.id === this.selectedVersion!.id);
+          if (currentVersion) {
+            this.loadVersion(currentVersion);
+          } else if (this.versions.length > 0) {
+            this.loadVersion(this.versions[0]);
+          }
+        } else if (this.versions.length > 0) {
+          this.loadVersion(this.versions[0]);
+        }
+      }
+    } catch (error) {
+      this.snackBar.open('Failed to reload versions', 'Close', { duration: 3000 });
+    } finally {
+      this.loading = false;
+    }
+  }
 
   createIntentFormGroup(intent: any = {}): FormGroup {
     const group = this.fb.group({
@@ -391,42 +418,6 @@ export default class VersionEditDialogComponent implements OnInit {
     });
   }
 
-  loadVersion(version: Version) {
-    this.selectedVersion = version;
-    
-    // Form değerlerini set et
-    this.versionForm.patchValue({
-      id: version.id,
-      caption: version.caption || '',
-      published: version.published || false,
-      general_prompt: (version as any).general_prompt || '', // Backend'den gelen general_prompt
-      last_update_date: version.last_update_date || ''
-    });
-  
-    // LLM config'i ayrı set et
-    if (version.llm) {
-      this.versionForm.patchValue({
-        llm: {
-          repo_id: version.llm.repo_id || '',
-          generation_config: version.llm.generation_config || {
-            max_new_tokens: 512,
-            temperature: 0.7,
-            top_p: 0.95,
-            repetition_penalty: 1.1
-          },
-          use_fine_tune: version.llm.use_fine_tune || false,
-          fine_tune_zip: version.llm.fine_tune_zip || ''
-        }
-      });
-    }
-  
-    // Clear and rebuild intents
-    this.intents.clear();
-    (version.intents || []).forEach(intent => {
-      this.intents.push(this.createIntentFormGroup(intent));
-    });
-  } 
-
   async saveVersion() {
     if (!this.selectedVersion) {
       this.snackBar.open('No version selected', 'Close', { duration: 3000 });
@@ -464,7 +455,7 @@ export default class VersionEditDialogComponent implements OnInit {
       // updateData'yı backend'in beklediği formatta hazırla
       const updateData = {
         caption: formValue.caption,
-        general_prompt: formValue.general_prompt, // Bu alan eksikti
+        general_prompt: formValue.general_prompt || '', // Bu alan eksikti
         llm: formValue.llm,
         intents: formValue.intents.map((intent: any) => ({
           name: intent.name,
@@ -513,59 +504,8 @@ export default class VersionEditDialogComponent implements OnInit {
       console.error('Save error:', error);
       
       if (error.status === 409) {
-        // Race condition handling
-        const formValue = this.versionForm.getRawValue();
-        
-        const retryUpdateData = {
-          caption: formValue.caption,
-          general_prompt: formValue.general_prompt,
-          llm: formValue.llm,
-          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
-          })),
-          last_update_date: currentVersion.last_update_date || ''
-        };
-  
-        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) {
-            try {
-              await this.apiService.updateVersion(
-                this.project.id, 
-                currentVersion.id, 
-                retryUpdateData,
-                true
-              ).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 {
-            await this.loadVersions();
-          }
-        });
+        // Race condition handling için ayrı metod çağır
+        await this.handleRaceCondition(currentVersion);
       } else {
         const errorMessage = error.error?.detail || error.message || 'Failed to save version';
         this.snackBar.open(errorMessage, 'Close', { 
@@ -578,6 +518,62 @@ export default class VersionEditDialogComponent implements OnInit {
     }
   }
   
+  // Race condition handling için ayrı metod
+  private async handleRaceCondition(currentVersion: Version) {
+    const formValue = this.versionForm.getRawValue();
+    
+    const retryUpdateData = {
+      caption: formValue.caption,
+      general_prompt: formValue.general_prompt || '',
+      llm: formValue.llm,
+      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
+      })),
+      last_update_date: currentVersion.last_update_date || ''
+    };
+  
+    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) {
+        try {
+          await this.apiService.updateVersion(
+            this.project.id, 
+            currentVersion.id, 
+            retryUpdateData,
+            true
+          ).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 {
+        await this.loadVersions();
+      }
+    });
+  }  
+  
   async publishVersion() {
     if (!this.selectedVersion) return;