fix: wire up prService template fns correctly

gitbutlerapp · Sep 10, 2024 · 09b02fe · 09b02fe
1 parent 8194283
commit 09b02fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/apps/desktop/src/lib/branch/BranchHeader.svelte b/apps/desktop/src/lib/branch/BranchHeader.svelte
@@ -91,7 +91,7 @@
 		const prTemplatePath = project.git_host.pullRequestTemplatePath;
 
 		if (prTemplatePath) {
-			pullRequestTemplateBody = await $gitHost.getPrTemplateContent(prTemplatePath);
+			pullRequestTemplateBody = await $prService?.getPrTemplateContent(prTemplatePath);
 		}
 
 		if (pullRequestTemplateBody) {

diff --git a/apps/desktop/src/lib/gitHost/github/githubPrService.ts b/apps/desktop/src/lib/gitHost/github/githubPrService.ts
@@ -107,7 +107,7 @@ export class GitHubPrService implements GitHostPrService {
 
 		const availableTemplates: string[] | undefined = await invoke(
 			'available_pull_request_templates',
-			{ path: targetPath }
+			{ rootPath: targetPath }
 		);
 
 		return availableTemplates;

diff --git a/apps/desktop/src/lib/settings/GitHostForm.svelte b/apps/desktop/src/lib/settings/GitHostForm.svelte
@@ -2,6 +2,7 @@
 	import { Project, ProjectService } from '$lib/backend/projects';
 	import SectionCard from '$lib/components/SectionCard.svelte';
 	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { createGitHostPrServiceStore } from '$lib/gitHost/interface/gitHostPrService';
 	import Select from '$lib/select/Select.svelte';
 	import SelectItem from '$lib/select/SelectItem.svelte';
 	import Section from '$lib/settings/Section.svelte';
@@ -12,14 +13,16 @@
 	const projectService = getContext(ProjectService);
 	const project = getContext(Project);
 	const gitHost = getGitHost();
+	const prService = createGitHostPrServiceStore(undefined);
+	$effect(() => prService.set($gitHost?.prService()));
 
 	let useTemplate = $state(!!project.git_host?.pullRequestTemplatePath);
 	let selectedTemplate = $state(project.git_host?.pullRequestTemplatePath ?? '');
 	let allAvailableTemplates = $state<{ label: string; value: string }[]>([]);
 
 	$effect(() => {
 		if (!project.path) return;
-		$gitHost?.getAvailablePrTemplates(project.path).then((availableTemplates) => {
+		$prService?.getAvailablePrTemplates(project.path).then((availableTemplates) => {
 			if (availableTemplates) {
 				allAvailableTemplates = availableTemplates.map((availableTemplate) => {
 					return {