Improves get draft error handling

Author: eamodio

src/commands/patches.ts

@@ -9,6 +9,7 @@ import { showPatchesView } from '../plus/drafts/actions';
 import type { Change, CreateDraft } from '../plus/webviews/patchDetails/protocol';
 import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import {
 	ActiveEditorCommand,
@@ -178,13 +179,13 @@ export class OpenCloudPatchCommand extends Command {
 			return;
 		}
 
-		const draft = args?.draft ?? (await this.container.drafts.getDraft(args?.id));
-		if (draft == null) {
-			void window.showErrorMessage(`Cannot open Cloud Patch; patch '${args.id}' not found`);
-			return;
+		try {
+			const draft = args?.draft ?? (await this.container.drafts.getDraft(args?.id));
+			void showPatchesView({ mode: 'view', draft: draft });
+		} catch (ex) {
+			Logger.error(ex, 'OpenCloudPatchCommand');
+			void window.showErrorMessage(`Unable to open Cloud Patch '${args.id}'`);
 		}
-
-		void showPatchesView({ mode: 'view', draft: draft });
 	}
 }
 

src/plus/drafts/draftsService.ts

@@ -307,22 +307,42 @@ export class DraftService implements Disposable {
 
 	@log()
 	async getDraft(id: string): Promise<Draft> {
+		const scope = getLogScope();
+
 		type Result = { data: DraftResponse };
 
 		const [rspResult, changesetsResult] = await Promise.allSettled([
 			this.connection.fetchGkDevApi(`v1/drafts/${id}`, { method: 'GET' }),
 			this.getChangesets(id),
 		]);
 
-		const rsp = getSettledValue(rspResult);
+		if (rspResult.status === 'rejected') {
+			Logger.error(rspResult.reason, scope, `Unable to open draft '${id}': ${rspResult.reason}`);
+			throw new Error(`Unable to open draft '${id}': ${rspResult.reason}`);
+		}
+
+		if (changesetsResult.status === 'rejected') {
+			Logger.error(
+				changesetsResult.reason,
+				scope,
+				`Unable to open changeset for draft '${id}': ${changesetsResult.reason}`,
+			);
+			throw new Error(`Unable to open changesets for draft '${id}': ${changesetsResult.reason}`);
+		}
 
+		const rsp = getSettledValue(rspResult)!;
 		if (rsp?.ok === false) {
-			Logger.error(undefined, `Getting draft failed: (${rsp.status}) ${rsp.statusText}`);
-			throw new Error(rsp.statusText);
+			const json = (await rsp.json()) as { error?: { message?: string } } | undefined;
+			Logger.error(
+				undefined,
+				scope,
+				`Unable to open draft '${id}': (${rsp.status}) ${json?.error?.message ?? rsp.statusText}`,
+			);
+			throw new Error(json?.error?.message ?? rsp.statusText);
 		}
 
 		const draft = ((await rsp.json()) as Result).data;
-		const changesets = getSettledValue(changesetsResult) ?? [];
+		const changesets = getSettledValue(changesetsResult)!;
 
 		const author: Draft['author'] = {
 			id: draft.createdBy,
@@ -394,62 +414,81 @@ export class DraftService implements Disposable {
 
 	@log()
 	async getChangesets(id: string): Promise<DraftChangeset[]> {
-		type Result = { data: DraftChangesetResponse[] };
-
-		const rsp = await this.connection.fetchGkDevApi(`/v1/drafts/${id}/changesets`, { method: 'GET' });
-
-		const changeset = ((await rsp.json()) as Result).data;
+		const scope = getLogScope();
 
-		const changesets: DraftChangeset[] = [];
-		for (const c of changeset) {
-			const patches: DraftPatch[] = [];
+		type Result = { data: DraftChangesetResponse[] };
 
-			// const repoPromises = Promise.allSettled(c.patches.map(p => this.getRepositoryForGkId(p.gitRepositoryId)));
+		try {
+			const rsp = await this.connection.fetchGkDevApi(`/v1/drafts/${id}/changesets`, { method: 'GET' });
+			if (rsp?.ok === false) {
+				const json = (await rsp.json()) as { error?: { message?: string } } | undefined;
+				Logger.error(
+					undefined,
+					scope,
+					`Unable to open changesets for draft '${id}': (${rsp.status}) ${
+						json?.error?.message ?? rsp.statusText
+					}`,
+				);
+				throw new Error(json?.error?.message ?? rsp.statusText);
+			}
 
-			for (const p of c.patches) {
-				// const repoData = await this.getRepositoryData(p.gitRepositoryId);
-				// const repo = await this.container.git.findMatchingRepository({
-				// 	firstSha: repoData.initialCommitSha,
-				// 	remoteUrl: repoData.remote?.url,
-				// });
+			const changeset = ((await rsp.json()) as Result).data;
+
+			const changesets: DraftChangeset[] = [];
+			for (const c of changeset) {
+				const patches: DraftPatch[] = [];
+
+				// const repoPromises = Promise.allSettled(c.patches.map(p => this.getRepositoryForGkId(p.gitRepositoryId)));
+
+				for (const p of c.patches) {
+					// const repoData = await this.getRepositoryData(p.gitRepositoryId);
+					// const repo = await this.container.git.findMatchingRepository({
+					// 	firstSha: repoData.initialCommitSha,
+					// 	remoteUrl: repoData.remote?.url,
+					// });
+
+					patches.push({
+						type: 'cloud',
+						id: p.id,
+						createdAt: new Date(p.createdAt),
+						updatedAt: new Date(p.updatedAt ?? p.createdAt),
+						draftId: p.draftId,
+						changesetId: p.changesetId,
+						userId: c.userId,
+
+						baseBranchName: p.baseBranchName,
+						baseRef: p.baseCommitSha,
+						gkRepositoryId: p.gitRepositoryId,
+						secureLink: p.secureDownloadData,
+
+						// // TODO@eamodio FIX THIS
+						// repository: repo,
+						// repoData: repoData,
+					});
+				}
 
-				patches.push({
-					type: 'cloud',
-					id: p.id,
-					createdAt: new Date(p.createdAt),
-					updatedAt: new Date(p.updatedAt ?? p.createdAt),
-					draftId: p.draftId,
-					changesetId: p.changesetId,
+				changesets.push({
+					id: c.id,
+					createdAt: new Date(c.createdAt),
+					updatedAt: new Date(c.updatedAt ?? c.createdAt),
+					draftId: c.draftId,
+					parentChangesetId: c.parentChangesetId,
 					userId: c.userId,
 
-					baseBranchName: p.baseBranchName,
-					baseRef: p.baseCommitSha,
-					gkRepositoryId: p.gitRepositoryId,
-					secureLink: p.secureDownloadData,
+					gitUserName: c.gitUserName,
+					gitUserEmail: c.gitUserEmail,
 
-					// // TODO@eamodio FIX THIS
-					// repository: repo,
-					// repoData: repoData,
+					deepLinkUrl: c.deepLink,
+					patches: patches,
 				});
 			}
 
-			changesets.push({
-				id: c.id,
-				createdAt: new Date(c.createdAt),
-				updatedAt: new Date(c.updatedAt ?? c.createdAt),
-				draftId: c.draftId,
-				parentChangesetId: c.parentChangesetId,
-				userId: c.userId,
-
-				gitUserName: c.gitUserName,
-				gitUserEmail: c.gitUserEmail,
+			return changesets;
+		} catch (ex) {
+			Logger.error(ex, scope);
 
-				deepLinkUrl: c.deepLink,
-				patches: patches,
-			});
+			throw ex;
 		}
-
-		return changesets;
 	}
 
 	@log()

src/views/draftsView.ts

@@ -135,7 +135,12 @@ export class DraftsView extends ViewBase<'drafts', DraftsViewNode, RepositoriesV
 				async (node: DraftNode) => {
 					let draft = node.draft;
 					if (draft.changesets == null) {
-						draft = await this.container.drafts.getDraft(node.draft.id);
+						try {
+							draft = await this.container.drafts.getDraft(node.draft.id);
+						} catch (ex) {
+							void window.showErrorMessage(`Unable to open Cloud Patch '${node.draft.id}'`);
+							return;
+						}
 					}
 					void showPatchesView({ mode: 'view', draft: draft });
 				},