Skip to content

[WEB-2629] fix: workspace draft delete and move mutation #5822

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 4 commits into from
Oct 14, 2024
Merged

[WEB-2629] fix: workspace draft delete and move mutation #5822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15215c1
fix: mutation fix
anmolsinghbhatia Oct 14, 2024
eb380a0
chore: code refactor
anmolsinghbhatia Oct 14, 2024
73e0d0d
chore: code refactor
anmolsinghbhatia Oct 14, 2024
5020a2c
chore: useWorkspaceIssueProperties added
anmolsinghbhatia Oct 14, 2024
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
49 changes: 0 additions & 49 deletions ...re/components/issues/issue-layouts/filters/applied-filters/roots/workspace-draft-root.tsx
View file
Open in desktop

This file was deleted.

14 changes: 9 additions & 5 deletions web/core/components/issues/workspace-draft/root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { EDraftIssuePaginationType } from "@/constants/workspace-drafts";
import { cn } from "@/helpers/common.helper";
// hooks
import { useCommandPalette, useProject, useWorkspaceDraftIssues } from "@/hooks/store";
import { useWorkspaceIssueProperties } from "@/hooks/use-workspace-issue-properties";
// components
import { DraftIssueBlock } from "./draft-issue-block";
import { WorkspaceDraftEmptyState } from "./empty-state";
Expand All @@ -28,6 +29,9 @@ export const WorkspaceDraftIssuesRoot: FC<TWorkspaceDraftIssuesRoot> = observer(
const { workspaceProjectIds } = useProject();
const { toggleCreateProjectModal } = useCommandPalette();

//swr hook for fetching issue properties
useWorkspaceIssueProperties(workspaceSlug);

// fetching issues
useSWR(
workspaceSlug && issueIds.length <= 0 ? `WORKSPACE_DRAFT_ISSUES_${workspaceSlug}` : null,
Expand All @@ -40,10 +44,6 @@ export const WorkspaceDraftIssuesRoot: FC<TWorkspaceDraftIssuesRoot> = observer(
await fetchIssues(workspaceSlug, "pagination", EDraftIssuePaginationType.NEXT);
};

if (loader === "init-loader" && issueIds.length <= 0) {
return <WorkspaceDraftIssuesLoader items={14} />;
}

if (workspaceProjectIds?.length === 0)
return (
<EmptyState
Expand All @@ -55,7 +55,11 @@ export const WorkspaceDraftIssuesRoot: FC<TWorkspaceDraftIssuesRoot> = observer(
/>
);

if (loader === "empty-state" && issueIds.length <= 0) return <WorkspaceDraftEmptyState />;
if (issueIds.length <= 0) return <WorkspaceDraftEmptyState />;

if (loader === "init-loader") {
return <WorkspaceDraftIssuesLoader items={14} />;
}

return (
<div className="relative">
Expand Down
12 changes: 8 additions & 4 deletions web/core/store/issue/workspace-draft/issue.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,10 @@ export class WorkspaceDraftIssues implements IWorkspaceDraftIssues {

const response = await workspaceDraftService.deleteIssue(workspaceSlug, issueId);
runInAction(() => {
unset(this.issueMapIds[workspaceSlug], issueId);
unset(this.issuesMap, issueId);
// Remove the issue from the issueMapIds
this.issueMapIds[workspaceSlug] = (this.issueMapIds[workspaceSlug] || []).filter((id) => id !== issueId);
// Remove the issue from the issuesMap
delete this.issuesMap[issueId];
// reduce the count of issues in the pagination info
if (this.paginationInfo?.total_count) {
set(this, "paginationInfo", {
Expand All @@ -324,8 +326,10 @@ export class WorkspaceDraftIssues implements IWorkspaceDraftIssues {

const response = await workspaceDraftService.moveIssue(workspaceSlug, issueId, payload);
runInAction(() => {
unset(this.issueMapIds[workspaceSlug], issueId);
unset(this.issuesMap, issueId);
// Remove the issue from the issueMapIds
this.issueMapIds[workspaceSlug] = (this.issueMapIds[workspaceSlug] || []).filter((id) => id !== issueId);
// Remove the issue from the issuesMap
delete this.issuesMap[issueId];
// reduce the count of issues in the pagination info
if (this.paginationInfo?.total_count) {
set(this, "paginationInfo", {
Expand Down