Skip to content

Commit

Permalink
Adds state context to Jira button
Browse files Browse the repository at this point in the history
Switches order of icons
  • Loading branch information
eamodio committed May 11, 2024
1 parent 22fe69d commit 9c2cddc
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/webviews/apps/commitDetails/components/gl-commit-details.ts
Expand Up @@ -177,14 +177,14 @@ export class GlCommitDetails extends GlDetailsBase {
)}"
>Connect to Jira Cloud</a
>
&mdash; ${hasAccount ? '' : 'sign up and '}get access to automatic rich Jira autolinks.`;
&mdash; ${hasAccount ? '' : 'sign up and '}get access to automatic rich Jira autolinks`;

if (hasAccount && hasConnectedJira) {
message = html`<i class="codicon codicon-check" style="vertical-align: text-bottom"></i> Jira connected
&mdash; automatic rich Jira autolinks are enabled.`;
&mdash; automatic rich Jira autolinks are enabled`;
}

return html`<gl-popover class="inline-popover" placement="bottom">
return html`<gl-popover hoist class="inline-popover">
<span class="tooltip-hint" slot="anchor"
>Jira issues <code-icon icon="${hasConnectedJira ? 'check' : 'gl-unplug'}"></code-icon
></span>
Expand Down Expand Up @@ -236,6 +236,7 @@ export class GlCommitDetails extends GlDetailsBase {
}
}

const { hasAccount, hasConnectedJira } = this.state ?? {};
const jiraIntegrationLink = `command:gitlens.plus.cloudIntegrations.manage?${encodeURIComponent(
JSON.stringify({
source: 'commitDetails',
Expand All @@ -258,17 +259,17 @@ export class GlCommitDetails extends GlDetailsBase {
: '…'}</span
>
<action-nav slot="actions">
<action-item
label="${hasAccount && hasConnectedJira ? 'Manage Jira' : 'Connect to Jira Cloud'}"
icon="gl-provider-jira"
href="${jiraIntegrationLink}"
></action-item>
<action-item
data-action="autolinks-settings"
label="Autolinks Settings"
icon="info"
icon="gear"
href="command:gitlens.showSettingsPage!autolinks"
></action-item>
<action-item
label="Manage Jira"
icon="gl-provider-jira"
href="${jiraIntegrationLink}"
></action-item>
</action-nav>
${when(
this.state == null,
Expand Down

0 comments on commit 9c2cddc

Please sign in to comment.