From 83cb0c2fed711380f6fffe4fa922e4798db8fbc5 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Tue, 24 May 2022 22:15:37 +0200 Subject: Kada se obrise fajl prelazi se na tab My"FileType". --- .../src/app/_elements/folder/folder.component.ts | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'frontend/src/app/_elements/folder/folder.component.ts') diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index c9252caa..8377ec53 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -336,22 +336,35 @@ export class FolderComponent implements AfterViewInit { case FolderType.Dataset: const dataset = file; Shared.openYesNoDialog("Obriši izvor podataka", "Eksperimenti i trenirani modeli nad ovim izvorom podataka će takođe biti obrisani, da li ste sigurni da želite da obrišete izvor: " + dataset.name + "?", () => { + if(this.selectedTab==TabType.MyDatasets){ this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1); this.files.splice(this.files.indexOf(file), 1); + } this.loadingAction = true; this.datasetsService.deleteDataset(dataset).subscribe((response) => { this.loadingAction = false; + if(this.selectedTab==TabType.File){ + this.refreshDatasets(null); + this.selectTab(TabType.MyDatasets); + } + }); }) break; case FolderType.Model: const model = file; Shared.openYesNoDialog("Obriši konfiguraciju neuronske mreže", "Trenirani modeli za ovu konfiguraciju će takođe biti obrisani, da li ste sigurni da želite da obrišete konfiguraciju: " + model.name + "?", () => { + if(this.selectedTab==TabType.MyModels){ this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1); this.files.splice(this.files.indexOf(file), 1); + } this.loadingAction = true; this.modelsService.deleteModel(file).subscribe((response) => { this.loadingAction = false; + if(this.selectedTab==TabType.File){ + this.refreshModels(null); + this.selectTab(TabType.MyModels); + } }); }) @@ -370,11 +383,17 @@ export class FolderComponent implements AfterViewInit { } else { const experiment = file; Shared.openYesNoDialog("Obriši eksperiment", "Trenirani modeli za ovaj eksperiment će takođe biti obrisani, da li ste sigurni da želite da obrišete eksperiment: " + experiment.name + "?", () => { + if(this.selectedTab==TabType.MyExperiments){ this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1); this.files.splice(this.files.indexOf(file), 1); + } this.loadingAction = true; this.experimentsService.deleteExperiment(experiment).subscribe((response) => { - this.loadingAction = false; + this.loadingAction = false; + if(this.selectedTab==TabType.File){ + this.refreshExperiments(); + this.selectTab(TabType.MyExperiments); + } }); }); } -- cgit v1.2.3 From 8c55bcee2a07fab3bb7d3907b490b058cf18b2a9 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Tue, 24 May 2022 22:19:24 +0200 Subject: Ispravljen bug kada se fajl obrise(Kada je fajl otvoren) ,a lista fajlova se ne updajta. --- frontend/src/app/_elements/folder/folder.component.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'frontend/src/app/_elements/folder/folder.component.ts') diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index 8377ec53..601f461e 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -345,7 +345,9 @@ export class FolderComponent implements AfterViewInit { this.loadingAction = false; if(this.selectedTab==TabType.File){ this.refreshDatasets(null); - this.selectTab(TabType.MyDatasets); + setTimeout(() => { + this.selectTab(TabType.MyDatasets); + }); } }); @@ -363,7 +365,9 @@ export class FolderComponent implements AfterViewInit { this.loadingAction = false; if(this.selectedTab==TabType.File){ this.refreshModels(null); - this.selectTab(TabType.MyModels); + setTimeout(() => { + this.selectTab(TabType.MyModels); + }); } }); }) @@ -392,7 +396,9 @@ export class FolderComponent implements AfterViewInit { this.loadingAction = false; if(this.selectedTab==TabType.File){ this.refreshExperiments(); - this.selectTab(TabType.MyExperiments); + setTimeout(() => { + this.selectTab(TabType.MyExperiments); + }); } }); }); -- cgit v1.2.3 From 31f13dc110c636faf6899ce8e58888bb86894a0d Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Tue, 24 May 2022 22:22:20 +0200 Subject: selectedFile prilikom brisanja postavljen na undefined. --- frontend/src/app/_elements/folder/folder.component.ts | 3 +++ 1 file changed, 3 insertions(+) (limited to 'frontend/src/app/_elements/folder/folder.component.ts') diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index 601f461e..93ef9043 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -345,6 +345,7 @@ export class FolderComponent implements AfterViewInit { this.loadingAction = false; if(this.selectedTab==TabType.File){ this.refreshDatasets(null); + this.selectedFile=undefined!; setTimeout(() => { this.selectTab(TabType.MyDatasets); }); @@ -365,6 +366,7 @@ export class FolderComponent implements AfterViewInit { this.loadingAction = false; if(this.selectedTab==TabType.File){ this.refreshModels(null); + this.selectedFile=undefined!; setTimeout(() => { this.selectTab(TabType.MyModels); }); @@ -396,6 +398,7 @@ export class FolderComponent implements AfterViewInit { this.loadingAction = false; if(this.selectedTab==TabType.File){ this.refreshExperiments(); + this.selectedFile=undefined!; setTimeout(() => { this.selectTab(TabType.MyExperiments); }); -- cgit v1.2.3