diff --git a/apps/frontend/src/app/components/header/header.component.html b/apps/frontend/src/app/components/header/header.component.html index d0e29792..bda3b3b4 100644 --- a/apps/frontend/src/app/components/header/header.component.html +++ b/apps/frontend/src/app/components/header/header.component.html @@ -22,14 +22,6 @@ } - - Facilities Cases diff --git a/apps/frontend/src/app/components/header/header.component.ts b/apps/frontend/src/app/components/header/header.component.ts index 14c2b53a..a8cb7d1d 100644 --- a/apps/frontend/src/app/components/header/header.component.ts +++ b/apps/frontend/src/app/components/header/header.component.ts @@ -34,29 +34,6 @@ export class HeaderComponent { { initialValue: null }, ); - private readonly _lastRoute = computed(() => { - this.routerEvents(); - - let currentRoute = this._activatedRoute.root; - while (currentRoute.firstChild) { - currentRoute = currentRoute.firstChild; - } - - return currentRoute; - }); - - readonly title = computed(() => { - return this._lastRoute().snapshot.data['title']; - }); - - readonly subtitle = computed(() => { - return this._lastRoute().snapshot.data['subtitle']; - }); - - readonly backButtonPresent = computed(() => { - return this.breadcrumbs().length > 1; - }); - readonly breadcrumbs = computed(() => { this.routerEvents(); @@ -89,8 +66,4 @@ export class HeaderComponent { return urlSegments.slice(0, urlSegments.length - n).join('/'); } - goBack(n = 1) { - this._router.navigateByUrl(this.cutUrl(n)); - } - } diff --git a/apps/frontend/src/app/pages/home/home.component.html b/apps/frontend/src/app/pages/home/home.component.html index cf711d6a..8f658603 100644 --- a/apps/frontend/src/app/pages/home/home.component.html +++ b/apps/frontend/src/app/pages/home/home.component.html @@ -1,3 +1,8 @@ + +
diff --git a/libs/cases/frontend/shell/src/lib/shell.routes.ts b/libs/cases/frontend/shell/src/lib/shell.routes.ts index 1439b6f1..aecaa33e 100644 --- a/libs/cases/frontend/shell/src/lib/shell.routes.ts +++ b/libs/cases/frontend/shell/src/lib/shell.routes.ts @@ -26,8 +26,6 @@ export const CASES_SHELL_ROUTES: Route[] = [ path: 'create', data: { breadcrumb: 'Create', - title: 'Create a Case', - subtitle: '', }, loadComponent: () => import('cases-frontend-view').then((m) => m.CreateCaseComponent), @@ -37,8 +35,6 @@ export const CASES_SHELL_ROUTES: Route[] = [ path: ':id', data: { breadcrumb: 'Details', - title: 'Detail of Case', - subtitle: '', }, loadComponent: () => import('cases-frontend-view').then((m) => m.DetailCaseComponent), diff --git a/libs/cases/frontend/view/src/lib/components/case-browse/case-browse.component.html b/libs/cases/frontend/view/src/lib/components/case-browse/case-browse.component.html index c92170b2..3905ef5f 100644 --- a/libs/cases/frontend/view/src/lib/components/case-browse/case-browse.component.html +++ b/libs/cases/frontend/view/src/lib/components/case-browse/case-browse.component.html @@ -2,6 +2,14 @@ Create Case
+ +
diff --git a/libs/cases/frontend/view/src/lib/components/case-browse/case-browse.component.ts b/libs/cases/frontend/view/src/lib/components/case-browse/case-browse.component.ts index da6c1157..1d773a2d 100644 --- a/libs/cases/frontend/view/src/lib/components/case-browse/case-browse.component.ts +++ b/libs/cases/frontend/view/src/lib/components/case-browse/case-browse.component.ts @@ -8,7 +8,7 @@ import { ViewEncapsulation, } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; -import { RouterLink } from '@angular/router'; +import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { XdCasesFacade } from '@frontend/cases/frontend/domain'; import { ICaseResponse } from '@frontend/cases/shared/models'; import { IxModule } from '@siemens/ix-angular'; @@ -131,6 +131,11 @@ export class CaseBrowseComponent { return cases; }); + constructor( + protected router: Router, + protected route: ActivatedRoute + ) {} + getStatusClasses(_case: ICaseResponse) { return { emergency: _case.priority === 'EMERGENCY', diff --git a/libs/cases/frontend/view/src/lib/components/create-case/create-case.component.html b/libs/cases/frontend/view/src/lib/components/create-case/create-case.component.html index a2e5899a..3506f69a 100644 --- a/libs/cases/frontend/view/src/lib/components/create-case/create-case.component.html +++ b/libs/cases/frontend/view/src/lib/components/create-case/create-case.component.html @@ -1,3 +1,11 @@ + +
{{ isEditing ? 'Submit changes' : 'Update Case' }} @@ -7,8 +9,17 @@ Delete Case + + + - @if(casedetail(); as _case){ +

_Case {{ _case.handle }}

@@ -67,5 +78,5 @@

_Case {{ _case.handle }}

- } +} diff --git a/libs/cases/frontend/view/src/lib/components/detail-case/detail-case.component.ts b/libs/cases/frontend/view/src/lib/components/detail-case/detail-case.component.ts index a768da43..65423b4d 100644 --- a/libs/cases/frontend/view/src/lib/components/detail-case/detail-case.component.ts +++ b/libs/cases/frontend/view/src/lib/components/detail-case/detail-case.component.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, inject, ViewEncapsulation } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; -import { ActivatedRoute, RouterLink } from '@angular/router'; +import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { XdCasesFacade } from '@frontend/cases/frontend/domain'; import { ECasePriority, ECaseStatus, ECaseType, ICaseResponse } from '@frontend/cases/shared/models'; import { IxModule, ModalService, ToastService } from '@siemens/ix-angular'; @@ -13,9 +13,9 @@ import DeleteModalComponent from './delete-modal/deleteModal.component'; @Component({ selector: 'lib-detail-case', standalone: true, - imports: [ CommonModule, FormsModule, IxModule, RouterLink ], + imports: [CommonModule, FormsModule, IxModule, RouterLink], templateUrl: './detail-case.component.html', - styleUrls: [ './detail-case.component.scss' ], + styleUrls: ['./detail-case.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, }) @@ -33,9 +33,12 @@ export class DetailCaseComponent { isEditing = false; datePattern = /^\d{4}-\d{2}-\d{2}T00:00:00\.000Z$/; - - constructor(private route: ActivatedRoute, private readonly _modalService: ModalService, private readonly toastService: ToastService) { - } + constructor( + protected router: Router, + protected route: ActivatedRoute, + private readonly _modalService: ModalService, + private readonly toastService: ToastService + ) {} deleteCase() { const caseId = this.mapCaseId(this.casedetail()); @@ -81,7 +84,7 @@ export class DetailCaseComponent { onSubmit(): void { const casedetail = this.casedetail(); - if(casedetail !== undefined) { + if (casedetail !== undefined) { const validationString = this.validateForm(casedetail); if (validationString === 'valid') { const caseId = this.mapCaseId(this.casedetail()); @@ -98,7 +101,7 @@ export class DetailCaseComponent { } } - validateForm(casedetail: ICaseResponse ) { + validateForm(casedetail: ICaseResponse) { if (casedetail !== undefined) { diff --git a/libs/facilities/frontend/shell/src/lib/shell.routes.ts b/libs/facilities/frontend/shell/src/lib/shell.routes.ts index fb4992f2..8234a557 100644 --- a/libs/facilities/frontend/shell/src/lib/shell.routes.ts +++ b/libs/facilities/frontend/shell/src/lib/shell.routes.ts @@ -25,8 +25,6 @@ export const FACILITIES_SHELL_ROUTES: Route[] = [ path: ':id', data: { breadcrumb: 'Details', - title: 'Details of Facility', - subtitle: '', }, loadComponent: () => import('facilities-frontend-view').then((m) => m.XdDetailPage), }, diff --git a/libs/facilities/frontend/view/src/lib/components/browse/browse.page.html b/libs/facilities/frontend/view/src/lib/components/browse/browse.page.html index 58bf2216..85ca71d4 100644 --- a/libs/facilities/frontend/view/src/lib/components/browse/browse.page.html +++ b/libs/facilities/frontend/view/src/lib/components/browse/browse.page.html @@ -6,6 +6,15 @@ {{ filter() ? 'Remove Filter for Issues' : 'Filter Facilities with Issues' }}
+ + + @if (showCardList) { @if (facilities(); as facilities) { diff --git a/libs/facilities/frontend/view/src/lib/components/browse/browse.page.ts b/libs/facilities/frontend/view/src/lib/components/browse/browse.page.ts index 7d4a39a9..57b43180 100644 --- a/libs/facilities/frontend/view/src/lib/components/browse/browse.page.ts +++ b/libs/facilities/frontend/view/src/lib/components/browse/browse.page.ts @@ -8,7 +8,7 @@ import { ViewEncapsulation, } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; -import { RouterLink } from '@angular/router'; +import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { XdBrowseFacade } from '@frontend/facilities/frontend/domain'; import { StatusToColorRecord } from '@frontend/facilities/frontend/models'; import { IxModule } from '@siemens/ix-angular'; @@ -42,7 +42,10 @@ export class XdBrowsePage { } }); - toggleView() { + constructor(protected readonly router: Router, protected readonly route: ActivatedRoute) { + } + + toggleView() { this.showCardList = !this.showCardList; } diff --git a/libs/facilities/frontend/view/src/lib/components/detail/detail.page.html b/libs/facilities/frontend/view/src/lib/components/detail/detail.page.html index 44267522..e86b782e 100644 --- a/libs/facilities/frontend/view/src/lib/components/detail/detail.page.html +++ b/libs/facilities/frontend/view/src/lib/components/detail/detail.page.html @@ -1,4 +1,13 @@ @if (facility(); as facility) { + + +
diff --git a/libs/facilities/frontend/view/src/lib/components/detail/detail.page.ts b/libs/facilities/frontend/view/src/lib/components/detail/detail.page.ts index 900b1b9b..a72668b0 100644 --- a/libs/facilities/frontend/view/src/lib/components/detail/detail.page.ts +++ b/libs/facilities/frontend/view/src/lib/components/detail/detail.page.ts @@ -10,7 +10,7 @@ import { ViewEncapsulation, } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; -import { ActivatedRoute, RouterLink } from '@angular/router'; +import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { XdDetailsFacade } from '@frontend/facilities/frontend/domain'; import { StatusToColorRecord } from '@frontend/facilities/frontend/models'; import { themeSwitcher } from '@siemens/ix'; @@ -36,7 +36,7 @@ export class XdDetailPage implements OnInit { protected theme = convertThemeName(themeSwitcher.getCurrentTheme()); protected readonly locked = signal(true); protected readonly StatusToColorRecord = StatusToColorRecord; - private readonly _assetId = this._route.snapshot.params['id']; + private readonly _assetId = this.route.snapshot.params['id']; private readonly _currentTime = new Date(); private readonly _28MinutesAgo = new Date(this._currentTime.getTime() - 28 * 60 * 1000); private readonly _detailsFacade = inject(XdDetailsFacade); @@ -179,7 +179,8 @@ export class XdDetailPage implements OnInit { }); constructor( - private _route: ActivatedRoute, + protected router: Router, + protected route: ActivatedRoute, private readonly _modalService: ModalService, ) {}