Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-07-12 13:29:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #672 from makeplane/sync/ce-ee

Browse Source 
sync: community changes
This commit is contained in:
pushya22
2024-07-22 14:03:30 +05:30
committed by GitHub
parent 4066fd515c eca79f33b6
commit 5112d077a9
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/types/src/project/projects.d.ts vendored
View File

@@ -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[];

2
web/ce/constants/issues.ts
View File

@@ -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[]

5
web/ce/store/issue/issue-details/activity.store.ts
View File

@@ -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(

7
web/core/components/issues/issue-detail/issue-activity/root.tsx
View File

@@ -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) => {