UI for sharable URLs

Summary:
Uploading the Flipper data could take some while. With the current implementation the user didn't know what was happening. This is why this diff immediately shows a sheet with a spinner, until the upload is finished.

The URL is still copied to the clipboard and a notifications is displayed. Additionally the user can copy the URL from the sheet.

Reviewed By: priteshrnandgaonkar

Differential Revision: D14441759

fbshipit-source-id: c853526a7da76e2dea5e1aaf6b6eff21e4268789
This commit is contained in:
Daniel Büchele
2019-03-14 04:19:28 -07:00
committed by Facebook Github Bot
parent 50a1fa64d8
commit aad970defd
5 changed files with 173 additions and 4 deletions

View File

@@ -13,6 +13,7 @@ import TitleBar from './chrome/TitleBar.js';
import MainSidebar from './chrome/MainSidebar.js'; import MainSidebar from './chrome/MainSidebar.js';
import BugReporterDialog from './chrome/BugReporterDialog.js'; import BugReporterDialog from './chrome/BugReporterDialog.js';
import ErrorBar from './chrome/ErrorBar.js'; import ErrorBar from './chrome/ErrorBar.js';
import ShareSheet from './chrome/ShareSheet.js';
import PluginContainer from './PluginContainer.js'; import PluginContainer from './PluginContainer.js';
import Sheet from './chrome/Sheet.js'; import Sheet from './chrome/Sheet.js';
import {ipcRenderer, remote} from 'electron'; import {ipcRenderer, remote} from 'electron';
@@ -20,6 +21,7 @@ import PluginDebugger from './chrome/PluginDebugger.js';
import { import {
ACTIVE_SHEET_BUG_REPORTER, ACTIVE_SHEET_BUG_REPORTER,
ACTIVE_SHEET_PLUGIN_DEBUGGER, ACTIVE_SHEET_PLUGIN_DEBUGGER,
ACTIVE_SHEET_SHARE_DATA,
} from './reducers/application.js'; } from './reducers/application.js';
import type {Logger} from './fb-interfaces/Logger.js'; import type {Logger} from './fb-interfaces/Logger.js';
@@ -68,6 +70,8 @@ export class App extends React.Component<Props> {
); );
} else if (this.props.activeSheet === ACTIVE_SHEET_PLUGIN_DEBUGGER) { } else if (this.props.activeSheet === ACTIVE_SHEET_PLUGIN_DEBUGGER) {
return <PluginDebugger onHide={onHide} />; return <PluginDebugger onHide={onHide} />;
} else if (this.props.activeSheet === ACTIVE_SHEET_SHARE_DATA) {
return <ShareSheet onHide={onHide} />;
} else { } else {
// contents are added via React.Portal // contents are added via React.Portal
return null; return null;

View File

@@ -8,11 +8,11 @@
import type {FlipperPlugin, FlipperDevicePlugin} from './plugin.js'; import type {FlipperPlugin, FlipperDevicePlugin} from './plugin.js';
import { import {
exportStoreToFile, exportStoreToFile,
exportStore,
importFileToStore, importFileToStore,
IMPORT_FLIPPER_TRACE_EVENT, IMPORT_FLIPPER_TRACE_EVENT,
EXPORT_FLIPPER_TRACE_EVENT, EXPORT_FLIPPER_TRACE_EVENT,
} from './utils/exportData.js'; } from './utils/exportData.js';
import {setActiveSheet, ACTIVE_SHEET_SHARE_DATA} from './reducers/application';
import type {Store} from './reducers/'; import type {Store} from './reducers/';
import electron from 'electron'; import electron from 'electron';
import {GK} from 'flipper'; import {GK} from 'flipper';
@@ -20,7 +20,6 @@ import {remote} from 'electron';
const {dialog} = remote; const {dialog} = remote;
import os from 'os'; import os from 'os';
import path from 'path'; import path from 'path';
import {shareFlipperData} from './fb-stubs/user';
import { import {
reportPlatformFailures, reportPlatformFailures,
tryCatchReportPlatformFailures, tryCatchReportPlatformFailures,
@@ -374,7 +373,7 @@ function getTemplate(
label: 'Sharable Link', label: 'Sharable Link',
accelerator: 'CommandOrControl+Shift+E', accelerator: 'CommandOrControl+Shift+E',
click: async function(item: Object, focusedWindow: Object) { click: async function(item: Object, focusedWindow: Object) {
shareFlipperData(await exportStore(store)); store.dispatch(setActiveSheet(ACTIVE_SHEET_SHARE_DATA));
}, },
}, },
], ],

148
src/chrome/ShareSheet.js Normal file
View File

