undo changes to +page.ts using userStore

psubram3 · psubram3 · commit 9ad91b64258b · 2025-08-18T12:06:07.000-07:00
unnecessary if using SSR, as we need to await parent anyways before calling userStore, which isn't particularly helpful on browser here anyways in the case of SSR...so easier to just remove.
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
@@ -7,7 +7,9 @@ import { gqlWsClient, userStore } from '../lib/stores/auth';
 import { getClientOptions } from '../stores/subscribable';
 
 export const load: LayoutLoad = async ({ data }) => {
+  console.log('RUNNING LAYOUT.TS!!!');
   if (browser) {
+    console.log('SETTING userStore NOW', JSON.stringify(data.user));
     userStore.set(data.user);
     gqlWsClient.set(createClient(getClientOptions()));
   }
diff --git a/src/routes/constraints/edit/[id]/+page.ts b/src/routes/constraints/edit/[id]/+page.ts
@@ -1,20 +1,11 @@
-import { browser } from '$app/environment';
 import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
-import { get } from 'svelte/store';
-import { userStore } from '../../../../lib/stores/auth';
-import type { User } from '../../../../types/app';
 import effects from '../../../../utilities/effects';
 import { parseFloatOrNull } from '../../../../utilities/generic';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { id: constraintIdParam } = params;
 
@@ -26,7 +17,6 @@ export const load: PageLoad = async ({ parent, params }) => {
       if (initialConstraint !== null) {
         return {
           initialConstraint,
-          user,
         };
       }
     }
diff --git a/src/routes/expansion/rules/edit/[id]/+page.ts b/src/routes/expansion/rules/edit/[id]/+page.ts
@@ -1,19 +1,10 @@
-import { browser } from '$app/environment';
 import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
-import { get } from 'svelte/store';
-import { userStore } from '../../../../../lib/stores/auth';
-import type { User } from '../../../../../types/app';
 import effects from '../../../../../utilities/effects';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { id: ruleIdParam } = params;
 
@@ -26,7 +17,6 @@ export const load: PageLoad = async ({ parent, params }) => {
       if (initialRule !== null) {
         return {
           initialRule,
-          user,
         };
       }
     }
diff --git a/src/routes/expansion/runs/+page.ts b/src/routes/expansion/runs/+page.ts
@@ -1,17 +1,8 @@
-import { browser } from '$app/environment';
-import { get } from 'svelte/store';
-import { userStore } from '../../../lib/stores/auth';
-import type { User } from '../../../types/app';
 import effects from '../../../utilities/effects';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const expansionRuns = await effects.getExpansionRuns(user);
 
diff --git a/src/routes/expansion/sets/new/+page.ts b/src/routes/expansion/sets/new/+page.ts
@@ -1,17 +1,8 @@
-import { browser } from '$app/environment';
-import { get } from 'svelte/store';
-import { userStore } from '../../../../lib/stores/auth';
-import type { User } from '../../../../types/app';
 import effects from '../../../../utilities/effects';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { plans: initialPlans } = await effects.getPlansAndModels(user);
 
diff --git a/src/routes/login/+page.ts b/src/routes/login/+page.ts
@@ -1,19 +1,10 @@
-import { browser } from '$app/environment';
 import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
-import { get } from 'svelte/store';
-import { userStore } from '../../lib/stores/auth';
-import type { User } from '../../types/app';
 import { hasNoAuthorization } from '../../utilities/permissions';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   if (user && !hasNoAuthorization(user)) {
     redirect(302, `${base}/plans`);
diff --git a/src/routes/models/+page.ts b/src/routes/models/+page.ts
@@ -1,17 +1,8 @@
-import { browser } from '$app/environment';
-import { get } from 'svelte/store';
-import { userStore } from '../../lib/stores/auth';
-import type { User } from '../../types/app';
 import effects from '../../utilities/effects';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const initialModels = await effects.getModels(user);
 
diff --git a/src/routes/models/[id]/+page.ts b/src/routes/models/[id]/+page.ts
@@ -1,19 +1,10 @@
-import { browser } from '$app/environment';
 import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
-import { get } from 'svelte/store';
-import { userStore } from '../../../lib/stores/auth';
-import type { User } from '../../../types/app';
 import effects from '../../../utilities/effects';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { id } = params;
   const modelId = parseFloat(id);
diff --git a/src/routes/parcels/edit/[id]/+page.ts b/src/routes/parcels/edit/[id]/+page.ts
@@ -1,21 +1,12 @@
-import { browser } from '$app/environment';
 import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
-import { get } from 'svelte/store';
-import { userStore } from '../../../../lib/stores/auth';
-import type { User } from '../../../../types/app';
 import type { Parcel } from '../../../../types/sequencing';
 import effects from '../../../../utilities/effects';
 import { parseFloatOrNull } from '../../../../utilities/generic';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { id: parcelIdParam } = params;
 
diff --git a/src/routes/plans/+page.ts b/src/routes/plans/+page.ts
@@ -1,17 +1,8 @@
-import { browser } from '$app/environment';
-import { get } from 'svelte/store';
-import { userStore } from '../../lib/stores/auth';
-import type { User } from '../../types/app';
 import effects from '../../utilities/effects';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { models = [], plans = [] } = await effects.getPlansAndModels(user);
 
diff --git a/src/routes/plans/[id]/+page.ts b/src/routes/plans/[id]/+page.ts
@@ -1,22 +1,13 @@
-import { browser } from '$app/environment';
 import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
-import { get } from 'svelte/store';
 import { SearchParameters } from '../../../enums/searchParameters';
-import { userStore } from '../../../lib/stores/auth';
 import { planReadOnlyMergeRequest } from '../../../stores/plan';
-import type { User } from '../../../types/app';
 import effects from '../../../utilities/effects';
 import { getSearchParameterNumber } from '../../../utilities/url';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params, url }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { id } = params;
   const planId = parseFloat(id);
diff --git a/src/routes/plans/[id]/merge/+page.ts b/src/routes/plans/[id]/merge/+page.ts
@@ -1,9 +1,5 @@
-import { browser } from '$app/environment';
 import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
-import { get } from 'svelte/store';
-import { userStore } from '../../../../lib/stores/auth';
-import type { User } from '../../../../types/app';
 import type {
   PlanMergeConflictingActivity,
   PlanMergeNonConflictingActivity,
@@ -13,12 +9,7 @@ import effects from '../../../../utilities/effects';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { id } = params;
   const planId = parseFloat(id);
diff --git a/src/routes/scheduling/conditions/edit/[id]/+page.ts b/src/routes/scheduling/conditions/edit/[id]/+page.ts
@@ -1,20 +1,11 @@
-import { browser } from '$app/environment';
 import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
-import { get } from 'svelte/store';
-import { userStore } from '../../../../../lib/stores/auth';
-import type { User } from '../../../../../types/app';
 import effects from '../../../../../utilities/effects';
 import { parseFloatOrNull } from '../../../../../utilities/generic';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { id: conditionIdParam } = params;
 
diff --git a/src/routes/scheduling/goals/edit/[id]/+page.ts b/src/routes/scheduling/goals/edit/[id]/+page.ts
@@ -1,20 +1,11 @@
-import { browser } from '$app/environment';
 import { base } from '$app/paths';
 import { redirect } from '@sveltejs/kit';
-import { get } from 'svelte/store';
-import { userStore } from '../../../../../lib/stores/auth';
-import type { User } from '../../../../../types/app';
 import effects from '../../../../../utilities/effects';
 import { parseFloatOrNull } from '../../../../../utilities/generic';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent, params }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { id: goalIdParam } = params;
 
diff --git a/src/routes/tags/+page.ts b/src/routes/tags/+page.ts
@@ -1,17 +1,8 @@
-import { browser } from '$app/environment';
-import { get } from 'svelte/store';
-import { userStore } from '../../lib/stores/auth';
-import type { User } from '../../types/app';
 import effects from '../../utilities/effects';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const initialTags = await effects.getTags(user);
 
diff --git a/src/routes/workspaces/[workspaceId]/+layout.ts b/src/routes/workspaces/[workspaceId]/+layout.ts
@@ -1,17 +1,8 @@
-import { browser } from '$app/environment';
-import { get } from 'svelte/store';
-import { userStore } from '../../../lib/stores/auth';
-import type { User } from '../../../types/app';
 import effects from '../../../utilities/effects';
 import type { LayoutLoad } from './$types';
 
 export const load: LayoutLoad = async ({ parent, params }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { workspaceId } = params;
 
diff --git a/src/routes/workspaces/[workspaceId]/actions/+layout.ts b/src/routes/workspaces/[workspaceId]/actions/+layout.ts
@@ -1,17 +1,8 @@
-import { browser } from '$app/environment';
-import { get } from 'svelte/store';
-import { userStore } from '../../../../lib/stores/auth';
-import type { User } from '../../../../types/app';
 import effects from '../../../../utilities/effects';
 import type { LayoutLoad } from './$types';
 
 export const load: LayoutLoad = async ({ parent, params }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
 
   const { workspaceId } = params;
 
diff --git a/src/routes/workspaces/[workspaceId]/actions/runs/[runId]/+layout.ts b/src/routes/workspaces/[workspaceId]/actions/runs/[runId]/+layout.ts
@@ -1,17 +1,8 @@
-import { browser } from '$app/environment';
-import { get } from 'svelte/store';
-import { userStore } from '../../../../../../lib/stores/auth';
-import type { User } from '../../../../../../types/app';
 import effects from '../../../../../../utilities/effects';
 import type { LayoutLoad } from './$types';
 
 export const load: LayoutLoad = async ({ parent, params }) => {
-  let user: User | null;
-  if (browser) {
-    user = get(userStore);
-  } else {
-    user = (await parent()).user;
-  }
+  const { user } = await parent();
   const { runId, workspaceId } = params;
   const actionRunId = parseFloat(runId);
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,9 @@ import { gqlWsClient, userStore } from '../lib/stores/auth';`
`7`	`7`	`import { getClientOptions } from '../stores/subscribable';`
`8`	`8`
`9`	`9`	`export const load: LayoutLoad = async ({ data }) => {`
	`10`	`+ console.log('RUNNING LAYOUT.TS!!!');`
`10`	`11`	`if (browser) {`
	`12`	`+ console.log('SETTING userStore NOW', JSON.stringify(data.user));`
`11`	`13`	`userStore.set(data.user);`
`12`	`14`	`gqlWsClient.set(createClient(getClientOptions()));`
`13`	`15`	`}`