From 3839ebc2066c0118d1dade6de6741c94f748ef75 Mon Sep 17 00:00:00 2001
From: gurusainath <gurusainath007@gmail.com>
Date: Mon, 22 Jul 2024 13:39:55 +0530
Subject: [PATCH] chore: handled error in activityIdsByIssueId in store and
 added new filed in the project types and handled the default active filters
 in constants in activity constants

---
 packages/types/src/project/projects.d.ts                   | 1 +
 web/ce/constants/issues.ts                                 | 2 ++
 web/ce/store/issue/issue-details/activity.store.ts         | 5 +++--
 .../components/issues/issue-detail/issue-activity/root.tsx | 7 ++-----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/types/src/project/projects.d.ts b/packages/types/src/project/projects.d.ts
index 59ccf73b6e2..335e9f98f60 100644
--- a/packages/types/src/project/projects.d.ts
+++ b/packages/types/src/project/projects.d.ts
@@ -35,6 +35,7 @@ export interface IProject {
   anchor: string | null;
   is_favorite: boolean;
   is_member: boolean;
+  is_time_tracking_enabled: boolean;
   logo_props: TLogoProps;
   member_role: EUserProjectRoles | null;
   members: IProjectMemberLite[];
diff --git a/web/ce/constants/issues.ts b/web/ce/constants/issues.ts
index 2fd2918277c..91abbb984ec 100644
--- a/web/ce/constants/issues.ts
+++ b/web/ce/constants/issues.ts
@@ -16,6 +16,8 @@ export const ACTIVITY_FILTER_TYPE_OPTIONS: Record<EActivityFilterType, { label:
   },
 };
 
+export const defaultActivityFilters: TActivityFilters[] = [EActivityFilterType.ACTIVITY, EActivityFilterType.COMMENT];
+
 export const filterActivityOnSelectedFilters = (
   activity: TIssueActivityComment[],
   filter: TActivityFilters[]
diff --git a/web/ce/store/issue/issue-details/activity.store.ts b/web/ce/store/issue/issue-details/activity.store.ts
index f76f30cf5e8..27515835046 100644
--- a/web/ce/store/issue/issue-details/activity.store.ts
+++ b/web/ce/store/issue/issue-details/activity.store.ts
@@ -6,6 +6,7 @@ import sortBy from "lodash/sortBy";
 import uniq from "lodash/uniq";
 import update from "lodash/update";
 import { action, makeObservable, observable, runInAction } from "mobx";
+import { computedFn } from "mobx-utils";
 import { TIssueActivityComment, TIssueActivity, TIssueActivityMap, TIssueActivityIdMap } from "@plane/types";
 // plane web constants
 import { EActivityFilterType } from "@/plane-web/constants/issues";
@@ -70,7 +71,7 @@ export class IssueActivityStore implements IIssueActivityStore {
     return this.activityMap[activityId] ?? undefined;
   };
 
-  public getActivityCommentByIssueId(issueId: string) {
+  getActivityCommentByIssueId = computedFn((issueId: string) => {
     if (!issueId) return undefined;
 
     let activityComments: TIssueActivityComment[] = [];
@@ -101,7 +102,7 @@ export class IssueActivityStore implements IIssueActivityStore {
     activityComments = sortBy(activityComments, "created_at");
 
     return activityComments;
-  }
+  });
 
   // actions
   public async fetchActivities(
diff --git a/web/core/components/issues/issue-detail/issue-activity/root.tsx b/web/core/components/issues/issue-detail/issue-activity/root.tsx
index 9e547dc1f5c..da30f24b04a 100644
--- a/web/core/components/issues/issue-detail/issue-activity/root.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/root.tsx
@@ -14,7 +14,7 @@ import { useIssueDetail, useProject } from "@/hooks/store";
 // plane web components
 import { IssueActivityWorklogCreateButton } from "@/plane-web/components/issues/worklog";
 // plane web constants
-import { TActivityFilters, EActivityFilterType } from "@/plane-web/constants/issues";
+import { TActivityFilters, defaultActivityFilters } from "@/plane-web/constants/issues";
 
 type TIssueActivity = {
   workspaceSlug: string;
@@ -35,10 +35,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
   const { createComment, updateComment, removeComment } = useIssueDetail();
   const { getProjectById } = useProject();
   // state
-  const [selectedFilters, setSelectedFilters] = useState<TActivityFilters[]>([
-    EActivityFilterType.ACTIVITY,
-    EActivityFilterType.COMMENT,
-  ]);
+  const [selectedFilters, setSelectedFilters] = useState<TActivityFilters[]>(defaultActivityFilters);
   // toggle filter
   const toggleFilter = (filter: TActivityFilters) => {
     setSelectedFilters((prevFilters) => {