Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed the extra pull request button #338

Merged
merged 1 commit into from
Jan 16, 2025
+2 −80
Merged

Removed the extra pull request button #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions frontend/src/lib/components/editors/DocumentEditor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,9 @@
interface Props {
previewWindow: HTMLElement;
saveChangesHandler: (commitMessage: string) => Promise<void>;
createPullRequestHandler: () => Promise<void>;
}

let {
previewWindow = $bindable(),
saveChangesHandler = $bindable(),
createPullRequestHandler = $bindable()
}: Props = $props();
let { previewWindow = $bindable(), saveChangesHandler = $bindable() }: Props = $props();

async function cancelChangesHandler() {
if ($editorText !== get(currentFile)) {
Expand Down Expand Up @@ -145,24 +140,6 @@
<path d="M382-240 154-468l57-57 171 171 367-367 57 57-424 424Z" />
</svg>
</button>
<!-- Pull Request -->
<button onclick={createPullRequestHandler} class="pull-request" title="Create Pull Request">
<svg
xmlns="http://www.w3.org/2000/svg"
width="25px"
height="25px"
viewBox="0 0 24 24"
fill="none"
>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M14.7071 2.70711L13.4142 4H14C17.3137 4 20 6.68629 20 10V16.1707C21.1652 16.5825 22 17.6938 22 19C22 20.6569 20.6569 22 19 22C17.3431 22 16 20.6569 16 19C16 17.6938 16.8348 16.5825 18 16.1707V10C18 7.79086 16.2091 6 14 6H13.4142L14.7071 7.29289C15.0976 7.68342 15.0976 8.31658 14.7071 8.70711C14.3166 9.09763 13.6834 9.09763 13.2929 8.70711L10.2929 5.70711C9.90237 5.31658 9.90237 4.68342 10.2929 4.29289L13.2929 1.29289C13.6834 0.902369 14.3166 0.902369 14.7071 1.29289C15.0976 1.68342 15.0976 2.31658 14.7071 2.70711ZM18 19C18 18.4477 18.4477 18 19 18C19.5523 18 20 18.4477 20 19C20 19.5523 19.5523 20 19 20C18.4477 20 18 19.5523 18 19ZM6 4C5.44772 4 5 4.44772 5 5C5 5.55228 5.44772 6 6 6C6.55228 6 7 5.55228 7 5C7 4.44772 6.55228 4 6 4ZM7 7.82929C8.16519 7.41746 9 6.30622 9 5C9 3.34315 7.65685 2 6 2C4.34315 2 3 3.34315 3 5C3 6.30622 3.83481 7.41746 5 7.82929V16.1707C3.83481 16.5825 3 17.6938 3 19C3 20.6569 4.34315 22 6 22C7.65685 22 9 20.6569 9 19C9 17.6938 8.16519 16.5825 7 16.1707V7.82929ZM6 18C5.44772 18 5 18.4477 5 19C5 19.5523 5.44772 20 6 20C6.55228 20 7 19.5523 7 19C7 18.4477 6.55228 18 6 18Z"
fill="#000000"
/>
</svg>
<span>Create Pull Request</span>
</button>
</div>
<div class="editor-panes">
<textarea bind:value={$editorText} class="editor-pane"></textarea>
Expand Down
57 changes: 1 addition & 56 deletions frontend/src/routes/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,57 +178,6 @@
}
});
});

let createPullRequestHandler = $state(async (): Promise<void> => {
const title = `Pull request for ${$currentFile}`;
const description = `This pull request contains changes made by ${$me.username}.`;
const headBranch = $branchName;

const response = await fetch(`${apiAddress}/api/pulls`, {
method: 'POST',
credentials: 'include',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
head_branch: headBranch,
base_branch: 'master',
title: title,
description: description
})
});

// Handle the response
if (!response.ok) {
const errorMessage = `Failed to create pull request (Code ${response.status}: "${response.statusText}")`;
addToast({
message: `Error: ${errorMessage}`,
type: ToastType.Error,
dismissible: true
});
return; // Exit the function early on error
}

// Parse the JSON response to get the pull request URL
const jsonResponse = await response.json();
const pullRequestUrl = jsonResponse.data?.pull_request_url; // Adjusted based on API response

if (pullRequestUrl) {
// If successful, show success toast with the URL
addToast({
message: `Pull request created successfully. View it [here](${pullRequestUrl}).`,
type: ToastType.Success,
dismissible: true
});
} else {
// Handle the case where the URL is not present (if needed)
addToast({
message: 'Pull request created successfully, but the URL is not available.',
type: ToastType.Warning,
dismissible: true
});
}
});
</script>

<div style="--sidebar-width: {sidebarWidth}" class="container">
Expand Down Expand Up @@ -273,11 +222,7 @@
/>
{#if mode === SelectedMode.Documents}
{#if showEditor && $currentFile !== ''}
<DocumentEditor
bind:saveChangesHandler
bind:previewWindow={previewWindow!}
bind:createPullRequestHandler
/>
<DocumentEditor bind:saveChangesHandler bind:previewWindow={previewWindow!} />
{:else}
<span class="nofile-placeholder">
<p>
Expand Down
Loading