Skip to content

Cleaning up cses where project id is not set #7760

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

Merged
merged 3 commits into from
Sep 27, 2024
Merged

Cleaning up cses where project id is not set #7760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
305f699
Cleaning up cses where project id is not set
joehan Sep 27, 2024
7c36011
Merge branch 'master' into jh-init-pid
fredzqm Sep 27, 2024
d2b2ccb
Merge branch 'master' into jh-init-pid
joehan Sep 27, 2024
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
5 changes: 4 additions & 1 deletion firebase-vscode/src/core/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,16 @@ export async function registerCore(
return;
}
const workspaceFolder = vscode.workspace.workspaceFolders[0];
const initCommand = currentProjectId.value ?
`${settings.firebasePath} init dataconnect --project ${currentProjectId.value}` :
`${settings.firebasePath} init dataconnect`;
vscode.tasks.executeTask(
new vscode.Task(
{ type: "shell" }, // this is the same type as in tasks.json
workspaceFolder, // The workspace folder
"firebase init dataconnect", // how you name the task
"firebase init dataconnect", // Shows up as MyTask: name
new vscode.ShellExecution(`${settings.firebasePath} init dataconnect --project ${currentProjectId.value}`),
new vscode.ShellExecution(initCommand),
),
);
});
Expand Down
5 changes: 4 additions & 1 deletion firebase-vscode/src/data-connect/terminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ export function runCommand(command: string) {
// TODO: This fails if the interactive shell is not expecting a command, such
// as when oh-my-zsh asking for (Y/n) to updates during startup.
// Consider using an non-interactive shell.
terminal.sendText(`${command} -P ${currentProjectId.value}`);
if (currentProjectId.value) {
command = `${command} --project ${currentProjectId.value}`;
}
terminal.sendText(command);
}

export function runTerminalTask(
Expand Down