[Fix] #8339 Bookmark Parameters to URLs

apps/gauzy/src/app/app.component.ts

@@ -21,6 +21,7 @@ import {
 	ISelectorVisibility,
 	JitsuService,
 	LanguagesService,
+	NavigationService,
 	SelectorBuilderService,
 	SeoService,
 	Store
@@ -47,7 +48,8 @@ export class AppComponent implements OnInit, AfterViewInit {
 		private readonly _router: Router,
 		private readonly _activatedRoute: ActivatedRoute,
 		private readonly _selectorBuilderService: SelectorBuilderService,
-		private readonly _dateRangePickerBuilderService: DateRangePickerBuilderService
+		private readonly _dateRangePickerBuilderService: DateRangePickerBuilderService,
+		private readonly _navigationService: NavigationService
 	) {
 		this.getActivateRouterDataEvent();
 		this.getPreferredLanguage();
@@ -200,18 +202,25 @@ export class AppComponent implements OnInit, AfterViewInit {
 				tap(
 					({
 						datePicker,
-						dates
+						dates,
+						bookmarkParams
 					}: {
 						datePicker: IDatePickerConfig;
 						dates: IDateRangePicker;
 						selectors: ISelectorVisibility;
+						bookmarkParams: Record<string, string>;
 					}) => {
+						// Date Range Picker
 						if (isNotEmpty(dates)) {
 							this._dateRangePickerBuilderService.setDateRangePicker(dates);
 						}
+
 						// Set Date Range Picker Default Unit
 						const datePickerConfig = Object.assign({}, DEFAULT_DATE_PICKER_CONFIG, datePicker);
 						this._dateRangePickerBuilderService.setDatePickerConfig(datePickerConfig);
+
+						// Create query parameters URL builder
+						this._navigationService.updateQueryParams(bookmarkParams);
 					}
 				),
 				// Automatically unsubscribe when the component is destroyed

apps/gauzy/src/app/pages/dashboard/dashboard-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { PermissionsGuard } from '@gauzy/ui-core/core';
+import { PermissionsGuard, BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { PermissionsEnum } from '@gauzy/contracts';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { DashboardComponent } from './dashboard.component';
@@ -33,7 +33,8 @@ const routes: Routes = [
 					}
 				},
 				resolve: {
-					dates: DateRangePickerResolver
+					dates: DateRangePickerResolver,
+					bookmarkParams: BookmarkQueryParamsResolver
 				}
 			},
 			{
@@ -48,7 +49,8 @@ const routes: Routes = [
 					}
 				},
 				resolve: {
-					dates: DateRangePickerResolver
+					dates: DateRangePickerResolver,
+					bookmarkParams: BookmarkQueryParamsResolver
 				}
 			},
 			{
@@ -60,7 +62,8 @@ const routes: Routes = [
 					}
 				},
 				resolve: {
-					dates: DateRangePickerResolver
+					dates: DateRangePickerResolver,
+					bookmarkParams: BookmarkQueryParamsResolver
 				}
 			},
 			{
@@ -76,7 +79,8 @@ const routes: Routes = [
 					}
 				},
 				resolve: {
-					dates: DateRangePickerResolver
+					dates: DateRangePickerResolver,
+					bookmarkParams: BookmarkQueryParamsResolver
 				}
 			},
 			{
@@ -99,7 +103,8 @@ const routes: Routes = [
 					}
 				},
 				resolve: {
-					dates: DateRangePickerResolver
+					dates: DateRangePickerResolver,
+					bookmarkParams: BookmarkQueryParamsResolver
 				}
 			}
 		]

apps/gauzy/src/app/pages/employees/activity/activity.module.ts

@@ -2,7 +2,7 @@ import { Inject, NgModule } from '@angular/core';
 import { ROUTES, RouterModule } from '@angular/router';
 import { NbCardModule, NbSpinnerModule } from '@nebular/theme';
 import { TranslateModule } from '@ngx-translate/core';
