Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-01-20 22:12:38 -05:00
Code Issues Activity

prompt for workspace in db link (#11032)

Browse source 
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
This commit is contained in:
Darius 2024-05-21 14:13:56 -05:00 • committed by GitHub
parent 8daf2d4cd6
commit b78e83f448
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 51 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.changeset/five-ties-raise.md Normal file
View file

@ -0,0 +1,7 @@
---
"@astrojs/db": patch
---
Adds support for multiple Astro Studio workspaces (aka “Teams”) to the Astro DB CLI
Users who are members of a team workspace in Astro Studio can now choose between those and their personal workspace when runnning `astro db link`.

58
packages/db/src/core/cli/commands/link/index.ts
View file

@ -20,20 +20,17 @@ export async function cmd() {
console.error(MISSING_SESSION_ID_ERROR);
process.exit(1);
}
const getWorkspaceIdAsync = getWorkspaceId().catch((err) => {
return err as Error;
});
await promptBegin();
const isLinkExisting = await promptLinkExisting();
if (isLinkExisting) {
const workspaceId = unwrapWorkspaceId(await getWorkspaceIdAsync);
const workspaceId = await promptWorkspace(sessionToken);
const existingProjectData = await promptExistingProjectName({ workspaceId });
return await linkProject(existingProjectData.id);
}
const isLinkNew = await promptLinkNew();
if (isLinkNew) {
const workspaceId = unwrapWorkspaceId(await getWorkspaceIdAsync);
const workspaceId = await promptWorkspace(sessionToken);
const newProjectName = await promptNewProjectName();
const newProjectRegion = await promptNewProjectRegion();
const spinner = ora('Creating new project...').start();
@ -56,14 +53,14 @@ async function linkProject(id: string) {
console.info('Project linked.');
}
async function getWorkspaceId(): Promise<string> {
async function getWorkspaces(sessionToken: string) {
const linkUrl = new URL(getAstroStudioUrl() + '/api/cli/workspaces.list');
const response = await safeFetch(
linkUrl,
{
method: 'POST',
headers: {
Authorization: `Bearer ${await getSessionIdFromFile()}`,
Authorization: `Bearer ${sessionToken}`,
'Content-Type': 'application/json',
},
},
@ -80,18 +77,40 @@ async function getWorkspaceId(): Promise<string> {
}
);
const { data, success } = (await response.json()) as Result<{ id: string }[]>;
const { data, success } = (await response.json()) as Result<{ id: string; name: string }[]>;
if (!success) {
throw new Error(`Failed to fetch user's workspace.`);
}
return data[0].id;
return data;
}
function unwrapWorkspaceId(workspaceId: string | Error): string {
if (typeof workspaceId !== 'string') {
console.error(workspaceId.message);
/**
* Get the workspace ID to link to.
* Prompts the user to choose if they have more than one workspace in Astro Studio.
* @returns A `Promise` for the workspace ID to use.
*/
async function promptWorkspace(sessionToken: string) {
const workspaces = await getWorkspaces(sessionToken);
if (workspaces.length === 0) {
console.error('No workspaces found.');
process.exit(1);
}
if (workspaces.length === 1) {
return workspaces[0].id;
}
const { workspaceId } = await prompts({
type: 'autocomplete',
name: 'workspaceId',
message: 'Select your workspace:',
limit: 5,
choices: workspaces.map((w) => ({ title: w.name, value: w.id })),
});
if (typeof workspaceId !== 'string') {
console.log('Canceled.');
process.exit(0);
}
return workspaceId;
}
@ -164,7 +183,9 @@ export async function promptExistingProjectName({ workspaceId }: { workspaceId:
}
);
const { data, success } = (await response.json()) as Result<{ id: string; idName: string }[]>;
const { data, success } = (await response.json()) as Result<
{ id: string; name: string; idName: string }[]
>;
if (!success) {
console.error(`Failed to fetch projects.`);
process.exit(1);
@ -174,7 +195,7 @@ export async function promptExistingProjectName({ workspaceId }: { workspaceId:
name: 'projectId',
message: 'What is your project name?',
limit: 5,
choices: data.map((p: any) => ({ title: p.name, value: p.id })),
choices: data.map((p) => ({ title: p.name, value: p.id })),
});
if (typeof projectId !== 'string') {
console.log('Canceled.');
@ -201,6 +222,10 @@ export async function promptBegin(): Promise<void> {
}
}
/**
* Ask the user if they want to link to an existing Astro Studio project.
* @returns A `Promise` for the user’s answer: `true` if they answer yes, otherwise `false`.
*/
export async function promptLinkExisting(): Promise<boolean> {
// prompt
const { linkExisting } = await prompts({
@ -212,6 +237,11 @@ export async function promptLinkExisting(): Promise<boolean> {
return !!linkExisting;
}
/**
* Ask the user if they want to link to a new Astro Studio Project.
* **Exits the process if they answer no.**
* @returns A `Promise` for the user’s answer: `true` if they answer yes.
*/
export async function promptLinkNew(): Promise<boolean> {
// prompt
const { linkNew } = await prompts({