Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export abstract class DfManageTableComponent<T>
}

viewRow(row: T): void {
this.router.navigate([(row as any).id], {
this.router.navigate([`${(row as any).id}-${(row as any).name}`], {
relativeTo: this._activatedRoute,
});
}
Expand Down
10 changes: 5 additions & 5 deletions src/app/shared/components/df-side-nav/df-side-nav.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ $red-palette: mat.define-palette(mat.$red-palette);
color: var(--mat-expansion-container-text-color);
cursor: pointer;
display: flex;
align-items: center;
align-items: center;

span {
margin-left: 6px;
}
span {
margin-left: 6px;
}
}

.profile-icon {
color: #0f0761;
color: #0f0761;
}

.sidenav-container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { of, switchMap } from 'rxjs';
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
import { DfSearchDialogComponent } from '../df-search-dialog/df-search-dialog.component';
import { UntilDestroy } from '@ngneat/until-destroy';

@UntilDestroy({ checkProperties: true })
@Component({
selector: 'df-side-nav',
Expand Down
4 changes: 3 additions & 1 deletion src/app/shared/utilities/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ export function generateBreadcrumb(
const translationKey = [...translationKeySoFar, translationKeySegment]
.join('.')
.replace(/\//g, '.');
const breadcrumb: Breadcrumb = { label: currentSegment };
const parts = currentSegment.split('-');
const requiredText = parts[parts.length - 1];
const breadcrumb: Breadcrumb = { label: requiredText };

if (index !== urlSegments.length - 1) {
breadcrumb.path = newPath.join('/');
Expand Down