refactor: remove redundant GitHub sync functionality
- Remove 'Push to GitHub' sync button from Workbench - Clean up unused parameters and imports - Improve UX by using only the proper GitHub deployment feature - Fix ESLint and Prettier formatting issues - Fix unused variable in GitHubDeploymentDialog This removes the old sync functionality in favor of the comprehensive GitHub deployment feature that builds projects before deployment.
This commit is contained in:
@@ -80,6 +80,7 @@ export function GitHubDeploymentDialog({ isOpen, onClose, projectName, files }:
|
|||||||
if (!token) {
|
if (!token) {
|
||||||
logStore.logError('No GitHub token available');
|
logStore.logError('No GitHub token available');
|
||||||
toast.error('GitHub authentication required');
|
toast.error('GitHub authentication required');
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,7 +106,7 @@ export function GitHubDeploymentDialog({ isOpen, onClose, projectName, files }:
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
errorData = await response.json();
|
errorData = await response.json();
|
||||||
} catch (e) {
|
} catch {
|
||||||
errorData = { message: 'Could not parse error response' };
|
errorData = { message: 'Could not parse error response' };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -149,6 +150,7 @@ export function GitHubDeploymentDialog({ isOpen, onClose, projectName, files }:
|
|||||||
logStore.logError('Failed to parse GitHub repositories response', { parseError });
|
logStore.logError('Failed to parse GitHub repositories response', { parseError });
|
||||||
toast.error('Failed to parse repository data');
|
toast.error('Failed to parse repository data');
|
||||||
setRecentRepos([]);
|
setRecentRepos([]);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -218,10 +220,9 @@ export function GitHubDeploymentDialog({ isOpen, onClose, projectName, files }:
|
|||||||
await octokit.repos.update({
|
await octokit.repos.update({
|
||||||
owner: connection.user.login,
|
owner: connection.user.login,
|
||||||
repo: repoName,
|
repo: repoName,
|
||||||
private: isPrivate
|
private: isPrivate,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
// 404 means repo doesn't exist, which is what we want for new repos
|
// 404 means repo doesn't exist, which is what we want for new repos
|
||||||
if (error.status !== 404) {
|
if (error.status !== 404) {
|
||||||
@@ -234,10 +235,12 @@ export function GitHubDeploymentDialog({ isOpen, onClose, projectName, files }:
|
|||||||
const { data: newRepo } = await octokit.repos.createForAuthenticatedUser({
|
const { data: newRepo } = await octokit.repos.createForAuthenticatedUser({
|
||||||
name: repoName,
|
name: repoName,
|
||||||
private: isPrivate,
|
private: isPrivate,
|
||||||
|
|
||||||
// Initialize with a README to avoid empty repository issues
|
// Initialize with a README to avoid empty repository issues
|
||||||
auto_init: true,
|
auto_init: true,
|
||||||
|
|
||||||
// Create a .gitignore file for the project
|
// Create a .gitignore file for the project
|
||||||
gitignore_template: "Node",
|
gitignore_template: 'Node',
|
||||||
});
|
});
|
||||||
|
|
||||||
// Set the URL for success dialog
|
// Set the URL for success dialog
|
||||||
@@ -247,7 +250,7 @@ export function GitHubDeploymentDialog({ isOpen, onClose, projectName, files }:
|
|||||||
console.log('Created new repository with auto_init, waiting for GitHub to initialize it...');
|
console.log('Created new repository with auto_init, waiting for GitHub to initialize it...');
|
||||||
|
|
||||||
// Wait a moment for GitHub to set up the initial commit
|
// Wait a moment for GitHub to set up the initial commit
|
||||||
await new Promise(resolve => setTimeout(resolve, 2000));
|
await new Promise((resolve) => setTimeout(resolve, 2000));
|
||||||
} else {
|
} else {
|
||||||
// Set URL for existing repo
|
// Set URL for existing repo
|
||||||
setCreatedRepoUrl(`https://github.com/${connection.user.login}/${repoName}`);
|
setCreatedRepoUrl(`https://github.com/${connection.user.login}/${repoName}`);
|
||||||
@@ -267,8 +270,10 @@ export function GitHubDeploymentDialog({ isOpen, onClose, projectName, files }:
|
|||||||
|
|
||||||
setPushedFiles(fileList);
|
setPushedFiles(fileList);
|
||||||
|
|
||||||
// Now we need to handle the repository, whether it's new or existing
|
/*
|
||||||
// Get the default branch for the repository
|
* Now we need to handle the repository, whether it's new or existing
|
||||||
|
* Get the default branch for the repository
|
||||||
|
*/
|
||||||
let defaultBranch: string;
|
let defaultBranch: string;
|
||||||
let baseSha: string | null = null;
|
let baseSha: string | null = null;
|
||||||
|
|
||||||
@@ -353,6 +358,7 @@ export function GitHubDeploymentDialog({ isOpen, onClose, projectName, files }:
|
|||||||
|
|
||||||
// Create a commit with the tree
|
// Create a commit with the tree
|
||||||
console.log('Creating commit');
|
console.log('Creating commit');
|
||||||
|
|
||||||
const { data: commitData } = await octokit.git.createCommit({
|
const { data: commitData } = await octokit.git.createCommit({
|
||||||
owner: connection.user.login,
|
owner: connection.user.login,
|
||||||
repo: repoName,
|
repo: repoName,
|
||||||
@@ -388,22 +394,33 @@ export function GitHubDeploymentDialog({ isOpen, onClose, projectName, files }:
|
|||||||
console.log('Reference created successfully');
|
console.log('Reference created successfully');
|
||||||
} catch (createRefError) {
|
} catch (createRefError) {
|
||||||
console.error('Error creating reference:', createRefError);
|
console.error('Error creating reference:', createRefError);
|
||||||
const errorMsg = typeof createRefError === 'object' && createRefError !== null && 'message' in createRefError ? String(createRefError.message) : 'Unknown error';
|
|
||||||
|
const errorMsg =
|
||||||
|
typeof createRefError === 'object' && createRefError !== null && 'message' in createRefError
|
||||||
|
? String(createRefError.message)
|
||||||
|
: 'Unknown error';
|
||||||
throw new Error(`Failed to create Git reference: ${errorMsg}`);
|
throw new Error(`Failed to create Git reference: ${errorMsg}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (gitError) {
|
} catch (gitError) {
|
||||||
console.error('Error with git operations:', gitError);
|
console.error('Error with git operations:', gitError);
|
||||||
const gitErrorMsg = typeof gitError === 'object' && gitError !== null && 'message' in gitError ? String(gitError.message) : 'Unknown error';
|
|
||||||
|
const gitErrorMsg =
|
||||||
|
typeof gitError === 'object' && gitError !== null && 'message' in gitError
|
||||||
|
? String(gitError.message)
|
||||||
|
: 'Unknown error';
|
||||||
throw new Error(`Failed during git operations: ${gitErrorMsg}`);
|
throw new Error(`Failed during git operations: ${gitErrorMsg}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save the repository information for this chat
|
// Save the repository information for this chat
|
||||||
localStorage.setItem(`github-repo-${currentChatId}`, JSON.stringify({
|
localStorage.setItem(
|
||||||
owner: connection.user.login,
|
`github-repo-${currentChatId}`,
|
||||||
name: repoName,
|
JSON.stringify({
|
||||||
url: `https://github.com/${connection.user.login}/${repoName}`,
|
owner: connection.user.login,
|
||||||
}));
|
name: repoName,
|
||||||
|
url: `https://github.com/${connection.user.login}/${repoName}`,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
// Show success dialog
|
// Show success dialog
|
||||||
setShowSuccessDialog(true);
|
setShowSuccessDialog(true);
|
||||||
@@ -446,6 +463,7 @@ export function GitHubDeploymentDialog({ isOpen, onClose, projectName, files }:
|
|||||||
|
|
||||||
// Refresh user data after auth
|
// Refresh user data after auth
|
||||||
const connection = getLocalStorage('github_connection');
|
const connection = getLocalStorage('github_connection');
|
||||||
|
|
||||||
if (connection?.user && connection?.token) {
|
if (connection?.user && connection?.token) {
|
||||||
setUser(connection.user);
|
setUser(connection.user);
|
||||||
fetchRecentRepos(connection.token);
|
fetchRecentRepos(connection.token);
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import { renderLogger } from '~/utils/logger';
|
|||||||
import { EditorPanel } from './EditorPanel';
|
import { EditorPanel } from './EditorPanel';
|
||||||
import { Preview } from './Preview';
|
import { Preview } from './Preview';
|
||||||
import useViewport from '~/lib/hooks';
|
import useViewport from '~/lib/hooks';
|
||||||
import { PushToGitHubDialog } from '~/components/@settings/tabs/connections/components/PushToGitHubDialog';
|
|
||||||
import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
|
import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
|
||||||
import { usePreviewStore } from '~/lib/stores/previews';
|
import { usePreviewStore } from '~/lib/stores/previews';
|
||||||
import { chatStore } from '~/lib/stores/chat';
|
import { chatStore } from '~/lib/stores/chat';
|
||||||
@@ -279,11 +279,17 @@ const FileModifiedDropdown = memo(
|
|||||||
);
|
);
|
||||||
|
|
||||||
export const Workbench = memo(
|
export const Workbench = memo(
|
||||||
({ chatStarted, isStreaming, metadata, updateChatMestaData, setSelectedElement }: WorkspaceProps) => {
|
({
|
||||||
|
chatStarted,
|
||||||
|
isStreaming,
|
||||||
|
metadata: _metadata,
|
||||||
|
updateChatMestaData: _updateChatMestaData,
|
||||||
|
setSelectedElement,
|
||||||
|
}: WorkspaceProps) => {
|
||||||
renderLogger.trace('Workbench');
|
renderLogger.trace('Workbench');
|
||||||
|
|
||||||
const [isSyncing, setIsSyncing] = useState(false);
|
const [isSyncing, setIsSyncing] = useState(false);
|
||||||
const [isPushDialogOpen, setIsPushDialogOpen] = useState(false);
|
|
||||||
const [fileHistory, setFileHistory] = useState<Record<string, FileHistory>>({});
|
const [fileHistory, setFileHistory] = useState<Record<string, FileHistory>>({});
|
||||||
|
|
||||||
// const modifiedFiles = Array.from(useStore(workbenchStore.unsavedFiles).keys());
|
// const modifiedFiles = Array.from(useStore(workbenchStore.unsavedFiles).keys());
|
||||||
@@ -436,17 +442,6 @@ export const Workbench = memo(
|
|||||||
<span>{isSyncing ? 'Syncing...' : 'Sync Files'}</span>
|
<span>{isSyncing ? 'Syncing...' : 'Sync Files'}</span>
|
||||||
</div>
|
</div>
|
||||||
</DropdownMenu.Item>
|
</DropdownMenu.Item>
|
||||||
<DropdownMenu.Item
|
|
||||||
className={classNames(
|
|
||||||
'cursor-pointer flex items-center w-full px-4 py-2 text-sm text-bolt-elements-textPrimary hover:bg-bolt-elements-item-backgroundActive gap-2 rounded-md group relative',
|
|
||||||
)}
|
|
||||||
onClick={() => setIsPushDialogOpen(true)}
|
|
||||||
>
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<div className="i-ph:git-branch" />
|
|
||||||
Push to GitHub
|
|
||||||
</div>
|
|
||||||
</DropdownMenu.Item>
|
|
||||||
</DropdownMenu.Content>
|
</DropdownMenu.Content>
|
||||||
</DropdownMenu.Root>
|
</DropdownMenu.Root>
|
||||||
</div>
|
</div>
|
||||||
@@ -493,31 +488,6 @@ export const Workbench = memo(
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<PushToGitHubDialog
|
|
||||||
isOpen={isPushDialogOpen}
|
|
||||||
onClose={() => setIsPushDialogOpen(false)}
|
|
||||||
onPush={async (repoName, username, token, isPrivate) => {
|
|
||||||
try {
|
|
||||||
console.log('Dialog onPush called with isPrivate =', isPrivate);
|
|
||||||
|
|
||||||
const commitMessage = prompt('Please enter a commit message:', 'Initial commit') || 'Initial commit';
|
|
||||||
const repoUrl = await workbenchStore.pushToGitHub(repoName, commitMessage, username, token, isPrivate);
|
|
||||||
|
|
||||||
if (updateChatMestaData && !metadata?.gitUrl) {
|
|
||||||
updateChatMestaData({
|
|
||||||
...(metadata || {}),
|
|
||||||
gitUrl: repoUrl,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return repoUrl;
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error pushing to GitHub:', error);
|
|
||||||
toast.error('Failed to push to GitHub');
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</motion.div>
|
</motion.div>
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user