From 13f31c7b93d364db8b3a1ef173a1af1f711592da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Leo=20Gr=C3=A4tz?=
<23726273+LarsLeo@users.noreply.github.com>
Date: Thu, 28 Jun 2018 13:50:01 +0200
Subject: [PATCH] TSK-593: bugfix: reload workbasket and classification list
after import
---
.../master/list/classification-list.component.html | 3 ++-
.../master/list/classification-list.component.ts | 4 ++++
.../import-export/import-export.component.ts | 12 ++++++++----
.../workbasket-list-toolbar.component.html | 2 +-
.../workbasket-list-toolbar.component.ts | 5 +++++
.../master/list/workbasket-list.component.html | 3 ++-
.../master/list/workbasket-list.component.ts | 2 +-
7 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/web/src/app/administration/classification/master/list/classification-list.component.html b/web/src/app/administration/classification/master/list/classification-list.component.html
index 71659bcaa..cc0d51eed 100644
--- a/web/src/app/administration/classification/master/list/classification-list.component.html
+++ b/web/src/app/administration/classification/master/list/classification-list.component.html
@@ -5,7 +5,8 @@
-
+
+
diff --git a/web/src/app/administration/classification/master/list/classification-list.component.ts b/web/src/app/administration/classification/master/list/classification-list.component.ts
index ed48886c7..21b8b8e32 100644
--- a/web/src/app/administration/classification/master/list/classification-list.component.ts
+++ b/web/src/app/administration/classification/master/list/classification-list.component.ts
@@ -119,6 +119,10 @@ export class ClassificationListComponent implements OnInit, OnDestroy {
}
+ refreshClassificationList() {
+ this.performRequest(true);
+ }
+
ngOnDestroy(): void {
if (this.classificationServiceSubscription) { this.classificationServiceSubscription.unsubscribe(); }
if (this.classificationTypeServiceSubscription) { this.classificationTypeServiceSubscription.unsubscribe(); }
diff --git a/web/src/app/administration/components/import-export/import-export.component.ts b/web/src/app/administration/components/import-export/import-export.component.ts
index 69a10a4b3..7523b257d 100644
--- a/web/src/app/administration/components/import-export/import-export.component.ts
+++ b/web/src/app/administration/components/import-export/import-export.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core';
import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service';
import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service';
import { DomainService } from 'app/services/domain/domain.service';
@@ -14,6 +14,10 @@ import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
export class ImportExportComponent implements OnInit {
@Input() currentSelection: ImportType;
+
+ @Output() importSucessful = new EventEmitter();
+
+
domains: string[] = [];
constructor(private domainService: DomainService, private workbasketDefinitionService: WorkbasketDefinitionService,
@@ -44,11 +48,11 @@ export class ImportExportComponent implements OnInit {
const reader = new FileReader();
if (this.currentSelection === ImportType.WORKBASKETS) {
- reader.onload = (e) => {
- this.workbasketDefinitionService.importWorkbasketDefinitions(e.target.result);
- }
+ reader.onload = (e) => this.workbasketDefinitionService.importWorkbasketDefinitions(e.target.result);
+ this.importSucessful.emit();
} else {
reader.onload = (e) => this.classificationDefinitionService.importClassifications(e.target.result);
+ this.importSucessful.emit();
}
reader.readAsText(file);
}
diff --git a/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html
index 4c9b927ba..214199377 100644
--- a/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html
+++ b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html
@@ -4,7 +4,7 @@
-
+
;
@Output() performSorting = new EventEmitter();
@Output() performFilter = new EventEmitter();
+ @Output() importSucessful = new EventEmitter();
workbasketServiceSubscription: Subscription;
selectionToImport = ImportType.WORKBASKETS;
sortingFields = new Map([['name', 'Name'], ['key', 'Key'], ['description', 'Description'], ['owner', 'Owner'], ['type', 'Type']]);
@@ -66,4 +67,8 @@ export class WorkbasketListToolbarComponent implements OnInit {
this.workbasketService.selectWorkBasket(undefined);
this.router.navigate([{ outlets: { detail: ['new-workbasket'] } }], { relativeTo: this.route });
}
+
+ importEvent() {
+ this.importSucessful.emit();
+ }
}
diff --git a/web/src/app/administration/workbasket/master/list/workbasket-list.component.html b/web/src/app/administration/workbasket/master/list/workbasket-list.component.html
index e1f6c96a2..fad4ad28c 100644
--- a/web/src/app/administration/workbasket/master/list/workbasket-list.component.html
+++ b/web/src/app/administration/workbasket/master/list/workbasket-list.component.html
@@ -1,7 +1,8 @@