Merge pull request Sofie-Automation#1269 from bbc/fix/ui-no-return-to-rundown-if-deleted

jstarpl · web-flow · commit f4e110888490 · 2024-10-03T10:37:38.000+02:00
fix: In kiosk mode, rundown page gets stalled if rundown is removed
diff --git a/packages/webui/src/client/lib/ReactMeteorData/ReactMeteorData.tsx b/packages/webui/src/client/lib/ReactMeteorData/ReactMeteorData.tsx
@@ -391,6 +391,7 @@ export function useSubscription<K extends keyof AllPubSubTypes>(
 /**
  * A Meteor Subscription hook that allows using React Functional Components and the Hooks API with Meteor subscriptions.
  * Subscriptions will be torn down 1000ms after unmounting the component.
+ * If the subscription is not enabled, the subscription will not be created, and the ready state will always be true.
  *
  * @export
  * @param {PubSub} sub The subscription to be subscribed to
@@ -421,7 +422,7 @@ export function useSubscriptionIfEnabled<K extends keyof AllPubSubTypes>(
 		}
 	}, [sub, enable, stringifyObjects(args)])
 
-	return ready
+	return !enable || ready
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -391,6 +391,7 @@ export function useSubscription<K extends keyof AllPubSubTypes>(`
`391`	`391`	`/**`
`392`	`392`	`* A Meteor Subscription hook that allows using React Functional Components and the Hooks API with Meteor subscriptions.`
`393`	`393`	`* Subscriptions will be torn down 1000ms after unmounting the component.`
	`394`	`+ * If the subscription is not enabled, the subscription will not be created, and the ready state will always be true.`
`394`	`395`	`*`
`395`	`396`	`* @export`
`396`	`397`	`* @param {PubSub} sub The subscription to be subscribed to`
`@@ -421,7 +422,7 @@ export function useSubscriptionIfEnabled<K extends keyof AllPubSubTypes>(`
`421`	`422`	`}`
`422`	`423`	`}, [sub, enable, stringifyObjects(args)])`
`423`	`424`
`424`		`- return ready`
	`425`	`+ return !enable \|\| ready`
`425`	`426`	`}`
`426`	`427`
`427`	`428`	`/**`