Ispravljeno da kod ucitavanje prediktora iz kolekcije bude lepo ucitan model. Disable-ovani dugmici za cuvanje dataseta i modela da se ne bi vise puta slao zahtev backu za cuvanje istog. Biranje drugog dataseta nakon izbora prvog (refresh).

5 files changed, 28 insertions, 7 deletions

diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts
index 8d2875a5..96818976 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -88,6 +88,7 @@ export class ColumnTableComponent implements AfterViewInit {
     if (this.route.snapshot.paramMap.get("id") == null && this.route.snapshot.paramMap.get("predictorId") == null) {
       this.dataset = dataset;
       this.setColumnTypeInitial();
+      this.resetColumnEncodings(Encoding.Label);
   
       this.columnsChecked = [];
       this.dataset.columnInfo.forEach(column => {
@@ -96,7 +97,6 @@ export class ColumnTableComponent implements AfterViewInit {
   
       this.resetInputColumns();
       this.resetOutputColumn();
-      this.resetColumnEncodings(Encoding.Label);
       this.setDeleteRowsForMissingValTreatment();
   
       this.nullValOption = [];
@@ -258,9 +258,11 @@ export class ColumnTableComponent implements AfterViewInit {
   resetColumnEncodings(encodingType: Encoding) {
     if (this.experiment != undefined && this.dataset != undefined) {
       this.experiment.encodings = [];
+      console.log("prvi: RESET COLUMN ENC, DUZINA ENCODINGS NIZA:", this.experiment.encodings.length);
       for (let i = 0; i < this.dataset.columnInfo.length; i++) {
         this.experiment.encodings.push(new ColumnEncoding(this.dataset?.columnInfo[i].columnName, encodingType));
       }
+      console.log("drugi: RESET COLUMN ENC, DUZINA ENCODINGS NIZA:", this.experiment.encodings.length);
       this.columnTableChangeDetected();
     }
   }
@@ -366,6 +368,7 @@ export class ColumnTableComponent implements AfterViewInit {
         Object.assign(this.experiment, experiment);
         this.experiment._columnsSelected = true;
         this.experimentChanged.emit();
+        this.okPressed.emit();
       }
     });
   }
@@ -385,6 +388,7 @@ export class ColumnTableComponent implements AfterViewInit {
       Object.assign(this.experiment, experiment);
       this.experiment._columnsSelected = true;
       this.experimentChanged.emit();
+      this.okPressed.emit();
     });
   }
 
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index fc3b98b2..60f6857c 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -62,6 +62,8 @@ export class FolderComponent implements AfterViewInit {
         if (this.type == FolderType.Dataset) {
           this.refreshFiles(dId);
         }
+        this.saveDisabled = false;
+        console.log("Notify dataset ", this.saveDisabled);
       });
     } else {
       console.warn("Dataset-Load: No connection!");
@@ -140,6 +142,9 @@ export class FolderComponent implements AfterViewInit {
   createNewFile() {
     if (this.type == FolderType.Dataset) {
       this.newFile = new Dataset();
+      this.formNewDataset.files = [];
+      this.formNewDataset.firstInput = false;
+      this.formNewDataset.filename = "";
     } else if (this.type == FolderType.Model) {
       this.newFile = new Model();
     }
@@ -251,6 +256,11 @@ export class FolderComponent implements AfterViewInit {
   }
 
   saveNewFile() {
+    console.log("USAO U saveDisabled: ", this.saveDisabled);
+    if (this.saveDisabled) {
+      console.log("USAO U IF");
+      return;
+    }
     this.saveDisabled = true;
     this.loadingAction = true;
     switch (this.type) {
@@ -261,9 +271,11 @@ export class FolderComponent implements AfterViewInit {
           this.okPressed.emit();
           //Shared.openDialog("Obaveštenje", "Uspešno ste dodali novi izvor podataka u kolekciju. Molimo sačekajte par trenutaka da se obradi.");
           this.refreshFiles();
+          this.createNewFile();
         },
           () => {
             Shared.openDialog("Neuspeo pokušaj!", "Izvor podataka sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeći dataset.");
+            this.saveDisabled = false;
           });
         break;
       case FolderType.Model:
@@ -273,12 +285,13 @@ export class FolderComponent implements AfterViewInit {
           this.loadingAction = false;
           //Shared.openDialog("Obaveštenje", "Uspešno ste dodali novu konfiguraciju neuronske mreže u kolekciju.");
           this.refreshFiles(null, model._id); // todo select model
+          this.createNewFile();
         }, (err) => {
           Shared.openDialog("Neuspeo pokušaj!", "Konfiguracija neuronske mreže sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeću konfiguraciju.");
+          this.saveDisabled = false;
         });
         break;
     }
-    this.saveDisabled = false;
   }
 
   predictorsForExp: { [expId: string]: Predictor[] } = {}
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
index 8714ae7f..3df76aa5 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
@@ -155,6 +155,7 @@ export class FormDatasetComponent {
   uploadDataset(onSuccess: Function = (dataset: Dataset) => { }, onError: Function = () => { }) {
     if (this.files[0] == undefined) {
       shared.openDialog("Greška", "Niste izabrali fajl za učitavanje.");
+      onError();
       return;
     }
 
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html
index a0ed26ef..6bd921fd 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.html
+++ b/frontend/src/app/_pages/experiment/experiment.component.html
@@ -57,7 +57,7 @@
         </div>
         <div #steps id="step_2" class="step-content" *ngIf="step1">
             <div class="step-content-inside">
-                <app-column-table (okPressed)="goToPage(2); experiment._columnsSelected = true;" (columnTableChanged)="columnTableChangedEvent()" (experimentChanged)="experimentChangedEvent()" [experiment]="experiment" [dataset]="dataset"></app-column-table>
+                <app-column-table (columnTableChanged)="columnTableChangedEvent()" (experimentChanged)="experimentChangedEvent()" [experiment]="experiment" [dataset]="dataset"></app-column-table>
             </div>
         </div>
         <div #steps id="step_3" class="step-content" *ngIf="step2">
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index 5822eedf..20a3afb0 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -171,11 +171,13 @@ export class ExperimentComponent implements AfterViewInit {
 
               this.modelsService.getModelById(predictor.modelId).subscribe((response) => {
                 let model = response;
-                this.folderModel.formModel.newModel = model;
+                this.folderModel.selectFile(model);
+                //this.folderModel.formModel.newModel = model;
                 this.step3 = true;
                 let numOfEpochsArray = Array.from({ length: model.epochs }, (_, i) => i + 1);
                 setTimeout(() => {
                   this.linechartComponent.update(numOfEpochsArray, predictor.metricsAcc, predictor.metricsLoss, predictor.metricsMae, predictor.metricsMse, predictor.metricsValAcc, predictor.metricsValLoss, predictor.metricsValMae, predictor.metricsValMse);
+                  this.goToPage(3);
                 })
               });
             });
@@ -189,6 +191,7 @@ export class ExperimentComponent implements AfterViewInit {
             this.dataset = response;
             this.folderDataset.forExperiment = this.experiment;
             this.folderDataset.selectFile(this.dataset);
+            this.goToPage(1);
           });
         });
       }
@@ -258,6 +261,9 @@ export class ExperimentComponent implements AfterViewInit {
     this.step2 = true;
     setTimeout(() => {
       this.folderModel.updateExperiment();
+      this.folderModel.selectFile(undefined);
+      this.folderModel.selectTab(TabType.NewFile);
+      this.goToPage(2);
     });
   }
 
@@ -276,9 +282,6 @@ export class ExperimentComponent implements AfterViewInit {
     setTimeout(() => {
       this.columnTable.loadDataset(d);
     });
-
-    this.folderModel.selectFile(undefined);
-    this.folderModel.selectTab(TabType.NewFile);
     // REFRESH GRAFIKA (4. KORAKA) URADITI 
   }