Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2025-12-24 15:49:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

[WEB-1872] fix: completed cycle gantt layout quick add issue validation (#5066)

Browse Source 
* fix: completed cycle gantt layout quick add issue validation

* chore: code refactor
This commit is contained in:
Anmol Singh Bhatia
2024-07-08 15:55:53 +05:30
committed by GitHub
parent 0e4ce2baa5
commit fb46249ccf
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/core/components/issues/issue-layouts/gantt/base-gantt-root.tsx
View File

@@ -21,6 +21,7 @@ import { IssueLayoutHOC } from "../issue-layout-HOC";
interface IBaseGanttRoot {
viewId?: string | undefined;
isCompletedCycle?: boolean;
}
type GanttStoreType =
@@ -30,7 +31,7 @@ type GanttStoreType =
| EIssuesStoreType.PROJECT_VIEW;
export const BaseGanttRoot: React.FC<IBaseGanttRoot> = observer((props: IBaseGanttRoot) => {
const { viewId } = props;
const { viewId, isCompletedCycle = false } = props;
// router
const { workspaceSlug } = useParams();
@@ -84,6 +85,11 @@ export const BaseGanttRoot: React.FC<IBaseGanttRoot> = observer((props: IBaseGan
const isAllowed = !!currentProjectRole && currentProjectRole >= EUserProjectRoles.MEMBER;
const quickAdd =
enableIssueCreation && isAllowed && !isCompletedCycle ? (
<GanttQuickAddIssueForm quickAddCallback={quickAddIssue} />
) : undefined;
return (
<IssueLayoutHOC layout={EIssueLayoutTypes.GANTT}>
<div className="h-full w-full">
@@ -102,9 +108,7 @@ export const BaseGanttRoot: React.FC<IBaseGanttRoot> = observer((props: IBaseGan
enableReorder={appliedDisplayFilters?.order_by === "sort_order" && isAllowed}
enableAddBlock={isAllowed}
enableSelection={isBulkOperationsEnabled && isAllowed}
quickAdd={
enableIssueCreation && isAllowed ? <GanttQuickAddIssueForm quickAddCallback={quickAddIssue} /> : undefined
}
quickAdd={quickAdd}
loadMoreBlocks={loadMoreIssues}
canLoadMoreBlocks={nextPageResults}
showAllBlocks

15
web/core/components/issues/issue-layouts/roots/cycle-layout-root.tsx
View File

@@ -21,7 +21,11 @@ import { EIssueLayoutTypes, EIssuesStoreType } from "@/constants/issue";
import { useCycle, useIssues } from "@/hooks/store";
import { IssuesStoreContext } from "@/hooks/use-issue-layout-store";
const CycleIssueLayout = (props: { activeLayout: EIssueLayoutTypes | undefined; cycleId: string }) => {
const CycleIssueLayout = (props: {
activeLayout: EIssueLayoutTypes | undefined;
cycleId: string;
isCompletedCycle: boolean;
}) => {
switch (props.activeLayout) {
case EIssueLayoutTypes.LIST:
return <CycleListLayout />;
@@ -30,7 +34,7 @@ const CycleIssueLayout = (props: { activeLayout: EIssueLayoutTypes | undefined;
case EIssueLayoutTypes.CALENDAR:
return <CycleCalendarLayout />;
case EIssueLayoutTypes.GANTT:
return <BaseGanttRoot viewId={props.cycleId} />;
return <BaseGanttRoot viewId={props.cycleId} isCompletedCycle={props.isCompletedCycle} />;
case EIssueLayoutTypes.SPREADSHEET:
return <CycleSpreadsheetLayout />;
default:
@@ -62,6 +66,7 @@ export const CycleLayoutRoot: React.FC = observer(() => {
const cycleDetails = cycleId ? getCycleById(cycleId.toString()) : undefined;
const cycleStatus = cycleDetails?.status?.toLocaleLowerCase() ?? "draft";
const isCompletedCycle = cycleStatus === "completed";
if (!workspaceSlug || !projectId || !cycleId) return <></>;
@@ -78,7 +83,11 @@ export const CycleLayoutRoot: React.FC = observer(() => {
<CycleAppliedFiltersRoot />
<div className="h-full w-full overflow-auto">
<CycleIssueLayout activeLayout={activeLayout} cycleId={cycleId?.toString()} />
<CycleIssueLayout
activeLayout={activeLayout}
cycleId={cycleId?.toString()}
isCompletedCycle={isCompletedCycle}
/>
</div>
{/* peek overview */}
<IssuePeekOverview />