From ca18855101e7be801b173f78f2d9802bcf35a0d4 Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Thu, 14 Dec 2023 21:28:30 -0600 Subject: [PATCH 1/2] changed breadcrumb --- .../components/df-manage-table/df-manage-table.component.ts | 2 +- .../shared/components/df-side-nav/df-side-nav.component.ts | 2 ++ src/app/shared/utilities/route.ts | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/shared/components/df-manage-table/df-manage-table.component.ts b/src/app/shared/components/df-manage-table/df-manage-table.component.ts index 0612c5d9..0ba1641a 100644 --- a/src/app/shared/components/df-manage-table/df-manage-table.component.ts +++ b/src/app/shared/components/df-manage-table/df-manage-table.component.ts @@ -211,7 +211,7 @@ export abstract class DfManageTableComponent } viewRow(row: T): void { - this.router.navigate([(row as any).id], { + this.router.navigate([`${(row as any).id}-${(row as any).label}`], { relativeTo: this._activatedRoute, }); } diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.ts b/src/app/shared/components/df-side-nav/df-side-nav.component.ts index d457208e..2aa44f6e 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.ts +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.ts @@ -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'; +import { CommonModule } from '@angular/common'; @UntilDestroy({ checkProperties: true }) @Component({ selector: 'df-side-nav', @@ -53,6 +54,7 @@ import { UntilDestroy } from '@ngneat/until-destroy'; NgFor, NgTemplateOutlet, MatDialogModule, + CommonModule ], }) export class DfSideNavComponent implements OnInit { diff --git a/src/app/shared/utilities/route.ts b/src/app/shared/utilities/route.ts index 1b810013..258e5af7 100644 --- a/src/app/shared/utilities/route.ts +++ b/src/app/shared/utilities/route.ts @@ -156,11 +156,14 @@ export function generateBreadcrumb( return true; } } else { + const translationKeySegment = isDynamic ? path.slice(1) : path; 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('/'); From ae8813d5382278cee5fa2b70686e640ff75ae603 Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Fri, 15 Dec 2023 13:36:57 -0600 Subject: [PATCH 2/2] updated route name --- .../df-manage-table/df-manage-table.component.ts | 2 +- .../components/df-side-nav/df-side-nav.component.scss | 10 +++++----- .../components/df-side-nav/df-side-nav.component.ts | 3 +-- src/app/shared/utilities/route.ts | 1 - 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/app/shared/components/df-manage-table/df-manage-table.component.ts b/src/app/shared/components/df-manage-table/df-manage-table.component.ts index 0ba1641a..98ae97f1 100644 --- a/src/app/shared/components/df-manage-table/df-manage-table.component.ts +++ b/src/app/shared/components/df-manage-table/df-manage-table.component.ts @@ -211,7 +211,7 @@ export abstract class DfManageTableComponent } viewRow(row: T): void { - this.router.navigate([`${(row as any).id}-${(row as any).label}`], { + this.router.navigate([`${(row as any).id}-${(row as any).name}`], { relativeTo: this._activatedRoute, }); } diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.scss b/src/app/shared/components/df-side-nav/df-side-nav.component.scss index d4ed8127..be4f7a64 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.scss +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.scss @@ -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 { diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.ts b/src/app/shared/components/df-side-nav/df-side-nav.component.ts index 2aa44f6e..7c3fabb0 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.ts +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.ts @@ -32,7 +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'; -import { CommonModule } from '@angular/common'; + @UntilDestroy({ checkProperties: true }) @Component({ selector: 'df-side-nav', @@ -54,7 +54,6 @@ import { CommonModule } from '@angular/common'; NgFor, NgTemplateOutlet, MatDialogModule, - CommonModule ], }) export class DfSideNavComponent implements OnInit { diff --git a/src/app/shared/utilities/route.ts b/src/app/shared/utilities/route.ts index 258e5af7..480340fc 100644 --- a/src/app/shared/utilities/route.ts +++ b/src/app/shared/utilities/route.ts @@ -156,7 +156,6 @@ export function generateBreadcrumb( return true; } } else { - const translationKeySegment = isDynamic ? path.slice(1) : path; const translationKey = [...translationKeySoFar, translationKeySegment] .join('.')