Make rtkq fetch return value or throw

There was only one call site where other properties than data was 
accessed, we should just keep the api simple when using the promise 
based requests.

Author: mtsgrd

apps/desktop/src/components/BranchCard.svelte

@@ -106,8 +106,8 @@
 		if (args.type === 'draft-branch') {
 			uiState.global.draftBranchName.set(title);
 			const normalized = await stackService.normalizeBranchName(title);
-			if (normalized.data) {
-				uiState.global.draftBranchName.set(normalized.data);
+			if (normalized) {
+				uiState.global.draftBranchName.set(normalized);
 			}
 		} else if (args.type === 'stack-branch') {
 			updateName({

apps/desktop/src/components/GithubIntegration.svelte

@@ -53,8 +53,8 @@
 			// After we call setUser, we want to re-clone the user store, as the userService itself sets the user store
 			mutableUser = structuredClone($user);
 			// TODO: Remove setting of gh username since it isn't used anywhere.
-			const githubUsername = await githubUserService.fetchGitHubLogin();
-			mutableUser.github_username = githubUsername.data?.name || undefined;
+			const githbLogin = await githubUserService.fetchGitHubLogin();
+			mutableUser.github_username = githbLogin.name || undefined;
 			userService.setUser(mutableUser);
 			toasts.success('GitHub authenticated');
 		} catch (err: any) {

apps/desktop/src/components/HunkContextMenu.svelte

@@ -89,10 +89,10 @@
 					label="Open in {$userSettings.defaultCodeEditor.displayName}"
 					onclick={async () => {
 						const project = await projectService.fetchProject(projectId);
-						if (project.data?.path) {
+						if (project.path) {
 							const path = getEditorUri({
 								schemeId: $userSettings.defaultCodeEditor.schemeIdentifer,
-								path: [vscodePath(project.data.path), filePath],
+								path: [vscodePath(project.path), filePath],
 								line: item.beforeLineNumber ?? item.afterLineNumber
 							});
 							openExternalUrl(path);

apps/desktop/src/components/MultiStackCreateNew.svelte

@@ -108,7 +108,7 @@
 
 	async function showAndPrefillName() {
 		createRefModal?.show();
-		createRefName = (await stackService.newBranchName(projectId))?.data ?? '';
+		createRefName = await stackService.newBranchName(projectId);
 		// Reset selected stack to default
 		selectedStackId = undefined;
 	}

apps/desktop/src/components/PrTemplateSection.svelte

@@ -31,9 +31,9 @@
 
 	async function selectTemplate(newPath: string) {
 		const template = await stackService.template(projectId, forgeName, newPath);
-		if (template.data) {
+		if (template) {
 			path.set(newPath);
-			onselect(template.data);
+			onselect(template);
 		}
 	}
 

apps/desktop/src/components/ProjectSettingsMenuAction.svelte

@@ -26,8 +26,7 @@
 	});
 
 	shortcutService.on('open-in-vscode', async () => {
-		const result = await projectsService.fetchProject(projectId);
-		const project = result.data;
+		const project = await projectsService.fetchProject(projectId);
 		if (!project) {
 			throw new Error(`Project not found: ${projectId}`);
 		}

apps/desktop/src/components/ReviewCreation.svelte

@@ -127,10 +127,7 @@
 
 	async function getDefaultBody(commits: Commit[]): Promise<string> {
 		if ($templateEnabled && $templatePath) {
-			const result = await stackService.template(projectId, forge.current.name, $templatePath);
-			if (result.data) {
-				return result.data;
-			}
+			return await stackService.template(projectId, forge.current.name, $templatePath);
 		}
 		if (commits.length === 1) {
 			return splitMessage(commits[0]!.message).description;

apps/desktop/src/components/StackDraft.svelte

@@ -20,22 +20,9 @@
 	const [uiState, stackService] = inject(UiState, StackService);
 	const draftBranchName = $derived(uiState.global.draftBranchName);
 
-	// Automatic branch name suggested by back end.
-	let newName = $state('');
 	let draftPanelEl: HTMLDivElement | undefined = $state();
 
-	const newNameResult = stackService.newBranchName(projectId);
-	newNameResult.then((name) => {
-		newName = name.data || '';
-	});
-
-	$effect(() => {
-		if (newName && !draftBranchName.current) {
-			draftBranchName.set(newName);
-		}
-	});
-
-	const branchName = $derived(draftBranchName.current || newName);
+	const newNameResult = $derived(stackService.newBranchName(projectId));
 
 	onMount(() => {
 		if (draftPanelEl) {
@@ -56,17 +43,20 @@
 				<div class="new-commit-view" data-testid={TestId.NewCommitView}>
 					<NewCommitView {projectId} />
 				</div>
-				<BranchCard
-					type="draft-branch"
-					{projectId}
-					{branchName}
-					readonly={false}
-					lineColor="var(--clr-commit-local)"
-				>
-					{#snippet branchContent()}
-						<CommitGoesHere commitId={undefined} selected last />
-					{/snippet}
-				</BranchCard>
+				{#await newNameResult then newName}
+					{@const branchName = draftBranchName.current || newName}
+					<BranchCard
+						type="draft-branch"
+						{projectId}
+						{branchName}
+						readonly={false}
+						lineColor="var(--clr-commit-local)"
+					>
+						{#snippet branchContent()}
+							<CommitGoesHere commitId={undefined} selected last />
+						{/snippet}
+					</BranchCard>
+				{/await}
 				<Resizer
 					persistId="resizer-darft-panel"
 					viewport={draftPanelEl}

apps/desktop/src/components/StackView.svelte

@@ -216,13 +216,13 @@
 					if (branchName && commitId) {
 						if (upstream) {
 							stackService.fetchUpstreamCommitById(projectId, stack.id, commitId).then((result) => {
-								if (!result.data) {
+								if (!result) {
 									selection.set(undefined);
 								}
 							});
 						} else {
 							stackService.fetchCommitById(projectId, stack.id, commitId).then((result) => {
-								if (!result.data) {
+								if (!result) {
 									selection.set(undefined);
 								}
 							});

apps/desktop/src/components/TargetCommitList.svelte

@@ -64,7 +64,7 @@
 
 	async function getPage(commitId: string | undefined) {
 		const result = await stackService.targetCommits(projectId, commitId, 20);
-		return result.data || [];
+		return result || [];
 	}
 
 	onMount(() => {