gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-30 20:09:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: wire up prService template fns correctly

Browse Source
This commit is contained in:
ndom91 2024-09-10 19:29:24 +02:00
parent 8194283275
commit 09b02feb78
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/desktop/src/lib/branch/BranchHeader.svelte
View File

@ -91,7 +91,7 @@
const prTemplatePath = project.git_host.pullRequestTemplatePath;
if (prTemplatePath) {
pullRequestTemplateBody = await $gitHost.getPrTemplateContent(prTemplatePath);
pullRequestTemplateBody = await $prService?.getPrTemplateContent(prTemplatePath);
}
if (pullRequestTemplateBody) {

2
apps/desktop/src/lib/gitHost/github/githubPrService.ts
View File

@ -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;

5
apps/desktop/src/lib/settings/GitHostForm.svelte
View File

@ -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,6 +13,8 @@
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 ?? '');
@ -19,7 +22,7 @@
$effect(() => {
if (!project.path) return;
$gitHost?.getAvailablePrTemplates(project.path).then((availableTemplates) => {
$prService?.getAvailablePrTemplates(project.path).then((availableTemplates) => {
if (availableTemplates) {
allAvailableTemplates = availableTemplates.map((availableTemplate) => {
return {