CW-Optimistic-stream Remove unnecessary comments

daostack · Sep 1, 2024 · a6eaa74 · a6eaa74
1 parent 45a9a65
commit a6eaa74
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 23 deletions.
diff --git a/src/pages/common/components/ChatComponent/ChatComponent.tsx b/src/pages/common/components/ChatComponent/ChatComponent.tsx
@@ -267,6 +267,8 @@ export default function ChatComponent({
   const timeoutId = useRef<ReturnType<typeof setTimeout> | null>();
 
   const optimisticFeedItems = useSelector(selectOptimisticFeedItems);
+
+  console.log("--optimisticFeedItems", optimisticFeedItems);
   const optimisticDiscussionMessages = useSelector(
     selectOptimisticDiscussionMessages,
   );

diff --git a/...CommonTabPanels/components/FeedTab/components/NewProposalCreation/NewProposalCreation.tsx b/...CommonTabPanels/components/FeedTab/components/NewProposalCreation/NewProposalCreation.tsx
@@ -1,19 +1,24 @@
 import React, { FC, ReactNode, useCallback, useMemo } from "react";
 import { useDispatch, useSelector } from "react-redux";
+import { Timestamp as FirestoreTimestamp } from "firebase/firestore";
 import { v4 as uuidv4 } from "uuid";
 import { selectUser } from "@/pages/Auth/store/selectors";
 import {
+  DiscussionMessageOwnerType,
   PROPOSAL_TYPE_SELECT_OPTIONS,
   ProposalsTypes,
 } from "@/shared/constants";
 import { NewProposalCreationFormValues } from "@/shared/interfaces";
 import {
   CirclesPermissions,
   Common,
+  CommonFeedType,
   CommonMember,
   Governance,
+  OptimisticFeedItemState,
 } from "@/shared/models";
 import { parseStringToTextEditorValue } from "@/shared/ui-kit/TextEditor";
+import { getUserName } from "@/shared/utils";
 import {
   selectIsProposalCreationLoading,
   selectProposalCreationData,
@@ -85,6 +90,53 @@ const NewProposalCreation: FC<NewProposalCreationProps> = (props) => {
 
       const proposalId = uuidv4();
       const discussionId = uuidv4();
+      const currentDate = FirestoreTimestamp.now();
+
+      const optimisticFeedItemId = uuidv4();
+      dispatch(
+        commonActions.setOptimisticFeedItem({
+          id: optimisticFeedItemId,
+          createdAt: currentDate,
+          updatedAt: currentDate,
+          isDeleted: false,
+          userId,
+          commonId: common.id,
+          data: {
+            type: CommonFeedType.OptimisticDiscussion,
+            id: discussionId,
+            discussionId: null,
+            lastMessage: {
+              userName: getUserName(user),
+              ownerId: userId,
+              content: JSON.stringify(values.content),
+              ownerType: DiscussionMessageOwnerType.User,
+            },
+            hasFiles: false,
+            hasImages: false,
+          },
+          optimisticData: {
+            id: discussionId,
+            title: values.title,
+            message: JSON.stringify(values.content),
+            ownerId: userId,
+            commonId: common.id,
+            lastMessage: currentDate,
+            updatedAt: currentDate,
+            createdAt: currentDate,
+            messageCount: 0,
+            followers: [],
+            files: [],
+            images: [],
+            discussionMessages: [],
+            isDeleted: false,
+            circleVisibility: userCircleIds,
+            circleVisibilityByCommon: null,
+            linkedCommonIds: [],
+            state: OptimisticFeedItemState.loading,
+          },
+          circleVisibility: userCircleIds,
+        }),
+      );
       switch (values.proposalType.value) {
         case ProposalsTypes.FUNDS_ALLOCATION: {
           const fundingProposalPayload = getFundingProposalPayload(
@@ -106,11 +158,25 @@ const NewProposalCreation: FC<NewProposalCreationProps> = (props) => {
           break;
         }
         case ProposalsTypes.SURVEY: {
-          dispatch(
-            commonActions.createSurveyProposal.request({
-              payload: getSurveyProposalPayload(values, commonId, proposalId, discussionId),
-            }),
+          console.log(
+            "----getSurveyProposalPayload",
+            getSurveyProposalPayload(
+              values,
+              commonId,
+              proposalId,
+              discussionId,
+            ),
           );
+          // dispatch(
+          //   commonActions.createSurveyProposal.request({
+          //     payload: getSurveyProposalPayload(
+          //       values,
+          //       commonId,
+          //       proposalId,
+          //       discussionId,
+          //     ),
+          //   }),
+          // );
           break;
         }
       }

diff --git a/src/pages/common/components/FeedItems/FeedItems.tsx b/src/pages/common/components/FeedItems/FeedItems.tsx
@@ -71,25 +71,24 @@ const FeedItems: FC<FeedItemsProps> = (props) => {
               (pinnedItem) => pinnedItem.feedObjectId === item.feedItem.id,
             );
 
-            return <></>;
-            // return (
-            //   <FeedItem
-            //     key={item.feedItem.id}
-            //     commonId={common.id}
-            //     commonName={common.name}
-            //     commonImage={common.image}
-            //     commonNotion={common.notion}
-            //     pinnedFeedItems={common.pinnedFeedItems}
-            //     isPinned={isPinned}
-            //     isProject={checkIsProject(common)}
-            //     item={item.feedItem}
-            //     governanceCircles={governance.circles}
-            //     isMobileVersion={isTabletView}
-            //     userCircleIds={userCircleIds}
-            //     isPreviewMode
-            //     directParent={common.directParent}
-            //   />
-            // );
+            return (
+              <FeedItem
+                key={item.feedItem.id}
+                commonId={common.id}
+                commonName={common.name}
+                commonImage={common.image}
+                commonNotion={common.notion}
+                pinnedFeedItems={common.pinnedFeedItems}
+                isPinned={isPinned}
+                isProject={checkIsProject(common)}
+                item={item.feedItem}
+                governanceCircles={governance.circles}
+                isMobileVersion={isTabletView}
+                userCircleIds={userCircleIds}
+                isPreviewMode
+                directParent={common.directParent}
+              />
+            );
           })}
         </InfiniteScroll>
       </FeedItemContext.Provider>