From 94e37d129c3ddc2f06600bcc9b2c64ef3e462fb0 Mon Sep 17 00:00:00 2001 From: Felix van Hove Date: Sun, 1 Jun 2025 13:35:13 +0200 Subject: [PATCH] fix: Fix Center Actions and View The layout of the items in the blue box was broken and the hamburger menu didn't navigate to any of the respective actions. Fixes: WEB-188 --- src/app/centers/centers-routing.module.ts | 27 +++++++++-- .../center-actions.component.ts | 2 +- .../centers-view/centers-view.component.html | 41 +++++++++++----- .../centers-view/centers-view.component.scss | 47 +++---------------- .../center-data-and-template.resolver.ts | 1 + src/theme/_content.scss | 1 + 6 files changed, 62 insertions(+), 57 deletions(-) diff --git a/src/app/centers/centers-routing.module.ts b/src/app/centers/centers-routing.module.ts index 429a4d671..b4ca7cda3 100644 --- a/src/app/centers/centers-routing.module.ts +++ b/src/app/centers/centers-routing.module.ts @@ -12,6 +12,7 @@ import { GeneralTabComponent } from './centers-view/general-tab/general-tab.comp import { NotesTabComponent } from './centers-view/notes-tab/notes-tab.component'; import { DatatableTabComponent } from './centers-view/datatable-tab/datatable-tab.component'; import { EditCenterComponent } from './edit-center/edit-center.component'; +import { CenterActionsComponent } from './centers-view/center-actions/center-actions.component'; /** Custom Resolvers */ import { OfficesResolver } from 'app/accounting/common-resolvers/offices.resolver'; @@ -90,12 +91,20 @@ const routes: Routes = [ } ] }, + { + path: 'actions/:action', + data: { title: 'Center Actions', breadcrumb: 'action', routeParamBreadcrumb: 'action' }, + component: CenterActionsComponent, + resolve: { + centersActionData: CenterActionsResolver + } + }, { path: 'edit', component: EditCenterComponent, - data: { title: 'Edit Center', breadcrumb: 'Edit' }, + data: { title: 'Edit Center', breadcrumb: 'Edit', routeParamBreadcrumb: false }, resolve: { - centerDataAndTemplate: CenterDataAndTemplateResolver + centerData: CenterDataAndTemplateResolver } } ] @@ -108,6 +117,18 @@ const routes: Routes = [ @NgModule({ imports: [RouterModule.forChild(routes)], - exports: [RouterModule] + exports: [RouterModule], + providers: [ + OfficesResolver, + CenterViewResolver, + SavingsAccountResolver, + CenterResourceResolver, + CenterSummaryResolver, + CenterNotesResolver, + CenterDatatableResolver, + CenterDatatablesResolver, + CenterActionsResolver, + CenterDataAndTemplateResolver + ] }) export class CentersRoutingModule {} diff --git a/src/app/centers/centers-view/center-actions/center-actions.component.ts b/src/app/centers/centers-view/center-actions/center-actions.component.ts index 5e53caa37..cc2c2c2fd 100644 --- a/src/app/centers/centers-view/center-actions/center-actions.component.ts +++ b/src/app/centers/centers-view/center-actions/center-actions.component.ts @@ -42,7 +42,7 @@ export class CenterActionsComponent { private router: Router ) { this.router.routeReuseStrategy.shouldReuseRoute = () => false; - const name = this.route.snapshot.params['name']; + const name = this.route.snapshot.params['action']; this.actions[name] = true; } } diff --git a/src/app/centers/centers-view/centers-view.component.html b/src/app/centers/centers-view/centers-view.component.html index 94b9f57f6..a0400d0c7 100644 --- a/src/app/centers/centers-view/centers-view.component.html +++ b/src/app/centers/centers-view/centers-view.component.html @@ -1,13 +1,14 @@ - +