From c1f507071e65903a6efda7285fff096bb7b8a7e5 Mon Sep 17 00:00:00 2001
From: Ivan Ljubisavljevic <ivan996sk@gmail.com>
Date: Thu, 19 May 2022 00:30:50 +0200
Subject: Sredjeno dodavanje public modela u svoje. Takodje sredjeno
 refreshovanje liste modela i datasetovanja prilikom brisanja. Dodati dijalozi
 za brisanje i dodavanje

---
 .../src/app/_elements/folder/folder.component.ts   | 32 ++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

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

diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 262b3b7d..e521f264 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -139,10 +139,7 @@ export class FolderComponent implements AfterViewInit {
   _initialized: boolean = false;
 
   refreshFiles(selectedDatasetId: string | null = null, selectedModelId: string | null = null) {
-    this.files = []
-    this.filteredFiles.length = 0;
-    this.folders[TabType.NewFile] = [];
-    this.folders[TabType.File] = [];
+    
     this.tabsToShow.forEach(tab => {
       this.folders[tab] = [];
     });
@@ -202,6 +199,7 @@ export class FolderComponent implements AfterViewInit {
   refreshDatasets(selectedDatasetId: string | null) {
     this.datasetsService.getMyDatasets().subscribe((datasets) => {
       this.folders[TabType.MyDatasets] = datasets;
+      console.log(this.filteredFiles);
       if (selectedDatasetId) {
         this.selectFile(datasets.filter(x => x._id == selectedDatasetId)[0]);
       }
@@ -238,7 +236,7 @@ export class FolderComponent implements AfterViewInit {
       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.");
+          Shared.openDialog("Obaveštenje", "Uspešno ste dodali novi izvor podataka u kolekciju. Molimo sačekajte par trenutaka da se obradi.");
           this.refreshFiles();
         },
           () => {
@@ -287,17 +285,20 @@ export class FolderComponent implements AfterViewInit {
 
   deleteFile(file: FolderFile, event: Event) {
     event.stopPropagation();
-    //console.log('delete');
+    this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
+    this.files.splice(this.files.indexOf(file), 1);
     switch (this.type) {
       case FolderType.Dataset:
         this.datasetsService.deleteDataset(<Dataset>file).subscribe((response) => {
-          this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
-          this.refreshFiles(null);
+          Shared.openDialog("Obaveštenje", "Uspešno ste obrisali odabrani izvor podataka.");
+          //this.filteredFiles.splice(this.files.indexOf(file), 1);
+          //this.refreshFiles();
         });
         break;
       case FolderType.Model:
         this.modelsService.deleteModel(<Model>file).subscribe((response) => {
-          this.refreshFiles(null);
+          Shared.openDialog("Obaveštenje", "Uspešno ste obrisali odabranu konfiguraciju neuronske mreže.");
+          //this.refreshFiles();
         });
         break;
       case FolderType.Experiment:
@@ -317,13 +318,22 @@ export class FolderComponent implements AfterViewInit {
         (<Dataset>file).isPreProcess = true;
         (<Dataset>file).isPublic = false;
         this.datasetsService.stealDataset(<Dataset>file).subscribe((response) => {
-          this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
+          Shared.openDialog("Obaveštenje", "Uspešno ste dodali javni izvor podataka u vašu kolekciju.");
           this.refreshFiles(null);
+        }, (error:any) => {
+          if (error.error == "Dataset with this name already exists") {
+            Shared.openDialog("Obaveštenje", "Izvor podataka sa ovim imenom postoji u vašoj kolekciji.");
+          }
         });
         break;
       case FolderType.Model:
-        this.modelsService.addModel(<Model>file).subscribe((response) => {
+        this.modelsService.stealModel(<Model>file).subscribe((response) => {
+          Shared.openDialog("Obaveštenje", "Uspešno ste dodali javnu konfiguraciju neuronske mreže u vašu kolekciju.");
           this.refreshFiles(null);
+        }, (error:any) => {
+          if (error.error == "Model already exisits or validation size is not between 0-1") {
+            Shared.openDialog("Obaveštenje", "Model sa ovim imenom postoji u vašoj kolekciji.");
+          }
         });
         break;
       case FolderType.Experiment:
-- 
cgit v1.2.3