[VS Code] Edit missing variables / auth

CHANGELOG.md

@@ -0,0 +1 @@
+- Add a confirmation in `firebase init dataconnect` before asking for app idea description. (#9282)

firebase-vscode/src/analytics.ts

@@ -27,10 +27,6 @@ export enum DATA_CONNECT_EVENT_NAME {
   RUN_PROD_MUTATION_WARNING_ACKED_ALWAYS = "run_prod_mutation_warning_acked_always",
   MISSING_VARIABLES = "missing_variables",
   GENERATE_OPERATION = "generate_operation",
-  GIF_TOS_MODAL = "gif_tos_modal",
-  GIF_TOS_MODAL_ACKED = "gif_tos_modal_acked",
-  GIF_TOS_MODAL_CLICKED = "gif_tos_modal_clicked",
-  GIF_TOS_MODAL_REJECTED = "gif_tos_modal_rejected",
   ADD_DATA = "add_data",
   READ_DATA = "read_data",
   MOVE_TO_CONNECTOR = "move_to_connector",

firebase-vscode/src/data-connect/ad-hoc-mutations.ts

@@ -284,16 +284,16 @@ function getDefaultScalarValueNode(type: string): ValueNode | undefined {
   }
 }
 
-export function getDefaultScalarValue(type: string): string {
+export function getDefaultScalarValue(type: string): any {
   switch (type) {
     case "Boolean":
-      return "false";
+      return false;
     case "Date":
       return new Date().toISOString().substring(0, 10);
     case "Float":
-      return "0";
+      return 0.0;
     case "Int":
-      return "0";
+      return 0;
     case "Int64":
       return "0";
     case "String":
@@ -303,8 +303,8 @@ export function getDefaultScalarValue(type: string): string {
     case "UUID":
       return "11111111222233334444555555555555";
     case "Vector":
-      return "[]";
+      return [1.1, 2.2, 3.3];
     default:
-      return "";
+      return undefined;
   }
 }

firebase-vscode/src/data-connect/execution/execution.ts

@@ -169,9 +169,7 @@ export function registerExecution(
         "Automatically starting emulator... Please retry `Run local` execution after it's started.",
         { modal: false },
       );
-      analyticsLogger.logger.logUsage(
-        DATA_CONNECT_EVENT_NAME.START_EMULATOR_FROM_EXECUTION,
-      );
+      analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.START_EMULATOR_FROM_EXECUTION);
       emulatorsController.startEmulators();
       return;
     }
@@ -185,35 +183,25 @@ export function registerExecution(
       analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.RUN_PROD_MUTATION_WARNING);
       const always = "Yes (always)";
       const yes = "Yes";
+      analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.RUN_PROD_MUTATION_WARNING);
       const result = await vscode.window.showWarningMessage(
         "You are about to perform a mutation in production environment. Are you sure?",
         { modal: !process.env.VSCODE_TEST_MODE },
         yes,
         always,
       );
 
-      switch (result) {
-        case yes:
-          analyticsLogger.logger.logUsage(
-            DATA_CONNECT_EVENT_NAME.RUN_PROD_MUTATION_WARNING_ACKED
-          );
-          break;
-        case always:
-          // If the user selects "always", we update User settings.
-          configs.update(
-            alwaysExecuteMutationsInProduction,
-            true,
-            ConfigurationTarget.Global,
-          );
-          analyticsLogger.logger.logUsage(
-            DATA_CONNECT_EVENT_NAME.RUN_PROD_MUTATION_WARNING_ACKED_ALWAYS
-          );
-          break;
-        default:
-          analyticsLogger.logger.logUsage(
-            DATA_CONNECT_EVENT_NAME.RUN_PROD_MUTATION_WARNING_REJECTED
-          );
-          return;
+      if (result !== always && result !== yes) {
+        return;
+      }
+
+      // If the user selects "always", we update User settings.
+      if (result === always) {
+        configs.update(
+          alwaysExecuteMutationsInProduction,
+          true,
+          ConfigurationTarget.Global,
+        );
       }
     }
 
