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

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

@@ -129,17 +129,30 @@ export default class ProjectEditDialogComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.form = this.fb.group({
-      name: [
-        { value: '', disabled: this.data.mode === 'edit' }, 
-        [Validators.required, Validators.pattern(/^[a-zA-Z0-9_]+$/)]
-      ],
-      caption: [''],
-      last_update_date: ['']
-    });
-
+    this.initializeForm();
+    
     if (this.data.mode === 'edit' && this.data.project) {
-      this.form.patchValue(this.data.project);
+      this.form.patchValue({
+        name: this.data.project.name,
+        caption: this.data.project.caption || '',
+        icon: this.data.project.icon || 'folder',
+        description: this.data.project.description || '',
+        defaultLanguage: this.data.project.default_language || 'tr',
+        supportedLanguages: this.data.project.supported_languages || ['tr'],
+        timezone: this.data.project.timezone || 'Europe/Istanbul',
+        region: this.data.project.region || 'tr-TR',
+        testUsers: this.data.project.test_users || []
+      });
+      
+      // Rebuild test users form array
+      const testUsersArray = this.form.get('testUsers') as FormArray;
+      testUsersArray.clear();
+      (this.data.project.test_users || []).forEach(phoneNumber => {
+        testUsersArray.push(this.fb.control(phoneNumber, Validators.required));
+      });
+    } else if (this.data.mode === 'create') {
+      // Yeni proje için boş bir versiyon otomatik ekle
+      this.data.autoCreateVersion = true;
     }
   }
 
@@ -149,28 +162,65 @@ export default class ProjectEditDialogComponent implements OnInit {
   }
 
   async save() {
-    if (this.form.invalid) return;
-
+    if (this.form.invalid) {
+      this.form.markAllAsTouched();
+      return;
+    }
+  
     this.saving = true;
     try {
-      const formData = this.form.getRawValue();
-
+      const formValue = this.form.value;
+      const projectData = {
+        ...formValue,
+        test_users: formValue.testUsers || [],
+        default_language: formValue.defaultLanguage,
+        supported_languages: formValue.supportedLanguages
+      };
+  
+      let result;
       if (this.data.mode === 'create') {
-        await this.apiService.createProject(formData).toPromise();
-        this.snackBar.open('Project created successfully', 'Close', { duration: 3000 });
+        result = await this.apiService.createProject(projectData).toPromise();
+        
+        // Otomatik boş versiyon oluştur
+        if (this.data.autoCreateVersion && result) {
+          const defaultVersion = {
+            description: 'Initial version',
+            default_api: '',
+            published: false,
+            llm: {
+              repo_id: '',
+              generation_config: {
+                max_new_tokens: 512,
+                temperature: 0.7,
+                top_p: 0.95,
+                top_k: 50,
+                repetition_penalty: 1.1
+              },
+              use_fine_tune: false,
+              fine_tune_zip: ''
+            },
+            intents: [],
+            parameters: []
+          };
+          
+          await this.apiService.createVersion(result.id, defaultVersion).toPromise();
+        }
+        
+        this.showMessage('Project created successfully!', false);
       } else {
-        await this.apiService.updateProject(this.data.project.id, formData).toPromise();
-        this.snackBar.open('Project updated successfully', 'Close', { duration: 3000 });
+        projectData.id = this.data.project.id;
+        projectData.last_update_date = this.data.project.last_update_date;
+        result = await this.apiService.updateProject(projectData).toPromise();
+        this.showMessage('Project updated successfully!', false);
       }
-
-      this.dialogRef.close(true);
+  
+      this.dialogRef.close(result);
     } catch (error: any) {
-      const message = error.error?.detail || 
-        (this.data.mode === 'create' ? 'Failed to create project' : 'Failed to update project');
-      this.snackBar.open(message, 'Close', { 
-        duration: 5000, 
-        panelClass: 'error-snackbar' 
-      });
+      if (error.status === 409) {
+        this.showMessage('This record was modified by another user. Please reload and try again.', true);
+      } else {
+        this.showMessage(error.error?.detail || 'Operation failed', true);
+      }
     } finally {
       this.saving = false;
     }