-import { PageRouteRegistryService } from '@gauzy/ui-core/core';
+import { BookmarkQueryParamsResolver, PageRouteRegistryService } from '@gauzy/ui-core/core';
 import {
 	ActivityItemModule,
 	DateRangePickerResolver,
@@ -92,7 +92,10 @@ export class ActivityModule {
 				title: 'ACTIVITY.APPS', // Register the title for the page
 				type: 'apps' // Register the type for the page
 			},
-			resolve: { dates: DateRangePickerResolver }
+			resolve: {
+				dates: DateRangePickerResolver,
+				bookmarkParams: BookmarkQueryParamsResolver
+			}
 		});
 
 		// Register URL Activity Page Routes
@@ -111,7 +114,10 @@ export class ActivityModule {
 				title: 'ACTIVITY.VISITED_SITES', // Register the title for the page
 				type: 'urls' // Register the type for the page
 			},
-			resolve: { dates: DateRangePickerResolver }
+			resolve: {
+				dates: DateRangePickerResolver,
+				bookmarkParams: BookmarkQueryParamsResolver
+			}
 		});
 
 		// Set the flag to true

apps/gauzy/src/app/pages/employees/activity/screenshot/screenshot-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { ScreenshotComponent } from './screenshot/screenshot.component';
 
@@ -17,7 +18,10 @@ const routes: Routes = [
 				isDisableFutureDate: true
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/employees/activity/time-activities/time-activities-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { TimeActivitiesComponent } from './time-activities/time-activities.component';
 
@@ -16,7 +17,10 @@ const routes: Routes = [
 				isSingleDatePicker: true
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/employees/timesheet/calendar/calendar-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { CalendarComponent } from './calendar/calendar.component';
 
@@ -12,7 +13,10 @@ const routes: Routes = [
 				unitOfTime: 'week'
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/employees/timesheet/daily/daily-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { DailyComponent } from './daily/daily.component';
 
@@ -14,7 +15,10 @@ const routes: Routes = [
 				isSingleDatePicker: true
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { WeeklyComponent } from './weekly/weekly.component';
 
@@ -13,7 +14,10 @@ const routes: Routes = [
 				isLockDatePicker: true
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/reports/amounts-owed-report/amounts-owed-report-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { AmountsOwedReportComponent } from './amounts-owed-report/amounts-owed-report.component';
 
@@ -12,7 +13,10 @@ const routes: Routes = [
 				unitOfTime: 'week'
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/reports/apps-urls-report/apps-urls-report-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { AppsUrlsReportComponent } from './apps-urls-report/apps-urls-report.component';
 
@@ -12,7 +13,10 @@ const routes: Routes = [
 				unitOfTime: 'week'
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/reports/client-budgets-report/client-budgets-report-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { ClientBudgetsReportComponent } from './client-budgets-report/client-budgets-report.component';
 
@@ -12,7 +13,10 @@ const routes: Routes = [
 				unitOfTime: 'week'
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/reports/expenses-report/expenses-report-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { ExpensesReportComponent } from './expenses-report/expenses-report.component';
 
@@ -12,7 +13,10 @@ const routes: Routes = [
 				unitOfTime: 'week'
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/reports/manual-time/manual-time-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { ManualTimeComponent } from './manual-time/manual-time.component';
 
@@ -12,7 +13,10 @@ const routes: Routes = [
 				unitOfTime: 'week'
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/reports/payment-report/payment-report-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { PaymentReportComponent } from './payment-report/payment-report.component';
 
@@ -15,7 +16,10 @@ const routes: Routes = [
 				employee: false
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/reports/project-budgets-report/project-budgets-report-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { ProjectBudgetsReportComponent } from './project-budgets-report/project-budgets-report.component';
 
@@ -12,7 +13,10 @@ const routes: Routes = [
 				unitOfTime: 'week'
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];
 

apps/gauzy/src/app/pages/reports/time-limit-report/time-limit-report-routing.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { BookmarkQueryParamsResolver } from '@gauzy/ui-core/core';
 import { DateRangePickerResolver } from '@gauzy/ui-core/shared';
 import { TimeLimitReportComponent } from './time-limit-report/time-limit-report.component';
 
@@ -14,7 +15,10 @@ const routes: Routes = [
 				unitOfTime: 'week'
 			}
 		},
-		resolve: { dates: DateRangePickerResolver }
+		resolve: {
+			dates: DateRangePickerResolver,
+			bookmarkParams: BookmarkQueryParamsResolver
+		}
 	}
 ];