WIP set unread comments threads indicator

appsmithorg · Jun 20, 2021 · 62690b6 · 62690b6
1 parent 598a48c
commit 62690b6
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 4 deletions.
diff --git a/app/client/src/actions/commentActions.ts b/app/client/src/actions/commentActions.ts
@@ -247,3 +247,12 @@ export const setAreCommentsEnabled = (flag: boolean) => ({
   type: ReduxActionTypes.SET_ARE_COMMENTS_ENABLED,
   payload: flag,
 });
+
+export const fetchUnreadCommentThreadsCountRequest = () => ({
+  type: ReduxActionTypes.FETCH_UNREAD_COMMENT_THREADS_COUNT_REQUEST,
+});
+
+export const fetchUnreadCommentThreadsCountSuccess = (flag: boolean) => ({
+  type: ReduxActionTypes.FETCH_UNREAD_COMMENT_THREADS_COUNT_SUCCESS,
+  payload: flag,
+});
diff --git a/app/client/src/api/CommentsAPI.tsx b/app/client/src/api/CommentsAPI.tsx
@@ -77,6 +77,11 @@ class CommentsApi extends Api {
       data: request,
     });
   }
+
+  // eslint-disable-next-line
+  static fetchUnreadCommentThreads(applicationId: string) {
+    return Promise.resolve({ data: { count: 10 } });
+  }
 }
 
 export default CommentsApi;
diff --git a/app/client/src/constants/ReduxActionConstants.tsx b/app/client/src/constants/ReduxActionConstants.tsx
@@ -9,6 +9,10 @@ export const ReduxSagaChannels: { [key: string]: string } = {
 };
 
 export const ReduxActionTypes: { [key: string]: string } = {
+  FETCH_UNREAD_COMMENT_THREADS_COUNT_REQUEST:
+    "FETCH_UNREAD_COMMENT_THREADS_COUNT_REQUEST",
+  FETCH_UNREAD_COMMENT_THREADS_COUNT_SUCCESS:
+    "FETCH_UNREAD_COMMENT_THREADS_COUNT_SUCCESS",
   MARK_ALL_NOTIFICATIONS_AS_READ_REQUEST:
     "MARK_ALL_NOTIFICATIONS_AS_READ_REQUEST",
   MARK_ALL_NOTIFICATIONS_AS_READ_SUCCESS:

diff --git a/app/client/src/reducers/uiReducers/commentsReducer/commentsReducer.ts b/app/client/src/reducers/uiReducers/commentsReducer/commentsReducer.ts
@@ -73,7 +73,6 @@ const commentsReducer = createReducer(initialState, {
   ) => ({
     ...state,
     isCommentMode: action.payload,
-    showUnreadIndicator: false,
     isIntroCarouselVisible: false,
   }),
   [ReduxActionTypes.CREATE_COMMENT_THREAD_REQUEST]: (
@@ -116,9 +115,7 @@ const commentsReducer = createReducer(initialState, {
       ),
     };
 
-    const showUnreadIndicator = !state.isCommentMode;
-
-    return { ...state, showUnreadIndicator };
+    return { ...state };
   },
   [ReduxActionTypes.UPDATE_COMMENT_THREAD_SUCCESS]: (
     state: CommentsReduxState,
@@ -260,6 +257,13 @@ const commentsReducer = createReducer(initialState, {
   ) => {
     return handleUpdateCommentEvent(state, action);
   },
+  [ReduxActionTypes.FETCH_UNREAD_COMMENT_THREADS_COUNT_SUCCESS]: (
+    state: CommentsReduxState,
+    action: ReduxAction<boolean>,
+  ) => ({
+    ...state,
+    showUnreadIndicator: action.payload,
+  }),
 });
 
 export default commentsReducer;
diff --git a/app/client/src/sagas/CommentSagas/index.ts b/app/client/src/sagas/CommentSagas/index.ts
@@ -13,6 +13,8 @@ import {
   deleteCommentThreadSuccess,
   setAreCommentsEnabled,
   setCommentMode,
+  fetchUnreadCommentThreadsCountSuccess,
+  fetchUnreadCommentThreadsCountRequest,
 } from "actions/commentActions";
 import {
   transformPublishedCommentActionPayload,
@@ -112,6 +114,7 @@ function* fetchApplicationComments() {
 
     if (isValidResponse) {
       yield put(fetchApplicationCommentsSuccess(response.data));
+      yield put(fetchUnreadCommentThreadsCountRequest());
     } else {
       // todo invalid response
     }
@@ -181,6 +184,7 @@ function* markThreadAsRead(action: ReduxAction<{ threadId: string }>) {
     const isValidResponse = yield validateResponse(response);
     if (isValidResponse) {
       yield put(updateCommentThreadSuccess(response.data));
+      yield put(fetchUnreadCommentThreadsCountRequest());
     }
   } catch (e) {
     console.log(e, "handle error");
@@ -264,6 +268,22 @@ function* deleteCommentReaction(
   }
 }
 
+function* fetchUnreadCommentsCount() {
+  try {
+    const applicationId = yield select(getCurrentApplicationId);
+    const response = yield call(
+      CommentsApi.fetchUnreadCommentThreads,
+      applicationId,
+    );
+    // const isValidResponse = yield validateResponse(response);
+    // if (isValidResponse) {
+    yield put(fetchUnreadCommentThreadsCountSuccess(response.data.count > 0));
+    // }
+  } catch (e) {
+    console.log(e, "handle error");
+  }
+}
+
 export default function* commentSagas() {
   yield all([
     takeLatest(
@@ -294,5 +314,9 @@ export default function* commentSagas() {
     takeLatest(ReduxActionTypes.ADD_COMMENT_REACTION, addCommentReaction),
     takeLatest(ReduxActionTypes.REMOVE_COMMENT_REACTION, deleteCommentReaction),
     fork(setIfCommentsAreEnabled),
+    takeLatest(
+      ReduxActionTypes.FETCH_UNREAD_COMMENT_THREADS_COUNT_REQUEST,
+      fetchUnreadCommentsCount,
+    ),
   ]);
 }
diff --git a/app/client/src/sagas/WebsocketSagas/handleSocketEvent.ts b/app/client/src/sagas/WebsocketSagas/handleSocketEvent.ts
@@ -6,6 +6,7 @@ import {
   newCommentThreadEvent,
   updateCommentThreadEvent,
   updateCommentEvent,
+  fetchUnreadCommentThreadsCountRequest,
 } from "actions/commentActions";
 
 import { newNotificationEvent } from "actions/notificationActions";
@@ -15,18 +16,22 @@ export default function* handleSocketEvent(event: any) {
     // comments
     case SOCKET_EVENTS.INSERT_COMMENT_THREAD: {
       yield put(newCommentThreadEvent(event.payload[0]));
+      yield put(fetchUnreadCommentThreadsCountRequest());
       return;
     }
     case SOCKET_EVENTS.INSERT_COMMENT: {
       yield put(newCommentEvent(event.payload[0]));
+      yield put(fetchUnreadCommentThreadsCountRequest());
       return;
     }
     case SOCKET_EVENTS.UPDATE_COMMENT_THREAD: {
       yield put(updateCommentThreadEvent(event.payload[0].thread));
+      yield put(fetchUnreadCommentThreadsCountRequest());
       return;
     }
     case SOCKET_EVENTS.UPDATE_COMMENT: {
       yield put(updateCommentEvent(event.payload[0].comment));
+      yield put(fetchUnreadCommentThreadsCountRequest());
       return;
     }
     // notifications