Migrate clone, create and edit activity dialogs to dedicated routes

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts

@@ -15,7 +15,6 @@ import {
   User
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import { internalRoutes } from '@ghostfolio/common/routes/routes';
 import { GfAccountBalancesComponent } from '@ghostfolio/ui/account-balances';
 import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';
 import { GfDialogFooterComponent } from '@ghostfolio/ui/dialog-footer';
@@ -41,7 +40,6 @@ import { PageEvent } from '@angular/material/paginator';
 import { Sort, SortDirection } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { MatTabsModule } from '@angular/material/tabs';
-import { Router } from '@angular/router';
 import { IonIcon } from '@ionic/angular/standalone';
 import { Big } from 'big.js';
 import { format, parseISO } from 'date-fns';
@@ -114,7 +112,6 @@ export class GfAccountDetailDialogComponent implements OnInit {
   private readonly destroyRef = inject(DestroyRef);
   private readonly dialogRef =
     inject<MatDialogRef<GfAccountDetailDialogComponent>>(MatDialogRef);
-  private readonly router = inject(Router);
   private readonly userService = inject(UserService);
 
   public constructor() {
@@ -155,17 +152,6 @@ export class GfAccountDetailDialogComponent implements OnInit {
     this.fetchActivities();
   }
 
-  protected onCloneActivity(aActivity: Activity) {
-    this.router.navigate(
-      internalRoutes.portfolio.subRoutes.activities.routerLink,
-      {
-        queryParams: { activityId: aActivity.id, createDialog: true }
-      }
-    );
-
-    this.dialogRef.close();
-  }
-
   protected onClose() {
     this.dialogRef.close();
   }
@@ -208,17 +194,6 @@ export class GfAccountDetailDialogComponent implements OnInit {
     this.fetchActivities();
   }
 
-  protected onUpdateActivity(aActivity: Activity) {
-    this.router.navigate(
-      internalRoutes.portfolio.subRoutes.activities.routerLink,
-      {
-        queryParams: { activityId: aActivity.id, editDialog: true }
-      }
-    );
-
-    this.dialogRef.close();
-  }
-
   protected showValuesInPercentage() {
     return (
       this.data.hasImpersonationId || this.user?.settings?.isRestrictedView

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html

@@ -132,8 +132,6 @@
           [sortColumn]="sortColumn"
           [sortDirection]="sortDirection"
           [totalItems]="totalItems"
-          (activityToClone)="onCloneActivity($event)"
-          (activityToUpdate)="onUpdateActivity($event)"
           (export)="onExport()"
           (pageChanged)="onChangePage($event)"
           (sortChanged)="onSortChanged($event)"

apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts

@@ -589,17 +589,6 @@ export class GfHoldingDetailDialogComponent implements OnInit {
     this.fetchActivities();
   }
 
-  protected onCloneActivity(aActivity: Activity) {
-    this.router.navigate(
-      internalRoutes.portfolio.subRoutes.activities.routerLink,
-      {
-        queryParams: { activityId: aActivity.id, createDialog: true }
-      }
-    );
-
-    this.dialogRef.close();
-  }
-
   protected onClose() {
     this.dialogRef.close();
   }
@@ -661,17 +650,6 @@ export class GfHoldingDetailDialogComponent implements OnInit {
     }
   }
 
-  protected onUpdateActivity(aActivity: Activity) {
-    this.router.navigate(
-      internalRoutes.portfolio.subRoutes.activities.routerLink,
-      {
-        queryParams: { activityId: aActivity.id, editDialog: true }
-      }
-    );
-
-    this.dialogRef.close();
-  }
-
   private fetchActivities(filters: Filter[] = this.getActivityFilters()) {
     this.dataService
       .fetchActivities({

apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html

@@ -374,8 +374,6 @@
           [sortDirection]="sortDirection"
           [sortDisabled]="true"
           [totalItems]="activitiesCount"
-          (activityToClone)="onCloneActivity($event)"
-          (activityToUpdate)="onUpdateActivity($event)"
           (export)="onExport()"
           (pageChanged)="onChangePage($event)"
         />

apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@@ -2,7 +2,6 @@ import { IcsService } from '@ghostfolio/client/services/ics/ics.service';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config';
-import { CreateOrderDto, UpdateOrderDto } from '@ghostfolio/common/dtos';
 import { downloadAsFile } from '@ghostfolio/common/helper';
 import {
   Activity,
@@ -10,6 +9,7 @@ import {
   User
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import { internalRoutes } from '@ghostfolio/common/routes/routes';
 import { DateRange } from '@ghostfolio/common/types';
 import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';
 import { GfFabComponent } from '@ghostfolio/ui/fab';
@@ -29,17 +29,12 @@ import { PageEvent } from '@angular/material/paginator';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { Sort, SortDirection } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
-import { ActivatedRoute, Router, RouterModule } from '@angular/router';
+import { Router, RouterModule } from '@angular/router';
 import { format, parseISO } from 'date-fns';
 import { DeviceDetectorService } from 'ngx-device-detector';
-import { of } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
 
-import { GfCreateOrUpdateActivityDialogComponent } from './create-or-update-activity-dialog/create-or-update-activity-dialog.component';
-import { CreateOrUpdateActivityDialogParams } from './create-or-update-activity-dialog/interfaces/interfaces';
 import { GfImportActivitiesDialogComponent } from './import-activities-dialog/import-activities-dialog.component';
 import { ImportActivitiesDialogParams } from './import-activities-dialog/interfaces/interfaces';
-import { ActivitiesPageParams } from './interfaces/interfaces';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -59,6 +54,7 @@ export class GfActivitiesPageComponent implements OnInit {
   protected hasImpersonationId: boolean;
   protected hasPermissionToCreateActivity: boolean;
   protected hasPermissionToDeleteActivity: boolean;
+  protected readonly internalRoutes = internalRoutes;
   protected pageIndex = 0;
   protected readonly pageSize = DEFAULT_PAGE_SIZE;
   protected sortColumn = 'date';
@@ -77,37 +73,9 @@ export class GfActivitiesPageComponent implements OnInit {
   private readonly impersonationStorageService = inject(
     ImpersonationStorageService
   );
-  private readonly route = inject(ActivatedRoute);
   private readonly router = inject(Router);
   private readonly userService = inject(UserService);
 
-  public constructor() {
-    this.route.queryParams
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        switchMap((params: ActivitiesPageParams) => {
-          if (params.activityId && (params.createDialog || params.editDialog)) {
-            return this.dataService
-              .fetchActivity(params.activityId)
-              .pipe(map((activity) => ({ activity, params })));
-          }
-
-          return of({ params, activity: undefined });
-        })
-      )
-      .subscribe(({ activity, params }) => {
-        if (params.createDialog) {
-          this.openCreateActivityDialog(activity);
-        } else if (params.editDialog) {
-          if (activity) {
-            this.openUpdateActivityDialog(activity);
-          } else {
-            this.router.navigate(['.'], { relativeTo: this.route });
-          }
-        }
-      });
-  }
-
   public ngOnInit() {
     this.deviceType = this.deviceDetectorService.getDeviceInfo().deviceType;
 
@@ -149,10 +117,6 @@ export class GfActivitiesPageComponent implements OnInit {
     });
   }
 
-  protected onCloneActivity(aActivity: Activity) {
-    this.openCreateActivityDialog(aActivity);
-  }
-
   protected onDeleteActivities() {
     this.dataService
       .deleteActivities({
@@ -308,12 +272,6 @@ export class GfActivitiesPageComponent implements OnInit {
     this.fetchActivities();
   }
 
-  protected onUpdateActivity(aActivity: Activity) {
-    this.router.navigate([], {
-      queryParams: { activityId: aActivity.id, editDialog: true }
-    });
-  }
-
   private fetchActivities() {
     // Reset dataSource and totalItems to show loading state
     this.dataSource = undefined;
@@ -343,45 +301,13 @@ export class GfActivitiesPageComponent implements OnInit {
           this.hasPermissionToCreateActivity &&
           this.user?.activitiesCount === 0
         ) {
-          this.router.navigate([], { queryParams: { createDialog: true } });
+          void this.router.navigate(
-        }
+            internalRoutes.portfolio.subRoutes.activities.subRoutes.create
-
+              .routerLink
-        this.changeDetectorRef.markForCheck();
+          );
-      });
         }
 
-  private openUpdateActivityDialog(aActivity: Activity) {
-    const dialogRef = this.dialog.open<
-      GfCreateOrUpdateActivityDialogComponent,
-      CreateOrUpdateActivityDialogParams
-    >(GfCreateOrUpdateActivityDialogComponent, {
-      data: {
-        activity: aActivity,
-        accounts: this.user?.accounts,
-        user: this.user
-      },
-      height: this.deviceType === 'mobile' ? '98vh' : '80vh',
-      width: this.deviceType === 'mobile' ? '100vw' : '50rem'
-    });
-
-    dialogRef
-      .afterClosed()
-      .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe((activity: UpdateOrderDto) => {
-        if (activity) {
-          this.dataService
-            .putActivity(activity)
-            .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe({
-              next: () => {
-                this.fetchActivities();
-
         this.changeDetectorRef.markForCheck();
-              }
-            });
-        }
-
-        this.router.navigate(['.'], { relativeTo: this.route });
       });
   }
 
@@ -393,59 +319,6 @@ export class GfActivitiesPageComponent implements OnInit {
     return /^\d{4}$/.test(dateRange);
   }
 
-  private openCreateActivityDialog(aActivity?: Activity) {
-    this.userService
-      .get()
-      .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe((user) => {
-        this.updateUser(user);
-
-        const dialogRef = this.dialog.open<
-          GfCreateOrUpdateActivityDialogComponent,
-          CreateOrUpdateActivityDialogParams
-        >(GfCreateOrUpdateActivityDialogComponent, {
-          data: {
-            accounts: this.user?.accounts,
-            activity: {
-              ...aActivity,
-              accountId: aActivity?.accountId,
-              assetProfile: aActivity?.assetProfile ?? null,
-              date: new Date(),
-              id: null,
-              fee: 0,
-              type: aActivity?.type ?? 'BUY',
-              unitPrice: null
-            },
-            user: this.user
-          } satisfies CreateOrUpdateActivityDialogParams,
-          height: this.deviceType === 'mobile' ? '98vh' : '80vh',
-          width: this.deviceType === 'mobile' ? '100vw' : '50rem'
-        });
-
-        dialogRef
-          .afterClosed()
-          .pipe(takeUntilDestroyed(this.destroyRef))
-          .subscribe((transaction: CreateOrderDto | null) => {
-            if (transaction) {
-              this.dataService.postActivity(transaction).subscribe({
-                next: () => {
-                  this.userService
-                    .get(true)
-                    .pipe(takeUntilDestroyed(this.destroyRef))
-                    .subscribe();
-
-                  this.fetchActivities();
-
-                  this.changeDetectorRef.markForCheck();
-                }
-              });
-            }
-
-            this.router.navigate(['.'], { relativeTo: this.route });
-          });
-      });
-  }
-
   private updateUser(aUser: User) {
     this.user = aUser;
 

apps/client/src/app/pages/portfolio/activities/activities-page.html

@@ -25,8 +25,6 @@
         (activitiesDeleted)="onDeleteActivities()"
         (activityClicked)="onClickActivity($event)"
         (activityDeleted)="onDeleteActivity($event)"
-        (activityToClone)="onCloneActivity($event)"
-        (activityToUpdate)="onUpdateActivity($event)"
         (export)="onExport()"
         (exportDrafts)="onExportDrafts($event)"
         (import)="onImport()"
@@ -43,6 +41,13 @@
     hasPermissionToCreateActivity &&
     !user.settings.isRestrictedView
   ) {
-    <gf-fab [queryParams]="{ createDialog: true }" />
+    <gf-fab
+      [routerLink]="
+        internalRoutes.portfolio.subRoutes.activities.subRoutes.create
+          .routerLink
+      "
+    />
   }
 </div>
+
+<router-outlet />

apps/client/src/app/pages/portfolio/activities/activities-page.routes.ts

@@ -4,10 +4,39 @@ import { internalRoutes } from '@ghostfolio/common/routes/routes';
 import { Routes } from '@angular/router';
 
 import { GfActivitiesPageComponent } from './activities-page.component';
+import { GfActivityDialogHostComponent } from './activity-dialog-host/activity-dialog-host.component';
+
+const { clone, create, update } =
+  internalRoutes.portfolio.subRoutes.activities.subRoutes;
 
 export const routes: Routes = [
   {
     canActivate: [AuthGuard],
+    children: [
+      {
+        component: GfActivityDialogHostComponent,
+        data: { mode: 'create' },
+        path: create.path,
+        title: create.title
+      },
+      {
+        children: [
+          {
+            component: GfActivityDialogHostComponent,
+            data: { mode: 'clone' },
+            path: clone.path,
+            title: clone.title
+          },
+          {
+            component: GfActivityDialogHostComponent,
+            data: { mode: 'update' },
+            path: update.path,
+            title: update.title
+          }
+        ],
+        path: ':activityId'
+      }
+    ],
     component: GfActivitiesPageComponent,
     path: '',
     title: internalRoutes.portfolio.subRoutes.activities.title

apps/client/src/app/pages/portfolio/activities/activity-dialog-host/activity-dialog-host.component.ts

@@ -0,0 +1,127 @@
+import { UserService } from '@ghostfolio/client/services/user/user.service';
+import { CreateOrderDto, UpdateOrderDto } from '@ghostfolio/common/dtos';
+import { Activity, User } from '@ghostfolio/common/interfaces';
+import { internalRoutes } from '@ghostfolio/common/routes/routes';
+import { DataService } from '@ghostfolio/ui/services';
+
+import {
+  ChangeDetectionStrategy,
+  Component,
+  DestroyRef,
+  OnInit,
+  inject
+} from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { MatDialog } from '@angular/material/dialog';
+import { ActivatedRoute, Router } from '@angular/router';
+import { DeviceDetectorService } from 'ngx-device-detector';
+import { Observable, of } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+
+import { GfCreateOrUpdateActivityDialogComponent } from '../create-or-update-activity-dialog/create-or-update-activity-dialog.component';
+import { CreateOrUpdateActivityDialogParams } from '../create-or-update-activity-dialog/interfaces/interfaces';
+
+type ActivityDialogMode = 'clone' | 'create' | 'update';
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  selector: 'gf-activity-dialog-host',
+  template: ''
+})
+export class GfActivityDialogHostComponent implements OnInit {
+  private readonly dataService = inject(DataService);
+  private readonly destroyRef = inject(DestroyRef);
+  private readonly deviceDetectorService = inject(DeviceDetectorService);
+  private readonly dialog = inject(MatDialog);
+  private readonly route = inject(ActivatedRoute);
+  private readonly router = inject(Router);
+  private readonly userService = inject(UserService);
+
+  public ngOnInit() {
+    const mode = this.route.snapshot.data.mode as ActivityDialogMode;
+    const activityId = this.route.snapshot.paramMap.get('activityId');
+
+    const activity$: Observable<Activity | undefined> = activityId
+      ? this.dataService.fetchActivity(activityId)
+      : of(undefined);
+
+    this.userService
+      .get()
+      .pipe(
+        switchMap((user) => {
+          return activity$.pipe(map((activity) => ({ activity, user })));
+        }),
+        takeUntilDestroyed(this.destroyRef)
+      )
+      .subscribe({
+        error: () => {
+          this.navigateBack();
+        },
+        next: ({ activity, user }) => {
+          this.openDialog(mode, user, activity);
+        }
+      });
+  }
+
+  private navigateBack() {
+    void this.router.navigate(
+      internalRoutes.portfolio.subRoutes.activities.routerLink
+    );
+  }
+
+  private openDialog(
+    aMode: ActivityDialogMode,
+    aUser: User,
+    aActivity?: Activity
+  ) {
+    const deviceType = this.deviceDetectorService.getDeviceInfo().deviceType;
+    const isUpdate = aMode === 'update';
+
+    const dialogRef = this.dialog.open<
+      GfCreateOrUpdateActivityDialogComponent,
+      CreateOrUpdateActivityDialogParams
+    >(GfCreateOrUpdateActivityDialogComponent, {
+      data: {
+        accounts: aUser?.accounts,
+        activity:
+          isUpdate && aActivity
+            ? aActivity
+            : {
+                ...aActivity,
+                accountId: aActivity?.accountId,
+                assetProfile: aActivity?.assetProfile ?? null,
+                date: new Date(),
+                fee: 0,
+                id: null,
+                type: aActivity?.type ?? 'BUY',
+                unitPrice: null
+              },
+        user: aUser
+      },
+      height: deviceType === 'mobile' ? '98vh' : '80vh',
+      width: deviceType === 'mobile' ? '100vw' : '50rem'
+    });
+
+    dialogRef
+      .afterClosed()
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((result: CreateOrderDto | UpdateOrderDto | null) => {
+        if (result) {
+          const request$: Observable<unknown> = isUpdate
+            ? this.dataService.putActivity(result as UpdateOrderDto)
+            : this.dataService.postActivity(result as CreateOrderDto);
+
+          request$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe({
+            next: () => {
+              this.userService
+                .get(true)
+                .pipe(takeUntilDestroyed(this.destroyRef))
+                .subscribe();
+            }
+          });
+        }
+
+        this.navigateBack();
+      });
+  }
+}

apps/client/src/app/pages/portfolio/activities/interfaces/interfaces.ts

@@ -1,7 +0,0 @@
-import { Params } from '@angular/router';
-
-export interface ActivitiesPageParams extends Params {
-  activityId?: string;
-  createDialog?: string;
-  editDialog?: string;
-}

libs/common/src/lib/routes/interfaces/internal-route.interface.ts

@@ -3,7 +3,7 @@ import { User } from '@ghostfolio/common/interfaces';
 export interface InternalRoute {
   excludeFromAssistant?: boolean | ((aUser: User) => boolean);
   path?: string;
-  routerLink: string[];
+  routerLink?: string[];
   subRoutes?: Record<string, InternalRoute>;
   title?: string;
 }

libs/common/src/lib/routes/routes.ts

@@ -125,6 +125,23 @@ export const internalRoutes = {
       activities: {
         path: 'activities',
         routerLink: ['/portfolio', 'activities'],
+        subRoutes: {
+          clone: {
+            excludeFromAssistant: true,
+            path: 'clone',
+            title: $localize`Clone Activity`
+          },
+          create: {
+            path: 'create',
+            routerLink: ['/portfolio', 'activities', 'create'],
+            title: $localize`Add Activity`
+          },
+          update: {
+            excludeFromAssistant: true,
+            path: 'update',
+            title: $localize`Update Activity`
+          }
+        },
         title: $localize`Activities`
       },
       allocations: {

libs/ui/src/lib/activities-table/activities-table.component.html

@@ -476,18 +476,34 @@
               </span>
             </button>
           }
-          <button mat-menu-item (click)="onUpdateActivity(element)">
+          <a
+            mat-menu-item
+            [routerLink]="
+              getActivityDialogRouterLink(
+                element,
+                activityDialogRoutes.update.path
+              )
+            "
+          >
             <span class="align-items-center d-flex">
               <ion-icon class="mr-2" name="create-outline" />
               <span><ng-container i18n>Edit</ng-container>...</span>
             </span>
-          </button>
+          </a>
-          <button mat-menu-item (click)="onCloneActivity(element)">
+          <a
+            mat-menu-item
+            [routerLink]="
+              getActivityDialogRouterLink(
+                element,
+                activityDialogRoutes.clone.path
+              )
+            "
+          >
             <span class="align-items-center d-flex">
               <ion-icon class="mr-2" name="copy-outline" />
               <span><ng-container i18n>Clone</ng-container>...</span>
             </span>
-          </button>
+          </a>
           <button
             mat-menu-item
             [disabled]="!element.isDraft"

libs/ui/src/lib/activities-table/activities-table.component.ts

@@ -9,7 +9,7 @@ import {
   AssetProfileIdentifier
 } from '@ghostfolio/common/interfaces';
 import { GfSymbolPipe } from '@ghostfolio/common/pipes';
-import { OrderWithAccount } from '@ghostfolio/common/types';
+import { internalRoutes } from '@ghostfolio/common/routes/routes';
 import { translate } from '@ghostfolio/ui/i18n';
 import { NotificationService } from '@ghostfolio/ui/notifications';
 
@@ -50,6 +50,7 @@ import {
 } from '@angular/material/sort';
 import { MatTableDataSource, MatTableModule } from '@angular/material/table';
 import { MatTooltipModule } from '@angular/material/tooltip';
+import { RouterModule } from '@angular/router';
 import { IonIcon } from '@ionic/angular/standalone';
 import { Type as ActivityType } from '@prisma/client';
 import { isUUID } from 'class-validator';
@@ -95,7 +96,8 @@ import { GfValueComponent } from '../value/value.component';
     MatTableModule,
     MatTooltipModule,
     NgxSkeletonLoaderModule,
-    ReactiveFormsModule
+    ReactiveFormsModule,
+    RouterModule
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   selector: 'gf-activities-table',
@@ -123,8 +125,6 @@ export class GfActivitiesTableComponent implements AfterViewInit, OnInit {
   @Output() activitiesDeleted = new EventEmitter<void>();
   @Output() activityClicked = new EventEmitter<AssetProfileIdentifier>();
   @Output() activityDeleted = new EventEmitter<string>();
-  @Output() activityToClone = new EventEmitter<OrderWithAccount>();
-  @Output() activityToUpdate = new EventEmitter<OrderWithAccount>();
   @Output() export = new EventEmitter<void>();
   @Output() exportDrafts = new EventEmitter<string[]>();
   @Output() import = new EventEmitter<void>();
@@ -151,6 +151,9 @@ export class GfActivitiesTableComponent implements AfterViewInit, OnInit {
   public readonly showCheckbox = input(false);
   public readonly showNameColumn = input(true);
 
+  protected readonly activityDialogRoutes =
+    internalRoutes.portfolio.subRoutes.activities.subRoutes;
+
   protected readonly displayedColumns = computed(() => {
     let columns = [
       'select',
@@ -265,6 +268,14 @@ export class GfActivitiesTableComponent implements AfterViewInit, OnInit {
     );
   }
 
+  public getActivityDialogRouterLink(aActivity: Activity, aPath: string) {
+    return [
+      ...internalRoutes.portfolio.subRoutes.activities.routerLink,
+      aActivity.id,
+      aPath
+    ];
+  }
+
   public isExcludedFromAnalysis(activity: Activity) {
     return (
       (activity.account && isAccountExcluded(activity.account)) ??
@@ -291,10 +302,6 @@ export class GfActivitiesTableComponent implements AfterViewInit, OnInit {
     }
   }
 
-  public onCloneActivity(aActivity: OrderWithAccount) {
-    this.activityToClone.emit(aActivity);
-  }
-
   public onDeleteActivities() {
     this.notificationService.confirm({
       confirmFn: () => {
@@ -349,10 +356,6 @@ export class GfActivitiesTableComponent implements AfterViewInit, OnInit {
     });
   }
 
-  public onUpdateActivity(aActivity: OrderWithAccount) {
-    this.activityToUpdate.emit(aActivity);
-  }
-
   public sortByValue(
     a: { key: ActivityType; value: string },
     b: { key: ActivityType; value: string }

libs/ui/src/lib/assistant/assistant.component.ts

@@ -688,21 +688,28 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
   private searchQuickLinks(aSearchTerm: string): SearchResultItem[] {
     const searchTerm = aSearchTerm.toLowerCase();
 
-    const allRoutes = Object.values<InternalRoute>(internalRoutes)
+    const isIncludedInAssistant = ({ excludeFromAssistant }: InternalRoute) => {
-      .filter(({ excludeFromAssistant }) => {
       if (isFunction(excludeFromAssistant)) {
         return excludeFromAssistant(this.user);
       }
 
       return !excludeFromAssistant;
-      })
+    };
+
+    const allRoutes = Object.values<InternalRoute>(internalRoutes)
+      .filter(isIncludedInAssistant)
       .reduce<InternalRoute[]>((acc, route) => {
         acc.push(route);
         if (route.subRoutes) {
-          acc.push(...Object.values(route.subRoutes));
+          acc.push(
+            ...Object.values(route.subRoutes).filter(isIncludedInAssistant)
+          );
         }
         return acc;
-      }, []);
+      }, [])
+      .filter((route): route is InternalRoute & { routerLink: string[] } => {
+        return route.routerLink !== undefined;
+      });
 
     const fuse = new Fuse(allRoutes, {
       keys: ['title'],

libs/ui/src/lib/fab/fab.component.html

@@ -3,7 +3,7 @@
   color="primary"
   mat-fab
   [queryParams]="queryParams()"
-  [routerLink]="[]"
+  [routerLink]="routerLink()"
 >
   <ion-icon name="add-outline" size="large" />
 </a>

libs/ui/src/lib/fab/fab.component.ts

@@ -13,7 +13,8 @@ import { addOutline } from 'ionicons/icons';
   templateUrl: './fab.component.html'
 })
 export class GfFabComponent {
-  public readonly queryParams = input.required<Params>();
+  public readonly queryParams = input<Params>();
+  public readonly routerLink = input<string[]>([]);
 
   public constructor() {
     addIcons({ addOutline });