Skip to content

Modify the issue association flow and Issue display #4349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 5, 2025
+28 −12
Merged

Modify the issue association flow and Issue display #4349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed713d2
Moves the issue card above the branch card
sergeibbb May 30, 2025
cb2f4f1
Modifies issue row when no issue is associated with the active branch
sergeibbb May 30, 2025
adf3476
Modifies the current issue card to be shorter than the other cards
sergeibbb May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions src/webviews/apps/plus/home/components/active-work.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,15 @@ export class GlActiveBranchCard extends GlBranchCardBase {
flex-direction: column;
gap: 0.8rem;
}

span.branch-item__missing {
color: var(--vscode-descriptionForeground);
font-style: italic;
}

gl-work-item {
--gl-card-vertical-padding: 0.4rem;
}
`,
];

Expand All @@ -243,9 +252,9 @@ export class GlActiveBranchCard extends GlBranchCardBase {

override render(): unknown {
return html`
${this.renderBranchIndicator()}${this.renderBranchItem(
${this.renderBranchIndicator()}${this.renderIssuesItem()}${this.renderBranchItem(
html`${this.renderBranchStateActions()}${this.renderBranchActions()}`,
)}${this.renderPrItem()}${this.renderIssuesItem()}
)}${this.renderPrItem()}
`;
}

Expand Down Expand Up @@ -518,16 +527,21 @@ export class GlActiveBranchCard extends GlBranchCardBase {
if (!issues.length) {
if (!this.expanded) return nothing;

return html`<gl-button
class="branch-item__missing"
appearance="secondary"
full
href=${this.createCommandLink<AssociateIssueWithBranchCommandArgs>('gitlens.associateIssueWithBranch', {
branch: this.branch.reference,
source: 'home',
})}
>Associate an Issue</gl-button
>`;
return html`<div class="branch-item__row" full>
<span class="branch-item__missing" full>Current work item</span>
<gl-tooltip hoist content="Associate an issue">
<a
href=${this.createCommandLink<AssociateIssueWithBranchCommandArgs>(
'gitlens.associateIssueWithBranch',
{
branch: this.branch.reference,
source: 'home',
},
)}
><span class="branch-item__icon"> <issue-icon></issue-icon> </span
></a>
</gl-tooltip>
</div>`;
}
return super.renderIssuesItem();
}
Expand Down
2 changes: 2 additions & 0 deletions src/webviews/apps/plus/home/components/branch-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,6 +1152,8 @@ export class GlWorkUnit extends LitElement {

gl-card::part(base) {
margin-block-end: 0;
padding-top: var(--gl-card-vertical-padding, 0.8rem);
padding-bottom: var(--gl-card-vertical-padding, 0.8rem);
}
`,
];
Expand Down