forked from github/plane
fix: sidebar height, authorization (#3626)
This commit is contained in:
parent
9cf5348019
commit
fc8edab59b
@ -20,6 +20,7 @@ export type GanttChartBlocksProps = {
|
|||||||
enableBlockLeftResize: boolean;
|
enableBlockLeftResize: boolean;
|
||||||
enableBlockRightResize: boolean;
|
enableBlockRightResize: boolean;
|
||||||
enableBlockMove: boolean;
|
enableBlockMove: boolean;
|
||||||
|
enableAddBlock: boolean;
|
||||||
showAllBlocks: boolean;
|
showAllBlocks: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -32,6 +33,7 @@ export const GanttChartBlocksList: FC<GanttChartBlocksProps> = observer((props)
|
|||||||
enableBlockLeftResize,
|
enableBlockLeftResize,
|
||||||
enableBlockRightResize,
|
enableBlockRightResize,
|
||||||
enableBlockMove,
|
enableBlockMove,
|
||||||
|
enableAddBlock,
|
||||||
showAllBlocks,
|
showAllBlocks,
|
||||||
} = props;
|
} = props;
|
||||||
// store hooks
|
// store hooks
|
||||||
@ -120,7 +122,7 @@ export const GanttChartBlocksList: FC<GanttChartBlocksProps> = observer((props)
|
|||||||
enableBlockMove={enableBlockMove}
|
enableBlockMove={enableBlockMove}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<ChartAddBlock block={block} blockUpdateHandler={blockUpdateHandler} />
|
enableAddBlock && <ChartAddBlock block={block} blockUpdateHandler={blockUpdateHandler} />
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -27,6 +27,7 @@ type Props = {
|
|||||||
enableBlockMove: boolean;
|
enableBlockMove: boolean;
|
||||||
enableBlockRightResize: boolean;
|
enableBlockRightResize: boolean;
|
||||||
enableReorder: boolean;
|
enableReorder: boolean;
|
||||||
|
enableAddBlock: boolean;
|
||||||
itemsContainerWidth: number;
|
itemsContainerWidth: number;
|
||||||
showAllBlocks: boolean;
|
showAllBlocks: boolean;
|
||||||
sidebarToRender: (props: any) => React.ReactNode;
|
sidebarToRender: (props: any) => React.ReactNode;
|
||||||
@ -45,6 +46,7 @@ export const GanttChartMainContent: React.FC<Props> = (props) => {
|
|||||||
enableBlockMove,
|
enableBlockMove,
|
||||||
enableBlockRightResize,
|
enableBlockRightResize,
|
||||||
enableReorder,
|
enableReorder,
|
||||||
|
enableAddBlock,
|
||||||
itemsContainerWidth,
|
itemsContainerWidth,
|
||||||
showAllBlocks,
|
showAllBlocks,
|
||||||
sidebarToRender,
|
sidebarToRender,
|
||||||
@ -111,6 +113,7 @@ export const GanttChartMainContent: React.FC<Props> = (props) => {
|
|||||||
enableBlockLeftResize={enableBlockLeftResize}
|
enableBlockLeftResize={enableBlockLeftResize}
|
||||||
enableBlockRightResize={enableBlockRightResize}
|
enableBlockRightResize={enableBlockRightResize}
|
||||||
enableBlockMove={enableBlockMove}
|
enableBlockMove={enableBlockMove}
|
||||||
|
enableAddBlock={enableAddBlock}
|
||||||
showAllBlocks={showAllBlocks}
|
showAllBlocks={showAllBlocks}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
@ -28,6 +28,7 @@ type ChartViewRootProps = {
|
|||||||
enableBlockRightResize: boolean;
|
enableBlockRightResize: boolean;
|
||||||
enableBlockMove: boolean;
|
enableBlockMove: boolean;
|
||||||
enableReorder: boolean;
|
enableReorder: boolean;
|
||||||
|
enableAddBlock: boolean;
|
||||||
bottomSpacing: boolean;
|
bottomSpacing: boolean;
|
||||||
showAllBlocks: boolean;
|
showAllBlocks: boolean;
|
||||||
};
|
};
|
||||||
@ -45,6 +46,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = (props) => {
|
|||||||
enableBlockRightResize,
|
enableBlockRightResize,
|
||||||
enableBlockMove,
|
enableBlockMove,
|
||||||
enableReorder,
|
enableReorder,
|
||||||
|
enableAddBlock,
|
||||||
bottomSpacing,
|
bottomSpacing,
|
||||||
showAllBlocks,
|
showAllBlocks,
|
||||||
} = props;
|
} = props;
|
||||||
@ -192,6 +194,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = (props) => {
|
|||||||
enableBlockMove={enableBlockMove}
|
enableBlockMove={enableBlockMove}
|
||||||
enableBlockRightResize={enableBlockRightResize}
|
enableBlockRightResize={enableBlockRightResize}
|
||||||
enableReorder={enableReorder}
|
enableReorder={enableReorder}
|
||||||
|
enableAddBlock={enableAddBlock}
|
||||||
itemsContainerWidth={itemsContainerWidth}
|
itemsContainerWidth={itemsContainerWidth}
|
||||||
showAllBlocks={showAllBlocks}
|
showAllBlocks={showAllBlocks}
|
||||||
sidebarToRender={sidebarToRender}
|
sidebarToRender={sidebarToRender}
|
||||||
|
@ -14,7 +14,6 @@ export const MonthChartView: FC<any> = () => {
|
|||||||
const monthBlocks: IMonthBlock[] = renderView;
|
const monthBlocks: IMonthBlock[] = renderView;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
|
||||||
<div className="absolute top-0 left-0 h-full w-max flex divide-x divide-custom-border-100/50">
|
<div className="absolute top-0 left-0 h-full w-max flex divide-x divide-custom-border-100/50">
|
||||||
{monthBlocks?.map((block, rootIndex) => (
|
{monthBlocks?.map((block, rootIndex) => (
|
||||||
<div key={`month-${block?.month}-${block?.year}`} className="relative">
|
<div key={`month-${block?.month}-${block?.year}`} className="relative">
|
||||||
@ -71,6 +70,5 @@ export const MonthChartView: FC<any> = () => {
|
|||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -16,6 +16,7 @@ type GanttChartRootProps = {
|
|||||||
enableBlockRightResize?: boolean;
|
enableBlockRightResize?: boolean;
|
||||||
enableBlockMove?: boolean;
|
enableBlockMove?: boolean;
|
||||||
enableReorder?: boolean;
|
enableReorder?: boolean;
|
||||||
|
enableAddBlock?: boolean;
|
||||||
bottomSpacing?: boolean;
|
bottomSpacing?: boolean;
|
||||||
showAllBlocks?: boolean;
|
showAllBlocks?: boolean;
|
||||||
};
|
};
|
||||||
@ -29,10 +30,11 @@ export const GanttChartRoot: FC<GanttChartRootProps> = (props) => {
|
|||||||
blockUpdateHandler,
|
blockUpdateHandler,
|
||||||
sidebarToRender,
|
sidebarToRender,
|
||||||
blockToRender,
|
blockToRender,
|
||||||
enableBlockLeftResize = true,
|
enableBlockLeftResize = false,
|
||||||
enableBlockRightResize = true,
|
enableBlockRightResize = false,
|
||||||
enableBlockMove = true,
|
enableBlockMove = false,
|
||||||
enableReorder = true,
|
enableReorder = false,
|
||||||
|
enableAddBlock = false,
|
||||||
bottomSpacing = false,
|
bottomSpacing = false,
|
||||||
showAllBlocks = false,
|
showAllBlocks = false,
|
||||||
} = props;
|
} = props;
|
||||||
@ -51,6 +53,7 @@ export const GanttChartRoot: FC<GanttChartRootProps> = (props) => {
|
|||||||
enableBlockRightResize={enableBlockRightResize}
|
enableBlockRightResize={enableBlockRightResize}
|
||||||
enableBlockMove={enableBlockMove}
|
enableBlockMove={enableBlockMove}
|
||||||
enableReorder={enableReorder}
|
enableReorder={enableReorder}
|
||||||
|
enableAddBlock={enableAddBlock}
|
||||||
bottomSpacing={bottomSpacing}
|
bottomSpacing={bottomSpacing}
|
||||||
showAllBlocks={showAllBlocks}
|
showAllBlocks={showAllBlocks}
|
||||||
/>
|
/>
|
||||||
|
@ -18,7 +18,7 @@ export const GanttChartSidebar: React.FC<Props> = (props) => {
|
|||||||
<div
|
<div
|
||||||
// DO NOT REMOVE THE ID
|
// DO NOT REMOVE THE ID
|
||||||
id="gantt-sidebar"
|
id="gantt-sidebar"
|
||||||
className="sticky left-0 z-10 min-h-full h-max flex-shrink-0 border-r-[0.5px] border-custom-border-200"
|
className="sticky top-0 left-0 z-10 min-h-full h-max flex-shrink-0 border-r-[0.5px] border-custom-border-200 bg-custom-background-100"
|
||||||
style={{
|
style={{
|
||||||
width: `${SIDEBAR_WIDTH}px`,
|
width: `${SIDEBAR_WIDTH}px`,
|
||||||
}}
|
}}
|
||||||
|
@ -84,6 +84,7 @@ export const BaseGanttRoot: React.FC<IBaseGanttRoot> = observer((props: IBaseGan
|
|||||||
enableBlockRightResize={isAllowed}
|
enableBlockRightResize={isAllowed}
|
||||||
enableBlockMove={isAllowed}
|
enableBlockMove={isAllowed}
|
||||||
enableReorder={appliedDisplayFilters?.order_by === "sort_order" && isAllowed}
|
enableReorder={appliedDisplayFilters?.order_by === "sort_order" && isAllowed}
|
||||||
|
enableAddBlock={isAllowed}
|
||||||
showAllBlocks
|
showAllBlocks
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -52,6 +52,7 @@ export const ModulesListGanttChartView: React.FC = observer(() => {
|
|||||||
enableBlockRightResize={isAllowed}
|
enableBlockRightResize={isAllowed}
|
||||||
enableBlockMove={isAllowed}
|
enableBlockMove={isAllowed}
|
||||||
enableReorder={isAllowed}
|
enableReorder={isAllowed}
|
||||||
|
enableAddBlock={isAllowed}
|
||||||
showAllBlocks
|
showAllBlocks
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user