@@ -0,0 +1,148 @@
/**
* Copyright 2018-present Facebook.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
* @format
*/
import {
FlexColumn,
Button,
styled,
colors,
Text,
LoadingIndicator,
Component,
FlexRow,
Spacer,
Input,
} from 'flipper';
import {shareFlipperData} from '../fb-stubs/user';
import {exportStore} from '../utils/exportData.js';
import PropTypes from 'prop-types';
import {clipboard} from 'electron';
const Container = styled(FlexColumn)({
padding: 20,
width: 500,
});
const Center = styled(FlexColumn)({
alignItems: 'center',
paddingTop: 50,
paddingBottom: 50,
});
const Uploading = styled(Text)({
marginTop: 15,
});
const ErrorMessage = styled(Text)({
display: 'block',
marginTop: 6,
wordBreak: 'break-all',
whiteSpace: 'pre-line',
lineHeight: 1.35,
});
const Copy = styled(Input)({
marginRight: 0,
marginBottom: 15,
});
const Title = styled(Text)({
marginBottom: 6,
});
const InfoText = styled(Text)({
lineHeight: 1.35,
marginBottom: 15,
});
type Props = {
onHide: () => mixed,
};
type State = {
result:
| ?{
error_class: string,
error: string,
}
| {
flipperUrl: string,
},
};
export default class ShareSheet extends Component<Props, State> {
static contextTypes = {
store: PropTypes.object.isRequired,
};
state = {
result: null,
};
async componentDidMount() {
const storeData = await exportStore(this.context.store);
const result = await shareFlipperData(storeData);
this.setState({result});
if (result.flipperUrl) {
clipboard.writeText(String(result.flipperUrl));
new window.Notification('Sharable Flipper trace created', {
body: 'URL copied to clipboard',
requireInteraction: true,
});
}
}
render() {
return (
<Container>
{this.state.result ? (
<>
<FlexColumn>
{this.state.result.flipperUrl ? (
<>
<Title bold>Data Upload Successful</Title>
<InfoText>
Flipper's data was successfully uploaded. This URL can be
used to share with other Flipper users. Opening it will
import the data from your trace.
</InfoText>
<Copy value={this.state.result.flipperUrl} />
<InfoText>
When sharing your Flipper link, consider that the captured
data might contain sensitve information like access tokens
used in network requests.
</InfoText>
</>
) : (
<>
<Title bold>{this.state.result.error_class || 'Error'}</Title>
<ErrorMessage code>
{this.state.result.error ||
'The data could not be uploaded'}
</ErrorMessage>
</>
)}
</FlexColumn>
<FlexRow>
<Spacer />
<Button compact padded onClick={this.props.onHide}>
Close
</Button>
</FlexRow>
</>
) : (
<Center>
<LoadingIndicator size={30} />
<Uploading bold color={colors.macOSTitleBarIcon}>
Uploading Flipper trace...
</Uploading>
</Center>
)}
</Container>
);
}
}

View File

@@ -17,7 +17,23 @@ export function logoutUser(): Promise<void> {
return Promise.reject(); return Promise.reject();
} }
export async function shareFlipperData(trace: string) { export async function shareFlipperData(
trace: string,
): Promise<
| {
id: string,
os: 'string',
deviceType: string,
plugins: string[],
fileUrl: string,
flipperUrl: string,
}
| {
error: string,
error_class: string,
stacktrace: string,
},
> {
new window.Notification('Feature not implemented'); new window.Notification('Feature not implemented');
return Promise.reject(); return Promise.reject();
} }

View File

@@ -12,11 +12,13 @@ export const ACTIVE_SHEET_PLUGIN_SHEET: 'PLUGIN_SHEET' = 'PLUGIN_SHEET';
export const ACTIVE_SHEET_BUG_REPORTER: 'BUG_REPORTER' = 'BUG_REPORTER'; export const ACTIVE_SHEET_BUG_REPORTER: 'BUG_REPORTER' = 'BUG_REPORTER';
export const ACTIVE_SHEET_PLUGIN_DEBUGGER: 'PLUGIN_DEBUGGER' = export const ACTIVE_SHEET_PLUGIN_DEBUGGER: 'PLUGIN_DEBUGGER' =
'PLUGIN_DEBUGGER'; 'PLUGIN_DEBUGGER';
export const ACTIVE_SHEET_SHARE_DATA: 'SHARE_DATA' = 'SHARE_DATA';
export type ActiveSheet = export type ActiveSheet =
| typeof ACTIVE_SHEET_PLUGIN_SHEET | typeof ACTIVE_SHEET_PLUGIN_SHEET
| typeof ACTIVE_SHEET_BUG_REPORTER | typeof ACTIVE_SHEET_BUG_REPORTER
| typeof ACTIVE_SHEET_PLUGIN_DEBUGGER | typeof ACTIVE_SHEET_PLUGIN_DEBUGGER
| typeof ACTIVE_SHEET_SHARE_DATA
| null; | null;
export type State = { export type State = {