AXON-379: Atlassian Notifications - Bitbucket and Jira Comments

package.json

@@ -1298,6 +1298,7 @@
         "flatten-anything": "^4.0.2",
         "form-data": "^2.5.2",
         "git-url-parse": "^15.0.0",
+        "graphql-request": "^6",
         "jwt-decode": "^4.0.0",
         "keytar": "^7.9.0",
         "lodash": "^4.17.21",

scripts/globalstore.sh

@@ -6,7 +6,7 @@ case `uname -s` in
     *)          CODEPATH=~/.config/Code;;
 esac
 
-OLDSTATE=`sqlite3 ${CODEPATH}/User/globalStorage/state.vscdb 'select value from ItemTable where key = "atlassian.atlascode";'`
+OLDSTATE=`sqlite3 "${CODEPATH}/User/globalStorage/state.vscdb" 'select value from ItemTable where key = "atlassian.atlascode";'`
 
 if [ -z `command -v jq` ]
 then
@@ -54,9 +54,9 @@ then
 	echo "Previous contents of global store $OLDSTATE"
 
 	NEWSTATE=`echo $OLDSTATE | jq -c "del(.$2)"`
-	sqlite3 ${CODEPATH}/User/globalStorage/state.vscdb "UPDATE ItemTable SET value = '$NEWSTATE' WHERE key = \"atlassian.atlascode\";"
+	sqlite3 "${CODEPATH}/User/globalStorage/state.vscdb" "UPDATE ItemTable SET value = '$NEWSTATE' WHERE key = \"atlassian.atlascode\";"
 
-	ACTUALNEWSTATE=`sqlite3 ${CODEPATH}/User/globalStorage/state.vscdb 'select value from ItemTable where key = "atlassian.atlascode";' | jq '.'`
+	ACTUALNEWSTATE=`sqlite3 "${CODEPATH}/User/globalStorage/state.vscdb" 'select value from ItemTable where key = "atlassian.atlascode";' | jq '.'`
 
 	echo "New contents of global store $ACTUALNEWSTATE"
 fi

src/analytics.ts

@@ -5,7 +5,7 @@ import { CreatePrTerminalSelection, UIErrorInfo } from './analyticsTypes';
 import { DetailedSiteInfo, isEmptySiteInfo, Product, ProductJira, SiteInfo } from './atlclients/authInfo';
 import { BitbucketIssuesTreeViewId, PullRequestTreeViewId } from './constants';
 import { Container } from './container';
-import { NotificationSurface } from './views/notifications/notificationManager';
+import { NotificationSurface, NotificationType } from './views/notifications/notificationManager';
 
 // IMPORTANT
 // Make sure there is a corresponding event with the correct attributes in the Data Portal for any event created here.
@@ -724,6 +724,31 @@ export async function createPrTerminalLinkPanelButtonClickedEvent(
 
     return anyUserOrAnonymous<UIEvent>(e);
 }
