WIP: temp store fix

Author: psubram3

src/lib/server/oidc.ts

@@ -245,7 +245,9 @@ const mutation = `mutation InsertUser($input: users_insert_input!) {
 async function upsertUser(decodedAccessToken: HasuraToken, accessToken: string): Promise<void> {
   const username = decodedAccessToken['https://hasura.io/jwt/claims']['x-hasura-user-id'];
   const defaultRole = decodedAccessToken['https://hasura.io/jwt/claims']['x-hasura-default-role'];
+  // defaultRole = defaultRole.split('-')[1];
   const allowedRoles = decodedAccessToken['https://hasura.io/jwt/claims']['x-hasura-allowed-roles'];
+  // allowedRoles = allowedRoles.map(v => v.split('-')[1]);
   const input = { default_role: defaultRole, username };
   const user: User = {
     activeRole: defaultRole,

src/routes/plans/[id]/+page.svelte

@@ -198,6 +198,8 @@
   let schedulingStatusText: string = '';
   let lastSimulationDatasetId: number | null = null;
 
+  $: console.log(`Subscriber - Plan Id: ${$planId}`); //, ${JSON.stringify($initialPlan)}, ${JSON.stringify($plan)}`);
+
   $: ({ invalidActivityCount, ...activityErrorCounts } = $activityErrorRollups.reduce(
     (prevCounts, activityErrorRollup) => {
       const extra = prevCounts.extra + activityErrorRollup.errorCounts.extra;

src/routes/plans/[id]/+page.ts

@@ -18,6 +18,8 @@ export const load: PageLoad = async ({ parent, params, url }) => {
     user = (await parent()).user;
   }
 
+  console.log('BROWSER LOADING +page.ts', params);
+
   const { id } = params;
   const planId = parseFloat(id);
 

src/stores/plan.ts

@@ -1,4 +1,4 @@
-import { derived, writable, type Readable, type Writable } from 'svelte/store';
+import { derived, get, writable, type Readable, type Writable } from 'svelte/store';
 import type { ActivityType } from '../types/activity';
 import type { Plan, PlanMergeRequest, PlanMergeRequestSchema, PlanMetadata } from '../types/plan';
 import type { PlanDataset } from '../types/simulation';
@@ -36,7 +36,10 @@ export const viewTimeRange: Writable<TimeRange> = writable({ end: 0, start: 0 })
 /* "plan" store dependencies */
 export const initialPlan: Writable<Plan | null> = writable(null);
 
-export const planId: Readable<number> = derived(initialPlan, $plan => ($plan ? $plan.id : -1));
+export const planId: Readable<number> = derived(initialPlan, $plan => {
+  console.log('PLAN ID IS GETTING A VALUE: ', $plan ? $plan.id : -1);
+  return $plan ? $plan.id : -1;
+});
 
 export const planMetadata = gqlSubscribable<PlanMetadata | null>(gql.SUB_PLAN_METADATA, { planId }, null);
 
@@ -102,12 +105,14 @@ export const planMergeRequestsOutgoing = gqlSubscribable<PlanMergeRequest[]>(
     planMergeRequests.map(planMergeRequest => ({ ...planMergeRequest, pending: false, type: 'outgoing' })),
 );
 
-export const planRevision = gqlSubscribable<number>(
-  gql.SUB_PLAN_REVISION,
-  { planId },
-  -1,
-  ({ revision }: Pick<Plan, 'revision'>) => revision,
-);
+export const planRevision = gqlSubscribable<number>(gql.SUB_PLAN_REVISION, { planId }, -1, revisionObject => {
+  console.log('????? plan revision Object', JSON.stringify(revisionObject), get(planId));
+  console.log(`revision's plan??? ${JSON.stringify(get(initialPlan))}`);
+  if (revisionObject && revisionObject['plan'] && revisionObject['plan']['revision']) {
+    return revisionObject['plan']['revision'];
+  }
+  return -1;
+});
 
 /* Helper Functions. */
 

src/stores/subscribable.ts

@@ -105,6 +105,11 @@ export function gqlSubscribable<T>(
               const [key] = Object.keys(data);
               const { [key]: newValue } = data;
               if (!isEqual(value, newValue)) {
+                if (query.includes('SubPlanRevision')) {
+                  console.log(
+                    `Plan Revision value stuff: ${JSON.stringify(value)} ${JSON.stringify(newValue)} ${JSON.stringify(data)}`,
+                  );
+                }
                 value = transformer(newValue);
                 subscribers.forEach(({ next }) => {
                   next(value as T);
@@ -134,6 +139,7 @@ export function gqlSubscribable<T>(
   }
 
   function setVariables(newVariables: QueryVariables): void {
+    console.log('????');
     newVariables = { ...variables, ...newVariables };
 
     if (!isEqual(variables, newVariables)) {
@@ -148,6 +154,9 @@ export function gqlSubscribable<T>(
    * These variables could be stores themselves or plain values.
    */
   function subscribeToVariables(initialVariables: QueryVariables | null): void {
+    if (query.includes('SubPlanRevision')) {
+      console.log(`PlanRevision SubscribeToVariables: ${JSON.stringify(initialVariables)}`);
+    }
     variableUnsubscribers.forEach(variableUnsubscribe => variableUnsubscribe());
     variableUnsubscribers = [];
 
@@ -159,7 +168,11 @@ export function gqlSubscribable<T>(
           // and resubscribe to the main query with those new variables
           const store = variable as Readable<any>;
           const unsubscriber = store.subscribe(storeValue => {
-            variables = { ...variables, [name]: storeValue };
+            if (query.includes('SubPlanRevision') || query.includes('PlanMergeRequestsOutgoing')) {
+              const shortQuery = query.includes('SubPlanRevision') ? 'SubPlanRevision' : 'PlanMergeRequestsOutgoing';
+              console.log(`SUBSCRIBER: ${name}, ${storeValue} -> ${shortQuery}`);
+            }
+            // variables = { ...variables, [name]: storeValue };
             resubscribe();
           });
           variableUnsubscribers.push(unsubscriber);
@@ -169,17 +182,24 @@ export function gqlSubscribable<T>(
   }
 
   function subscribe(next: Subscriber<T>): Unsubscriber {
-    // If we are in the browser and do not yet have a web socket client
-    // we will create one and subscribe to variables
-    subscribeToVariables(variables); // should not be harmful if this runs every time subscribe is called
-
-    // Subscribe within the WS to the GQL query
-    // Note that subscribeToVariables may immediately result in a resubscription if
-    // any of the variables are stores since the stores will call next(value) on
-    // initial subscription. This call below covers the case where no stores are passed
-    // in as variables. If resubscribe is called by subscribeToVariables then the debounce
-    // should take care of the duplication.
-    debouncedClientSubscribe();
+    if (browser) {
+      if (query.includes('SubPlanRevision') || query.includes('PlanMergeRequestsOutgoing')) {
+        const shortQuery = query.includes('SubPlanRevision') ? 'SubPlanRevision' : 'PlanMergeRequestsOutgoing';
+        console.log('RUNNING -> ', shortQuery);
+      }
+
+      // If we are in the browser and do not yet have a web socket client
+      // we will create one and subscribe to variables
+      subscribeToVariables(variables); // should not be harmful if this runs every time subscribe is called
+
+      // Subscribe within the WS to the GQL query
+      // Note that subscribeToVariables may immediately result in a resubscription if
+      // any of the variables are stores since the stores will call next(value) on
+      // initial subscription. This call below covers the case where no stores are passed
+      // in as variables. If resubscribe is called by subscribeToVariables then the debounce
+      // should take care of the duplication.
+      debouncedClientSubscribe();
+    }
 
     const subscriber: Subscription<T> = { next };
     subscribers.add(subscriber);