Skip to content

Commit

Permalink
review comment fixes, remove validate function
Browse files Browse the repository at this point in the history
  • Loading branch information
thechenky committed Jun 10, 2019
1 parent e9253c7 commit c00dfdc
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions src/init/features/project.ts
Expand Up @@ -61,7 +61,6 @@ async function selectProjectFromOptions(options: any): Promise<ProjectInfo> {
* @returns A {@link FirebaseProject} object.
*/
async function selectProjectFromList(options: any): Promise<ProjectInfo> {
let project: FirebaseProject | undefined;
const projects: FirebaseProject[] = await listProjects();
let choices = projects.filter((p: FirebaseProject) => !!p).map((p) => {
return {
Expand All @@ -85,18 +84,13 @@ async function selectProjectFromList(options: any): Promise<ProjectInfo> {
type: "list",
name: "id",
message: "Select a default Firebase project for this directory:",
validate: (answer: any) => {
if (!_.includes(choices, answer)) {
return `Must specify a Firebase project to which you have access.`;
}
return true;
},
choices,
} as Question);
});
if (projectId === NEW_PROJECT || projectId === NO_PROJECT) {
return { id: projectId };
}

let project: FirebaseProject | undefined;
project = projects.find((p) => p.projectId === projectId);
const pId = choices.find((p) => p.value === projectId);
const label = pId ? pId.name : "";
Expand Down Expand Up @@ -131,7 +125,7 @@ export async function doSetup(setup: any, config: Config, options: any): Promise
return;
}

const projectInfo: ProjectInfo = await getProjectInfo(options);
const projectInfo = await getProjectInfo(options);
if (projectInfo.id === NEW_PROJECT) {
setup.createProject = true;
return;
Expand Down

0 comments on commit c00dfdc

Please sign in to comment.