From b304126af39eb7df08a4e55fc648bb08ff14fad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20B=C3=BCchele?= Date: Wed, 6 Mar 2019 05:50:05 -0800 Subject: [PATCH] Share Flipper file Reviewed By: jknoxville Differential Revision: D14340965 fbshipit-source-id: 9145ae8d409e9d4f8becfd1a19a8a9b3739af3fb --- src/MenuBar.js | 59 ++++++++++++++++++++++++++++---------------- src/fb-stubs/user.js | 5 ++++ 2 files changed, 43 insertions(+), 21 deletions(-) diff --git a/src/MenuBar.js b/src/MenuBar.js index 78ddb641e..e526db7c9 100644 --- a/src/MenuBar.js +++ b/src/MenuBar.js @@ -8,6 +8,7 @@ import type {FlipperPlugin, FlipperDevicePlugin} from './plugin.js'; import { exportStoreToFile, + exportStore, importFileToStore, IMPORT_FLIPPER_TRACE_EVENT, EXPORT_FLIPPER_TRACE_EVENT, @@ -19,6 +20,7 @@ import {remote} from 'electron'; const {dialog} = remote; import os from 'os'; import path from 'path'; +import {shareFlipperData} from './fb-stubs/user'; import { reportPlatformFailures, tryCatchReportPlatformFailures, @@ -326,27 +328,8 @@ function getTemplate( label: 'File', submenu: [ { - label: 'Export Data...', - role: 'export', - click: function(item: Object, focusedWindow: Object) { - dialog.showSaveDialog( - null, - { - title: 'FlipperExport', - defaultPath: path.join(os.homedir(), 'FlipperExport.flipper'), - }, - file => { - reportPlatformFailures( - exportStoreToFile(file, store), - `${EXPORT_FLIPPER_TRACE_EVENT}:UI`, - ); - }, - ); - }, - }, - { - label: 'Import Data...', - role: 'import', + label: 'Open File...', + accelerator: 'CommandOrControl+O', click: function(item: Object, focusedWindow: Object) { dialog.showOpenDialog( { @@ -362,6 +345,40 @@ function getTemplate( ); }, }, + { + label: 'Export', + submenu: [ + { + label: 'File...', + accelerator: 'CommandOrControl+E', + click: function(item: Object, focusedWindow: Object) { + dialog.showSaveDialog( + null, + { + title: 'FlipperExport', + defaultPath: path.join( + os.homedir(), + 'FlipperExport.flipper', + ), + }, + file => { + reportPlatformFailures( + exportStoreToFile(file, store), + `${EXPORT_FLIPPER_TRACE_EVENT}:UI`, + ); + }, + ); + }, + }, + { + label: 'Sharable Link', + accelerator: 'CommandOrControl+Shift+E', + click: async function(item: Object, focusedWindow: Object) { + shareFlipperData(await exportStore(store)); + }, + }, + ], + }, ], }); } diff --git a/src/fb-stubs/user.js b/src/fb-stubs/user.js index 940551e46..3bfff668e 100644 --- a/src/fb-stubs/user.js +++ b/src/fb-stubs/user.js @@ -16,3 +16,8 @@ export async function graphQLQuery(query: string) { export function logoutUser(): Promise { return Promise.reject(); } + +export async function shareFlipperData(trace: string) { + new window.Notification('Feature not implemented'); + return Promise.reject(); +}