diff --git a/packages/frontend/src/components/issues-table.tsx b/packages/frontend/src/components/issues-table.tsx index 68140ae..fb54dad 100644 --- a/packages/frontend/src/components/issues-table.tsx +++ b/packages/frontend/src/components/issues-table.tsx @@ -170,108 +170,126 @@ export function IssuesTable({ - {issues.map((issueData) => ( - { - if (issueData.Issue.id === selectedIssueId) { - selectIssue(null); - return; - } - selectIssue(issueData); - }} - > - {showId && ( - - { + const isSelected = issueData.Issue.id === selectedIssueId; + return ( + { + if (isSelected) { + selectIssue(null); + return; + } + selectIssue(issueData); + }} + > + {showId && ( + - {issueData.Issue.number.toString().padStart(3, "0")} - - - )} - {showTitle && ( - - + {issueData.Issue.number.toString().padStart(3, "0")} + + + )} + {showTitle && ( + - {selectedOrganisation?.Organisation.features.issueTypes && - issueTypes[issueData.Issue.type] && ( - - )} - {selectedOrganisation?.Organisation.features.issueStatus && - (columns.status == null || columns.status === true) && ( - - )} - {issueData.Issue.title} - - - )} - {showDescription && ( - - + {selectedOrganisation?.Organisation.features.issueTypes && + issueTypes[issueData.Issue.type] && ( + + )} + {selectedOrganisation?.Organisation.features.issueStatus && + (columns.status == null || columns.status === true) && ( + + )} + {issueData.Issue.title} + + + )} + {showDescription && ( + - {issueData.Issue.description} - - - )} - {showAssignee && ( - - + {issueData.Issue.description} + + + )} + {showAssignee && ( + - {selectedOrganisation?.Organisation.features.issueAssigneesShownInTable && - issueData.Assignees && - issueData.Assignees.length > 0 && ( -
- {issueData.Assignees.slice(0, 3).map((assignee) => ( - - ))} - {issueData.Assignees.length > 3 && ( - - +{issueData.Assignees.length - 3} - - )} -
- )} - -
- )} -
- ))} + + {selectedOrganisation?.Organisation.features.issueAssigneesShownInTable && + issueData.Assignees && + issueData.Assignees.length > 0 && ( +
+ {issueData.Assignees.slice(0, 3).map((assignee) => ( + + ))} + {issueData.Assignees.length > 3 && ( + + +{issueData.Assignees.length - 3} + + )} +
+ )} +
+ + )} + + ); + })}
);