Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Guest-Koristik-Ispravka-FrontEnd

1 files changed, 19 insertions, 12 deletions

diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 20ca1121..6ca0faa8 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -53,8 +53,9 @@ export class FolderComponent implements AfterViewInit {
 
     if (this.signalRService.hubConnection) {
       this.signalRService.hubConnection.on("NotifyDataset", (dName: string, dId: string) => {
-        this.refreshFiles(dId);
-
+        if (this.type == FolderType.Dataset) {
+          this.refreshFiles(dId);
+        }
       });
     } else {
       console.warn("Dataset-Load: No connection!");
@@ -98,8 +99,8 @@ export class FolderComponent implements AfterViewInit {
     this.newFileSelected = false;
     this.listView = false;
     this.selectedFileChanged.emit(this.selectedFile);
-    this.displayFile();
     this.selectTab(TabType.File);
+    this.displayFile();
   }
 
   createNewFile() {
@@ -117,9 +118,13 @@ export class FolderComponent implements AfterViewInit {
   _initialized: boolean = false;
 
   refreshFiles(selectedDatasetId: string | null) {
+    this.files = []
+    this.filteredFiles.length = 0;
+    this.folders[TabType.NewFile] = [];
+    this.folders[TabType.File] = [];
     this.tabsToShow.forEach(tab => {
       this.folders[tab] = [];
-    })
+    });
 
     this.datasetsService.getMyDatasets().subscribe((datasets) => {
       this.folders[TabType.MyDatasets] = datasets;
@@ -137,7 +142,6 @@ export class FolderComponent implements AfterViewInit {
     });
 
     this.modelsService.getMyModels().subscribe((models) => {
-      console.log(models);
       this.folders[TabType.MyModels] = models;
     });
 
@@ -164,8 +168,9 @@ export class FolderComponent implements AfterViewInit {
     switch (this.type) {
       case FolderType.Dataset:
         this.formDataset!.uploadDataset((dataset: Dataset) => {
+          this.newFile = undefined;
           Shared.openDialog("Obaveštenje", "Uspešno ste dodali novi izvor podataka u kolekciju. Molimo sačekajte par trenutaka da se procesira.");
-          this.refreshFiles(dataset._id);
+          this.refreshFiles(null);
         },
           () => {
             Shared.openDialog("Neuspeo pokušaj!", "Izvor podataka sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeći dataset.");
@@ -173,7 +178,7 @@ export class FolderComponent implements AfterViewInit {
         break;
       case FolderType.Model:
         this.modelsService.addModel(this.formModel.newModel).subscribe(model => {
-          this.formModel.newModel = model;
+          this.newFile = undefined;
           Shared.openDialog("Obaveštenje", "Uspešno ste dodali novu konfiguraciju neuronske mreže u kolekciju.");
           this.refreshFiles(null); // todo select model
         }, (err) => {
@@ -205,8 +210,8 @@ export class FolderComponent implements AfterViewInit {
   filteredFiles: FolderFile[] = [];
 
   searchTermsChanged() {
-    if (!this.files) return;
     this.filteredFiles.length = 0;
+    if (!this.files) return;
     this.filteredFiles.push(...this.files.filter((file) => file.name.toLowerCase().includes(this.searchTerm.toLowerCase())));
     /*if (this.selectedFile) {
       if (!this.filteredFiles.includes(this.selectedFile)) {
@@ -226,17 +231,19 @@ export class FolderComponent implements AfterViewInit {
     this.listView = !this.listView;
   }
 
-  deleteFile(file: FolderFile) {
-    console.log('delete');
+  deleteFile(file: FolderFile, event: Event) {
+    event.stopPropagation();
+    //console.log('delete');
     switch (this.type) {
       case FolderType.Dataset:
         this.datasetsService.deleteDataset(<Dataset>file).subscribe((response) => {
-          console.log(response);
+          this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
+          this.refreshFiles(null);
         });
         break;
       case FolderType.Model:
         this.modelsService.deleteModel(<Model>file).subscribe((response) => {
-          console.log(response);
+          this.refreshFiles(null);
         });
         break;
       case FolderType.Experiment: