fix(hooks): make useActivity and useAdaptiveCard work if an adapter i…

…sn't yet present on the context
webex · Mar 3, 2022 · 5bb40d0 · 5bb40d0
1 parent 44b2fb2
commit 5bb40d0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/src/components/hooks/useActivity.js b/src/components/hooks/useActivity.js
@@ -18,19 +18,29 @@ import {AdapterContext} from './contexts';
  */
 export default function useActivity(activityID) {
   const [activity, setActivity] = useState({});
-  const {activitiesAdapter} = useContext(AdapterContext);
+  const adapter = useContext(AdapterContext);
+  const activitiesAdapter = adapter && adapter.activitiesAdapter;
 
   useEffect(() => {
-    const onError = (error) => {
-      throw error;
-    };
-    const subscription = activitiesAdapter.getActivity(activityID).subscribe(setActivity, onError);
-
-    return () => {
-      subscription.unsubscribe();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+    let cleanup;
+
+    if (!activitiesAdapter || !activityID) {
+      setActivity({});
+      cleanup = undefined;
+    } else {
+      const onError = (error) => {
+        throw error;
+      };
+      const subscription = activitiesAdapter
+        .getActivity(activityID).subscribe(setActivity, onError);
+
+      cleanup = () => {
+        subscription.unsubscribe();
+      };
+    }
+
+    return cleanup;
+  }, [activitiesAdapter, activityID]);
 
   return activity;
 }
diff --git a/src/components/hooks/useAdaptiveCard.js b/src/components/hooks/useAdaptiveCard.js
@@ -17,7 +17,8 @@ import {AdapterContext} from './contexts';
  */
 export default function useAdaptiveCard(activityID) {
   const [card, setCard] = useState({});
-  const {activitiesAdapter} = useContext(AdapterContext);
+  const adapter = useContext(AdapterContext);
+  const activitiesAdapter = adapter && adapter.activitiesAdapter;
 
   useEffect(() => {
     let cleanup;