Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { CirclesPermissions, Common, CommonMember } from "@/shared/models";
import { DesktopMenu, MenuButton } from "@/shared/ui-kit";
import { StaticLinkType, generateStaticShareLink } from "@/shared/utils";
import { useMenuItems } from "./hooks";
import { useUpdateCommonSeenState } from "@/shared/hooks/useCases";

interface ActionsButtonProps {
common: Common;
Expand All @@ -22,6 +23,7 @@ const ActionsButton: FC<ActionsButtonProps> = (props) => {
onOpen: onShareModalOpen,
onClose: onShareModalClose,
} = useModal(false);
const { markCommonAsSeen } = useUpdateCommonSeenState();
const items = useMenuItems(
{
common,
Expand All @@ -33,6 +35,7 @@ const ActionsButton: FC<ActionsButtonProps> = (props) => {
share: onShareModalOpen,
onFollowToggle: commonFollow.onFollowToggle,
onSearchClick,
markCommonAsSeen
},
);
const shareLink = generateStaticShareLink(StaticLinkType.Common, common);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from "react";
import { CommonFollowState } from "@/shared/hooks/useCases";
import {
FollowIcon,
Message3Icon,
SearchIcon,
Share3Icon,
UnfollowIcon,
Expand All @@ -17,14 +18,15 @@ interface Actions {
share: () => void;
onSearchClick?: () => void;
onFollowToggle: CommonFollowState["onFollowToggle"];
markCommonAsSeen: (commonId: string) => void;
}

export const useMenuItems = (
options: GetAllowedItemsOptions,
actions: Actions,
): Item[] => {
const { common } = options;
const { share, onFollowToggle, onSearchClick } = actions;
const { share, onFollowToggle, onSearchClick, markCommonAsSeen } = actions;

const items: Item[] = [
{
Expand All @@ -51,6 +53,18 @@ export const useMenuItems = (
onClick: () => onFollowToggle(),
icon: <UnfollowIcon />,
},
{
id: CommonFeedMenuItem.MarkRead,
text: "Mark all as read",
onClick: () => {
if (!common.id) {
return;
}

markCommonAsSeen(common.id);
},
icon: <Message3Icon />,
},
];

return getAllowedItems(items, options);
Expand Down
1 change: 1 addition & 0 deletions src/pages/commonFeed/constants/commonFeedMenuItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ export enum CommonFeedMenuItem {
Share = "share",
Follow = "follow",
Mute = "mute",
MarkRead = "markRead",
}
1 change: 1 addition & 0 deletions src/pages/commonFeed/utils/getAllowedItems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const MENU_ITEM_TO_CHECK_FUNCTION_MAP: Record<
!isFollowInProgress && Boolean(commonMember && !commonMember.isFollowing),
[CommonFeedMenuItem.Mute]: ({ commonMember, isFollowInProgress }) =>
!isFollowInProgress && Boolean(commonMember?.isFollowing),
[CommonFeedMenuItem.MarkRead]: () => true,
};

export const getAllowedItems = (items: Item[], options: Options): Item[] =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const useDMUsers = (): Return => {
}

fetchDMUsers();
},[userId, fetchDMUsers]);
},[userId]);

return {
fetchDMUsers,
Expand Down
13 changes: 13 additions & 0 deletions src/services/Common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,19 @@ class CommonService {

return snapshot.data() || null;
};

public markCommonAsSeen = async (
commonId: string,
userId: string,
): Promise<void> => {
await Api.post(
ApiEndpoint.MarkCommonSeenForUser,
{
commonId,
userId
},
);
};
}

export default new CommonService();
1 change: 1 addition & 0 deletions src/shared/constants/endpoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const ApiEndpoint = {
CreateCommon: "/commons/create",
UpdateCommon: "/commons/update",
CreateSubCommon: "/commons/subcommon/create",
MarkCommonSeenForUser: "/commons/mark-seen-for-user",
MarkFeedObjectSeenForUser: "/commons/mark-feed-object-seen-for-user",
MarkFeedObjectUnseenForUser: "/commons/mark-feed-object-unseen-for-user",
LinkStream: "/commons/link-stream",
Expand Down
1 change: 1 addition & 0 deletions src/shared/hooks/useCases/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,6 @@ export { useEligibleVoters } from "./useEligibleVoters";
export { useDiscussionMessageReaction } from "./useDiscussionMessageReaction";
export { useChatMessageReaction } from "./useChatMessageReaction";
export { useUserReaction } from "./useUserReaction";
export { useUpdateCommonSeenState } from "./useUpdateCommonSeenState";
export * from "./useCommonFollow";
export * from "./usePreloadDiscussionMessagesById";
43 changes: 43 additions & 0 deletions src/shared/hooks/useCases/useUpdateCommonSeenState.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { useCallback } from "react";
import { useSelector } from "react-redux";
import { selectUser } from "@/pages/Auth/store/selectors";
import { CommonService } from "@/services";
import useNotification from "../useNotification";

interface Return {
markCommonAsSeen: (
commonId: string,
delay?: number,
) => ReturnType<typeof setTimeout>;
}

export const useUpdateCommonSeenState = (): Return => {
const user = useSelector(selectUser());
const userId = user?.uid;
const { notify } = useNotification();

const updateSeenState = async (
commonId: string,
) => {
if (!userId) {
return;
}

try {
await CommonService.markCommonAsSeen(commonId, userId);
} catch (error) {
notify("Something went wrong");
}
};

const markCommonAsSeen = useCallback(
(commonId: string, delay = 0) => {
return setTimeout(() => {
updateSeenState(commonId);
}, delay);
},
[userId],
);

return { markCommonAsSeen };
};