KON-652: merge conflicts resolved
Merge branch 'KON-605-NEW' of ssh://git.eclipse.org:29418/openk-coremodules/org.eclipse.openk-coremodules.contactBaseData.frontend into KON-605-NEW
diff --git a/README.md b/README.md
index 442ff0e..f94b2fe 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# OpenKonsquenz Core Modules - Contact Base Data Frontend
+# OpenKonsequenz Core Modules - Contact Base Data Frontend
-This application represents a core module for **OpenKonsquenz**.
+This application represents a core module for **OpenKonsequenz**.
### Run Development
@@ -39,4 +39,6 @@
Example
+```
<div class="pull-right" *visibleByRight>
+```
diff --git a/package.json b/package.json
index 9644923..92f7ac6 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "openkonsequenz-contact-base-data-2019",
"version": "1.0.0",
"description": "Contact Base Data",
- "license": "MIT",
+ "license": "Eclipse Public License - v 2.0",
"author": "Martin Gardyan <martin.gardyan@pta.de>",
"angular-cli": {},
"scripts": {
@@ -18,7 +18,7 @@
"sy-post-build": "node hooks/post-build.js",
"sy-build": "npm run sy-pre-build && ng build --base-href /contactdatabase/ --prod --aot && npm run sy-post-build",
"sy-build-noprod": "npm run sy-pre-build && ng build --base-href /contactdatabase/ && npm run sy-post-build",
- "sy-build-prod": "npm run sy-pre-build && ng build --prod --aot --base-href /contactdatabase/ && npm run sy-post-build",
+ "sy-build-prod": "npm run sy-pre-build && ng build --prod --aot --base-href /contactdatabase/ && npm run sy-post-build",
"start-in-docker": "npm run sy-pre-start && ng serve --optimization=false --vendor-chunk --common-chunk --host=0.0.0.0 --disableHostCheck=true --proxy-config proxy-docker.conf.json",
"start-in-docker-unsecure": "npm run sy-pre-start && ng serve --optimization=false --vendor-chunk --common-chunk --host=0.0.0.0 --disableHostCheck=true --proxy-config proxy-docker-unsecure.conf.json"
},
diff --git a/src/app/shared/components/anonymizer/anonymizer.sandbox.ts b/src/app/shared/components/anonymizer/anonymizer.sandbox.ts
index 12947cc..5581548 100644
--- a/src/app/shared/components/anonymizer/anonymizer.sandbox.ts
+++ b/src/app/shared/components/anonymizer/anonymizer.sandbox.ts
@@ -25,17 +25,15 @@
@Injectable()
export class AnonymizerSandbox extends BaseSandbox {
-
public userModuleAssignmentsDataDetails$: Observable<Array<UserModuleAssignment>> = this.appState$.select(store.getUserModuleAssignmentsData);
- private _userModuls:UserModuleAssignment[]=[];
-
+ private _userModuls: UserModuleAssignment[] = [];
constructor(protected appState$: Store<store.State>, protected actionsSubject: ActionsSubject, protected router: Router, protected modalService: NgbModal) {
super(appState$);
}
public init() {
- this.userModuleAssignmentsDataDetails$.subscribe((userModuls:UserModuleAssignment[])=>{
- this._userModuls= userModuls;
+ this.userModuleAssignmentsDataDetails$.subscribe((userModuls: UserModuleAssignment[]) => {
+ this._userModuls = userModuls;
});
this.actionsSubject.pipe(ofType(contactsActions.anonymizeContactSuccess), takeUntil(this._endSubscriptions$)).subscribe(() => {
this.router.navigateByUrl(`/overview`);
@@ -50,11 +48,10 @@
const modalRef = this.modalService.open(SafetyQueryDialogComponent);
modalRef.componentInstance.title = 'ConfirmDialog.Action.anonymize';
- if(noExclamationMark){
+ if (noExclamationMark) {
modalRef.componentInstance.warning2 = 'ConfirmDialog.AnonymizationWarning';
modalRef.componentInstance.showExclamationMarkIcon = false;
- }
- else{
+ } else {
modalRef.componentInstance.warning1 = 'ConfirmDialog.AssignmentWarning';
modalRef.componentInstance.warning2 = 'ConfirmDialog.AnonymizationWarning';
modalRef.componentInstance.showExclamationMarkIcon = true;
diff --git a/src/app/shared/components/header/header.component.spec.ts b/src/app/shared/components/header/header.component.spec.ts
index 5ad067a..e4975e4 100644
--- a/src/app/shared/components/header/header.component.spec.ts
+++ b/src/app/shared/components/header/header.component.spec.ts
@@ -11,6 +11,7 @@
* SPDX-License-Identifier: EPL-2.0
********************************************************************************/
import { HeaderComponent } from '@shared/components/header/header.component';
+import { of } from 'rxjs';
describe('HeaderComponent', () => {
let component: HeaderComponent;
@@ -30,10 +31,9 @@
});
it('should navigate to overview after call navigateToOverview', () => {
- const spy1 = spyOn<any>(component, '_winLocReload').and.callFake(function() {});
- const spy2 = spyOn(router, 'navigateByUrl');
+ const spy = spyOn(router, 'navigateByUrl').and.returnValue({ then: () => of(true) });
+
component.navigateToOverview();
- expect(spy1).toHaveBeenCalled();
- expect(spy2).toHaveBeenCalled();
+ expect(spy).toHaveBeenCalled();
});
});
diff --git a/src/app/shared/components/header/header.component.ts b/src/app/shared/components/header/header.component.ts
index 9063608..3d7bab3 100644
--- a/src/app/shared/components/header/header.component.ts
+++ b/src/app/shared/components/header/header.component.ts
@@ -31,12 +31,11 @@
constructor(public router: Router) {}
public navigateToOverview(): void {
- // reset contacts state
+ // reset contacts state
sessionStorage.clear();
- this._winLocReload();
- navigateToOverview(this.router);
- }
+ navigateToOverview(this.router).then(this._winLocReload);
+ }
private _winLocReload(): void {
window.location.reload();
}
diff --git a/src/app/shared/utility/utilityHelpers.ts b/src/app/shared/utility/utilityHelpers.ts
index 72a1697..d33c3da 100644
--- a/src/app/shared/utility/utilityHelpers.ts
+++ b/src/app/shared/utility/utilityHelpers.ts
@@ -47,6 +47,6 @@
},
};
-export function navigateToOverview(router: Router): void {
- router.navigateByUrl(`/overview`);
+export function navigateToOverview(router: Router): Promise<boolean> {
+ return router.navigateByUrl(`/overview`);
}
