π₯π₯π₯ 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
[WEB-749] fix: rendering empty states with "showEmptyGroup" filter in issue grouping (#3954)
guru_sainath898cf98be36a
diff --git a/web/components/issues/issue-layouts/kanban/default.tsx b/web/components/issues/issue-layouts/kanban/default.tsxindex 3cbab589f1..5bb46f1433 100644--- a/web/components/issues/issue-layouts/kanban/default.tsx+++ b/web/components/issues/issue-layouts/kanban/default.tsx@@ -58,6 +58,7 @@ export interface IGroupByKanBan {scrollableContainerRef?: MutableRefObject<HTMLDivElement | null>;isDragStarted?: boolean;showEmptyGroup?: boolean;+ subGroupIssueHeaderCount?: (listId: string) => number;}const GroupByKanBan: React.FC<IGroupByKanBan> = observer((props) => {@@ -83,6 +84,7 @@ const GroupByKanBan: React.FC<IGroupByKanBan> = observer((props) => {scrollableContainerRef,isDragStarted,showEmptyGroup = true,+ subGroupIssueHeaderCount,} = props;const member = useMember();@@ -97,17 +99,27 @@ const GroupByKanBan: React.FC<IGroupByKanBan> = observer((props) => {if (!list) return null;- const groupWithIssues = list.filter((_list) => (issueIds as TGroupedIssues)?.[_list.id]?.length > 0);-- const groupList = showEmptyGroup ? list : groupWithIssues;-- const visibilityGroupBy = (_list: IGroupByColumn) => {+ const visibilityGroupBy = (_list: IGroupByColumn): { showGroup: boolean; showIssues: boolean } => {if (sub_group_by) {- if (kanbanFilters?.sub_group_by.includes(_list.id)) return true;- return false;+ const groupVisibility = {+ showGroup: true,+ showIssues: true,+ };+ if (!showEmptyGroup) {+ groupVisibility.showGroup = subGroupIssueHeaderCount ? subGroupIssueHeaderCount(_list.id) > 0 : true;+ }+ return groupVisibility;} else {- if (kanbanFilters?.group_by.includes(_list.id)) return true;- return false;+ const groupVisibility = {+ showGroup: true,+ showIssues: true,+ };+ if (!showEmptyGroup) {+ if ((issueIds as TGroupedIssues)?.[_list.id]?.length > 0) groupVisibility.showGroup = true;+ else groupVisibility.showGroup = false;+ }+ if (kanbanFilters?.group_by.includes(_list.id)) groupVisibility.showIssues = false;+ return groupVisibility;}};@@ -115,13 +127,18 @@ const GroupByKanBan: React.FC<IGroupByKanBan> = observer((props) => {return (<div className={`relative w-full flex gap-2 ${sub_group_by ? "h-full" : "h-full"}`}>- {groupList &&- groupList.length > 0 &&- groupList.map((_list: IGroupByColumn) => {+ {list &&+ list.length > 0 &&+ list.map((_list: IGroupByColumn) => {const groupByVisibilityToggle = visibilityGroupBy(_list);+ if (groupByVisibilityToggle.showGroup === false) return <></>;return (- <div className={`relative flex flex-shrink-0 flex-col group ${groupByVisibilityToggle ? `` : `w-[350px]`}`}>+ <div+ 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"><HeaderGroupByCard@@ -141,7 +158,7 @@ const GroupByKanBan: React.FC<IGroupByKanBan> = observer((props) => {</div>)}- {!groupByVisibilityToggle && (+ {groupByVisibilityToggle.showIssues && (<KanbanGroupgroupId={_list.id}issuesMap={issuesMap}@@ -159,7 +176,6 @@ const GroupByKanBan: React.FC<IGroupByKanBan> = observer((props) => {viewId={viewId}disableIssueCreation={disableIssueCreation}canEditProperties={canEditProperties}- groupByVisibilityToggle={groupByVisibilityToggle}scrollableContainerRef={scrollableContainerRef}isDragStarted={isDragStarted}/>@@ -197,6 +213,7 @@ export interface IKanBan {canEditProperties: (projectId: string | undefined) => boolean;scrollableContainerRef?: MutableRefObject<HTMLDivElement | null>;isDragStarted?: boolean;+ subGroupIssueHeaderCount?: (listId: string) => number;}export const KanBan: React.FC<IKanBan> = observer((props) => {@@ -221,6 +238,7 @@ export const KanBan: React.FC<IKanBan> = observer((props) => {scrollableContainerRef,isDragStarted,showEmptyGroup,+ subGroupIssueHeaderCount,} = props;const issueKanBanView = useKanbanView();@@ -248,6 +266,7 @@ export const KanBan: React.FC<IKanBan> = observer((props) => {scrollableContainerRef={scrollableContainerRef}isDragStarted={isDragStarted}showEmptyGroup={showEmptyGroup}+ subGroupIssueHeaderCount={subGroupIssueHeaderCount}/>);});diff --git a/web/components/issues/issue-layouts/kanban/kanban-group.tsx b/web/components/issues/issue-layouts/kanban/kanban-group.tsxindex a05fb17911..5a46324bd2 100644--- a/web/components/issues/issue-layouts/kanban/kanban-group.tsx+++ b/web/components/issues/issue-layouts/kanban/kanban-group.tsx@@ -37,7 +37,7 @@ interface IKanbanGroup {viewId?: string;disableIssueCreation?: boolean;canEditProperties: (projectId: string | undefined) => boolean;- groupByVisibilityToggle: boolean;+ groupByVisibilityToggle?: boolean;scrollableContainerRef?: MutableRefObject<HTMLDivElement | null>;isDragStarted?: boolean;}diff --git a/web/components/issues/issue-layouts/kanban/swimlanes.tsx b/web/components/issues/issue-layouts/kanban/swimlanes.tsxindex d60e3b6186..11f5304b9f 100644--- a/web/components/issues/issue-layouts/kanban/swimlanes.tsx+++ b/web/components/issues/issue-layouts/kanban/swimlanes.tsx@@ -29,6 +29,7 @@ interface ISubGroupSwimlaneHeader {list: IGroupByColumn[];kanbanFilters: TIssueKanbanFilters;handleKanbanFilters: (toggle: "group_by" | "sub_group_by", value: string) => void;+ showEmptyGroup: boolean;}const getSubGroupHeaderIssuesCount = (issueIds: TSubGroupedIssues, groupById: string) => {@@ -39,6 +40,22 @@ const getSubGroupHeaderIssuesCount = (issueIds: TSubGroupedIssues, groupById: streturn headerCount;};+const visibilitySubGroupByGroupCount = (+ issueIds: TSubGroupedIssues,+ _list: IGroupByColumn,+ showEmptyGroup: boolean+): boolean => {+ let subGroupHeaderVisibility = true;++ if (showEmptyGroup) subGroupHeaderVisibility = true;+ else {+ if (getSubGroupHeaderIssuesCount(issueIds, _list.id) > 0) subGroupHeaderVisibility = true;+ else subGroupHeaderVisibility = false;+ }++ return subGroupHeaderVisibility;+};+const SubGroupSwimlaneHeader: React.FC<ISubGroupSwimlaneHeader> = ({issueIds,sub_group_by,@@ -46,25 +63,36 @@ const SubGroupSwimlaneHeader: React.FC<ISubGroupSwimlaneHeader> = ({list,kanbanFilters,handleKanbanFilters,+ showEmptyGroup,}) => (<div className="relative flex gap-2 h-max min-h-full w-full items-center">{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}- />- </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}+ />+ </div>+ );+ })}</div>);@@ -124,52 +152,74 @@ const SubGroupSwimlane: React.FC<ISubGroupSwimlane> = observer((props) => {return issueCount;};+ const visibilitySubGroupBy = (_list: IGroupByColumn): { showGroup: boolean; showIssues: boolean } => {+ const subGroupVisibility = {+ showGroup: true,+ showIssues: true,+ };+ if (showEmptyGroup) subGroupVisibility.showGroup = true;+ else {+ if (calculateIssueCount(_list.id) > 0) subGroupVisibility.showGroup = true;+ else subGroupVisibility.showGroup = false;+ }+ if (kanbanFilters?.sub_group_by.includes(_list.id)) subGroupVisibility.showIssues = false;+ return subGroupVisibility;+ };+return (<div className="relative h-max min-h-full w-full">{list &&list.length > 0 &&- list.map((_list: any) => (- <div 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>+ list.map((_list: any) => {+ const subGroupByVisibilityToggle = visibilitySubGroupBy(_list);+ if (subGroupByVisibilityToggle.showGroup === false) return <></>;- {!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}- handleIssues={handleIssues}- quickActions={quickActions}- kanbanFilters={kanbanFilters}- handleKanbanFilters={handleKanbanFilters}- showEmptyGroup={showEmptyGroup}- enableQuickIssueCreate={enableQuickIssueCreate}- canEditProperties={canEditProperties}- addIssuesToView={addIssuesToView}- quickAddCallback={quickAddCallback}- viewId={viewId}- scrollableContainerRef={scrollableContainerRef}- isDragStarted={isDragStarted}- />+ return (+ <div 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>- ))}++ {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}+ 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>);});@@ -261,6 +311,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {kanbanFilters={kanbanFilters}handleKanbanFilters={handleKanbanFilters}list={groupByList}+ showEmptyGroup={showEmptyGroup}/></div>