@@ -252,16 +240,12 @@ export function registerExecution(
 
 
     // if execution args is empty, reset to {}
-    if (!executionArgsJSON.value) {
-      executionArgsJSON.value = "{}";
-    }
+    executionArgsJSON.value = executionArgsJSON.value || "{}";
 
     // Check for missing arguments
     const missingArgs = await verifyMissingArgs(ast, executionArgsJSON.value);
-
-    // prompt user to continue execution or modify arguments
+    // Open variables panel to edit missing variables.
     if (missingArgs.length > 0) {
-      analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.MISSING_VARIABLES);
       // open a modal with option to run anyway or edit args
       const editArgs = { title: "Edit variables" };
       const continueExecution = { title: "Continue Execution" };
@@ -339,7 +323,6 @@ export function registerExecution(
   }
 
   async function generateOperation(arg: GenerateOperationInput) {
-    analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.GENERATE_OPERATION);
     if (!arg.projectId) {
       vscode.window.showErrorMessage(`Connect a Firebase project to use Gemini in Firebase features.`);
       return;
@@ -505,14 +488,12 @@ async function verifyMissingArgs(
   }
   return argsWithType
     .filter((arg) => arg.type?.includes("!"))
-    .filter((arg) => !userArgs[arg.varName]);
+    .filter((arg) => userArgs[arg.varName] === undefined);
 }
 
 function getDefaultArgs(args: TypedInput[]) {
   return args.reduce((acc: { [key: string]: any }, arg) => {
-    const defaultValue = getDefaultScalarValue(arg.type as string);
-
-    acc[arg.varName] = defaultValue;
+    acc[arg.varName] = getDefaultScalarValue((arg.type || "").replaceAll("!", ""));
     return acc;
   }, {});
 }

src/init/features/dataconnect/index.ts

@@ -118,12 +118,22 @@ export async function askQuestions(setup: Setup): Promise<void> {
           "Learn more about Gemini in Firebase and how it uses your data: https://firebase.google.com/docs/gemini-in-firebase#how-gemini-in-firebase-uses-your-data",
         );
       }
-      info.appDescription = await input({
-        message: `Describe your app to automatically generate a schema with Gemini [Enter to use a template]:`,
+      const wantToGenerate = await confirm({
+        message: "Do you want to generate schema and queries with Gemini?",
+        default: false,
       });
-      if (info.appDescription) {
+      if (wantToGenerate) {
         configstore.set("gemini", true);
         await ensureGIFApiTos(setup.projectId);
+        info.appDescription = await input({
+          message: `Describe your app idea:`,
+          validate: async (s: string) => {
+            if (s.length > 0) {
+              return true;
+            }
+            return "Please enter a description for your app idea.";
+          },
+        });
       }
     }
     if (hasBilling) {
@@ -161,9 +171,14 @@ export async function actuate(setup: Setup, config: Config, options: any): Promi
     await sdk.actuate(setup, config);
   } finally {
     void trackGA4("dataconnect_init", {
-      project_status: setup.projectId ? (setup.isBillingEnabled ? "blaze" : "spark") : "missing",
       flow: info.analyticsFlow,
-      provision_cloud_sql: String(info.shouldProvisionCSQL),
+      project_status: setup.projectId
+        ? setup.isBillingEnabled
+          ? info.shouldProvisionCSQL
+            ? "blaze_provisioned_csql"
+            : "blaze"
+          : "spark"
+        : "missing",
     });
   }
 
@@ -646,7 +661,7 @@ async function promptForLocation(setup: Setup, info: RequiredInfo): Promise<void
   if (info.locationId === "") {
     const choices = await locationChoices(setup);
     info.locationId = await select<string>({
-      message: "What location should the new Cloud SQL instance be in?",
+      message: "What location would you like to use?",
       choices,
       default: FDC_DEFAULT_REGION,
     });