diff --git a/web/components/issues/issue-layouts/list/block-root.tsx b/web/components/issues/issue-layouts/list/block-root.tsx index 4be71acaf..7825a5b18 100644 --- a/web/components/issues/issue-layouts/list/block-root.tsx +++ b/web/components/issues/issue-layouts/list/block-root.tsx @@ -154,7 +154,7 @@ export const IssueBlockRoot: FC = observer((props) => { canEditProperties={canEditProperties} displayProperties={displayProperties} nestingLevel={nestingLevel + 1} - spacingLeft={spacingLeft + (displayProperties?.key ? 12 : 0)} + spacingLeft={spacingLeft + 12} containerRef={containerRef} selectionHelpers={selectionHelpers} groupId={groupId} diff --git a/web/components/issues/issue-layouts/list/block.tsx b/web/components/issues/issue-layouts/list/block.tsx index 358c72189..32b656745 100644 --- a/web/components/issues/issue-layouts/list/block.tsx +++ b/web/components/issues/issue-layouts/list/block.tsx @@ -119,6 +119,9 @@ export const IssueBlock = observer((props: IssueBlockProps) => { } }; + //TODO: add better logic. This is to have a min width for ID/Key based on the length of project identifier + const keyMinWidth = (projectIdentifier.length + 5) * 7; + return (
{ }} >
-
-
+
+
{/* select checkbox */} {projectId && canEditIssueProperties && ( { )} {displayProperties && displayProperties?.key && ( -
+
{projectIdentifier}-{issue.sequence_id}
)} diff --git a/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx b/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx index 771871bda..1e5a2574e 100644 --- a/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx +++ b/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx @@ -108,7 +108,7 @@ export const SpreadsheetIssueRow = observer((props: Props) => { quickActions={quickActions} canEditProperties={canEditProperties} nestingLevel={nestingLevel + 1} - spacingLeft={spacingLeft + (displayProperties.key ? 12 : 28)} + spacingLeft={spacingLeft + 12} isEstimateEnabled={isEstimateEnabled} updateIssue={updateIssue} portalElement={portalElement} @@ -187,7 +187,7 @@ const IssueRowDetails = observer((props: IssueRowDetailsProps) => { const issueDetail = issue.getIssueById(issueId); - const marginLeft = `${spacingLeft}px`; + const subIssueIndentation = `${spacingLeft}px`; useOutsideClickDetector(menuActionRef, () => setIsMenuActive(false)); @@ -222,6 +222,9 @@ const IssueRowDetails = observer((props: IssueRowDetailsProps) => { const subIssuesCount = issueDetail?.sub_issues_count ?? 0; const isIssueSelected = selectionHelpers.getIsEntitySelected(issueDetail.id); + //TODO: add better logic. This is to have a min width for ID/Key based on the length of project identifier + const keyMinWidth = (getProjectIdentifierById(issueDetail.project_id)?.length + 5) * 7; + return ( <> { )} disabled={!!issueDetail?.tempId} > -
+
{/* select checkbox */} {projectId && !disableUserActions && ( { } disabled={issueDetail.project_id === projectId} > -
+
{
)} + + {/* sub issues indentation */} +
+ + +
+

+ {getProjectIdentifierById(issueDetail.project_id)}-{issueDetail.sequence_id} +

+
+
+ {/* sub-issues chevron */} -
+
{subIssuesCount > 0 && ( )}
- - -
-

- {getProjectIdentifierById(issueDetail.project_id)}-{issueDetail.sequence_id} -

-
-
-
+
{issueDetail.name} diff --git a/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx b/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx index 9de9a68e7..74f65db31 100644 --- a/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx +++ b/web/components/issues/issue-layouts/spreadsheet/spreadsheet-header.tsx @@ -48,7 +48,7 @@ export const SpreadsheetHeader = observer((props: Props) => { tabIndex={-1} > {canSelectIssues && ( -
+
{ />
)} -
Issues