Skip to content

[WEB-2015] chore: handled type error in issue detail and issue peek overview #5185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SatishGandham merged 1 commit into from
Jul 22, 2024
Merged

[WEB-2015] chore: handled type error in issue detail and issue peek overview #5185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/types/src/project/projects.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
Expand Down
2 changes: 2 additions & 0 deletions web/ce/constants/issues.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand Down
5 changes: 3 additions & 2 deletions web/ce/store/issue/issue-details/activity.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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[] = [];
Expand Down Expand Up @@ -101,7 +102,7 @@ export class IssueActivityStore implements IIssueActivityStore {
activityComments = sortBy(activityComments, "created_at");

return activityComments;
}
});

// actions
public async fetchActivities(
Expand Down
7 changes: 2 additions & 5 deletions web/core/components/issues/issue-detail/issue-activity/root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) => {
Expand Down