-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2360 from daostack/feature/CW-2358-last-visited-c…
…ommon Remember last visited common and use it #2358
- Loading branch information
Showing
22 changed files
with
236 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import { UnsubscribeFunction } from "@/shared/interfaces"; | ||
| import { Collection, UserActivity } from "@/shared/models"; | ||
| import { firestoreDataConverter } from "@/shared/utils"; | ||
| import firebase, { isFirestoreCacheError } from "@/shared/utils/firebase"; | ||
|
|
||
| const userActivityConverter = firestoreDataConverter<UserActivity>(); | ||
|
|
||
| class UserActivityService { | ||
| private getUsersActivityCollection = () => | ||
| firebase | ||
| .firestore() | ||
| .collection(Collection.UsersActivity) | ||
| .withConverter(userActivityConverter); | ||
|
|
||
| public getUserActivity = async ( | ||
| userId: string, | ||
| cached = false, | ||
| ): Promise<UserActivity | null> => { | ||
| try { | ||
| const snapshot = await this.getUsersActivityCollection() | ||
| .doc(userId) | ||
| .get({ source: cached ? "cache" : "default" }); | ||
|
|
||
| return snapshot?.data() || null; | ||
| } catch (error) { | ||
| if (cached && isFirestoreCacheError(error)) { | ||
| return this.getUserActivity(userId); | ||
| } else { | ||
| throw error; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| public updateUserActivity = async ( | ||
| userId: string, | ||
| data: Partial<UserActivity>, | ||
| ): Promise<void> => { | ||
| await this.getUsersActivityCollection() | ||
| .doc(userId) | ||
| .set(data, { merge: true }); | ||
| }; | ||
|
|
||
| public subscribeToUserActivity = ( | ||
| userId: string, | ||
| callback: (userActivity: UserActivity) => void, | ||
| ): UnsubscribeFunction => { | ||
| const query = this.getUsersActivityCollection().doc(userId); | ||
|
|
||
| return query.onSnapshot((snapshot) => { | ||
| const userActivity = snapshot.data(); | ||
|
|
||
| if (userActivity) { | ||
| callback(userActivity); | ||
| } | ||
| }); | ||
| }; | ||
| } | ||
|
|
||
| export default new UserActivityService(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| import { useCallback, useEffect } from "react"; | ||
| import { useDispatch, useSelector } from "react-redux"; | ||
| import { Logger, UserActivityService } from "@/services"; | ||
| import { | ||
| commonLayoutActions, | ||
| CommonLayoutState, | ||
| selectCommonLayoutLastCommonFromFeed, | ||
| } from "@/store/states"; | ||
|
|
||
| interface Return { | ||
| lastVisitedCommon: CommonLayoutState["lastCommonFromFeed"]; | ||
| updateLastVisitedCommon: ( | ||
| data: CommonLayoutState["lastCommonFromFeed"], | ||
| ) => void; | ||
| } | ||
|
|
||
| export const useLastVisitedCommon = (userId?: string): Return => { | ||
| const dispatch = useDispatch(); | ||
| const lastVisitedCommon = useSelector(selectCommonLayoutLastCommonFromFeed); | ||
|
|
||
| const updateLastVisitedCommon = useCallback< | ||
| Return["updateLastVisitedCommon"] | ||
| >( | ||
| async (data) => { | ||
| dispatch(commonLayoutActions.setLastCommonFromFeed(data)); | ||
|
|
||
| if (!userId || !data?.id) { | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| await UserActivityService.updateUserActivity(userId, { | ||
| lastVisitedCommon: data.id, | ||
| }); | ||
| } catch (error) { | ||
| Logger.error(error); | ||
| } | ||
| }, | ||
| [userId], | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| if (!userId) { | ||
| return; | ||
| } | ||
|
|
||
| const unsubscribe = UserActivityService.subscribeToUserActivity( | ||
| userId, | ||
| (updatedUserActivity) => { | ||
| if (updatedUserActivity.lastVisitedCommon) { | ||
| dispatch( | ||
| commonLayoutActions.setLastCommonFromFeed({ | ||
| id: updatedUserActivity.lastVisitedCommon, | ||
| data: null, | ||
| }), | ||
| ); | ||
| } | ||
| }, | ||
| ); | ||
|
|
||
| return unsubscribe; | ||
| }, [userId]); | ||
|
|
||
| return { | ||
| lastVisitedCommon, | ||
| updateLastVisitedCommon, | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.