+
+export async function notificationActionButtonClickedEvent(
+    uri: Uri,
+    notificationData: { surface: NotificationSurface; type: NotificationType },
+    action: string,
+): Promise<UIEvent> {
+    const e = {
+        tenantIdType: null,
+        uiEvent: {
+            origin: 'desktop',
+            platform: AnalyticsPlatform.for(process.platform),
+            action: 'clicked',
+            actionSubject: 'button',
+            actionSubjectId: 'notificationActionButton',
+            attributes: {
+                uri: uri.toString(),
+                action: action,
+                notificationSurface: notificationData.surface,
+                notificationType: notificationData.type,
+            },
+        },
+    };
+
+    return anyUserOrAnonymous<UIEvent>(e);
+}
 // Helper methods
 
 async function instanceTrackEvent(

src/atlclients/authInfo.ts

@@ -15,6 +15,7 @@ export interface RemoveAuthInfoEvent extends AuthInfoEvent {
     type: AuthChangeType.Remove;
     product: Product;
     credentialId: string;
+    userId: string;
 }
 
 export interface Product {

src/atlclients/authStore.test.ts

@@ -337,6 +337,7 @@ describe('CredentialManager', () => {
                 type: AuthChangeType.Remove,
                 product: mockJiraSite.product,
                 credentialId: mockJiraSite.credentialId,
+                userId: mockAuthInfo.user.id,
             });
 
             // Verify info message was shown

src/atlclients/authStore.ts

@@ -62,6 +62,18 @@ export class CredentialManager implements Disposable {
         return this.getAuthInfoForProductAndCredentialId(site, allowCache);
     }
 
+    public async getAllValidAuthInfo(product: Product): Promise<AuthInfo[]> {
+        // Get all unique sites by credentialId
+        const sites = Container.siteManager.getSitesAvailable(product);
+        const uniquelyCredentialedSites = Array.from(new Map(sites.map((site) => [site.credentialId, site])).values());
+
+        const authInfos = await Promise.all(uniquelyCredentialedSites.map((site) => this.getAuthInfo(site, true)));
+
+        return authInfos.filter(
+            (authInfo): authInfo is AuthInfo => !!authInfo && authInfo.state !== AuthInfoState.Invalid,
+        );
+    }
+
     /**
      * Saves the auth info to both the in-memory store and the secretstorage.
      */
@@ -348,7 +360,9 @@ export class CredentialManager implements Disposable {
         const productAuths = this._memStore.get(site.product.key);
         let wasKeyDeleted = false;
         let wasMemDeleted = false;
+        let userId = '';
         if (productAuths) {
+            userId = productAuths.get(site.credentialId)?.user.id || '';
             wasMemDeleted = productAuths.delete(site.credentialId);
             this._memStore.set(site.product.key, productAuths);
         }
@@ -366,6 +380,7 @@ export class CredentialManager implements Disposable {
                 type: AuthChangeType.Remove,
                 product: site.product,
                 credentialId: site.credentialId,
+                userId: userId,
             };
             this._onDidAuthChange.fire(removeEvent);
 

src/atlclients/graphql/graphqlClient.ts

@@ -0,0 +1,48 @@
+import { request } from 'graphql-request';
+
+import { Logger } from '../../logger';
+import { AuthInfo, isOAuthInfo } from '../authInfo';
+
+export async function graphqlRequest<T = any>(
+    document: string,
+    variables: Record<string, any>,
+    authInfo: AuthInfo,
+    endpoint: string = 'https://api.atlassian.com/graphql',
+): Promise<T> {
+    if (!document) {
+        throw new Error('GraphQL document is not set.');
+    }
+    if (!authInfo) {
+        throw new Error('Auth info is not set.');
+    }
+
+    Logger.debug('GraphQL request', {
+        endpoint,
+        document,
+        variables,
+    });
+
+    try {
+        const response = await request<T>(endpoint, document, variables, createHeaders(authInfo));
+        Logger.debug('GraphQL response', { response });
+        return response;
+    } catch (error) {
+        Logger.error(error, 'GraphQL request failed');
+        throw error;
+    }
+}
+
+function createHeaders(authInfo: AuthInfo) {
+    const headers: Record<string, string> = {};
+    headers['Content-Type'] = 'application/json';
+    setAuthorizationHeader(authInfo, headers);
+    return headers;
+}
+
+function setAuthorizationHeader(authInfo: AuthInfo, headers: Record<string, string>) {
+    if (isOAuthInfo(authInfo)) {
+        headers['Authorization'] = `Bearer ${authInfo.access}`;
+    } else {
+        throw new Error('Unsupported authentication type.');
+    }
+}

src/atlclients/graphql/graphqlDocuments.ts

@@ -0,0 +1,38 @@
+import { gql } from 'graphql-request';
+
+export const unseenNotificationCountVSCode = gql`
+    query unseenNotificationCountVSCode {
+        notifications {
+            unseenNotificationCount
+        }
+    }
+`;
+
+export const notificationFeedVSCode = gql`
+    query notificationFeedVSCode($first: Int) {
+        notifications {
+            notificationFeed(filter: { readStateFilter: unread, categoryFilter: direct }, flat: true, first: $first) {
+                nodes {
+                    headNotification {
+                        notificationId
+                        timestamp
+                        content {
+                            actor {
+                                displayName
+                            }
+                            bodyItems {
+                                document {
+                                    format
+                                    data
+                                }
+                            }
+                            url
+                            type
+                            message
+                        }
+                    }
+                }
+            }
+        }
+    }
+`;

src/bitbucket/checkoutHelper.ts

@@ -135,10 +135,12 @@ export class BitbucketCheckoutHelper implements CheckoutHelper {
                 ...pr,
                 workspaceRepo: wsRepo,
             });
-        } catch {
+        } catch (e) {
+            Logger.error(e, 'Error opening pull request');
             this.showLoginMessage(
                 'Cannot open pull request. Authenticate with Bitbucket in the extension settings and try again.',
             );
+            commands.executeCommand(Commands.ShowBitbucketAuth);
         }
     }
 

src/commands.ts

@@ -14,7 +14,7 @@ import { rerunPipeline } from './commands/bitbucket/rerunPipeline';
 import { runPipeline } from './commands/bitbucket/runPipeline';
 import { assignIssue } from './commands/jira/assignIssue';
 import { createIssue } from './commands/jira/createIssue';
-import { showIssue, showIssueForKey, showIssueForSiteIdAndKey } from './commands/jira/showIssue';
+import { showIssue, showIssueForKey, showIssueForSiteIdAndKey, showIssueForURL } from './commands/jira/showIssue';
 import { startWorkOnIssue } from './commands/jira/startWorkOnIssue';
 import { configuration } from './config/configuration';
 import { Commands, HelpTreeViewId } from './constants';
@@ -117,6 +117,7 @@ export function registerCommands(vscodeContext: ExtensionContext) {
             Commands.ShowIssueForSiteIdAndKey,
             async (siteId: string, issueKey: string) => await showIssueForSiteIdAndKey(siteId, issueKey),
         ),
