From 49fe1624676ccf1faec6454934d636e656194c4f Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Tue, 10 May 2022 21:01:07 +0200
Subject: Doradjeno cuvanje eksperimenta i obavestavanje parent komponente.
 Ispravljen bag - graph se update-uje pri cuvanju/izmeni eksperimenta.
 Obrisane bespotrebne komponente.

---
 .../src/app/_elements/column-table/column-table.component.ts  | 11 +++++++----
 frontend/src/app/_elements/folder/folder.component.ts         |  6 ++++++
 .../src/app/_elements/form-model/form-model.component.html    |  6 +++---
 frontend/src/app/_elements/form-model/form-model.component.ts |  4 ++++
 4 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'frontend/src/app/_elements')

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 330c42ee..44a15f22 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -24,6 +24,7 @@ export class ColumnTableComponent implements AfterViewInit {
   @Input() experiment!: Experiment;
   @Output() okPressed: EventEmitter<string> = new EventEmitter();
   @Output() columnTableChanged = new EventEmitter();
+  @Output() experimentChanged = new EventEmitter();
 
   Object = Object;
   Encoding = Encoding;
@@ -231,9 +232,9 @@ export class ColumnTableComponent implements AfterViewInit {
     });
     dialogRef.afterClosed().subscribe(experiment => {
       if (experiment) {
-        this.experiment = experiment;
-        /*this.experiment._id = experiment._id; //MORA OVAKO
-        this.experiment.name = experiment.name;*/
+        Object.assign(this.experiment, experiment);
+        this.experiment._columnsSelected = true;
+        this.experimentChanged.emit();
         console.log(this.experiment);
       }
     });
@@ -241,7 +242,9 @@ export class ColumnTableComponent implements AfterViewInit {
 
   openUpdateExperimentDialog() {
     this.experimentService.updateExperiment(this.experiment).subscribe((response) => {
-      this.experiment = response;
+      Object.assign(this.experiment, response);
+      this.experiment._columnsSelected = true;
+      this.experimentChanged.emit();
       Shared.openDialog("Izmena eksperimenta", "Uspešno ste izmenili podatke o eksperimentu.");
     });
   }
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index fabb524c..e60f041e 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -360,6 +360,12 @@ export class FolderComponent implements AfterViewInit {
     }
     this.searchTermsChanged();
   }
+
+  updateExperiment() {
+    if (this.formModel) {
+      this.formModel.updateGraph();
+    }
+  }
 }
 
 export enum Privacy {
diff --git a/frontend/src/app/_elements/form-model/form-model.component.html b/frontend/src/app/_elements/form-model/form-model.component.html
index 8ec29a09..4e0d1cfb 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.html
+++ b/frontend/src/app/_elements/form-model/form-model.component.html
@@ -109,7 +109,7 @@
 
             <div class="col-sm-9">
                 <!-- {{forExperiment._columnsSelected}} -->
-                <app-graph [model]="newModel" *ngIf="forExperiment._columnsSelected" [inputColumns]="forExperiment.inputColumns"></app-graph>
+                <app-graph [model]="newModel" *ngIf="forExperiment._columnsSelected" [inputColumns]="getInputColumns()"></app-graph>
                 <app-graph [model]="newModel" *ngIf="!forExperiment._columnsSelected" [inputColumns]="['Nisu odabrane ulazne kolone']"></app-graph>
             </div>
         </div>
@@ -124,9 +124,9 @@
             <button class="btn-clear btn-icon bubble" (click)="removeLayer()">
                 <mat-icon>remove</mat-icon>
             </button>
-            
+
             <div>{{newModel.hiddenLayers}}</div>
-            
+
             <button class="btn-clear btn-icon bubble" (click)="addLayer()">
                 <mat-icon>add</mat-icon>
             </button>
diff --git a/frontend/src/app/_elements/form-model/form-model.component.ts b/frontend/src/app/_elements/form-model/form-model.component.ts
index 71b374b0..b9976b84 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.ts
+++ b/frontend/src/app/_elements/form-model/form-model.component.ts
@@ -135,4 +135,8 @@ export class FormModelComponent implements AfterViewInit {
   updateTestSet(event: MatSliderChange) {
     this.testSetDistribution = event.value!;
   }
+
+  getInputColumns() {
+    return this.forExperiment.inputColumns.filter(x => x != this.forExperiment.outputColumn);
+  }
 }
-- 
cgit v1.2.3