From 75c4f20c8a66b257aa81dd5cd27077fb60621f51 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Wed, 18 Aug 2021 03:58:13 -0700 Subject: [PATCH] Revert "First level of questions and redirection along with unit tests" (#2702) Summary: This reverts commit 2e87164152d0365d407ffa8a608bd45ead75ca21. Causing OSS tests to break: https://github.com/facebook/flipper/runs/3358415851 Pull Request resolved: https://github.com/facebook/flipper/pull/2702 Differential Revision: D30393320 Pulled By: passy fbshipit-source-id: a326a59d35fdbe0af0c52a2502a01ab9753d2e60 --- .../sandy-chrome/appinspect/AppSelector.tsx | 6 +- .../__tests__/TroubleshootingGuide.node.tsx | 73 ------------------- .../fb-stubs/TroubleshootingGuide.tsx | 2 +- .../troubleshooting/GuideFirstScreen.tsx | 61 ---------------- .../appinspect/troubleshooting/Question1.tsx | 26 ------- .../appinspect/troubleshooting/Question2.tsx | 26 ------- .../appinspect/troubleshooting/Question3.tsx | 26 ------- 7 files changed, 3 insertions(+), 217 deletions(-) delete mode 100644 desktop/app/src/sandy-chrome/appinspect/__tests__/TroubleshootingGuide.node.tsx delete mode 100644 desktop/app/src/sandy-chrome/appinspect/troubleshooting/GuideFirstScreen.tsx delete mode 100644 desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question1.tsx delete mode 100644 desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question2.tsx delete mode 100644 desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question3.tsx diff --git a/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx b/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx index e8297db95..b5e95a036 100644 --- a/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx +++ b/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx @@ -29,8 +29,7 @@ import BaseDevice, {OS} from '../../server/devices/BaseDevice'; import Client from '../../Client'; import {State} from '../../reducers'; import {brandColors, brandIcons, colors} from '../../ui/components/colors'; -import {TroubleshootingGuide} from './fb-stubs/TroubleshootingGuide'; -import GK from '../../fb-stubs/GK'; +import TroubleshootingGuide from './fb-stubs/TroubleshootingGuide'; const {Text} = Typography; @@ -109,8 +108,7 @@ export function AppSelector() { ) : ( - // GK check to decide if troubleshooting guide will be visible or not - + ); } diff --git a/desktop/app/src/sandy-chrome/appinspect/__tests__/TroubleshootingGuide.node.tsx b/desktop/app/src/sandy-chrome/appinspect/__tests__/TroubleshootingGuide.node.tsx deleted file mode 100644 index 851eb4ecf..000000000 --- a/desktop/app/src/sandy-chrome/appinspect/__tests__/TroubleshootingGuide.node.tsx +++ /dev/null @@ -1,73 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - */ - -import {render, fireEvent} from '@testing-library/react'; -import React from 'react'; -import {TroubleshootingGuide} from '../fb/TroubleshootingGuide'; -import {Provider} from 'react-redux'; -import {createMockFlipperWithPlugin} from '../../../test-utils/createMockFlipperWithPlugin'; -import {TestUtils} from 'flipper-plugin'; -import {loadNext} from '../fb/TroubleshootingGuide'; - -test('render initial screen of troubleshooting guide correctly', async () => { - const TestPlugin = TestUtils.createTestPlugin({ - plugin() { - return {}; - }, - }); - - const {store} = await createMockFlipperWithPlugin(TestPlugin); - - const res = render( - - , - , - ); - - // Clicking on the troubleshooting guide button to launch the guide - fireEvent.click(res.getByText('Troubleshooting Guide')); - - // Checking if the 3 initial questions appear - expect(res.queryAllByText("Can't see the device.").length).toBe(1); - expect(res.queryAllByText('Can see the device but not the app.').length).toBe( - 1, - ); - expect( - res.queryAllByText('Can see the device and the app but not the plugin.') - .length, - ).toBe(1); - - // Clicking on close - fireEvent.click(res.getByRole('button', {name: 'Close'})); - - // Checking if close on the modal popup works and the questions are no longer visible - expect(res.queryAllByText("Can't see the device.").length).toBe(0); - expect(res.queryAllByText('Can see the device but not the app.').length).toBe( - 0, - ); - expect( - res.queryAllByText('Can see the device and the app but not the plugin.') - .length, - ).toBe(0); - - // Clicking on the first radio checkbox ie the first question after re-launching the guide - fireEvent.click(res.getByText('Troubleshooting Guide')); - fireEvent.click(res.getByText("Can't see the device.")); - fireEvent.click(res.getByText('Next')); - - // Checking if the screen of the first question shows up - expect(res.queryAllByText('Work in progress Q1 !').length).toBe(1); -}); - -test('check return value of loadNext function', async () => { - const toggleModal = jest.fn(); - const result = loadNext('cannot_see_device', toggleModal); - // Checking loadNext returns 'q1' which will be used to toggleModal when the user input in the previous screen was 'opt1' - expect(result).toBe('question1'); -}); diff --git a/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx b/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx index 0c624dd00..f7e7ee642 100644 --- a/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx +++ b/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx @@ -10,6 +10,6 @@ import React from 'react'; import {NoDevices} from '../NoDevices'; -export function TroubleshootingGuide(_props: {showGuide: boolean}) { +export default function TroubleshootingGuide() { return ; } diff --git a/desktop/app/src/sandy-chrome/appinspect/troubleshooting/GuideFirstScreen.tsx b/desktop/app/src/sandy-chrome/appinspect/troubleshooting/GuideFirstScreen.tsx deleted file mode 100644 index 9e2abfa70..000000000 --- a/desktop/app/src/sandy-chrome/appinspect/troubleshooting/GuideFirstScreen.tsx +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - */ - -import React, {useState} from 'react'; -import {Modal, Typography, Radio, Space, Button, RadioChangeEvent} from 'antd'; -import {Layout} from 'flipper-plugin'; -import {ModalDialog} from '../fb/TroubleshootingGuide'; - -const {Text} = Typography; - -export function GuideFirstScreen(props: { - toggleModal: (showModal: ModalDialog) => void; - onAnswer: ( - answer: string, - toggleModal: (showModal: ModalDialog) => void, - ) => void; -}) { - const [answer, setAnswer] = useState(''); - const handleChange = (e: RadioChangeEvent) => { - setAnswer(e.target.value); - }; - - return ( - props.toggleModal('next')} - bodyStyle={{maxHeight: 800, overflow: 'auto'}}> - - What problem are you facing? - - - - Can't see the device. - - - Can see the device but not the app. - - - Can see the device and the app but not the plugin. - - - - - - - ); -} diff --git a/desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question1.tsx b/desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question1.tsx deleted file mode 100644 index ec3b2d06a..000000000 --- a/desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question1.tsx +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - */ - -import React from 'react'; -import {Modal} from 'antd'; -import {ModalDialog} from '../fb/TroubleshootingGuide'; - -export function Question1(props: { - toggleModal: (showModal: ModalDialog) => void; -}) { - return ( - props.toggleModal('next')} - bodyStyle={{maxHeight: 800, overflow: 'auto'}}> - ); -} diff --git a/desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question2.tsx b/desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question2.tsx deleted file mode 100644 index f3c183520..000000000 --- a/desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question2.tsx +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - */ - -import React from 'react'; -import {Modal} from 'antd'; -import {ModalDialog} from '../fb/TroubleshootingGuide'; - -export function Question2(props: { - toggleModal: (showModal: ModalDialog) => void; -}) { - return ( - props.toggleModal('next')} - bodyStyle={{maxHeight: 800, overflow: 'auto'}}> - ); -} diff --git a/desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question3.tsx b/desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question3.tsx deleted file mode 100644 index 046f757db..000000000 --- a/desktop/app/src/sandy-chrome/appinspect/troubleshooting/Question3.tsx +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - */ - -import React from 'react'; -import {Modal} from 'antd'; -import {ModalDialog} from '../fb/TroubleshootingGuide'; - -export function Question3(props: { - toggleModal: (showModal: ModalDialog) => void; -}) { - return ( - props.toggleModal('next')} - bodyStyle={{maxHeight: 800, overflow: 'auto'}}> - ); -}