diff --git a/web/components/core/views/spreadsheet-view/single-issue.tsx b/web/components/core/views/spreadsheet-view/single-issue.tsx index ea8161c05..8bae0d40d 100644 --- a/web/components/core/views/spreadsheet-view/single-issue.tsx +++ b/web/components/core/views/spreadsheet-view/single-issue.tsx @@ -58,6 +58,7 @@ type Props = { properties: Properties; handleEditIssue: (issue: IIssue) => void; handleDeleteIssue: (issue: IIssue) => void; + setCurrentProjectId: React.Dispatch>; gridTemplateColumns: string; disableUserActions: boolean; user: ICurrentUserResponse | undefined; @@ -74,6 +75,7 @@ export const SingleSpreadsheetIssue: React.FC = ({ properties, handleEditIssue, handleDeleteIssue, + setCurrentProjectId, gridTemplateColumns, disableUserActions, user, @@ -214,7 +216,7 @@ export const SingleSpreadsheetIssue: React.FC = ({ const openPeekOverview = () => { const { query } = router; - + setCurrentProjectId(issue.project_detail.id); router.push({ pathname: router.pathname, query: { ...query, peekIssue: issue.id }, diff --git a/web/components/core/views/spreadsheet-view/spreadsheet-issues.tsx b/web/components/core/views/spreadsheet-view/spreadsheet-issues.tsx index 48eab1af8..3cefd60e1 100644 --- a/web/components/core/views/spreadsheet-view/spreadsheet-issues.tsx +++ b/web/components/core/views/spreadsheet-view/spreadsheet-issues.tsx @@ -15,6 +15,7 @@ type Props = { setExpandedIssues: React.Dispatch>; properties: Properties; handleIssueAction: (issue: IIssue, action: "copy" | "delete" | "edit") => void; + setCurrentProjectId: React.Dispatch>; gridTemplateColumns: string; disableUserActions: boolean; user: ICurrentUserResponse | undefined; @@ -31,6 +32,7 @@ export const SpreadsheetIssues: React.FC = ({ gridTemplateColumns, properties, handleIssueAction, + setCurrentProjectId, disableUserActions, user, userAuth, @@ -65,6 +67,7 @@ export const SpreadsheetIssues: React.FC = ({ properties={properties} handleEditIssue={() => handleIssueAction(issue, "edit")} handleDeleteIssue={() => handleIssueAction(issue, "delete")} + setCurrentProjectId={setCurrentProjectId} disableUserActions={disableUserActions} user={user} userAuth={userAuth} @@ -86,6 +89,7 @@ export const SpreadsheetIssues: React.FC = ({ gridTemplateColumns={gridTemplateColumns} properties={properties} handleIssueAction={handleIssueAction} + setCurrentProjectId={setCurrentProjectId} disableUserActions={disableUserActions} user={user} userAuth={userAuth} diff --git a/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx b/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx index 486e494e8..4cd42cec6 100644 --- a/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx +++ b/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx @@ -43,6 +43,7 @@ export const SpreadsheetView: React.FC = ({ userAuth, }) => { const [expandedIssues, setExpandedIssues] = useState([]); + const [currentProjectId, setCurrentProjectId] = useState(null); const router = useRouter(); const { workspaceSlug, projectId, cycleId, moduleId } = router.query; @@ -71,7 +72,7 @@ export const SpreadsheetView: React.FC = ({ <> mutateIssues()} - projectId={projectId?.toString() ?? ""} + projectId={currentProjectId ?? ""} workspaceSlug={workspaceSlug?.toString() ?? ""} readOnly={disableUserActions} /> @@ -89,6 +90,7 @@ export const SpreadsheetView: React.FC = ({ projectId={issue.project_detail.id} expandedIssues={expandedIssues} setExpandedIssues={setExpandedIssues} + setCurrentProjectId={setCurrentProjectId} gridTemplateColumns={gridTemplateColumns} properties={properties} handleIssueAction={handleIssueAction} @@ -148,7 +150,9 @@ export const SpreadsheetView: React.FC = ({ ) : ( - +
+ +
)}