update user activity use-case to use last common from feed

daostack · Nov 29, 2023 · ccd140a · ccd140a
1 parent 5227d92
commit ccd140a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 33 deletions.
diff --git a/src/shared/hooks/useCases/useUserActivity.ts b/src/shared/hooks/useCases/useUserActivity.ts
@@ -1,19 +1,31 @@
 import { useCallback, useEffect } from "react";
+import { useDispatch, useSelector } from "react-redux";
 import { Logger, UserActivityService } from "@/services";
-import { useLoadingState } from "@/shared/hooks";
-import { LoadingState } from "@/shared/interfaces";
 import { UserActivity } from "@/shared/models";
+import {
+  commonLayoutActions,
+  selectCommonLayoutLastCommonFromFeed,
+} from "@/store/states";
 
-interface Return extends LoadingState<UserActivity | null> {
+interface Return {
+  lastVisitedCommon?: string;
   updateUserActivity: (data: Partial<UserActivity>) => void;
 }
 
 export const useUserActivity = (userId?: string): Return => {
-  const [userActivityState, setUserActivityState] =
-    useLoadingState<UserActivity | null>(null, { loading: true });
+  const dispatch = useDispatch();
+  const lastCommonFromFeed = useSelector(selectCommonLayoutLastCommonFromFeed);
 
   const updateUserActivity = useCallback(
     async (data: Partial<UserActivity>) => {
+      if (data.lastVisitedCommon) {
+        dispatch(
+          commonLayoutActions.setLastCommonFromFeed({
+            id: data.lastVisitedCommon,
+            data: null,
+          }),
+        );
+      }
       if (!userId) {
         return;
       }
@@ -35,19 +47,22 @@ export const useUserActivity = (userId?: string): Return => {
     const unsubscribe = UserActivityService.subscribeToUserActivity(
       userId,
       (updatedUserActivity) => {
-        setUserActivityState({
-          loading: false,
-          fetched: true,
-          data: updatedUserActivity,
-        });
+        if (updatedUserActivity.lastVisitedCommon) {
+          dispatch(
+            commonLayoutActions.setLastCommonFromFeed({
+              id: updatedUserActivity.lastVisitedCommon,
+              data: null,
+            }),
+          );
+        }
       },
     );
 
     return unsubscribe;
   }, [userId]);
 
   return {
-    ...userActivityState,
+    lastVisitedCommon: lastCommonFromFeed?.id,
     updateUserActivity,
   };
 };
diff --git a/src/shared/layouts/CommonSidenavLayout/components/LayoutTabs/LayoutTabs.tsx b/src/shared/layouts/CommonSidenavLayout/components/LayoutTabs/LayoutTabs.tsx
@@ -1,5 +1,5 @@
 import React, { CSSProperties, FC, ReactNode } from "react";
-import { useDispatch, useSelector } from "react-redux";
+import { useSelector } from "react-redux";
 import { useHistory } from "react-router-dom";
 import classNames from "classnames";
 import {
@@ -13,10 +13,6 @@ import { useModal } from "@/shared/hooks";
 import { useUserActivity, useUserCommonIds } from "@/shared/hooks/useCases";
 import { Avatar2Icon, Blocks2Icon, InboxIcon } from "@/shared/icons";
 import { CreateCommonPrompt } from "@/shared/layouts/MultipleSpacesLayout/components/Header/components/Navigation/components";
-import {
-  commonLayoutActions,
-  selectCommonLayoutLastCommonFromFeed,
-} from "@/store/states";
 import { LayoutTab } from "../../constants";
 import { getActiveLayoutTab, getLayoutTabName } from "./utils";
 import styles from "./LayoutTabs.module.scss";
@@ -35,21 +31,17 @@ interface TabConfiguration {
 
 const LayoutTabs: FC<LayoutTabsProps> = (props) => {
   const { className } = props;
-  const dispatch = useDispatch();
   const history = useHistory();
   const { getCommonPagePath, getInboxPagePath, getProfilePagePath } =
     useRoutesContext();
-  const lastCommonIdFromFeed = useSelector(
-    selectCommonLayoutLastCommonFromFeed,
-  );
   const isAuthenticated = useSelector(authentificated());
   const userStreamsWithNotificationsAmount = useSelector(
     selectUserStreamsWithNotificationsAmount(),
   );
   const user = useSelector(selectUser());
   const userId = user?.uid;
   const { data: userCommonIds } = useUserCommonIds();
-  const { data: userActivity } = useUserActivity(userId);
+  const { lastVisitedCommon } = useUserActivity(userId);
   const {
     isShowing: isCreateCommonPromptOpen,
     onOpen: onCreateCommonPromptOpen,
@@ -89,15 +81,7 @@ const LayoutTabs: FC<LayoutTabsProps> = (props) => {
   } as CSSProperties;
 
   const handleSpacesClick = () => {
-    if (
-      lastCommonIdFromFeed &&
-      lastCommonIdFromFeed.id !== userActivity?.lastVisitedCommon
-    ) {
-      dispatch(commonLayoutActions.setLastCommonFromFeed(null));
-    }
-
-    const commonForRedirectId =
-      userActivity?.lastVisitedCommon || userCommonIds[0];
+    const commonForRedirectId = lastVisitedCommon || userCommonIds[0];
 
     if (commonForRedirectId) {
       history.push(getCommonPagePath(commonForRedirectId));

diff --git a/...hared/layouts/MultipleSpacesLayout/components/Header/components/Navigation/Navigation.tsx b/...hared/layouts/MultipleSpacesLayout/components/Header/components/Navigation/Navigation.tsx
@@ -40,9 +40,8 @@ const Navigation: FC<NavigationProps> = (props) => {
   const user = useSelector(selectUser());
   const userId = user?.uid;
   const { data: userCommonIds } = useUserCommonIds();
-  const { data: userActivity } = useUserActivity(userId);
-  const mySpacesCommonId =
-    userActivity?.lastVisitedCommon || userCommonIds[0] || "";
+  const { lastVisitedCommon } = useUserActivity(userId);
+  const mySpacesCommonId = lastVisitedCommon || userCommonIds[0] || "";
   const mySpacesPagePath = (
     mySpacesCommonId ? getCommonPagePath(mySpacesCommonId) : ""
   ) as ROUTE_PATHS;