jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use BaseDevice from flipper-frontend-core in flipper-ui-core

Browse Source 
Summary: Use BasDevice definition from flipper-frontend-core in flipper-ui-core and remove the redundant definition from flipper-ui-core

Reviewed By: lblasa

Differential Revision: D37234785

fbshipit-source-id: 6e768090a197c1d2c49cb1cd573acea12fb65d24
This commit is contained in:
Andrey Goncharov
2022-06-20 12:18:40 -07:00
committed by Facebook GitHub Bot
parent ef5fa275a3
commit fd380a4c1e
32 changed files with 29 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
desktop/flipper-ui-core/src/utils/__tests__/exportData.node.tsx
View File

@@ -733,8 +733,6 @@ test('test determinePluginsToProcess for mutilple clients having plugins present
logger,
mockStore,
new Set(['TestPlugin', 'TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -750,8 +748,6 @@ test('test determinePluginsToProcess for mutilple clients having plugins present
logger,
mockStore,
new Set(['TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -767,8 +763,6 @@ test('test determinePluginsToProcess for mutilple clients having plugins present
logger,
mockStore,
new Set(['TestPlugin', 'TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -829,8 +823,6 @@ test('test determinePluginsToProcess for no selected plugin present in any clien
logger,
mockStore,
new Set(['TestPlugin', 'TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -846,8 +838,6 @@ test('test determinePluginsToProcess for no selected plugin present in any clien
logger,
mockStore,
new Set(['TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -891,8 +881,6 @@ test('test determinePluginsToProcess for multiple clients on same device', async
logger,
mockStore,
new Set(['TestPlugin', 'TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -908,8 +896,6 @@ test('test determinePluginsToProcess for multiple clients on same device', async
logger,
mockStore,
new Set(['TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -958,8 +944,6 @@ test('test determinePluginsToProcess for multiple clients on different device',
logger,
mockStore,
new Set(['TestPlugin', 'TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -975,8 +959,6 @@ test('test determinePluginsToProcess for multiple clients on different device',
logger,
mockStore,
new Set(['TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -992,8 +974,6 @@ test('test determinePluginsToProcess for multiple clients on different device',
logger,
mockStore,
new Set(['TestPlugin', 'TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -1009,8 +989,6 @@ test('test determinePluginsToProcess for multiple clients on different device',
logger,
mockStore,
new Set(['TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
device1,
flipperServer,
);
@@ -1083,8 +1061,6 @@ test('test determinePluginsToProcess to ignore archived clients', async () => {
logger,
mockStore,
new Set(['TestPlugin', 'TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
archivedDevice,
flipperServer,
);
@@ -1100,8 +1076,6 @@ test('test determinePluginsToProcess to ignore archived clients', async () => {
logger,
mockStore,
new Set(['TestPlugin', 'TestDevicePlugin']),
// TODO: Remove at the end of migration
// @ts-expect-error
archivedDevice,
flipperServer,
);

2
desktop/flipper-ui-core/src/utils/clientUtils.tsx
View File

@@ -9,7 +9,7 @@
import {deconstructClientId} from 'flipper-common';
import type Client from '../Client';
import type BaseDevice from '../devices/BaseDevice';
import type {BaseDevice} from 'flipper-frontend-core';
export function currentActiveApps(
clients: Array<Client>,

2
desktop/flipper-ui-core/src/utils/createSandyPluginWrapper.tsx
View File

@@ -28,7 +28,7 @@ import {useStore} from './useStore';
import {setStaticView, StaticView} from '../reducers/connections';
import {getStore} from '../store';
import {setActiveNotifications} from '../reducers/notifications';
import BaseDevice from '../devices/BaseDevice';
import {BaseDevice} from 'flipper-frontend-core';
export type SandyPluginModule = ConstructorParameters<
typeof _SandyPluginDefinition

8
desktop/flipper-ui-core/src/utils/exportData.tsx
View File

@@ -10,14 +10,14 @@
import * as React from 'react';
import {getLogger} from 'flipper-common';
import {Store, MiddlewareAPI} from '../reducers';
import {DeviceExport} from '../devices/BaseDevice';
import {DeviceExport} from 'flipper-frontend-core';
import {selectedPlugins, State as PluginsState} from '../reducers/plugins';
import {PluginNotification} from '../reducers/notifications';
import Client, {ClientExport} from '../Client';
import {getAppVersion} from './info';
import {pluginKey} from '../utils/pluginKey';
import {DevicePluginMap, ClientPluginMap} from '../plugin';
import {default as BaseDevice} from '../devices/BaseDevice';
import {BaseDevice} from 'flipper-frontend-core';
import {ArchivedDevice} from 'flipper-frontend-core';
import {v4 as uuidv4} from 'uuid';
import {tryCatchReportPlatformFailures} from 'flipper-common';
@@ -540,14 +540,10 @@ export async function importDataToStore(
);
store.dispatch({
type: 'REGISTER_DEVICE',
// TODO: Remove at the end of migration
// @ts-expect-error
payload: archivedDevice,
});
store.dispatch({
type: 'SELECT_DEVICE',
// TODO: Remove at the end of migration
// @ts-expect-error
payload: archivedDevice,
});

2
desktop/flipper-ui-core/src/utils/flipperLibImplementation/index.tsx
View File

@@ -21,7 +21,7 @@ import {
} from 'flipper-common';
import type {Store} from '../../reducers';
import createPaste from '../../fb-stubs/createPaste';
import type BaseDevice from '../../devices/BaseDevice';
import type {BaseDevice} from 'flipper-frontend-core';
import constants from '../../fb-stubs/constants';
import {addNotification} from '../../reducers/notifications';
import {deconstructPluginKey} from 'flipper-common';

2
desktop/flipper-ui-core/src/utils/pluginUtils.tsx
View File

@@ -10,7 +10,7 @@
import type {PluginDefinition} from '../plugin';
import type {State, Store} from '../reducers';
import type {State as PluginsState} from '../reducers/plugins';
import type BaseDevice from '../devices/BaseDevice';
import type {BaseDevice} from 'flipper-frontend-core';
import type Client from '../Client';
import type {
ActivatablePluginDetails,

2
desktop/flipper-ui-core/src/utils/reduxDevToolsConfig.tsx
View File

@@ -8,7 +8,7 @@
*/
import {State} from '../reducers/index';
import {DeviceExport} from '../devices/BaseDevice';
import {DeviceExport} from 'flipper-frontend-core';
export const stateSanitizer = (state: State) => {
if (state.connections && state.connections.devices) {

2
desktop/flipper-ui-core/src/utils/screenshot.tsx
View File

@@ -7,7 +7,7 @@
* @format
*/
import BaseDevice from '../devices/BaseDevice';
import {BaseDevice} from 'flipper-frontend-core';
import {reportPlatformFailures} from 'flipper-common';
import {getRenderHostInstance} from '../RenderHost';
import {getFlipperLib, path} from 'flipper-plugin';