refactor: move navigate options to the navigation event

also update the event params

Author: Miodec

frontend/src/ts/controllers/route-controller.ts

@@ -5,20 +5,11 @@ import { isAuthAvailable, isAuthenticated } from "../firebase";
 import { isFunboxActive } from "../test/funbox/list";
 import * as TestState from "../test/test-state";
 import * as Notifications from "../elements/notifications";
-import { LoadingOptions } from "../pages/page";
 import * as NavigationEvent from "../observables/navigation-event";
 
 //source: https://www.youtube.com/watch?v=OstALBk-jTc
 // https://www.youtube.com/watch?v=OstALBk-jTc
 
-//this will be used in tribe
-type NavigateOptions = {
-  force?: boolean;
-  empty?: boolean;
-  data?: unknown;
-  loadingOptions?: LoadingOptions;
-};
-
 function pathToRegex(path: string): RegExp {
   return new RegExp(
     "^" + path.replace(/\//g, "\\/").replace(/:\w+/g, "(.+)") + "$",
@@ -42,7 +33,7 @@ type Route = {
   path: string;
   load: (
     params: Record<string, string>,
-    navigateOptions: NavigateOptions,
+    navigateOptions: NavigationEvent.NavigateOptions,
   ) => Promise<void>;
 };
 
@@ -166,7 +157,7 @@ export async function navigate(
   url = window.location.pathname +
     window.location.search +
     window.location.hash,
-  options = {} as NavigateOptions,
+  options = {} as NavigationEvent.NavigateOptions,
 ): Promise<void> {
   if (
     !options.force &&
@@ -211,7 +202,9 @@ export async function navigate(
   await router(options);
 }
 
-async function router(options = {} as NavigateOptions): Promise<void> {
+async function router(
+  options = {} as NavigationEvent.NavigateOptions,
+): Promise<void> {
   const matches = routes.map((r) => {
     return {
       route: r,
@@ -251,6 +244,6 @@ document.addEventListener("DOMContentLoaded", () => {
   });
 });
 
-NavigationEvent.subscribe((it) => {
-  void navigate(it.url, { data: it.data });
+NavigationEvent.subscribe((url, options) => {
+  void navigate(url, options);
 });

frontend/src/ts/observables/navigation-event.ts

@@ -1,20 +1,25 @@
-type NavigationEvent = {
-  url: string;
+import { LoadingOptions } from "../pages/page";
+
+export type NavigateOptions = {
+  force?: boolean;
+  empty?: boolean;
+  //this will be used in tribe
   data?: unknown;
+  loadingOptions?: LoadingOptions;
 };
 
-type SubscribeFunction = (event: NavigationEvent) => void;
+type SubscribeFunction = (url: string, options: NavigateOptions) => void;
 
 const subscribers: SubscribeFunction[] = [];
 
 export function subscribe(fn: SubscribeFunction): void {
   subscribers.push(fn);
 }
 
-export function dispatch(event: NavigationEvent): void {
+export function dispatch(url: string, options: NavigateOptions): void {
   subscribers.forEach((fn) => {
     try {
-      fn(event);
+      fn(url, options);
     } catch (e) {
       console.error("Navigation event subscriber threw an error");
       console.error(e);

frontend/src/ts/pages/profile-search.ts

@@ -64,8 +64,7 @@ export const page = new Page({
 $(".page.pageProfileSearch form").on("submit", (e) => {
   e.preventDefault();
   if (lastProfile === null) return;
-  NavigationEvent.dispatch({
-    url: `/profile/${lastProfile.name}`,
+  NavigationEvent.dispatch(`/profile/${lastProfile.name}`, {
     data: lastProfile,
   });
 });