gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-26 19:15:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: simplify getAvailablePullRequestTemplate args

Browse Source
This commit is contained in:
ndom91 2024-09-08 18:11:03 +02:00
parent 216f5b40f3
commit 6b55fa56ba
3 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/desktop/src/lib/backend/github.ts
View File

@ -1,6 +1,4 @@
import { invoke } from '$lib/backend/ipc';
import { Project } from '$lib/backend/projects';
import { plainToInstance } from 'class-transformer';
export type Verification = {
user_code: string;
@ -21,13 +19,12 @@ export async function checkAuthStatus(params: { deviceCode: string }) {
}
export async function getAvailablePullRequestTemplates(
projectId: string
projectPath: string
): Promise<PullRequestTemplatePaths[] | undefined> {
// TODO: Find a workaround to avoid this dynamic import
// https://github.com/sveltejs/kit/issues/905
const path = await import('@tauri-apps/api/path');
const currentProject = plainToInstance(Project, await invoke('get_project', { id: projectId }));
const targetPath = await path.join(currentProject.path, '.github');
const targetPath = await path.join(projectPath, '.github');
const availableTemplates: PullRequestTemplatePaths[] | undefined = await invoke(
'get_available_pull_request_templates',

5
apps/desktop/src/lib/backend/projects.ts
View File

@ -27,6 +27,11 @@ export class Project {
use_diff_context: boolean | undefined;
snapshot_lines_threshold!: number | undefined;
use_new_locking!: boolean;
git_host!: {
type: 'github' | 'gitlab' | 'bitbucket' | 'azure';
use_pull_request_template: boolean;
pull_request_template_path: string;
};
private succeeding_rebases!: boolean;
get succeedingRebases() {

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

@ -3,12 +3,8 @@
getAvailablePullRequestTemplates,
type PullRequestTemplatePaths
} from '$lib/backend/github';
import { ProjectService } from '$lib/backend/projects';
import { Project, ProjectService } from '$lib/backend/projects';
import SectionCard from '$lib/components/SectionCard.svelte';
import {
gitHostPullRequestTemplatePath,
gitHostUsePullRequestTemplate
} from '$lib/config/config';
import Select from '$lib/select/Select.svelte';
import SelectItem from '$lib/select/SelectItem.svelte';
import Section from '$lib/settings/Section.svelte';
@ -16,26 +12,50 @@
import Toggle from '$lib/shared/Toggle.svelte';
import { getContext } from '$lib/utils/context';
const usePullRequestTemplate = gitHostUsePullRequestTemplate();
const pullRequestTemplatePath = gitHostPullRequestTemplatePath();
let selectedTemplate = $state('');
let allAvailableTemplates = $state<PullRequestTemplatePaths[]>([]);
const projectService = getContext(ProjectService);
const id = projectService.getLastOpenedProject();
const project = getContext(Project);
console.log('PROJECT', project);
$effect(() => {
if (!id) return;
getAvailablePullRequestTemplates(id).then((availableTemplates) => {
if (!project.path) return;
getAvailablePullRequestTemplates(project.path).then((availableTemplates) => {
if (availableTemplates) {
allAvailableTemplates = availableTemplates;
}
});
});
// TODO: Save to project-based settings
$inspect('SELECTED_TEAMPLTE', selectedTemplate);
// TODO: investigate if theres a better wayt o get old clients up to speed with
// new preferences keys
async function updateExistingProjects() {
if (!project.git_host) {
project.git_host = {
type: 'github',
use_pull_request_template: false,
pull_request_template_path: ''
};
await projectService.updateProject(project);
}
}
async function setUsePullRequestTemplate(value: boolean) {
await updateExistingProjects();
// project[gitHost.type].use_pull_request_template = value;
project.git_host.use_pull_request_template = value;
await projectService.updateProject(project);
}
async function setPullRequestTemplatePath(value: string) {
selectedTemplate = value;
await updateExistingProjects();
// project[gitHost.type].pull_request_template_path = value;
project.git_host.pull_request_template_path = value;
await projectService.updateProject(project);
}
</script>
<Section>
@ -55,7 +75,9 @@
<Toggle
id="use-pull-request-template-boolean"
value="false"
bind:checked={$usePullRequestTemplate}
on:click={(e) => {
setUsePullRequestTemplate((e.target as MouseEvent['target'] & { checked: boolean }).checked);
}}
/>
</svelte:fragment>
<svelte:fragment slot="caption">
@ -73,7 +95,7 @@
searchable
disabled={false}
onselect={(value) => {
selectedTemplate = value;
setPullRequestTemplatePath(value);
}}
>
{#snippet itemSnippet({ item, highlighted })}