microsoft · cwhitten · Jun 30, 2020 · Jun 29, 2020 · Jun 29, 2020 · Jun 29, 2020
@@ -5,7 +5,7 @@ import * as React from 'react';
 import { fireEvent } from '@bfc/test-utils';
 
 import { renderWithStore } from '../../../testUtils';
-import { CreateOptions } from '../../../../src/components/CreationFlow/CreateOptions';
+import { CreateOptions } from '../../../../src/components/CreationFlow/CreateOptions/CreateOptions';
 
 describe('<CreateOptions/>', () => {
   const handleDismissMock = jest.fn();

@@ -6,7 +6,7 @@ import { fireEvent } from '@bfc/test-utils';
 
 import { renderWithStore } from '../../../testUtils';
 import { StorageFolder } from '../../../../src/store/types';
-import DefineConversation from '../../../../src/components/CreationFlow/DefineConversation';
+import DefineConversation from '../../../../src/components/CreationFlow/DefineConversation/DefineConversation';
 
 describe('<DefineConversation/>', () => {
   const onCurrentPathUpdateMock = jest.fn();

@@ -6,10 +6,10 @@ import { render, fireEvent } from '@bfc/test-utils';
 import { createHistory, createMemorySource, LocationProvider } from '@reach/router';
 
 import { StoreContext } from '../../../src/store';
-import CreationFlow from '../../../src/components/CreationFlow/index';
+import CreationFlow from '../../../src/components/CreationFlow/CreationFlow';
 import { CreationFlowStatus } from '../../../src/constants';
 
-jest.mock('../../../src/components/DialogWrapper', () => {
+jest.mock('../../../src/components/DialogWrapper/DialogWrapper', () => {
   return {
     DialogWrapper: jest.fn((props) => {
       return props.children;

@@ -4,7 +4,7 @@
 import React from 'react';
 import { render } from '@bfc/test-utils';
 
-import { DialogWrapper } from '../../../src/components/DialogWrapper';
+import { DialogWrapper } from '../../../src/components/DialogWrapper/DialogWrapper';
 import { DialogTypes } from '../../../src/components/DialogWrapper/styles';
 
 describe('<DialogWrapper />', () => {

@@ -5,7 +5,7 @@ import * as React from 'react';
 import { render, fireEvent } from '@bfc/test-utils';
 
 import { EmulatorOpenButton } from '../../../src/components/TestController/emulatorOpenButton';
-import { BotStatus } from '../../../src/constants/index';
+import { BotStatus } from '../../../src/constants';
 
 describe('<EmulatorOpenButton />', () => {
   it('should show the button to open emulator', () => {

@@ -3,7 +3,7 @@
 
 import React from 'react';
 
-import { AppUpdater } from '../../src/components/AppUpdater';
+import { AppUpdater } from '../../src/components/AppUpdater/AppUpdater';
 import { AppUpdaterStatus } from '../../src/constants';
 import { renderWithStore } from '../testUtils';
 

@@ -4,7 +4,7 @@
 import * as React from 'react';
 import { render } from '@bfc/test-utils';
 
-import '../../src/components/Conversation';
+import '../../src/components/Conversation/Conversation';
 
 describe('<Conversation/>', () => {
   it('should render the conversation', async () => {

@@ -6,9 +6,9 @@ import { render, fireEvent } from '@bfc/test-utils';
 
 import { renderWithStore } from '../testUtils';
 import { dialogs } from '../constants.json';
+import { ProjectTree } from '../../src/components/ProjectTree/ProjectTree';
 
 import { TriggerCreationModal } from './../../src/components/ProjectTree/TriggerCreationModal';
-import { ProjectTree } from './../../src/components/ProjectTree';
 import { CreateDialogModal } from './../../src/pages/design/createDialogModal';
 
 jest.mock('@bfc/code-editor', () => {

@@ -4,7 +4,7 @@
 import * as React from 'react';
 import { render } from '@bfc/test-utils';
 
-import { ErrorBoundary } from '../../src/components/ErrorBoundary/index';
+import { ErrorBoundary } from '../../src/components/ErrorBoundary/ErrorBoundary';
 
 const Store = React.createContext({
   actions: {

@@ -4,7 +4,7 @@
 import * as React from 'react';
 import { render } from '@bfc/test-utils';
 
-import { Header } from '../../src/components/Header';
+import { Header } from '../../src/components/Header/Header';
 
 describe('<Header />', () => {
   it('should render the header', () => {

@@ -6,7 +6,7 @@ import { fireEvent, render } from '@bfc/test-utils';
 
 import { RecentBotList } from '../../src/pages/home/RecentBotList';
 import { ExampleList } from '../../src/pages/home/ExampleList';
-import { ToolBar } from '../../src/components/ToolBar/index';
+import { ToolBar } from '../../src/components/ToolBar/ToolBar';
 describe('<Home/>', () => {
   it('should dispatch onSelectionChanged event when clicked on a link on <RecentBotList>', () => {
     const recentProjects = [

@@ -4,11 +4,11 @@
 import React from 'react';
 import { render } from '@bfc/test-utils';
 
-import OnboardingContext from '../../src/Onboarding/context';
+import OnboardingContext from '../../src/Onboarding/OnboardingContext';
 import { StoreContext } from '../../src/store';
-import TeachingBubbles from '../../src/Onboarding/TeachingBubbles';
-import { stepSets as defaultStepSets } from '../../src/Onboarding/onboarding';
-import WelcomeModal from '../../src/Onboarding/WelcomeModal';
+import TeachingBubbles from '../../src/Onboarding/TeachingBubbles/TeachingBubbles';
+import { stepSets as defaultStepSets } from '../../src/Onboarding/onboardingUtils';
+import WelcomeModal from '../../src/Onboarding/WelcomeModal/WelcomeModal';
 
 describe('<Onboarding />', () => {
   let value;

@@ -5,7 +5,7 @@ import * as React from 'react';
 import { fireEvent } from '@bfc/test-utils';
 
 import { dialogs } from '../constants.json';
-import { ProjectTree } from '../../src/components/ProjectTree/index.tsx';
+import { ProjectTree } from '../../src/components/ProjectTree/ProjectTree.tsx';
 import { renderWithStore } from '../testUtils';
 
 describe('<ProjectTree/>', () => {

@@ -7,7 +7,7 @@ import { Skill } from '@bfc/shared';
 
 import Skills from '../../src/pages/skills';
 import SkillList from '../../src/pages/skills/skill-list';
-import CreateSkillModal from '../../src/components/SkillForm/CreateSkillModal';
+import CreateSkillModal from '../../src/components/SkillForm/CreateSkillModal/CreateSkillModal';
 import { renderWithStore } from '../testUtils';
 
 jest.mock('../../src/components/SkillForm/CreateSkillModal/validateManifestUrl', () => ({

@@ -4,7 +4,7 @@
 import * as React from 'react';
 import { fireEvent, render } from '@bfc/test-utils';
 
-import { ToolBar } from '../../src/components/ToolBar';
+import { ToolBar } from '../../src/components/ToolBar/ToolBar';
 
 const toolbarItems = (onClick) => [
   {

@@ -4,7 +4,7 @@
 import * as React from 'react';
 import { render } from '@bfc/test-utils';
 
-import { NavItem } from '../src/components/NavItem';
+import { NavItem } from '../src/components/NavItem/NavItem';
 import { StoreProvider } from '../src/store';
 
 describe('<Header />', () => {

@@ -4,8 +4,8 @@
 import * as React from 'react';
 import { render } from '@bfc/test-utils';
 
-import { BASEPATH } from '../src/constants/index';
-import { NotFound } from '../src/components/NotFound';
+import { BASEPATH } from '../src/constants';
+import { NotFound } from '../src/components/NotFound/NotFound';
 
 describe('<NotFound />', () => {
   it('should render a not found page', async () => {

@@ -1,8 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+import { ActionTypes } from '../../src/constants';
+
 import { applyMiddleware } from './../../src/store';
 import { Store, State } from './../../src/store/types';
-import { ActionTypes } from './../../src/constants';
 
 describe('applyMiddleware', () => {
   it('warns when dispatching during middleware setup', () => {

@@ -2,7 +2,8 @@
 // Licensed under the MIT License.
 import { DialogInfo, LgFile, LuFile } from '@bfc/shared';
 
-import { ActionTypes } from './../../../src/constants';
+import { ActionTypes } from '../../../src/constants';
+
 import filePersistence from './../../../src/store/persistence/FilePersistence';
 import { State } from './../../../src/store/types';
 

@@ -3,7 +3,7 @@
 
 import createReducer from '../../../src/store/reducer/createReducer';
 
-jest.mock('../../../src/constants/index', () => {
+jest.mock('../../../src/constants', () => {
   return {
     ActionTypes: {
       mockActionType: 'mockActionType',

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { ActionTypes, FileTypes } from '../../../src/constants/index';
+import { ActionTypes, FileTypes } from '../../../src/constants';
 import { reducer } from '../../../src/store/reducer/index';
 
 const mockResponse = {

@@ -10,24 +10,24 @@ import { FocusZone } from 'office-ui-fabric-react/lib/FocusZone';
 import { TooltipHost, DirectionalHint } from 'office-ui-fabric-react/lib/Tooltip';
 import formatMessage from 'format-message';
 
-import { Header } from './components/Header';
-import { NavItem } from './components/NavItem';
+import { Header } from './components/Header/Header';
+import { NavItem } from './components/NavItem/NavItem';
 import { BASEPATH } from './constants';
 import Routes from './router';
 import { StoreContext } from './store';
 import { main, sideBar, content, divider, globalNav, leftNavBottom, rightPanel, dividerTop } from './styles';
 import { resolveToBasePath } from './utils/fileUtil';
-import { ErrorBoundary } from './components/ErrorBoundary';
-import { RequireAuth } from './components/RequireAuth';
+import { ErrorBoundary } from './components/ErrorBoundary/ErrorBoundary';
+import { RequireAuth } from './components/RequireAuth/RequireAuth';
 import onboardingState from './utils/onboardingStorage';
 import { isElectron } from './utils/electronUtil';
 import { useLinks } from './utils/hooks';
 
 initializeIcons(undefined, { disableWarnings: true });
 
-const Onboarding = React.lazy(() => import('./Onboarding'));
+const Onboarding = React.lazy(() => import('./Onboarding/Onboarding'));
 const AppUpdater = React.lazy(() =>
-  import('./components/AppUpdater').then((module) => ({ default: module.AppUpdater }))
+  import('./components/AppUpdater/AppUpdater').then((module) => ({ default: module.AppUpdater }))
 );
 
 // eslint-disable-next-line react/display-name

@@ -6,14 +6,14 @@ import { navigate } from '@reach/router';
 import formatMessage from 'format-message';
 
 import onboardingState from '../utils/onboardingStorage';
-import { OpenConfirmModal } from '../components/Modal';
+import { OpenConfirmModal } from '../components/Modal/ConfirmDialog';
 import { StoreContext } from '../store';
 import { useLocation } from '../utils/hooks';
 
-import OnboardingContext from './context';
-import TeachingBubbles from './TeachingBubbles';
-import WelcomeModal from './WelcomeModal';
-import { IStepSet, stepSets as defaultStepSets } from './onboarding';
+import OnboardingContext from './OnboardingContext';
+import TeachingBubbles from './TeachingBubbles/TeachingBubbles';
+import WelcomeModal from './WelcomeModal/WelcomeModal';
+import { IStepSet, stepSets as defaultStepSets } from './onboardingUtils';
 
 const getCurrentSet = (stepSets) => stepSets.findIndex(({ id }) => id === onboardingState.getCurrentSet('setUpBot'));
 

@@ -3,7 +3,7 @@
 
 import { createContext } from 'react';
 
-import { IStep, IStepSet } from './onboarding';
+import { IStep, IStepSet } from './onboardingUtils';
 
 interface OnboardingContext {
   actions: {

@@ -6,8 +6,8 @@ import formatMessage from 'format-message';
 import debounce from 'lodash/debounce';
 import { TeachingBubble } from 'office-ui-fabric-react/lib/TeachingBubble';
 
-import OnboardingContext from '../context';
-import { getTeachingBubble } from '../onboarding';
+import OnboardingContext from '../OnboardingContext';
+import { getTeachingBubble } from '../onboardingUtils';
 import { StoreContext } from '../../store';
 
 import { teachingBubbleStyles, teachingBubbleTheme } from './styles';

@@ -7,7 +7,7 @@ import { useContext } from 'react';
 import formatMessage from 'format-message';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
 
-import OnboardingContext from '../../context';
+import OnboardingContext from '../../OnboardingContext';
 import { palette } from '../../palette';
 
 import { buttonStyles, content } from './styles';

@@ -8,7 +8,7 @@ import formatMessage from 'format-message';
 import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import { IconButton, PrimaryButton } from 'office-ui-fabric-react/lib/Button';
 
-import OnboardingContext from '../../context';
+import OnboardingContext from '../../OnboardingContext';
 
 import {
   buttonStyle,

@@ -4,10 +4,10 @@
 import React, { useContext } from 'react';
 import { Modal } from 'office-ui-fabric-react/lib/Modal';
 
-import OnboardingContext from '../context';
+import OnboardingContext from '../OnboardingContext';
 
-import CollapsedWelcomeModal from './Collapsed';
-import ExpandedWelcomeModal from './Expanded';
+import CollapsedWelcomeModal from './Collapsed/CollapsedWelcomeModal';
+import ExpandedWelcomeModal from './Expanded/ExpandedWelcomeModal';
 import { collapsedStyles, expandedStyles } from './style';
 
 const WelcomeModal = () => {

@@ -23,7 +23,7 @@ import { Sticky, StickyPositionType } from 'office-ui-fabric-react/lib/Sticky';
 import { ProjectTemplate } from '@bfc/shared';
 
 import { DialogCreationCopy, EmptyBotTemplateId } from '../../../constants';
-import { DialogWrapper } from '../../DialogWrapper';
+import { DialogWrapper } from '../../DialogWrapper/DialogWrapper';
 import { DialogTypes } from '../../DialogWrapper/styles';
 
 import {

@@ -11,9 +11,9 @@ import { CreationFlowStatus } from '../../constants';
 import { StoreContext } from '../../store';
 import Home from '../../pages/home';
 
-import { CreateOptions } from './CreateOptions';
-import { OpenProject } from './OpenProject';
-import DefineConversation from './DefineConversation';
+import { CreateOptions } from './CreateOptions/CreateOptions';
+import { OpenProject } from './OpenProject/OpenProject';
+import DefineConversation from './DefineConversation/DefineConversation';
 
 type CreationFlowProps = RouteComponentProps<{}>;
 

@@ -14,11 +14,11 @@ import { RouteComponentProps } from '@reach/router';
 import querystring from 'query-string';
 
 import { DialogCreationCopy, nameRegex } from '../../../constants';
-import { DialogWrapper } from '../../DialogWrapper';
+import { DialogWrapper } from '../../DialogWrapper/DialogWrapper';
 import { DialogTypes } from '../../DialogWrapper/styles';
 import { LocationSelectContent } from '../LocationBrowser/LocationSelectContent';
 import { StorageFolder } from '../../../store/types';
-import { FieldConfig, useForm } from '../../../hooks';
+import { FieldConfig, useForm } from '../../../hooks/useForm';
 
 import { name, description, halfstack, stackinput } from './styles';
 const MAXTRYTIMES = 10000;

@@ -26,8 +26,7 @@ import { ComboBox, IComboBox, IComboBoxOption } from 'office-ui-fabric-react/lib
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import moment from 'moment';
 
-import { nameRegex } from '../../../constants';
-import { FileTypes } from '../../../constants/index';
+import { FileTypes, nameRegex } from '../../../constants';
 import { StorageFolder, File } from '../../../store/types';
 import { getFileIconName, calculateTimeDiff } from '../../../utils';
 

@@ -10,7 +10,7 @@ import formatMessage from 'format-message';
 import { RouteComponentProps } from '@reach/router';
 
 import { DialogCreationCopy } from '../../../constants';
-import { DialogWrapper } from '../../DialogWrapper';
+import { DialogWrapper } from '../../DialogWrapper/DialogWrapper';
 import { DialogTypes } from '../../DialogWrapper/styles';
 import { LocationSelectContent } from '../LocationBrowser/LocationSelectContent';
 import { StorageFolder } from '../../../store/types';

@@ -7,7 +7,7 @@ import React, { Component } from 'react';
 import formatMessage from 'format-message';
 
 import { StoreContext } from '../../store';
-import { ErrorPopup } from '../ErrorPopup';
+import { ErrorPopup } from '../ErrorPopup/ErrorPopup';
 
 const githubIssueUrl = `https://github.com/microsoft/BotFramework-Composer/issues`;
 const errorToShow = {

@@ -7,7 +7,8 @@ import { Dialog, DialogType, DialogFooter } from 'office-ui-fabric-react/lib/Dia
 import { PrimaryButton } from 'office-ui-fabric-react/lib/Button';
 import ReactDOM from 'react-dom';
 
-import { dialogStyle, builtInStyles } from './styles';
+import { builtInStyles } from './styles';
+import { dialogStyle } from './dialogStyle';
 
 type Props = {
   setting: {

@@ -9,7 +9,8 @@ import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button'
 import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
 import ReactDOM from 'react-dom';
 
-import { dialogStyle, builtInStyles, dialog, dialogModal, confirmationContainer } from './styles';
+import { builtInStyles, dialog, dialogModal, confirmationContainer } from './styles';
+import { dialogStyle } from './dialogStyle';
 
 interface ConfirmDialogProps {
   onCancel: () => void;