+        commands.registerCommand(Commands.ShowIssueForURL, async (issueURL: string) => await showIssueForURL(issueURL)),
         commands.registerCommand(Commands.ToDoIssue, (issueNode) =>
             commands.executeCommand(Commands.ShowIssue, issueNode.issue),
         ),

src/commands/bitbucket/pullRequest.ts

@@ -1,10 +1,10 @@
 import { CheckoutHelper } from 'src/bitbucket/interfaces';
 import { Uri } from 'vscode';
 
-const extractPullRequestComponents = (url: string): { repoUrl: string; prId: number } => {
+export const extractPullRequestComponents = (url: string): { repoUrl: string; prId: number } => {
     const repoUrl = url.slice(0, url.indexOf('/pull-requests'));
     const prUrlPath = Uri.parse(url).path;
-    const prId = prUrlPath.slice(prUrlPath.lastIndexOf('/') + 1);
+    const prId = prUrlPath.split('/pull-requests/')[1]?.split('/')[0];
     return { repoUrl, prId: parseInt(prId) };
 };
 

src/commands/jira/showIssue.ts

@@ -12,6 +12,7 @@ import { DetailedSiteInfo, emptySiteInfo, ProductJira } from '../../atlclients/a
 import { Container } from '../../container';
 import { getCachedOrFetchMinimalIssue } from '../../jira/fetchIssue';
 import { issueForKey } from '../../jira/issueForKey';
+import { Logger } from '../../logger';
 
 export async function showIssue(issueOrKeyAndSite: MinimalIssueOrKeyAndSite<DetailedSiteInfo>) {
     let issue: MinimalIssue<DetailedSiteInfo>;
@@ -41,6 +42,31 @@ export async function showIssue(issueOrKeyAndSite: MinimalIssueOrKeyAndSite<Deta
     Container.jiraIssueViewManager.createOrShow(issue);
 }
 
+export async function showIssueForURL(issueURL: string) {
+    try {
+        const url = new URL(issueURL);
+        const hostname = url.hostname;
+        // Match something like /AXON-123 in the path
+        const match = url.pathname.match(/\/([A-Z][A-Z0-9]+-\d+)/i);
+        const issueKey = match ? match[1] : undefined;
+
+        if (!issueKey) {
+            throw new Error('Issue key not found in URL');
+        }
+
+        // Try to find the site by hostname
+        const site = Container.siteManager.getSiteForHostname(ProductJira, hostname);
+
+        if (!site) {
+            throw new Error(`No site found for hostname: ${hostname}`);
+        }
+
+        await showIssueForSiteIdAndKey(site.id, issueKey);
+    } catch (e) {
+        vscode.window.showErrorMessage('Invalid URL.');
+        Logger.error(e, 'Could not show issue for URL');
+    }
+}
 export async function showIssueForSiteIdAndKey(siteId: string, issueKey: string) {
     const site: DetailedSiteInfo | undefined = Container.siteManager.getSiteForId(ProductJira, siteId);
 

src/constants.ts

@@ -55,6 +55,7 @@ export const enum Commands {
     ShowIssue = 'atlascode.jira.showIssue',
     ShowIssueForKey = 'atlascode.jira.showIssueForKey',
     ShowIssueForSiteIdAndKey = 'atlascode.jira.showIssueForSiteIdAndKey',
+    ShowIssueForURL = 'atlascode.jira.showIssueForURL',
     ShowConfigPage = 'atlascode.showConfigPage',
     ShowConfigPageFromExtensionContext = 'atlascode.extensionContext.showConfigPage',
     ShowJiraAuth = 'atlascode.showJiraAuth',

src/lib/webview/controller/pullrequest/pullRequestDetailsWebviewController.ts

@@ -1,6 +1,7 @@
 import { defaultActionGuard } from '@atlassianlabs/guipi-core-controller';
 import { MinimalIssue } from '@atlassianlabs/jira-pi-common-models';
 import Axios from 'axios';
+import { Uri } from 'vscode';
 
 import { DetailedSiteInfo } from '../../../../atlclients/authInfo';
 import {
@@ -14,6 +15,7 @@ import {
     Task,
     User,
 } from '../../../../bitbucket/model';
+import { NotificationManagerImpl } from '../../../../views/notifications/notificationManager';
 import { AnalyticsApi } from '../../../analyticsApi';
 import { CommonAction, CommonActionType } from '../../../ipc/fromUI/common';
 import { PullRequestDetailsAction, PullRequestDetailsActionType } from '../../../ipc/fromUI/pullRequestDetails';
@@ -63,7 +65,9 @@ export class PullRequestDetailsWebviewController implements WebviewController<Pu
         this.commonHandler = commonHandler;
     }
 
-    public onShown(): void {}
+    public onShown(): void {
+        NotificationManagerImpl.getInstance().clearNotificationsByUri(Uri.parse(this.pr.data.url));
+    }
 
     private postMessage(message: PullRequestDetailsMessage | PullRequestDetailsResponse | CommonMessage) {
         this.messagePoster(message);