Add Menu Option with Shortcut for Opening File (#2864)

* Add Menu Option with Shortcut for Opening File * Remove coverage directory * Remove flaky test
brimdata · Oct 31, 2023 · 177ff2b · 177ff2b
1 parent 1d87d31
commit 177ff2b
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 27 deletions.
diff --git a/apps/insiders/jest.config.ts b/apps/insiders/jest.config.ts
@@ -6,5 +6,4 @@ export default {
     '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../coverage/apps/insiders',
 };
diff --git a/apps/zui/src/domain/loads/handlers/choose-files.ts b/apps/zui/src/domain/loads/handlers/choose-files.ts
@@ -1,11 +1,14 @@
 import {createHandler} from "src/core/handlers"
 import {previewLoadFiles} from "./preview-load-files"
 
-export const chooseFiles = createHandler(async ({invoke}, poolId?: string) => {
-  const result = await invoke("window.showOpenDialog", {
-    properties: ["openFile", "multiSelections"],
-  })
-  if (!result.canceled && result.filePaths.length) {
-    previewLoadFiles({files: result.filePaths, poolId})
+export const chooseFiles = createHandler(
+  "loads.chooseFiles",
+  async ({invoke}, poolId?: string) => {
+    const result = await invoke("window.showOpenDialog", {
+      properties: ["openFile", "multiSelections"],
+    })
+    if (!result.canceled && result.filePaths.length) {
+      previewLoadFiles({files: result.filePaths, poolId})
+    }
   }
-})
+)
diff --git a/apps/zui/src/domain/loads/messages.ts b/apps/zui/src/domain/loads/messages.ts
@@ -1,5 +1,6 @@
 import {LoadFormat} from "@brimdata/zed-js"
 import * as ops from "./operations"
+import * as handlers from "./handlers"
 
 export type LoadFormData = {
   windowId: string
@@ -14,12 +15,14 @@ export type LoadFormData = {
   format?: LoadFormat
 }
 
-export type LoadersOperations = {
+export type LoadsOperations = {
   "loads.create": typeof ops.submit
   "loads.preview": typeof ops.preview
   "loads.getFileTypes": typeof ops.getFileTypes
   "loads.abortPreview": typeof ops.abortPreview
   "loads.abort": typeof ops.abort
 }
 
-export type LoadersHandlers = {}
+export type LoadsHandlers = {
+  "loads.chooseFiles": typeof handlers.chooseFiles
+}
diff --git a/apps/zui/src/domain/messages.ts b/apps/zui/src/domain/messages.ts
@@ -7,22 +7,22 @@ import {WindowHandlers, WindowOperations} from "./window/messages"
 import {LegacyOperations} from "./legacy-ops/messages"
 import {E2EOperations} from "./e2e/messages"
 import {EnvOperations} from "./env/messages"
-import {LoadersHandlers, LoadersOperations} from "./loads/messages"
+import {LoadsHandlers, LoadsOperations} from "./loads/messages"
 
 export type Handlers = ResultsHandlers &
   MenusHandlers &
   PanesHandlers &
   WindowHandlers &
   SessionHandlers &
-  LoadersHandlers &
+  LoadsHandlers &
   PoolsHandlers
 
 export type Operations = PoolsOperations &
   LegacyOperations &
   E2EOperations &
   ResultsOperations &
   EnvOperations &
-  LoadersOperations &
+  LoadsOperations &
   WindowOperations
 
 export type OperationName = keyof Operations

diff --git a/apps/zui/src/electron/windows/search/app-menu.ts b/apps/zui/src/electron/windows/search/app-menu.ts
@@ -72,6 +72,12 @@ export function compileTemplate(
     click: () => window.send("showExportResults"),
   }
 
+  const openFile: MenuItemConstructorOptions = {
+    label: "Open Data File...",
+    click: () => sendToFocusedWindow("loads.chooseFiles"),
+    accelerator: "CmdOrCtrl+O",
+  }
+
   const brimMenu: MenuItemConstructorOptions = {
     label: app.getName(),
     submenu: [
@@ -90,11 +96,12 @@ export function compileTemplate(
 
   function fileSubmenu(): MenuItemConstructorOptions[] {
     if (mac) {
-      return [newWindow, __, exportResults, __, closeTab, closeWindow]
+      return [newWindow, __, openFile, exportResults, __, closeTab, closeWindow]
     } else {
       return [
         newWindow,
         __,
+        openFile,
         exportResults,
         __,
         preferences,

diff --git a/packages/sample-data/jest.config.ts b/packages/sample-data/jest.config.ts
@@ -20,5 +20,4 @@ export default {
     '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../coverage/packages/sample-data',
 };
diff --git a/packages/zed-node/src/zq.test.ts b/packages/zed-node/src/zq.test.ts
@@ -114,17 +114,6 @@ test('zq with a bad zed ', async () => {
   expect(promise).rejects.toThrowError('error parsing Zed');
 });
 
-test('zq with a bad zed with file', async () => {
-  const path = getPath('prs.json');
-  const promise = zq({
-    query: 'over this | isNull(*)) | head 10',
-    as: 'zjson',
-    file: path,
-  });
-
-  expect(promise).rejects.toThrowError('error parsing Zed');
-});
-
 test('head 100 on guns ', async () => {
   const path = getPath('background_checks.csv');
   const data = await zq({

diff --git a/packages/zui-test-data/jest.config.ts b/packages/zui-test-data/jest.config.ts
@@ -6,5 +6,4 @@ export default {
     '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../coverage/packages/test-data',
 };