nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1505: Fix Domain bug (#1458) 

* TSK-1505: fix domain bug

* TSK-1505: fix prettier error

* TSK-1505: fix prettier error

* TSK-1505: remove global domain variable
This commit is contained in:
Franzi321 2021-02-03 11:16:51 +01:00 committed by GitHub
parent aa6d304b49
commit 9c4d6e479d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/src/app/administration/components/workbasket-list/workbasket-list.component.ts
View File

@ -10,7 +10,7 @@ import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.ser
import { OrientationService } from 'app/shared/services/orientation/orientation.service';
import { ImportExportService } from 'app/administration/services/import-export.service';
import { Actions, ofActionCompleted, ofActionDispatched, Select, Store } from '@ngxs/store';
import { takeUntil } from 'rxjs/operators';
import { takeUntil, take } from 'rxjs/operators';
import {
DeselectWorkbasket,
GetWorkbasketsSummary,
@ -44,6 +44,7 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
};
requestInProgress: boolean;
requestInProgressLocal = false;
@Input() expanded: boolean;
@ViewChild('wbToolbar', { static: true })
@ -83,7 +84,6 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
ngOnInit() {
this.requestInProgressService.setRequestInProgress(true);
this.selectedWorkbasket$.pipe(takeUntil(this.destroy$)).subscribe((selectedWorkbasket) => {
if (typeof selectedWorkbasket !== 'undefined') {
this.selectedId = selectedWorkbasket.workbasketId;
@ -117,6 +117,7 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
.getSelectedDomain()
.pipe(takeUntil(this.destroy$))
.subscribe((domain) => {
this.filterBy.domain = [domain];
this.performRequest();
});
@ -157,7 +158,9 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
}
performFilter(filterBy: WorkbasketQueryFilterParameter) {
const domain = this.filterBy.domain;
this.filterBy = filterBy;
this.filterBy.domain = domain;
this.performRequest();
}

5
web/src/app/shared/components/nav-bar/nav-bar.component.ts
View File

@ -12,8 +12,6 @@ import { SidenavService } from '../../services/sidenav/sidenav.service';
})
export class NavBarComponent implements OnInit {
selectedRoute = '';
title = '';
titleWorkbaskets = 'Workbaskets';
titleClassifications = 'Classifications';
titleAccessItems = 'Access items';
@ -21,6 +19,7 @@ export class NavBarComponent implements OnInit {
titleWorkplace = 'Workplace';
titleHistory = 'History';
toggle: boolean = false;
title = this.titleWorkplace;
selectedRouteSubscription: Subscription;
@ -38,7 +37,7 @@ export class NavBarComponent implements OnInit {
this.sidenavService.toggleSidenav();
}
setTitle(value: string = 'workbaskets') {
setTitle(value: string = '') {
if (value.indexOf('workbaskets') === 0) {
this.title = this.titleWorkbaskets;
} else if (value.indexOf('classifications') === 0) {

2
web/src/app/shared/components/sidenav-list/sidenav-list.component.ts
View File

@ -19,7 +19,7 @@ export class SidenavListComponent implements OnInit {
accessUrl = 'taskana/administration/access-items-management';
classificationUrl = 'taskana/administration/classifications';
workbasketsUrl = 'taskana/administration/workbaskets';
administrationsUrl = 'taskana/administration';
administrationsUrl = 'taskana/administration/workbaskets';
administrationAccess = false;
monitorAccess = false;