remove previous breadcrumbs related logic

daostack · Nov 29, 2023 · f54671f · f54671f
1 parent 17a2840
commit f54671f
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 32 deletions.
diff --git a/src/pages/commonFeed/CommonFeedPage.tsx b/src/pages/commonFeed/CommonFeedPage.tsx
@@ -95,7 +95,7 @@ const CommonFeedPage: FC = () => {
 
   useEffect(() => {
     return () => {
-      dispatch(multipleSpacesLayoutActions.moveBreadcrumbsToPrevious());
+      dispatch(multipleSpacesLayoutActions.clearBreadcrumbs());
     };
   }, []);
 

diff --git a/...hared/layouts/MultipleSpacesLayout/components/Header/components/Navigation/Navigation.tsx b/...hared/layouts/MultipleSpacesLayout/components/Header/components/Navigation/Navigation.tsx
@@ -16,10 +16,6 @@ import {
   CommonSidenavLayoutTab,
   getActiveLayoutTab,
 } from "@/shared/layouts/CommonSidenavLayout";
-import {
-  selectMultipleSpacesLayoutBreadcrumbs,
-  selectMultipleSpacesLayoutPreviousBreadcrumbs,
-} from "@/store/states";
 import { CreateCommonPrompt, NavigationItem } from "./components";
 import { NavigationItemOptions } from "./types";
 import styles from "./Navigation.module.scss";
@@ -41,24 +37,12 @@ const Navigation: FC<NavigationProps> = (props) => {
   const userStreamsWithNotificationsAmount = useSelector(
     selectUserStreamsWithNotificationsAmount(),
   );
-  const currentBreadcrumbs = useSelector(selectMultipleSpacesLayoutBreadcrumbs);
-  const previousBreadcrumbs = useSelector(
-    selectMultipleSpacesLayoutPreviousBreadcrumbs,
-  );
   const user = useSelector(selectUser());
   const userId = user?.uid;
   const { data: userCommonIds } = useUserCommonIds();
   const { data: userActivity } = useUserActivity(userId);
-  const breadcrumbs = previousBreadcrumbs || currentBreadcrumbs;
-  const breadcrumbsCommonId =
-    breadcrumbs?.type === InboxItemType.FeedItemFollow
-      ? breadcrumbs.activeCommonId
-      : "";
   const mySpacesCommonId =
-    breadcrumbsCommonId ||
-    userActivity?.lastVisitedCommon ||
-    userCommonIds[0] ||
-    "";
+    userActivity?.lastVisitedCommon || userCommonIds[0] || "";
   const mySpacesPagePath = (
     mySpacesCommonId ? getCommonPagePath(mySpacesCommonId) : ""
   ) as ROUTE_PATHS;

diff --git a/src/store/states/multipleSpacesLayout/actions.ts b/src/store/states/multipleSpacesLayout/actions.ts
@@ -36,8 +36,8 @@ export const setBreadcrumbsData = createStandardAction(
   MultipleSpacesLayoutActionType.SET_BREADCRUMBS_DATA,
 )<MultipleSpacesLayoutBreadcrumbs | null>();
 
-export const moveBreadcrumbsToPrevious = createStandardAction(
-  MultipleSpacesLayoutActionType.MOVE_BREADCRUMBS_TO_PREVIOUS,
+export const clearBreadcrumbs = createStandardAction(
+  MultipleSpacesLayoutActionType.CLEAR_BREADCRUMBS,
 )();
 
 export const addOrUpdateProjectInBreadcrumbs = createStandardAction(

diff --git a/src/store/states/multipleSpacesLayout/constants.ts b/src/store/states/multipleSpacesLayout/constants.ts
@@ -10,7 +10,7 @@ export enum MultipleSpacesLayoutActionType {
 
   SET_BREADCRUMBS_DATA = "@MULTIPLE_SPACES_LAYOUT/SET_BREADCRUMBS_DATA",
 
-  MOVE_BREADCRUMBS_TO_PREVIOUS = "@MULTIPLE_SPACES_LAYOUT/MOVE_BREADCRUMBS_TO_PREVIOUS",
+  CLEAR_BREADCRUMBS = "@MULTIPLE_SPACES_LAYOUT/CLEAR_BREADCRUMBS",
 
   ADD_OR_UPDATE_PROJECT_IN_BREADCRUMBS = "@MULTIPLE_SPACES_LAYOUT/ADD_OR_UPDATE_PROJECT_IN_BREADCRUMBS",
 

diff --git a/src/store/states/multipleSpacesLayout/reducer.ts b/src/store/states/multipleSpacesLayout/reducer.ts
@@ -10,7 +10,6 @@ type Action = ActionType<typeof actions>;
 
 const initialState: MultipleSpacesLayoutState = {
   breadcrumbs: null,
-  previousBreadcrumbs: null,
   backUrl: null,
   mainWidth: window.innerWidth,
 };
@@ -49,11 +48,8 @@ export const reducer = createReducer<MultipleSpacesLayoutState, Action>(
       nextState.breadcrumbs = payload && { ...payload };
     }),
   )
-  .handleAction(actions.moveBreadcrumbsToPrevious, (state) =>
+  .handleAction(actions.clearBreadcrumbs, (state) =>
     produce(state, (nextState) => {
-      nextState.previousBreadcrumbs = nextState.breadcrumbs && {
-        ...nextState.breadcrumbs,
-      };
       nextState.breadcrumbs = null;
     }),
   )

diff --git a/src/store/states/multipleSpacesLayout/selectors.ts b/src/store/states/multipleSpacesLayout/selectors.ts
@@ -3,10 +3,6 @@ import { AppState } from "@/shared/interfaces";
 export const selectMultipleSpacesLayoutBreadcrumbs = (state: AppState) =>
   state.multipleSpacesLayout.breadcrumbs;
 
-export const selectMultipleSpacesLayoutPreviousBreadcrumbs = (
-  state: AppState,
-) => state.multipleSpacesLayout.previousBreadcrumbs;
-
 export const selectMultipleSpacesLayoutBackUrl = (state: AppState) =>
   state.multipleSpacesLayout.backUrl;
 

diff --git a/src/store/states/multipleSpacesLayout/types.ts b/src/store/states/multipleSpacesLayout/types.ts
@@ -27,7 +27,6 @@ export type MultipleSpacesLayoutBreadcrumbs =
 
 export interface MultipleSpacesLayoutState {
   breadcrumbs: MultipleSpacesLayoutBreadcrumbs | null;
-  previousBreadcrumbs: MultipleSpacesLayoutBreadcrumbs | null;
   backUrl: string | null;
   mainWidth: number;
 }

diff --git a/src/store/transforms.ts b/src/store/transforms.ts
@@ -99,7 +99,6 @@ export const multipleSpacesLayoutTransform = createTransform(
   (inboundState: MultipleSpacesLayoutState) => ({
     ...inboundState,
     breadcrumbs: null,
-    previousBreadcrumbs: null,
     backUrl: null,
   }),
   (outboundState: MultipleSpacesLayoutState) => outboundState,