* move quickPick helpers to utils

* remove dashboard launch (will do in separate PR)
dbos-inc · Feb 27, 2024 · 6d9248b · 6d9248b
1 parent 92fb1c2
commit 6d9248b
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 60 deletions.
diff --git a/src/commands.ts b/src/commands.ts
@@ -1,10 +1,9 @@
 import * as vscode from 'vscode';
 import { logger, config, provDB, debugProxy } from './extension';
 import { DbosMethodType } from "./sourceParser";
-import { getWorkspaceFolder, stringify } from './utils';
+import { getWorkspaceFolder, isQuickPickItem, showQuickPick } from './utils';
 import { dbos_cloud_login } from './configuration';
 import { ClientConfig } from 'pg';
-import { wrap } from 'node:module';
 
 export const cloudLoginCommandName = "dbos-ttdbg.cloud-login";
 export const startDebuggingCodeLensCommandName = "dbos-ttdbg.start-debugging-code-lens";
@@ -58,54 +57,6 @@ async function startDebugging(folder: vscode.WorkspaceFolder, getWorkflowID: (cl
     }
 }
 
-function isQuickPickItem(item: vscode.QuickPickItem | vscode.QuickInputButton | undefined): item is vscode.QuickPickItem {
-    return item !== undefined && "label" in item;
-}
-
-interface QuickPickOptions {
-    title?: string;
-    items?: vscode.QuickPickItem[];
-    buttons?: vscode.QuickInputButton[];
-    canSelectMany?: boolean;
-    placeHolder?: string;
-}
-
-async function showQuickPick(options: QuickPickOptions) {
-    const disposables: { dispose(): any }[] = [];
-    try {
-        return await new Promise<vscode.QuickPickItem | vscode.QuickInputButton | undefined>((resolve, reject) => {
-            const input = vscode.window.createQuickPick();
-            input.title = options.title;
-            input.placeholder = options.placeHolder;
-            input.canSelectMany = options.canSelectMany ?? false;
-            input.items = options.items ?? [];
-            input.buttons = options.buttons ?? [];
-
-            disposables.push(
-                input.onDidTriggerButton(async (button) => {
-                    resolve(button);
-                    input.hide();
-                }),
-                input.onDidChangeSelection(items => {
-                    const item = items[0];
-                    if (item) {
-                        resolve(item);
-                        input.hide();
-                    }
-                }),
-                input.onDidHide(() => {
-                    resolve(undefined);
-                    input.dispose();
-                }),
-            );
-
-            input.show();
-        });
-    } finally {
-        disposables.forEach(d => d.dispose());
-    }
-}
-
 export async function startDebuggingFromCodeLens(folder: vscode.WorkspaceFolder, name: string, $type: DbosMethodType) {
     logger.info(`startDebuggingFromCodeLens`, { folder: folder.uri.fsPath, name, type: $type });
     await startDebugging(folder, async (clientConfig) => {
@@ -118,16 +69,17 @@ export async function startDebuggingFromCodeLens(folder: vscode.WorkspaceFolder,
 
         const editButton: vscode.QuickInputButton = {
             iconPath: new vscode.ThemeIcon("edit"),
-            tooltip: "Specify workflow by operation uuid"
-        };
-
-        const searchButton: vscode.QuickInputButton = {
-            iconPath: new vscode.ThemeIcon("search"),
-            tooltip: "Select workflow via DBOS User Dashboard"
+            tooltip: "Specify workflow id directly"
         };
 
+        // TODO: add dashboard launch support
+        // const dashboardButton: vscode.QuickInputButton = {
+        //     iconPath: new vscode.ThemeIcon("server"),
+        //     tooltip: "Select workflow via DBOS User Dashboard"
+        // };
+
         const pickResult = await showQuickPick({
-            buttons : [editButton, searchButton],
+            buttons : [editButton],
             items,
             canSelectMany: false,
             title: "Select a workflow ID to debug"
@@ -138,9 +90,6 @@ export async function startDebuggingFromCodeLens(folder: vscode.WorkspaceFolder,
         }
         if (pickResult === editButton) {
             return await vscode.window.showInputBox({ prompt: "Enter the workflow ID" });
-        } else if (pickResult === searchButton) {
-            vscode.window.showInformationMessage("TODO: open user dashboard");
-            return undefined;
         } else {
             throw new Error(`Unexpected button: ${pickResult.tooltip ?? "<unknown>"}`);
         }

diff --git a/src/utils.ts b/src/utils.ts
@@ -61,3 +61,53 @@ export async function getWorkspaceFolder() {
 	}
 	return await vscode.window.showWorkspaceFolderPick();
 }
+
+export interface QuickPickOptions {
+    title?: string;
+    items?: vscode.QuickPickItem[];
+    buttons?: vscode.QuickInputButton[];
+    canSelectMany?: boolean;
+    placeHolder?: string;
+}
+
+export type QuickPickResult = vscode.QuickPickItem | vscode.QuickInputButton;
+
+export function isQuickPickItem(item?: QuickPickResult): item is vscode.QuickPickItem {
+    return item !== undefined && "label" in item;
+}
+
+export async function showQuickPick(options: QuickPickOptions) {
+    const disposables: { dispose(): any }[] = [];
+    try {
+        return await new Promise<QuickPickResult | undefined>((resolve, reject) => {
+            const input = vscode.window.createQuickPick();
+            input.title = options.title;
+            input.placeholder = options.placeHolder;
+            input.canSelectMany = options.canSelectMany ?? false;
+            input.items = options.items ?? [];
+            input.buttons = options.buttons ?? [];
+
+            disposables.push(
+                input.onDidTriggerButton(async (button) => {
+                    resolve(button);
+                    input.hide();
+                }),
+                input.onDidChangeSelection(items => {
+                    const item = items[0];
+                    if (item) {
+                        resolve(item);
+                        input.hide();
+                    }
+                }),
+                input.onDidHide(() => {
+                    resolve(undefined);
+                    input.dispose();
+                }),
+            );
+
+            input.show();
+        });
+    } finally {
+        disposables.forEach(d => d.dispose());
+    }
+}