Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

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 (#5185)

guru_sainatheca79f33b68e
diff --git a/packages/types/src/project/projects.d.ts b/packages/types/src/project/projects.d.ts
index 59ccf73b6e..335e9f98f6 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 2fd2918277..91abbb984e 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 f76f30cf5e..2751583504 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 9e547dc1f5..da30f24b04 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) => {