TagSpaces is an offline, open source, document manager with tagging support
refactoring dialogs
Ilian Sapundshiev12dd7eb351e8
diff --git a/app/components/VerticalNavigation.js b/app/components/VerticalNavigation.jsindex bd304787f..45b9a0e10 100644--- a/app/components/VerticalNavigation.js+++ b/app/components/VerticalNavigation.js@@ -34,10 +34,6 @@ import HelpIcon from '@material-ui/icons/HelpOutline';import { withTheme } from '@material-ui/core/styles';import SplitPane from 'react-split-pane';import LogoIcon from '../assets/images/icon100x100.svg';-import SettingsDialog from './dialogs/settings/SettingsDialog';-import CreateDirectoryDialog from './dialogs/CreateDirectoryDialog';-import CreateFileDialog from './dialogs/CreateFileDialog';-// import SelectDirectoryDialog from './dialogs/SelectDirectoryDialog';import TagLibrary from '../components/TagLibrary';import Search from '../components/Search';import PerspectiveManager from '../components/PerspectiveManager';@@ -49,11 +45,7 @@ import { type Tag } from '../reducers/taglibrary';import {actions as AppActions,getDirectoryPath,- isEditTagDialogOpened,isSettingsDialogOpened,- isCreateFileDialogOpened,- isCreateDirectoryOpened,- isSelectDirectoryDialogOpened,isLocationManagerPanelOpened,isTagLibraryPanelOpened,isSearchPanelOpened,@@ -64,27 +56,6 @@ import {import { actions as SettingsActions, isFirstRun } from '../reducers/settings';import LoadingLazy from './LoadingLazy';-const EditEntryTagDialog = React.lazy(() => import(/* webpackChunkName: "EditEntryTagDialog" */ './dialogs/EditEntryTagDialog'));-const EditEntryTagDialogAsync = props => (- <React.Suspense fallback={<LoadingLazy />}>- <EditEntryTagDialog {...props} />- </React.Suspense>-);--const SelectDirectoryDialog = React.lazy(() => import(/* webpackChunkName: "LicenseDialog" */ './dialogs/SelectDirectoryDialog'));-const SelectDirectoryAsync = props => (- <React.Suspense fallback={<LoadingLazy />}>- <SelectDirectoryDialog {...props} />- </React.Suspense>-);--// const SettingsDialog = React.lazy(() => import(/* webpackChunkName: "SettingsDialog" */ './dialogs/SettingsDialog'));-// const SettingsDialogAsync = props => (-// <React.Suspense fallback={<LoadingLazy />}>-// <SettingsDialog {...props} />-// </React.Suspense>-// );-const ProTeaserDialog = React.lazy(() => import(/* webpackChunkName: "ProTeaserDialog" */ './dialogs/ProTeaserDialog'));const ProTeaserDialogAsync = props => (<React.Suspense fallback={<LoadingLazy />}>@@ -93,24 +64,16 @@ const ProTeaserDialogAsync = props => ();type Props = {+ theme: Object,isFirstRun: boolean,setFirstRun: (isFirstRun: boolean) => void,toggleOnboardingDialog: () => void,- isEditTagDialogOpened: boolean,- toggleEditTagDialog: () => void,- currentEntryPath: string,- selectedTag: Tag,- isCreateDirectoryOpened: boolean,- toggleCreateDirectoryDialog: () => void,- isCreateFileDialogOpened: boolean,toggleCreateFileDialog: () => void,toggleAboutDialog: () => void,toggleKeysDialog: () => void,- isSettingsDialogOpened: boolean,toggleSettingsDialog: () => void,+ isSettingsDialogOpened: () => void,setManagementPanelVisibility: boolean => void,- isSelectDirectoryDialogOpened: boolean,- toggleSelectDirectoryDialog: () => void,isLocationManagerPanelOpened: boolean,openLocationManagerPanel: () => void,isTagLibraryPanelOpened: boolean,@@ -126,21 +89,17 @@ type Props = {openURLExternally: (url: string) => void,switchTheme: () => void,shouldTogglePanel: string,- currentDirectory: string,isReadOnlyMode: boolean};type State = {- selectedDirectoryPath?: string,isManagementPanelVisible?: boolean, // evtl. redux migration- CreateFileDialogKey: string,isProTeaserVisible: boolean};class VerticalNavigation extends React.Component<Props, State> {state = {isManagementPanelVisible: true,- CreateFileDialogKey: uuidv1(),isProTeaserVisible: false};@@ -184,41 +143,21 @@ class VerticalNavigation extends React.Component<Props, State> {this.setState({ isProTeaserVisible: !this.state.isProTeaserVisible });}- chooseDirectoryPath = (currentPath: string) => {- this.setState({- selectedDirectoryPath: currentPath- });- };-- resetState = dialogKey => {- this.setState({- [dialogKey]: uuidv1()- });- };-render() {const {isFirstRun,- isEditTagDialogOpened,- isSettingsDialogOpened,- isCreateDirectoryOpened,- isCreateFileDialogOpened,- isSelectDirectoryDialogOpened,isLocationManagerPanelOpened,isTagLibraryPanelOpened,isSearchPanelOpened,+ isSettingsDialogOpened,isPerspectivesPanelOpened,isHelpFeedbackPanelOpened,- currentDirectory,isReadOnlyMode,- toggleAboutDialog,- toggleCreateDirectoryDialog,toggleCreateFileDialog,- toggleSelectDirectoryDialog,+ toggleAboutDialog,toggleOnboardingDialog,toggleSettingsDialog,toggleKeysDialog,- toggleEditTagDialog,openLocationManagerPanel,openTagLibraryPanel,openSearchPanel,@@ -228,7 +167,8 @@ class VerticalNavigation extends React.Component<Props, State> {setManagementPanelVisibility,openFileNatively,openURLExternally,- setFirstRun+ setFirstRun,+ theme} = this.props;return (<div>@@ -240,30 +180,6 @@ class VerticalNavigation extends React.Component<Props, State> {}`}</style>- <CreateDirectoryDialog- open={isCreateDirectoryOpened}- onClose={toggleCreateDirectoryDialog}- selectedDirectoryPath={currentDirectory}- />- {isEditTagDialogOpened && (- <EditEntryTagDialogAsync- key={uuidv1()}- open={isEditTagDialogOpened}- onClose={toggleEditTagDialog}- currentEntryPath={this.props.currentEntryPath}- selectedTag={this.props.selectedTag}- />- )}- {isSelectDirectoryDialogOpened && (- <SelectDirectoryAsync- open={isSelectDirectoryDialogOpened}- onClose={toggleSelectDirectoryDialog}- chooseDirectoryPath={this.chooseDirectoryPath}- selectedDirectoryPath={- this.state.selectedDirectoryPath || currentDirectory- }- />- )}{this.state.isProTeaserVisible && (<ProTeaserDialogAsyncopen={this.state.isProTeaserVisible}@@ -272,31 +188,12 @@ class VerticalNavigation extends React.Component<Props, State> {key={uuidv1()}/>)}- {/* {isSettingsDialogOpened && (- <SettingsDialogAsync- open={isSettingsDialogOpened}- onClose={toggleSettingsDialog}- />- )} */}- <SettingsDialog- open={isSettingsDialogOpened}- onClose={toggleSettingsDialog}- />- <CreateFileDialog- key={uuidv1()}- open={isCreateFileDialogOpened}- selectedDirectoryPath={- this.state.selectedDirectoryPath || currentDirectory- }- chooseDirectoryPath={this.chooseDirectoryPath}- onClose={toggleCreateFileDialog}- /><SplitPanesplit="vertical"minSize={44}maxSize={44}defaultSize={44}- resizerStyle={{ backgroundColor: this.props.theme.palette.divider }}+ resizerStyle={{ backgroundColor: theme.palette.divider }}><div style={this.styles.panel}><IconButton@@ -489,17 +386,12 @@ class VerticalNavigation extends React.Component<Props, State> {function mapStateToProps(state) {return {isFirstRun: isFirstRun(state),- isEditTagDialogOpened: isEditTagDialogOpened(state),isSettingsDialogOpened: isSettingsDialogOpened(state),- isCreateDirectoryOpened: isCreateDirectoryOpened(state),- isCreateFileDialogOpened: isCreateFileDialogOpened(state),- isSelectDirectoryDialogOpened: isSelectDirectoryDialogOpened(state),isLocationManagerPanelOpened: isLocationManagerPanelOpened(state),isTagLibraryPanelOpened: isTagLibraryPanelOpened(state),isSearchPanelOpened: isSearchPanelOpened(state),isPerspectivesPanelOpened: isPerspectivesPanelOpened(state),isHelpFeedbackPanelOpened: isHelpFeedbackPanelOpened(state),- currentDirectory: getDirectoryPath(state),isReadOnlyMode: isReadOnlyMode(state)};}@@ -507,13 +399,10 @@ function mapStateToProps(state) {function mapActionCreatorsToProps(dispatch) {return bindActionCreators({- toggleCreateDirectoryDialog: AppActions.toggleCreateDirectoryDialog,toggleCreateFileDialog: AppActions.toggleCreateFileDialog,- toggleSelectDirectoryDialog: AppActions.toggleSelectDirectoryDialog,toggleOnboardingDialog: AppActions.toggleOnboardingDialog,toggleSettingsDialog: AppActions.toggleSettingsDialog,toggleAboutDialog: AppActions.toggleAboutDialog,- toggleEditTagDialog: AppActions.toggleEditTagDialog,toggleKeysDialog: AppActions.toggleKeysDialog,openLocationManagerPanel: AppActions.openLocationManagerPanel,openTagLibraryPanel: AppActions.openTagLibraryPanel,diff --git a/app/containers/MainPage.js b/app/containers/MainPage.jsindex eeb8ad19a..f46a25f22 100644--- a/app/containers/MainPage.js+++ b/app/containers/MainPage.js@@ -20,6 +20,7 @@import React, { Component } from 'react';import { bindActionCreators } from 'redux';import { connect } from 'react-redux';+import uuidv1 from 'uuid';import { withStyles } from '@material-ui/core/styles';import classNames from 'classnames';import { translate } from 'react-i18next';@@ -35,6 +36,9 @@ import { DragDropContext } from 'react-dnd';import VerticalNavigation from '../components/VerticalNavigation';import FolderContainer from '../components/FolderContainer';import EntryContainer from '../components/EntryContainer';+import SettingsDialog from '../components/dialogs/settings/SettingsDialog';+import CreateDirectoryDialog from '../components/dialogs/CreateDirectoryDialog';+import CreateFileDialog from '../components/dialogs/CreateFileDialog';import {getDesktopMode,getKeyBindingObject,@@ -61,6 +65,11 @@ import {isSearchPanelOpened,isPerspectivesPanelOpened,isHelpFeedbackPanelOpened,+ isEditTagDialogOpened,+ isCreateDirectoryOpened,+ isSelectDirectoryDialogOpened,+ isCreateFileDialogOpened,+ isSettingsDialogOpened,isReadOnlyMode} from '../reducers/app';import { actions as LocationIndexActions, isIndexing } from '../reducers/location-index';@@ -127,6 +136,12 @@ type Props = {lastPublishedVersion: string,isUpdateAvailable: boolean,isReadOnlyMode: boolean,+ isSettingsDialogOpened: boolean,+ toggleSettingsDialog: () => void,+ isCreateFileDialogOpened: boolean,+ toggleCreateFileDialog: () => void,+ isCreateDirectoryOpened: boolean,+ toggleCreateDirectoryDialog: () => void,isAboutDialogOpened: boolean,toggleAboutDialog: () => void,isCreateDirectoryOpened: boolean,@@ -141,6 +156,10 @@ type Props = {toggleThirdPartyLibsDialog: () => void,isOnboardingDialogOpened: boolean,toggleOnboardingDialog: () => void,+ isSelectDirectoryDialogOpened: boolean,+ toggleSelectDirectoryDialog: () => void,+ isEditTagDialogOpened: boolean,+ toggleEditTagDialog: () => void,setEntryFullWidth: (isFullWidth: boolean) => void,hideNotifications: () => void,cancelDirectoryIndexing: () => void,@@ -223,7 +242,22 @@ const OnboardingDialogAsync = props => (</React.Suspense>);+const EditEntryTagDialog = React.lazy(() => import(/* webpackChunkName: "EditEntryTagDialog" */ '../components/dialogs/EditEntryTagDialog'));+const EditEntryTagDialogAsync = props => (+ <React.Suspense fallback={<LoadingLazy />}>+ <EditEntryTagDialog {...props} />+ </React.Suspense>+);++const SelectDirectoryDialog = React.lazy(() => import(/* webpackChunkName: "LicenseDialog" */ '../components/dialogs/SelectDirectoryDialog'));+const SelectDirectoryAsync = props => (+ <React.Suspense fallback={<LoadingLazy />}>+ <SelectDirectoryDialog {...props} />+ </React.Suspense>+);+type State = {+ selectedDirectoryPath?: string,isManagementPanelVisible?: boolean, // optionality because of https://github.com/codemix/flow-runtime/issues/149mainSplitSize?: any,isDrawerOpened?: boolean,@@ -376,7 +410,7 @@ class MainPage extends Component<Props, State> {);} else {files.map(file => { // TODO move this in reducer -> look at DirectoryMenu handleFileInputChange- let filePath;+ let filePath = '';let fileName = '';try {fileName = decodeURIComponent(file.name);@@ -447,6 +481,12 @@ class MainPage extends Component<Props, State> {}};+ chooseDirectoryPath = (currentPath: string) => {+ this.setState({+ selectedDirectoryPath: currentPath+ });+ };+keyBindingHandlers = {toggleShowHiddenEntries: this.props.toggleShowUnixHiddenEntries,showFolderNavigator: this.props.openLocationManagerPanel,@@ -459,18 +499,28 @@ class MainPage extends Component<Props, State> {const {classes,theme,+ isCreateFileDialogOpened,+ isSettingsDialogOpened,isAboutDialogOpened,isKeysDialogOpened,isOnboardingDialogOpened,isLicenseDialogOpened,isThirdPartyLibsDialogOpened,+ isSelectDirectoryDialogOpened,+ isCreateDirectoryOpened,+ isEditTagDialogOpened,toggleOnboardingDialog,toggleSettingsDialog,toggleKeysDialog,toggleLicenseDialog,toggleThirdPartyLibsDialog,toggleAboutDialog,- setFirstRun+ toggleCreateDirectoryDialog,+ toggleCreateFileDialog,+ toggleSelectDirectoryDialog,+ toggleEditTagDialog,+ setFirstRun,+ directoryPath} = this.props;const { FILE } = NativeTypes;@@ -513,7 +563,42 @@ class MainPage extends Component<Props, State> {open={isThirdPartyLibsDialogOpened}onClose={toggleThirdPartyLibsDialog}/>- )}+ )}+ {isEditTagDialogOpened && (+ <EditEntryTagDialogAsync+ key={uuidv1()}+ open={isEditTagDialogOpened}+ onClose={toggleEditTagDialog}+ />+ )}+ {isSelectDirectoryDialogOpened && (+ <SelectDirectoryAsync+ open={isSelectDirectoryDialogOpened}+ onClose={toggleSelectDirectoryDialog}+ chooseDirectoryPath={this.chooseDirectoryPath}+ selectedDirectoryPath={+ this.state.selectedDirectoryPath || directoryPath+ }+ />+ )}+ <CreateDirectoryDialog+ open={isCreateDirectoryOpened}+ onClose={toggleCreateDirectoryDialog}+ selectedDirectoryPath={directoryPath}+ />+ <CreateFileDialog+ key={uuidv1()}+ open={isCreateFileDialogOpened}+ selectedDirectoryPath={+ this.state.selectedDirectoryPath || directoryPath+ }+ chooseDirectoryPath={this.chooseDirectoryPath}+ onClose={toggleCreateFileDialog}+ />+ <SettingsDialog+ open={isSettingsDialogOpened}+ onClose={toggleSettingsDialog}+ /><SnackbaranchorOrigin={{ vertical: 'bottom', horizontal: 'center' }}open={this.props.notificationStatus.visible}@@ -668,6 +753,11 @@ class MainPage extends Component<Props, State> {function mapStateToProps(state) {return {+ isEditTagDialogOpened: isEditTagDialogOpened(state),+ isCreateDirectoryOpened: isCreateDirectoryOpened(state),+ isCreateFileDialogOpened: isCreateFileDialogOpened(state),+ isSelectDirectoryDialogOpened: isSelectDirectoryDialogOpened(state),+ isSettingsDialogOpened: isSettingsDialogOpened(state),isAboutDialogOpened: isAboutDialogOpened(state),isKeysDialogOpened: isKeysDialogOpened(state),isOnboardingDialogOpened: isOnboardingDialogOpened(state),@@ -696,6 +786,11 @@ function mapStateToProps(state) {function mapDispatchToProps(dispatch) {return bindActionCreators({+ toggleSettingsDialog: AppActions.toggleSettingsDialog,+ toggleCreateFileDialog: AppActions.toggleCreateFileDialog,+ toggleCreateDirectoryDialog: AppActions.toggleCreateDirectoryDialog,+ toggleSelectDirectoryDialog: AppActions.toggleSelectDirectoryDialog,+ toggleEditTagDialog: AppActions.toggleEditTagDialog,toggleOnboardingDialog: AppActions.toggleOnboardingDialog,toggleLicenseDialog: AppActions.toggleLicenseDialog,toggleThirdPartyLibsDialog: AppActions.toggleThirdPartyLibsDialog,