Merged PR 1420: #3420 TK Routing

#3420 TK Routing

Related work items: #3420
This commit is contained in:
Andreas Schickinger
2022-10-24 14:50:15 +00:00
committed by Lorenz Hilpert
parent 0ee86faa00
commit b5e5601671
2 changed files with 14 additions and 3 deletions

View File

@@ -32,8 +32,8 @@
</div>
</ng-template>
<div class="actions">
<a class="cta-back cta-action-primary" [routerLink]="['/filiale/task-calendar/tasks']">
<div class="actions" *ngIf="previousBreadcrumb$ | async; let breadcrumb">
<a class="cta-back cta-action-primary" [routerLink]="breadcrumb.path" [queryParams]="breadcrumb.params">
Zurück zur Übersicht
</a>
</div>

View File

@@ -23,6 +23,7 @@ import { TaskCalendarStore } from '../../task-calendar.store';
})
export class TaskSearchComponent implements OnInit, AfterViewInit {
private _onDestroy$ = new Subject();
private _taskCalendarKey = this._config.get('process.ids.taskCalendar');
today = this.dateAdapter.today();
byDate = (item: DisplayInfoDTO) => this.domainTaskCalendarService.getDateGroupKey(item.taskDate || item.publicationDate);
@@ -52,6 +53,16 @@ export class TaskSearchComponent implements OnInit, AfterViewInit {
map(([fetching, length, hits]) => !fetching && length <= 0 && hits === 0)
);
previousBreadcrumb$ = this._breadcrumb.getBreadcrumbsByKeyAndTags$(this._taskCalendarKey, ['task-calendar']).pipe(
map((breadcrumbs) => {
if (breadcrumbs?.length > 1) {
return breadcrumbs[breadcrumbs.length - 2];
}
// Fallback wenn kein vorheriger Breadcrumb existiert
return { path: '/filiale/task-calendar/tasks' };
})
);
constructor(
private dateAdapter: DateAdapter,
private taskCalendarStore: TaskCalendarStore,
@@ -128,7 +139,7 @@ export class TaskSearchComponent implements OnInit, AfterViewInit {
updateBreadcrumb(queryParams?: Params) {
this._breadcrumb.addOrUpdateBreadcrumbIfNotExists({
key: this._config.get('process.ids.taskCalendar'),
key: this._taskCalendarKey,
name: queryParams?.main_qs || 'Suchergebnisse',
path: '/filiale/task-calendar/search',
tags: ['task-calendar', 'search'],