fix: resolve module and cycle mutation issues in peek overview, issue sidebar and empty state (#3466)

* fix: resolve module and cycle mutation issues in peek overview, sidebar, and empty state

* chore: code refactor
This commit is contained in:
Anmol Singh Bhatia 2024-01-25 14:06:03 +05:30 committed by GitHub
parent a104cc4814
commit 7f2e99dd2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 89 additions and 33 deletions

View File

@ -120,12 +120,23 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = (props) => {
}, },
addIssueToCycle: async (workspaceSlug: string, projectId: string, cycleId: string, issueIds: string[]) => { addIssueToCycle: async (workspaceSlug: string, projectId: string, cycleId: string, issueIds: string[]) => {
try { try {
await addIssueToCycle(workspaceSlug, projectId, cycleId, issueIds); await addIssueToCycle(workspaceSlug, projectId, cycleId, issueIds)
setToastAlert({ .then((res) => {
title: "Cycle added to issue successfully", updateIssue(workspaceSlug, projectId, res.id, res);
type: "success", fetchIssue(workspaceSlug, projectId, res.id);
message: "Issue added to issue successfully", setToastAlert({
}); title: "Cycle added to issue successfully",
type: "success",
message: "Issue added to issue successfully",
});
})
.catch(() => {
setToastAlert({
type: "error",
title: "Error!",
message: "Selected issues could not be added to the cycle. Please try again.",
});
});
} catch (error) { } catch (error) {
setToastAlert({ setToastAlert({
title: "Cycle add to issue failed", title: "Cycle add to issue failed",
@ -152,12 +163,23 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = (props) => {
}, },
addIssueToModule: async (workspaceSlug: string, projectId: string, moduleId: string, issueIds: string[]) => { addIssueToModule: async (workspaceSlug: string, projectId: string, moduleId: string, issueIds: string[]) => {
try { try {
await addIssueToModule(workspaceSlug, projectId, moduleId, issueIds); await addIssueToModule(workspaceSlug, projectId, moduleId, issueIds)
setToastAlert({ .then((res) => {
title: "Module added to issue successfully", updateIssue(workspaceSlug, projectId, res.id, res);
type: "success", fetchIssue(workspaceSlug, projectId, res.id);
message: "Module added to issue successfully", setToastAlert({
}); title: "Module added to issue successfully",
type: "success",
message: "Module added to issue successfully",
});
})
.catch(() =>
setToastAlert({
type: "error",
title: "Error!",
message: "Selected issues could not be added to the module. Please try again.",
})
);
} catch (error) { } catch (error) {
setToastAlert({ setToastAlert({
title: "Module add to issue failed", title: "Module add to issue failed",

View File

@ -2,7 +2,7 @@ import { useState } from "react";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react-lite";
import { PlusIcon } from "lucide-react"; import { PlusIcon } from "lucide-react";
// hooks // hooks
import { useApplication, useIssues, useUser } from "hooks/store"; import { useApplication, useIssueDetail, useIssues, useUser } from "hooks/store";
import useToast from "hooks/use-toast"; import useToast from "hooks/use-toast";
// components // components
import { EmptyState } from "components/common"; import { EmptyState } from "components/common";
@ -29,6 +29,7 @@ export const CycleEmptyState: React.FC<Props> = observer((props) => {
const [cycleIssuesListModal, setCycleIssuesListModal] = useState(false); const [cycleIssuesListModal, setCycleIssuesListModal] = useState(false);
// store hooks // store hooks
const { issues } = useIssues(EIssuesStoreType.CYCLE); const { issues } = useIssues(EIssuesStoreType.CYCLE);
const { updateIssue, fetchIssue } = useIssueDetail();
const { const {
commandPalette: { toggleCreateIssueModal }, commandPalette: { toggleCreateIssueModal },
eventTracker: { setTrackElement }, eventTracker: { setTrackElement },
@ -44,13 +45,19 @@ export const CycleEmptyState: React.FC<Props> = observer((props) => {
const issueIds = data.map((i) => i.id); const issueIds = data.map((i) => i.id);
await issues.addIssueToCycle(workspaceSlug.toString(), projectId, cycleId.toString(), issueIds).catch(() => { await issues
setToastAlert({ .addIssueToCycle(workspaceSlug.toString(), projectId, cycleId.toString(), issueIds)
type: "error", .then((res) => {
title: "Error!", updateIssue(workspaceSlug, projectId, res.id, res);
message: "Selected issues could not be added to the cycle. Please try again.", fetchIssue(workspaceSlug, projectId, res.id);
})
.catch(() => {
setToastAlert({
type: "error",
title: "Error!",
message: "Selected issues could not be added to the cycle. Please try again.",
});
}); });
});
}; };
const isEditingAllowed = !!userRole && userRole >= EUserProjectRoles.MEMBER; const isEditingAllowed = !!userRole && userRole >= EUserProjectRoles.MEMBER;

View File

@ -2,7 +2,7 @@ import { useState } from "react";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react-lite";
import { PlusIcon } from "lucide-react"; import { PlusIcon } from "lucide-react";
// hooks // hooks
import { useApplication, useIssues, useUser } from "hooks/store"; import { useApplication, useIssueDetail, useIssues, useUser } from "hooks/store";
import useToast from "hooks/use-toast"; import useToast from "hooks/use-toast";
// components // components
import { EmptyState } from "components/common"; import { EmptyState } from "components/common";
@ -29,6 +29,8 @@ export const ModuleEmptyState: React.FC<Props> = observer((props) => {
const [moduleIssuesListModal, setModuleIssuesListModal] = useState(false); const [moduleIssuesListModal, setModuleIssuesListModal] = useState(false);
// store hooks // store hooks
const { issues } = useIssues(EIssuesStoreType.MODULE); const { issues } = useIssues(EIssuesStoreType.MODULE);
const { updateIssue, fetchIssue } = useIssueDetail();
const { const {
commandPalette: { toggleCreateIssueModal }, commandPalette: { toggleCreateIssueModal },
eventTracker: { setTrackElement }, eventTracker: { setTrackElement },
@ -43,9 +45,12 @@ export const ModuleEmptyState: React.FC<Props> = observer((props) => {
if (!workspaceSlug || !projectId || !moduleId) return; if (!workspaceSlug || !projectId || !moduleId) return;
const issueIds = data.map((i) => i.id); const issueIds = data.map((i) => i.id);
await issues await issues
.addIssueToModule(workspaceSlug.toString(), projectId?.toString(), moduleId.toString(), issueIds) .addIssueToModule(workspaceSlug.toString(), projectId?.toString(), moduleId.toString(), issueIds)
.then((res) => {
updateIssue(workspaceSlug, projectId, res.id, res);
fetchIssue(workspaceSlug, projectId, res.id);
})
.catch(() => .catch(() =>
setToastAlert({ setToastAlert({
type: "error", type: "error",

View File

@ -113,12 +113,23 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
}, },
addIssueToCycle: async (workspaceSlug: string, projectId: string, cycleId: string, issueIds: string[]) => { addIssueToCycle: async (workspaceSlug: string, projectId: string, cycleId: string, issueIds: string[]) => {
try { try {
await addIssueToCycle(workspaceSlug, projectId, cycleId, issueIds); await addIssueToCycle(workspaceSlug, projectId, cycleId, issueIds)
setToastAlert({ .then((res) => {
title: "Cycle added to issue successfully", updateIssue(workspaceSlug, projectId, res.id, res);
type: "success", fetchIssue(workspaceSlug, projectId, res.id);
message: "Issue added to issue successfully", setToastAlert({
}); title: "Cycle added to issue successfully",
type: "success",
message: "Issue added to issue successfully",
});
})
.catch(() => {
setToastAlert({
type: "error",
title: "Error!",
message: "Selected issues could not be added to the cycle. Please try again.",
});
});
} catch (error) { } catch (error) {
setToastAlert({ setToastAlert({
title: "Cycle add to issue failed", title: "Cycle add to issue failed",
@ -145,12 +156,23 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
}, },
addIssueToModule: async (workspaceSlug: string, projectId: string, moduleId: string, issueIds: string[]) => { addIssueToModule: async (workspaceSlug: string, projectId: string, moduleId: string, issueIds: string[]) => {
try { try {
await addIssueToModule(workspaceSlug, projectId, moduleId, issueIds); await addIssueToModule(workspaceSlug, projectId, moduleId, issueIds)
setToastAlert({ .then((res) => {
title: "Module added to issue successfully", updateIssue(workspaceSlug, projectId, res.id, res);
type: "success", fetchIssue(workspaceSlug, projectId, res.id);
message: "Module added to issue successfully", setToastAlert({
}); title: "Module added to issue successfully",
type: "success",
message: "Module added to issue successfully",
});
})
.catch(() =>
setToastAlert({
type: "error",
title: "Error!",
message: "Selected issues could not be added to the module. Please try again.",
})
);
} catch (error) { } catch (error) {
setToastAlert({ setToastAlert({
title: "Module add to issue failed", title: "Module add to issue failed",