diff --git a/resources/icons/dark/output.svg b/resources/icons/dark/output.svg index 27df074e93..7724b0e90f 100644 --- a/resources/icons/dark/output.svg +++ b/resources/icons/dark/output.svg @@ -1,13 +1,13 @@ - - - - - + + + + + \ No newline at end of file diff --git a/src/commands.ts b/src/commands.ts index 25e13cbe9a..081b0f8ff7 100644 --- a/src/commands.ts +++ b/src/commands.ts @@ -1331,12 +1331,20 @@ ${contents} }), ); - context.subscriptions.push(vscode.commands.registerCommand('review.createSuggestionsFromChanges', async (value: ({ resourceStates: { resourceUri }[] }) | ({ resourceUri: vscode.Uri }), ...additionalSelected: ({ resourceUri: vscode.Uri })[]) => { + interface SCMResourceStates { + resourceStates: { resourceUri: vscode.Uri }[]; + } + interface SCMResourceUri { + resourceUri: vscode.Uri; + } + context.subscriptions.push(vscode.commands.registerCommand('review.createSuggestionsFromChanges', async (value: SCMResourceStates | SCMResourceUri, ...additionalSelected: SCMResourceUri[]) => { let resources: vscode.Uri[]; - if ('resourceStates' in value) { - resources = value.resourceStates.map(resource => resource.resourceUri); + const asResourceStates = value as Partial; + if (asResourceStates.resourceStates) { + resources = asResourceStates.resourceStates.map(resource => resource.resourceUri); } else { - resources = [value.resourceUri]; + const asResourceUri = value as SCMResourceUri; + resources = [asResourceUri.resourceUri]; if (additionalSelected) { resources.push(...additionalSelected.map(resource => resource.resourceUri)); } diff --git a/src/common/logger.ts b/src/common/logger.ts index 5fc3fca312..024cd584d2 100644 --- a/src/common/logger.ts +++ b/src/common/logger.ts @@ -7,6 +7,10 @@ import { Disposable } from './lifecycle'; export const PR_TREE = 'PullRequestTree'; +interface Stringish { + toString: () => string; +} + class Log extends Disposable { private readonly _outputChannel: vscode.LogOutputChannel; private readonly _activePerfMarkers: Map = new Map(); @@ -28,36 +32,40 @@ class Log extends Disposable { this._activePerfMarkers.delete(marker); } - private logString(message: any, component?: string): string { + private logString(message: string | Error | Stringish | Object, component?: string): string { + let logMessage: string; if (typeof message !== 'string') { + const asString = message as Partial; if (message instanceof Error) { - message = message.message; - } else if ('toString' in message) { - message = message.toString(); + logMessage = message.message; + } else if (asString.toString) { + logMessage = asString.toString(); } else { - message = JSON.stringify(message); + logMessage = JSON.stringify(message); } + } else { + logMessage = message; } - return component ? `[${component}] ${message}` : message; + return component ? `[${component}] ${logMessage}` : logMessage; } - public trace(message: any, component: string) { + public trace(message: string | Error | Stringish | Object, component: string) { this._outputChannel.trace(this.logString(message, component)); } - public debug(message: any, component: string) { + public debug(message: string | Error | Stringish | Object, component: string) { this._outputChannel.debug(this.logString(message, component)); } - public appendLine(message: any, component: string) { + public appendLine(message: string | Error | Stringish | Object, component: string) { this._outputChannel.info(this.logString(message, component)); } - public warn(message: any, component?: string) { + public warn(message: string | Error | Stringish | Object, component?: string) { this._outputChannel.warn(this.logString(message, component)); } - public error(message: any, component: string) { + public error(message: string | Error | Stringish | Object, component: string) { this._outputChannel.error(this.logString(message, component)); } } diff --git a/src/common/uri.ts b/src/common/uri.ts index 9d8a3efcd3..c12e2f9ec0 100644 --- a/src/common/uri.ts +++ b/src/common/uri.ts @@ -11,7 +11,7 @@ import fetch from 'cross-fetch'; import * as vscode from 'vscode'; import { Repository } from '../api/api'; import { EXTENSION_ID } from '../constants'; -import { IAccount, isTeam, ITeam, reviewerId } from '../github/interface'; +import { IAccount, isITeam, ITeam, reviewerId } from '../github/interface'; import { PullRequestModel } from '../github/pullRequestModel'; import { GitChangeType } from './file'; import Logger from './logger'; @@ -322,7 +322,7 @@ export namespace DataUri { await doFetch(); } catch (retryError) { // Log the error and return a generic user icon instead of crashing - const userIdentifier = isTeam(user) ? `${user.org}/${user.slug}` : user.login || 'unknown'; + const userIdentifier = isITeam(user) ? `${user.org}/${user.slug}` : user.login || 'unknown'; Logger.error(`Failed to fetch avatar after retry for user ${userIdentifier}: ${retryError}`, 'avatarCirclesAsImageDataUris'); return genericUserIconAsImageDataURI(width, height); } diff --git a/src/github/activityBarViewProvider.ts b/src/github/activityBarViewProvider.ts index a872435024..88c98f34f2 100644 --- a/src/github/activityBarViewProvider.ts +++ b/src/github/activityBarViewProvider.ts @@ -13,7 +13,7 @@ import { formatError } from '../common/utils'; import { getNonce, IRequestMessage, WebviewViewBase } from '../common/webview'; import { ReviewManager } from '../view/reviewManager'; import { FolderRepositoryManager } from './folderRepositoryManager'; -import { GithubItemStateEnum, IAccount, isTeam, ITeam, PullRequestMergeability, reviewerId, ReviewEventEnum, ReviewState } from './interface'; +import { GithubItemStateEnum, IAccount, isITeam, ITeam, PullRequestMergeability, reviewerId, ReviewEventEnum, ReviewState } from './interface'; import { PullRequestModel } from './pullRequestModel'; import { getDefaultMergeMethod } from './pullRequestOverview'; import { PullRequestView } from './pullRequestOverviewCommon'; @@ -154,9 +154,9 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W } } - if (targetReviewer && isTeam(targetReviewer.reviewer)) { + if (targetReviewer && isITeam(targetReviewer.reviewer)) { teamReviewers.push(targetReviewer.reviewer); - } else if (targetReviewer && !isTeam(targetReviewer.reviewer)) { + } else if (targetReviewer && !isITeam(targetReviewer.reviewer)) { userReviewers.push(targetReviewer.reviewer); } diff --git a/src/github/createPRViewProvider.ts b/src/github/createPRViewProvider.ts index 7b102b8edf..de69326582 100644 --- a/src/github/createPRViewProvider.ts +++ b/src/github/createPRViewProvider.ts @@ -33,7 +33,7 @@ import { titleAndBodyFrom, } from './folderRepositoryManager'; import { GitHubRepository } from './githubRepository'; -import { IAccount, ILabel, IMilestone, IProject, isTeam, ITeam, MergeMethod, RepoAccessAndMergeMethods } from './interface'; +import { IAccount, ILabel, IMilestone, IProject, isITeam, ITeam, MergeMethod, RepoAccessAndMergeMethods } from './interface'; import { BaseBranchMetadata, PullRequestGitHelper } from './pullRequestGitHelper'; import { PullRequestModel } from './pullRequestModel'; import { getDefaultMergeMethod } from './pullRequestOverview'; @@ -315,7 +315,7 @@ export abstract class BaseCreatePullRequestViewProvider; + return !!asAccount && !!asAccount?.name && !!asAccount?.email; } export function isTeam(x: Actor | Team | Node | undefined | null): x is Team { - return !!x && 'slug' in x; + const asTeam = x as Partial; + return !!asTeam && !!asTeam?.slug; } export interface Team { diff --git a/src/github/interface.ts b/src/github/interface.ts index 354f43562f..e2d39f831c 100644 --- a/src/github/interface.ts +++ b/src/github/interface.ts @@ -104,15 +104,16 @@ export interface MergeQueueEntry { export function reviewerId(reviewer: ITeam | IAccount): string { // We can literally get different login values for copilot depending on where it's coming from (already assignee vs suggested assingee) - return isTeam(reviewer) ? reviewer.id : (reviewer.specialDisplayName ?? reviewer.login); + return isITeam(reviewer) ? reviewer.id : (reviewer.specialDisplayName ?? reviewer.login); } export function reviewerLabel(reviewer: ITeam | IAccount | IActor | any): string { - return isTeam(reviewer) ? (reviewer.name ?? reviewer.slug ?? reviewer.id) : (reviewer.specialDisplayName ?? reviewer.login); + return isITeam(reviewer) ? (reviewer.name ?? reviewer.slug ?? reviewer.id) : (reviewer.specialDisplayName ?? reviewer.login); } -export function isTeam(reviewer: ITeam | IAccount | IActor | any): reviewer is ITeam { - return 'org' in reviewer; +export function isITeam(reviewer: ITeam | IAccount | IActor | any): reviewer is ITeam { + const asITeam = reviewer as Partial; + return !!asITeam.org; } export interface ISuggestedReviewer extends IAccount { @@ -120,10 +121,11 @@ export interface ISuggestedReviewer extends IAccount { isCommenter: boolean; } -export function isSuggestedReviewer( +export function isISuggestedReviewer( reviewer: IAccount | ISuggestedReviewer | ITeam ): reviewer is ISuggestedReviewer { - return 'isAuthor' in reviewer && 'isCommenter' in reviewer; + const asISuggestedReviewer = reviewer as Partial; + return !!asISuggestedReviewer.isAuthor && !!asISuggestedReviewer.isCommenter; } export interface IProject { diff --git a/src/github/pullRequestGitHelper.ts b/src/github/pullRequestGitHelper.ts index 0c6ccd595a..ea9f6250f2 100644 --- a/src/github/pullRequestGitHelper.ts +++ b/src/github/pullRequestGitHelper.ts @@ -340,10 +340,7 @@ export class PullRequestGitHelper { static async isRemoteCreatedForPullRequest(repository: Repository, remoteName: string) { try { - Logger.debug( - `Check if remote '${remoteName}' is created for pull request - start`, - PullRequestGitHelper.ID, - ); + Logger.debug(`Check if remote '${remoteName}' is created for pull request - start`, PullRequestGitHelper.ID); const isForPR = await repository.getConfig(`remote.${remoteName}.${PullRequestRemoteMetadataKey}`); Logger.debug(`Check if remote '${remoteName}' is created for pull request - end`, PullRequestGitHelper.ID); return isForPR === 'true'; diff --git a/src/github/pullRequestModel.ts b/src/github/pullRequestModel.ts index dcafb0f1fb..f2858e046b 100644 --- a/src/github/pullRequestModel.ts +++ b/src/github/pullRequestModel.ts @@ -1256,20 +1256,14 @@ export class PullRequestModel extends IssueModel implements IPullRe commit: OctokitCommon.PullsListCommitsResponseData[0], ): Promise { try { - Logger.debug( - `Fetch file changes of commit ${commit.sha} in PR #${this.number} - enter`, - PullRequestModel.ID, - ); + Logger.debug(`Fetch file changes of commit ${commit.sha} in PR #${this.number} - enter`, PullRequestModel.ID,); const { octokit, remote } = await this.githubRepository.ensure(); const fullCommit = await octokit.call(octokit.api.repos.getCommit, { owner: remote.owner, repo: remote.repositoryName, ref: commit.sha, }); - Logger.debug( - `Fetch file changes of commit ${commit.sha} in PR #${this.number} - done`, - PullRequestModel.ID, - ); + Logger.debug(`Fetch file changes of commit ${commit.sha} in PR #${this.number} - done`, PullRequestModel.ID,); return fullCommit.data.files ?? []; } catch (e) { @@ -1552,10 +1546,7 @@ export class PullRequestModel extends IssueModel implements IPullRe this._onDidChangeChangesSinceReview.fire(); } - Logger.debug( - `Fetch file changes and merge base of PR #${this.number} - done, total files ${files.length} `, - PullRequestModel.ID, - ); + Logger.debug(`Fetch file changes and merge base of PR #${this.number} - done, total files ${files.length} `, PullRequestModel.ID,); return files; } diff --git a/src/github/pullRequestOverview.ts b/src/github/pullRequestOverview.ts index b111d7c33e..1845eb2279 100644 --- a/src/github/pullRequestOverview.ts +++ b/src/github/pullRequestOverview.ts @@ -23,7 +23,7 @@ import { FolderRepositoryManager } from './folderRepositoryManager'; import { GithubItemStateEnum, IAccount, - isTeam, + isITeam, ITeam, MergeMethod, MergeMethodsAvailability, @@ -420,7 +420,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel = asPromise(quickPick.onDidAccept).then(() => { const pickedReviewers: (IAccount | ITeam)[] | undefined = quickPick?.selectedItems.filter(item => item.user).map(item => item.user) as (IAccount | ITeam)[]; - const botReviewers = this._existingReviewers.filter(reviewer => !isTeam(reviewer.reviewer) && reviewer.reviewer.accountType === 'Bot').map(reviewer => reviewer.reviewer); + const botReviewers = this._existingReviewers.filter(reviewer => !isITeam(reviewer.reviewer) && reviewer.reviewer.accountType === 'Bot').map(reviewer => reviewer.reviewer); return pickedReviewers.concat(botReviewers); }); const hidePromise = asPromise(quickPick.onDidHide); @@ -432,15 +432,15 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel { - const newReviewers: (IAccount | ITeam)[] = isTeam(reviewer) ? newTeamReviewers : newUserReviewers; + const newReviewers: (IAccount | ITeam)[] = isITeam(reviewer) ? newTeamReviewers : newUserReviewers; newReviewers.push(reviewer); }); const removedUserReviewers: IAccount[] = []; const removedTeamReviewers: ITeam[] = []; this._existingReviewers.forEach(existing => { - let newReviewers: (IAccount | ITeam)[] = isTeam(existing.reviewer) ? newTeamReviewers : newUserReviewers; - let removedReviewers: (IAccount | ITeam)[] = isTeam(existing.reviewer) ? removedTeamReviewers : removedUserReviewers; + let newReviewers: (IAccount | ITeam)[] = isITeam(existing.reviewer) ? newTeamReviewers : newUserReviewers; + let removedReviewers: (IAccount | ITeam)[] = isITeam(existing.reviewer) ? removedTeamReviewers : removedUserReviewers; if (!newReviewers.find(newTeamReviewer => newTeamReviewer.id === existing.reviewer.id)) { removedReviewers.push(existing.reviewer); } @@ -769,9 +769,9 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel(context const user = filteredUsers[i]; let detail: string | undefined; - if (isSuggestedReviewer(user)) { + if (isISuggestedReviewer(user)) { detail = user.isAuthor && user.isCommenter ? vscode.l10n.t('Recently edited and reviewed changes to these files') : user.isAuthor @@ -46,7 +46,7 @@ async function getItems(context } alreadyAssignedItems.push({ - label: isTeam(user) ? `${user.org}/${user.slug}` : COPILOT_ACCOUNTS[user.login] ? COPILOT_ACCOUNTS[user.login].name : user.login, + label: isITeam(user) ? `${user.org}/${user.slug}` : COPILOT_ACCOUNTS[user.login] ? COPILOT_ACCOUNTS[user.login].name : user.login, description: user.name, user, picked, @@ -123,13 +123,13 @@ export async function getAssigneesQuickPickItems(folderRepositoryManager: Folder } function userThemeIcon(user: IAccount | ITeam) { - return (isTeam(user) ? new vscode.ThemeIcon('organization') : new vscode.ThemeIcon('account')); + return (isITeam(user) ? new vscode.ThemeIcon('organization') : new vscode.ThemeIcon('account')); } async function getReviewersQuickPickItems(folderRepositoryManager: FolderRepositoryManager, remoteName: string, isInOrganization: boolean, author: IAccount, existingReviewers: ReviewState[], suggestedReviewers: ISuggestedReviewer[] | undefined, refreshKind: TeamReviewerRefreshKind, ): Promise<(vscode.QuickPickItem & { user?: IAccount | ITeam })[]> { - existingReviewers = existingReviewers.filter(reviewer => isTeam(reviewer.reviewer) || (reviewer.reviewer.accountType !== AccountType.Bot)); + existingReviewers = existingReviewers.filter(reviewer => isITeam(reviewer.reviewer) || (reviewer.reviewer.accountType !== AccountType.Bot)); if (!suggestedReviewers) { return []; } diff --git a/src/github/utils.ts b/src/github/utils.ts index 39a81b43a5..973ba34d7a 100644 --- a/src/github/utils.ts +++ b/src/github/utils.ts @@ -375,8 +375,8 @@ export function convertRESTPullRequestToRawPullRequest( }; // mergeable is not included in the list response, will need to fetch later - if ('mergeable' in pullRequest) { - item.mergeable = pullRequest.mergeable + if ((pullRequest as OctokitCommon.PullsGetResponseData).mergeable !== undefined) { + item.mergeable = (pullRequest as OctokitCommon.PullsGetResponseData).mergeable ? PullRequestMergeability.Mergeable : PullRequestMergeability.NotMergeable; } @@ -618,14 +618,39 @@ export interface RestAccount { type: string; } +export interface GraphQLAccount { + login: string; + url: string; + avatarUrl: string; + email?: string; + id: string; + name?: string; + __typename: string; +} + export function parseAccount( - author: { login: string; url: string; avatarUrl: string; email?: string, id: string, name?: string, __typename: string } | RestAccount | null, + author: GraphQLAccount | RestAccount | null, githubRepository?: GitHubRepository, ): IAccount { if (author) { - const avatarUrl = 'avatarUrl' in author ? author.avatarUrl : author.avatar_url; - const id = 'node_id' in author ? author.node_id : author.id; - const url = 'html_url' in author ? author.html_url : author.url; + let avatarUrl: string; + let id: string; + let url: string; + let accountType: string; + if ((author as RestAccount).html_url) { + const asRestAccount = author as RestAccount; + avatarUrl = asRestAccount.avatar_url; + id = asRestAccount.node_id; + url = asRestAccount.html_url; + accountType = asRestAccount.type; + } else { + const asGraphQLAccount = author as GraphQLAccount; + avatarUrl = asGraphQLAccount.avatarUrl; + id = asGraphQLAccount.id; + url = asGraphQLAccount.url; + accountType = asGraphQLAccount.__typename; + } + // In some places, Copilot comes in as a user, and in others as a bot return { login: author.login, @@ -635,7 +660,7 @@ export function parseAccount( id, name: author.name ?? COPILOT_ACCOUNTS[author.login]?.name ?? undefined, specialDisplayName: COPILOT_ACCOUNTS[author.login] ? (author.name ?? COPILOT_ACCOUNTS[author.login].name) : undefined, - accountType: toAccountType('__typename' in author ? author.__typename : author.type), + accountType: toAccountType(accountType), }; } else { return { diff --git a/src/issues/issueCompletionProvider.ts b/src/issues/issueCompletionProvider.ts index cc0f4fc669..5dfe5c7b01 100644 --- a/src/issues/issueCompletionProvider.ts +++ b/src/issues/issueCompletionProvider.ts @@ -181,12 +181,12 @@ export class IssueCompletionProvider implements vscode.CompletionItemProvider { } } } - + // If no issues were found, show a configuration prompt if (completionItems.length === 0) { return [new ConfigureIssueQueriesCompletionItem()]; } - + return completionItems; } diff --git a/src/issues/util.ts b/src/issues/util.ts index deaca741b7..c0a2400a72 100644 --- a/src/issues/util.ts +++ b/src/issues/util.ts @@ -182,11 +182,9 @@ async function getUpstream(repositoriesManager: RepositoriesManager, repository: function extractContext(context: LinkContext): { fileUri: vscode.Uri | undefined, lineNumber: number | undefined } { if (context instanceof vscode.Uri) { return { fileUri: context, lineNumber: undefined }; - } else if (context !== undefined && 'lineNumber' in context && 'uri' in context) { - return { fileUri: context.uri, lineNumber: context.lineNumber }; - } else { - return { fileUri: undefined, lineNumber: undefined }; } + const asEditorLineNumberContext = context as Partial | undefined; + return { fileUri: asEditorLineNumberContext?.uri, lineNumber: asEditorLineNumberContext?.lineNumber }; } function getFileAndPosition(context: LinkContext, positionInfo?: NewIssue): { uri: vscode.Uri | undefined, range: vscode.Range | vscode.NotebookRange | undefined } { diff --git a/src/lm/tools/fetchIssueTool.ts b/src/lm/tools/fetchIssueTool.ts index 035c37d0e9..631e26ae7e 100644 --- a/src/lm/tools/fetchIssueTool.ts +++ b/src/lm/tools/fetchIssueTool.ts @@ -6,7 +6,7 @@ import * as vscode from 'vscode'; import { InMemFileChange } from '../../common/file'; -import { isTeam } from '../../github/interface'; +import { isITeam } from '../../github/interface'; import { PullRequestModel } from '../../github/pullRequestModel'; import { RepoToolBase } from './toolsUtils'; @@ -59,7 +59,7 @@ export class FetchIssueTool extends RepoToolBase { comments: issueOrPullRequest.item.comments?.map(c => ({ body: c.body, author: c.author.login })) ?? [], author: issueOrPullRequest.author?.login, assignees: issueOrPullRequest.assignees?.map(a => a.login), - reviewers: issueOrPullRequest instanceof PullRequestModel ? issueOrPullRequest.reviewers?.map(r => isTeam(r) ? r.name : r.login).filter((login): login is string => !!login) : undefined + reviewers: issueOrPullRequest instanceof PullRequestModel ? issueOrPullRequest.reviewers?.map(r => isITeam(r) ? r.name : r.login).filter((login): login is string => !!login) : undefined }; if (issueOrPullRequest instanceof PullRequestModel && issueOrPullRequest.isResolved()) { const fileChanges = await issueOrPullRequest.getFileChangesInfo(); diff --git a/src/notifications/notificationItem.ts b/src/notifications/notificationItem.ts index 2e1e37ac6f..7f312c118a 100644 --- a/src/notifications/notificationItem.ts +++ b/src/notifications/notificationItem.ts @@ -22,4 +22,9 @@ export interface NotificationTreeItem { export function isNotificationTreeItem(item: unknown): item is NotificationTreeItem { return !!item && (item as Partial).kind === 'notification'; -} \ No newline at end of file +} + +export interface NotificationID { + threadId: string; + notificationKey: string; +} diff --git a/src/notifications/notificationsFeatureRegistar.ts b/src/notifications/notificationsFeatureRegistar.ts index 3f59919404..6bc547889b 100644 --- a/src/notifications/notificationsFeatureRegistar.ts +++ b/src/notifications/notificationsFeatureRegistar.ts @@ -12,7 +12,7 @@ import { CredentialStore } from '../github/credentials'; import { RepositoriesManager } from '../github/repositoriesManager'; import { chatCommand } from '../lm/utils'; import { NotificationsDecorationProvider } from './notificationDecorationProvider'; -import { isNotificationTreeItem, NotificationTreeDataItem } from './notificationItem'; +import { isNotificationTreeItem, NotificationID, NotificationTreeDataItem } from './notificationItem'; import { NotificationsManager, NotificationsSortMethod } from './notificationsManager'; import { NotificationsProvider } from './notificationsProvider'; @@ -104,7 +104,7 @@ export class NotificationsFeatureRegister extends Disposable { }) ); this._register( - vscode.commands.registerCommand('notification.markAsRead', (options: any) => { + vscode.commands.registerCommand('notification.markAsRead', (options: NotificationTreeDataItem) => { const { threadId, notificationKey } = this._extractMarkAsCommandOptions(options); /* __GDPR__ "notification.markAsRead" : {} @@ -114,7 +114,7 @@ export class NotificationsFeatureRegister extends Disposable { }) ); this._register( - vscode.commands.registerCommand('notification.markAsDone', (options: any) => { + vscode.commands.registerCommand('notification.markAsDone', (options: NotificationTreeDataItem) => { const { threadId, notificationKey } = this._extractMarkAsCommandOptions(options); /* __GDPR__ "notification.markAsDone" : {} @@ -162,15 +162,16 @@ export class NotificationsFeatureRegister extends Disposable { })); } - private _extractMarkAsCommandOptions(options: any): { threadId: string, notificationKey: string } { + private _extractMarkAsCommandOptions(options: NotificationTreeDataItem | NotificationID | unknown): { threadId: string, notificationKey: string } { let threadId: string; let notificationKey: string; + const asID = options as Partial; if (isNotificationTreeItem(options)) { threadId = options.notification.id; notificationKey = options.notification.key; - } else if ('threadId' in options && 'notificationKey' in options && typeof options.threadId === 'number' && typeof options.notificationKey === 'string') { - threadId = options.threadId; - notificationKey = options.notificationKey; + } else if (asID.threadId !== undefined && asID.notificationKey !== undefined) { + threadId = asID.threadId; + notificationKey = asID.notificationKey; } else { throw new Error(`Invalid arguments for command notification.markAsRead : ${JSON.stringify(options)}`); } diff --git a/src/test/issues/issuesUtils.test.ts b/src/test/issues/issuesUtils.test.ts index eb6c816cb0..6b48644d14 100644 --- a/src/test/issues/issuesUtils.test.ts +++ b/src/test/issues/issuesUtils.test.ts @@ -48,7 +48,7 @@ describe('Issues utilities', function () { const notIssue = '#a4'; const notIssueParsed = parseIssueExpressionOutput(notIssue.match(ISSUE_OR_URL_EXPRESSION)); assert.strictEqual(notIssueParsed, undefined); - + // Test PR URL parsing const prUrl = 'https://github.com/microsoft/vscode/pull/123'; const prUrlParsed = parseIssueExpressionOutput(prUrl.match(ISSUE_OR_URL_EXPRESSION)); @@ -56,7 +56,7 @@ describe('Issues utilities', function () { assert.strictEqual(prUrlParsed?.commentNumber, undefined); assert.strictEqual(prUrlParsed?.name, 'vscode'); assert.strictEqual(prUrlParsed?.owner, 'microsoft'); - + // Test HTTP PR URL (without S) const prUrlHttp = 'http://github.com/owner/repo/pull/456'; const prUrlHttpParsed = parseIssueExpressionOutput(prUrlHttp.match(ISSUE_OR_URL_EXPRESSION)); diff --git a/webviews/components/comment.tsx b/webviews/components/comment.tsx index 57dad13457..6cb648f94c 100644 --- a/webviews/components/comment.tsx +++ b/webviews/components/comment.tsx @@ -36,9 +36,10 @@ const association = ({ authorAssociation }: ReviewEvent, format = (assoc: string export function CommentView(commentProps: Props) { const { isPRDescription, children, comment, headerInEditMode } = commentProps; const { bodyHTML, body } = comment; - const id = ('id' in comment) ? comment.id : -1; - const canEdit = ('canEdit' in comment) ? comment.canEdit : false; - const canDelete = ('canDelete' in comment) ? comment.canDelete : false; + + const id = (comment as Partial).id ?? -1; + const canEdit: boolean = !!(comment as Partial).canEdit; + const canDelete: boolean = !!(comment as Partial).canDelete; const pullRequestReviewId = (comment as IComment).pullRequestReviewId; const [bodyMd, setBodyMd] = useStateProp(body); @@ -151,10 +152,11 @@ const DESCRIPTORS = { const reviewDescriptor = (state: string) => DESCRIPTORS[state] || 'reviewed'; function CommentBox({ for: comment, onFocus, onMouseEnter, onMouseLeave, children }: CommentBoxProps) { - const htmlUrl = ('htmlUrl' in comment) ? comment.htmlUrl : (comment as PullRequest).url; + const asNotPullRequest = comment as Partial; + const htmlUrl = asNotPullRequest.htmlUrl ?? (comment as PullRequest).url; const isDraft = (isIComment(comment) && comment.isDraft) ?? (isReviewEvent(comment) && (comment.state?.toLocaleUpperCase() === 'PENDING')); - const author = ('user' in comment) ? comment.user! : (comment as PullRequest).author!; - const createdAt = ('createdAt' in comment) ? comment.createdAt : (comment as ReviewEvent).submittedAt; + const author = asNotPullRequest.user ?? (comment as PullRequest).author; + const createdAt = (comment as IComment | CommentEvent | PullRequest).createdAt ?? (comment as ReviewEvent).submittedAt; return (
diff --git a/webviews/components/reviewer.tsx b/webviews/components/reviewer.tsx index 829e710982..74d7e18bfa 100644 --- a/webviews/components/reviewer.tsx +++ b/webviews/components/reviewer.tsx @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import React, { cloneElement, useContext } from 'react'; import { ReviewEvent } from '../../src/common/timelineEvent'; -import { AccountType, isTeam, ReviewState } from '../../src/github/interface'; +import { AccountType, isITeam, ReviewState } from '../../src/github/interface'; import { ariaAnnouncementForReview } from '../common/aria'; import PullRequestContext from '../common/context'; import { checkIcon, commentIcon, pendingIcon, requestChanges, syncIcon } from './icon'; @@ -24,7 +24,7 @@ export function Reviewer(reviewInfo: { reviewState: ReviewState, event?: ReviewE
{ - ((state !== 'REQUESTED') && (isTeam(reviewer) ? true : (reviewer.accountType !== AccountType.Bot))) ? + ((state !== 'REQUESTED') && (isITeam(reviewer) ? true : (reviewer.accountType !== AccountType.Bot))) ? () : null diff --git a/webviews/createPullRequestViewNew/app.tsx b/webviews/createPullRequestViewNew/app.tsx index b7a6aaafbc..a31ca21cff 100644 --- a/webviews/createPullRequestViewNew/app.tsx +++ b/webviews/createPullRequestViewNew/app.tsx @@ -6,7 +6,7 @@ import React, { useCallback, useContext, useEffect, useRef, useState } from 'react'; import { render } from 'react-dom'; import { CreateParamsNew, RemoteInfo } from '../../common/views'; -import { isTeam, MergeMethod } from '../../src/github/interface'; +import { isITeam, MergeMethod } from '../../src/github/interface'; import PullRequestContextNew from '../common/createContextNew'; import { ErrorBoundary } from '../common/errorBoundary'; import { LabelCreate } from '../common/label'; @@ -275,7 +275,7 @@ export function main() {
  • - {isTeam(reviewer) ? reviewer.slug : (reviewer.specialDisplayName ?? reviewer.login)} + {isITeam(reviewer) ? reviewer.slug : (reviewer.specialDisplayName ?? reviewer.login)}
    • )}