π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
Merge branch 'preview' of github.com:makeplane/plane into develop
sriram veeraghanta80761d3507af
diff --cc web/components/issues/issue-layouts/kanban/default.tsxindex 394f5ef184,5bb46f1433..06f798d0f5--- a/web/components/issues/issue-layouts/kanban/default.tsx+++ b/web/components/issues/issue-layouts/kanban/default.tsx@@@ -122,27 -126,29 +134,30 @@@ const GroupByKanBan: React.FC<IGroupByKconst isGroupByCreatedBy = group_by === "created_by";return (- <div className={`relative flex w-full gap-2 ${sub_group_by ? "h-full" : "h-full"}`}>- {groupList &&- groupList.length > 0 &&- groupList.map((_list: IGroupByColumn) => {- const groupByVisibilityToggle = visibilityGroupBy(_list);+ <div className={`relative w-full flex gap-2 ${sub_group_by ? "h-full" : "h-full"}`}>+ {list &&+ list.length > 0 &&- list.map((_list: IGroupByColumn) => {- const groupByVisibilityToggle = visibilityGroupBy(_list);++ list.map((subList: IGroupByColumn) => {++ const groupByVisibilityToggle = visibilityGroupBy(subList);+ if (groupByVisibilityToggle.showGroup === false) return <></>;return (<div- key={_list.id}- className={`group relative flex flex-shrink-0 flex-col ${groupByVisibilityToggle ? `` : `w-[350px]`}`}++ key={subList.id}+ className={`relative flex flex-shrink-0 flex-col group ${+ groupByVisibilityToggle.showIssues ? `w-[350px]` : ``+ } `}>{sub_group_by === null && (- <div className="flex-shrink-0 sticky top-0 z-[2] w-full bg-custom-background-90 py-1">+ <div className="sticky top-0 z-[2] w-full flex-shrink-0 bg-custom-background-90 py-1"><HeaderGroupByCardsub_group_by={sub_group_by}group_by={group_by}-- column_id={_list.id}-- icon={_list.icon}-- title={_list.name}-- count={(issueIds as TGroupedIssues)?.[_list.id]?.length || 0}-- issuePayload={_list.payload}++ column_id={subList.id}++ icon={subList.icon}++ title={subList.name}++ count={(issueIds as TGroupedIssues)?.[subList.id]?.length || 0}++ issuePayload={subList.payload}disableIssueCreation={disableIssueCreation || isGroupByCreatedBy}storeType={storeType}addIssuesToView={addIssuesToView}@@@ -152,9 -158,9 +167,9 @@@</div>)}- {!groupByVisibilityToggle && (+ {groupByVisibilityToggle.showIssues && (<KanbanGroup-- groupId={_list.id}++ groupId={subList.id}issuesMap={issuesMap}issueIds={issueIds}peekIssueId={peekIssue?.issueId ?? ""}diff --cc web/components/issues/issue-layouts/kanban/swimlanes.tsxindex 6b61e66614,11f5304b9f..644c254d6f--- a/web/components/issues/issue-layouts/kanban/swimlanes.tsx+++ b/web/components/issues/issue-layouts/kanban/swimlanes.tsx@@@ -28,7 -29,7 +28,8 @@@ interface ISubGroupSwimlaneHeaderlist: IGroupByColumn[];kanbanFilters: TIssueKanbanFilters;handleKanbanFilters: (toggle: "group_by" | "sub_group_by", value: string) => void;+ storeType: KanbanStoreType;+ showEmptyGroup: boolean;}const getSubGroupHeaderIssuesCount = (issueIds: TSubGroupedIssues, groupById: string) => {@@@ -47,26 -63,36 +64,37 @@@ const SubGroupSwimlaneHeader: React.FC<list,kanbanFilters,handleKanbanFilters,+ showEmptyGroup,}) => (- <div className="relative flex gap-2 h-max min-h-full w-full items-center">+ <div className="relative flex h-max min-h-full w-full items-center gap-2">{list &&list.length > 0 &&- list.map((_list: IGroupByColumn) => (- <div key={`${sub_group_by}_${_list.id}`} className="flex w-[350px] flex-shrink-0 flex-col">- <HeaderGroupByCard- sub_group_by={sub_group_by}- group_by={group_by}- column_id={_list.id}- icon={_list.icon}- title={_list.name}- count={getSubGroupHeaderIssuesCount(issueIds as TSubGroupedIssues, _list?.id)}- kanbanFilters={kanbanFilters}- handleKanbanFilters={handleKanbanFilters}- issuePayload={_list.payload}- storeType={storeType}- />- </div>- ))}+ list.map((_list: IGroupByColumn) => {+ const subGroupByVisibilityToggle = visibilitySubGroupByGroupCount(+ issueIds as TSubGroupedIssues,+ _list,+ showEmptyGroup+ );++ if (subGroupByVisibilityToggle === false) return <></>;++ return (+ <div key={`${sub_group_by}_${_list.id}`} className="flex w-[350px] flex-shrink-0 flex-col">+ <HeaderGroupByCard+ sub_group_by={sub_group_by}+ group_by={group_by}+ column_id={_list.id}+ icon={_list.icon}+ title={_list.name}+ count={getSubGroupHeaderIssuesCount(issueIds as TSubGroupedIssues, _list?.id)}+ kanbanFilters={kanbanFilters}+ handleKanbanFilters={handleKanbanFilters}+ issuePayload={_list.payload}++ storeType={storeType}+ />+ </div>+ );+ })}</div>);@@@ -131,49 -170,56 +173,56 @@@ const SubGroupSwimlane: React.FC<ISubGr<div className="relative h-max min-h-full w-full">{list &&list.length > 0 &&- list.map((_list: any) => (- <div key={_list.id} className="flex flex-shrink-0 flex-col">- <div className="sticky top-[50px] z-[1] flex w-full items-center bg-custom-background-90 py-1">- <div className="sticky left-0 flex-shrink-0 bg-custom-background-90 pr-2">- <HeaderSubGroupByCard- column_id={_list.id}- icon={_list.Icon}- title={_list.name || ""}- count={calculateIssueCount(_list.id)}- kanbanFilters={kanbanFilters}- handleKanbanFilters={handleKanbanFilters}- />+ list.map((_list: any) => {+ const subGroupByVisibilityToggle = visibilitySubGroupBy(_list);+ if (subGroupByVisibilityToggle.showGroup === false) return <></>;-+ return (- <div className="flex flex-shrink-0 flex-col">++ <div key={_list.id} className="flex flex-shrink-0 flex-col">+ <div className="sticky top-[50px] z-[1] flex w-full items-center bg-custom-background-90 py-1">+ <div className="sticky left-0 flex-shrink-0 bg-custom-background-90 pr-2">+ <HeaderSubGroupByCard+ column_id={_list.id}+ icon={_list.Icon}+ title={_list.name || ""}+ count={calculateIssueCount(_list.id)}+ kanbanFilters={kanbanFilters}+ handleKanbanFilters={handleKanbanFilters}+ />+ </div>+ <div className="w-full border-b border-dashed border-custom-border-400" /></div>- <div className="w-full border-b border-dashed border-custom-border-400" />- </div>- {!kanbanFilters?.sub_group_by.includes(_list.id) && (- <div className="relative">- <KanBan- issuesMap={issuesMap}- issueIds={(issueIds as TSubGroupedIssues)?.[_list.id]}- displayProperties={displayProperties}- sub_group_by={sub_group_by}- group_by={group_by}- sub_group_id={_list.id}- updateIssue={updateIssue}- quickActions={quickActions}- kanbanFilters={kanbanFilters}- handleKanbanFilters={handleKanbanFilters}- showEmptyGroup={showEmptyGroup}- enableQuickIssueCreate={enableQuickIssueCreate}- canEditProperties={canEditProperties}- addIssuesToView={addIssuesToView}- quickAddCallback={quickAddCallback}- viewId={viewId}- scrollableContainerRef={scrollableContainerRef}- isDragStarted={isDragStarted}- storeType={storeType}- />- </div>- )}- </div>- ))}+ {subGroupByVisibilityToggle.showIssues && (+ <div className="relative">+ <KanBan+ issuesMap={issuesMap}+ issueIds={(issueIds as TSubGroupedIssues)?.[_list.id]}+ displayProperties={displayProperties}+ sub_group_by={sub_group_by}+ group_by={group_by}+ sub_group_id={_list.id}- handleIssues={handleIssues}++ storeType={storeType}++ updateIssue={updateIssue}+ quickActions={quickActions}+ kanbanFilters={kanbanFilters}+ handleKanbanFilters={handleKanbanFilters}+ showEmptyGroup={showEmptyGroup}+ enableQuickIssueCreate={enableQuickIssueCreate}+ canEditProperties={canEditProperties}+ addIssuesToView={addIssuesToView}+ quickAddCallback={quickAddCallback}+ viewId={viewId}+ scrollableContainerRef={scrollableContainerRef}+ isDragStarted={isDragStarted}+ subGroupIssueHeaderCount={(groupByListId: string) =>+ getSubGroupHeaderIssuesCount(issueIds as TSubGroupedIssues, groupByListId)+ }+ />+ </div>+ )}+ </div>+ );+ })}</div>);});@@@ -266,7 -311,7 +315,8 @@@ export const KanBanSwimLanes: React.FC<kanbanFilters={kanbanFilters}handleKanbanFilters={handleKanbanFilters}list={groupByList}+ storeType={storeType}+ showEmptyGroup={showEmptyGroup}/></div>