From ca72b4ff41b5f9fb7d79399c709346d40da0352e Mon Sep 17 00:00:00 2001
From: Andrey Mikhadyuk <mihadiuk.andrej@gmail.com>
Date: Thu, 30 Nov 2023 12:36:24 +0400
Subject: [PATCH 1/2] remove loader from the breadcrumbs

---
 .../components/FeedItemBreadcrumbs/FeedItemBreadcrumbs.tsx    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/shared/layouts/MultipleSpacesLayout/components/Header/components/Breadcrumbs/components/FeedItemBreadcrumbs/FeedItemBreadcrumbs.tsx b/src/shared/layouts/MultipleSpacesLayout/components/Header/components/Breadcrumbs/components/FeedItemBreadcrumbs/FeedItemBreadcrumbs.tsx
index eac4ae6a42..f86df49344 100644
--- a/src/shared/layouts/MultipleSpacesLayout/components/Header/components/Breadcrumbs/components/FeedItemBreadcrumbs/FeedItemBreadcrumbs.tsx
+++ b/src/shared/layouts/MultipleSpacesLayout/components/Header/components/Breadcrumbs/components/FeedItemBreadcrumbs/FeedItemBreadcrumbs.tsx
@@ -9,7 +9,6 @@ import {
   selectCommonLayoutCommonId,
 } from "@/store/states";
 import { useGoToCreateCommon } from "../../../../../../hooks";
-import { LoadingBreadcrumbsItem } from "../LoadingBreadcrumbsItem";
 import { Separator } from "../Separator";
 import { ActiveFeedBreadcrumbsItem, FeedBreadcrumbsItem } from "./components";
 import styles from "./FeedItemBreadcrumbs.module.scss";
@@ -60,7 +59,6 @@ const FeedItemBreadcrumbs: FC<FeedItemBreadcrumbsProps> = (props) => {
 
   return (
     <ul className={styles.container}>
-      {breadcrumbs.areItemsLoading && <LoadingBreadcrumbsItem />}
       {!breadcrumbs.areItemsLoading &&
         breadcrumbs.items.map((item, index) => (
           <React.Fragment key={item.commonId}>
@@ -75,7 +73,7 @@ const FeedItemBreadcrumbs: FC<FeedItemBreadcrumbsProps> = (props) => {
         ))}
       {breadcrumbs.activeItem && (
         <>
-          {(breadcrumbs.areItemsLoading || breadcrumbs.items.length > 0) && (
+          {!breadcrumbs.areItemsLoading && breadcrumbs.items.length > 0 && (
             <Separator />
           )}
           <ActiveFeedBreadcrumbsItem

From 8707e4411721cd06bdbb529629ea20135253ea75 Mon Sep 17 00:00:00 2001
From: Andrey Mikhadyuk <mihadiuk.andrej@gmail.com>
Date: Thu, 30 Nov 2023 14:02:38 +0400
Subject: [PATCH 2/2] fix breadcrumbs when switching to parent common item

---
 .../saga/configureBreadcrumbsData.ts          | 53 +++++++++++++++----
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/store/states/multipleSpacesLayout/saga/configureBreadcrumbsData.ts b/src/store/states/multipleSpacesLayout/saga/configureBreadcrumbsData.ts
index 9a189226e1..c877af75e2 100644
--- a/src/store/states/multipleSpacesLayout/saga/configureBreadcrumbsData.ts
+++ b/src/store/states/multipleSpacesLayout/saga/configureBreadcrumbsData.ts
@@ -1,6 +1,7 @@
 import { put, select } from "redux-saga/effects";
 import { InboxItemType } from "@/shared/constants";
 import {
+  MultipleSpacesLayoutFeedItemBreadcrumbs,
   selectCommonLayoutCommonsState,
   selectCommonLayoutProjectsState,
 } from "@/store/states";
@@ -39,6 +40,42 @@ const getItemsByExistingData = (
   return items;
 };
 
+const getNextBreadcrumbsData = (
+  items: ProjectsStateItem[] | null,
+  currentBreadcrumbs: MultipleSpacesLayoutFeedItemBreadcrumbs | null,
+  activeCommonId: string,
+): Pick<
+  MultipleSpacesLayoutFeedItemBreadcrumbs,
+  "items" | "areItemsLoading" | "areItemsFetched"
+> => {
+  if (items) {
+    return {
+      items,
+      areItemsLoading: false,
+      areItemsFetched: true,
+    };
+  }
+  if (!currentBreadcrumbs) {
+    return {
+      items: [],
+      areItemsLoading: true,
+      areItemsFetched: false,
+    };
+  }
+
+  const activeItemIndex = currentBreadcrumbs.items.findIndex(
+    (item) => item.commonId === activeCommonId,
+  );
+
+  return {
+    ...currentBreadcrumbs,
+    items:
+      activeItemIndex > -1
+        ? currentBreadcrumbs.items.slice(0, activeItemIndex + 1)
+        : currentBreadcrumbs.items,
+  };
+};
+
 export function* configureBreadcrumbsData(
   action: ReturnType<typeof actions.configureBreadcrumbsData>,
 ) {
@@ -88,17 +125,11 @@ export function* configureBreadcrumbsData(
 
   yield put(
     actions.setBreadcrumbsData({
-      ...(items
-        ? {
-            items,
-            areItemsLoading: false,
-            areItemsFetched: true,
-          }
-        : currentBreadcrumbs || {
-            items: [],
-            areItemsLoading: true,
-            areItemsFetched: false,
-          }),
+      ...getNextBreadcrumbsData(
+        items,
+        currentBreadcrumbs,
+        payload.activeCommonId,
+      ),
       type: InboxItemType.FeedItemFollow,
       activeItem: payload.activeItem ? { ...payload.activeItem } : null,
       activeCommonId: payload.activeCommonId,