Merge pull request #13 from AndresMorelos/fix-import-export

Fixing import function when no file is added.

Author: AndresMorelos

app/components/settings/ImportExport.jsx

@@ -32,17 +32,14 @@ import {
   getSavedSettings,
 } from '../reducers/SettingsReducer';
 
-import {
-  getSecretKey
-} from '../reducers/exportImportReducer'
+import { getSecretKey } from '../reducers/exportImportReducer';
 
 // Actions
 import * as SettingsActions from '../actions/settings';
 import * as ExportImportActions from '../actions/exportImport';
 
 import { bindActionCreators } from 'redux';
 
-
 // Component
 class Settings extends Component {
   constructor(props) {
@@ -55,12 +52,14 @@ class Settings extends Component {
 
   componentDidMount() {
     ipc.on('import-file-selected', (event, filePath) => {
-      this.handleFileUpload(filePath);
-    })
+      if (filePath) {
+        this.handleFileUpload(filePath);
+      }
+    });
   }
 
   componentWillUnmount() {
-    ipc.removeAllListeners(['import-file-selected'])
+    ipc.removeAllListeners(['import-file-selected']);
   }
 
   // Check if settings have been saved
@@ -86,22 +85,24 @@ class Settings extends Component {
   }
 
   handleFileUpload(filePath) {
-    const { secretKey } = this.props
+    const { secretKey } = this.props;
     parseImportFile(filePath, secretKey, (err, fileData) => {
       if (err) {
         return;
       }
-      this.importData(fileData)
-    })
+      this.importData(fileData);
+    });
   }
 
   importData(fileData) {
-    const { importData } = this.props.boundExportImportActionsCreators;
-    importData(fileData)
+    if (fileData) {
+      const { importData } = this.props.boundExportImportActionsCreators;
+      importData(fileData);
+    }
   }
 
   selectImportFile(fileData) {
-    ipc.send('open-import-file-dialog')
+    ipc.send('open-import-file-dialog');
   }
 
   // Render Main Content
@@ -148,10 +149,20 @@ class Settings extends Component {
           </Tabs>
           <TabContent>
             {this.state.visibleTab === 1 && (
-              <Profile t={t} profile={profile} updateSettings={updateSettings} setSavable={this.setSavable} />
+              <Profile
+                t={t}
+                profile={profile}
+                updateSettings={updateSettings}
+                setSavable={this.setSavable}
+              />
             )}
             {this.state.visibleTab === 2 && (
-              <Invoice t={t} invoice={invoice} updateSettings={updateSettings} setSavable={this.setSavable} />
+              <Invoice
+                t={t}
+                invoice={invoice}
+                updateSettings={updateSettings}
+                setSavable={this.setSavable}
+              />
             )}
             {this.state.visibleTab === 3 && (
               <General
@@ -183,23 +194,26 @@ Settings.propTypes = {
   }).isRequired,
   boundExportImportActionsCreators: PropTypes.shape({
     exportData: PropTypes.func.isRequired,
-    importData: PropTypes.func.isRequired
+    importData: PropTypes.func.isRequired,
   }),
   currentSettings: PropTypes.object.isRequired,
   savedSettings: PropTypes.object.isRequired,
   secretKey: PropTypes.string.isRequired,
 };
 
 // Map State & Dispatch to Props & Export
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   boundActionCreators: bindActionCreators(SettingsActions, dispatch),
-  boundExportImportActionsCreators: bindActionCreators(ExportImportActions, dispatch)
+  boundExportImportActionsCreators: bindActionCreators(
+    ExportImportActions,
+    dispatch
+  ),
 });
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   currentSettings: getCurrentSettings(state),
   savedSettings: getSavedSettings(state),
-  secretKey: getSecretKey(state)
+  secretKey: getSecretKey(state),
 });
 
 export default compose(

app/containers/Settings.jsx

@@ -3,12 +3,12 @@ const ipc = require('electron').ipcMain;
 const dialog = require('electron').dialog;
 
 ipc.on('open-import-file-dialog', event => {
-  const [file] = dialog.showOpenDialogSync(
+  const result = dialog.showOpenDialogSync(
     {
       properties: ['openFile'],
       filters: [{ name: 'Import Data', extensions: ['json'] }],
     }
   )
 
-  if (file) { event.sender.send('import-file-selected', file); }
+  if (result && result.file) { event.sender.send('import-file-selected', result.file); }
 });

main/select-import-file.js

@@ -2,7 +2,7 @@
   "name": "invoncify",
   "homepage": "https://invoncify.andresmorelos.me",
   "productName": "Invoncify",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "license": "GPL-3.0",
   "description": "Flexible invoicing desktop app with beautiful & customizable templates",
   "author": {