0.1.1-preview

- Update packages
- Fix bug when file is removed
- General housekeeping

Author: patrickdevivo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "augmentable-sql",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Augmentable SQL",
   "main": "main/index.js",
   "scripts": {
@@ -16,11 +16,11 @@
   "author": "Patrick DeVivo",
   "devDependencies": {
     "electron": "~1.7.8",
-    "electron-builder": "^19.33.0",
+    "electron-builder": "^19.34.1",
     "electron-devtools-installer": "^2.2.0"
   },
   "dependencies": {
-    "alasql": "^0.4.2",
+    "alasql": "^0.4.3",
     "electron-is-dev": "^0.3.0",
     "electron-remote": "^1.2.0",
     "md5-file": "^3.2.3",

ui/package.json

@@ -1,12 +1,12 @@
 {
   "name": "ui",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": true,
   "dependencies": {
     "@blueprintjs/core": "^1.30.0",
     "@blueprintjs/table": "1.27.0",
     "brace": "^0.10.0",
-    "mobx": "^3.3.0",
+    "mobx": "^3.3.1",
     "mobx-react": "^4.3.3",
     "normalize.css": "^7.0.0",
     "numbro": "^1.11.0",

ui/src/components/App.js

@@ -8,6 +8,7 @@ import './styles.css';
 import numbro from 'numbro';
 import moment from 'moment';
 import MainStore from 'stores/MainStore';
+import _ from 'lodash';
 
 import SQL from './SQL';
 import Controls from './Controls';
@@ -31,13 +32,15 @@ class App extends Component {
       MainStore.setFileHovering(false);
     }
   }
+  pluralize(count, baseWord) {
+    return count !== 1 ? `${baseWord}s` : baseWord;
+  }
   render() {
     const {latestResults} = MainStore.toJS();
-    console.log(latestResults)
     return (
       <div className="App">
         <nav id="title-bar">
-          <span>{latestResults ? `${numbro(latestResults.itemCount).format()} rows. ${moment.duration(latestResults.executionTime).asSeconds()} seconds.` : 'Augmentable SQL'}</span>
+          <span>{latestResults ? `${numbro(latestResults.itemCount).format()} ${this.pluralize(latestResults.itemCount, 'row')}. ${moment.duration(latestResults.executionTime).asSeconds()} seconds. Previewing ${_.size(latestResults.preview)} ${this.pluralize(_.size(latestResults.preview), 'row')}.` : 'Augmentable SQL'}</span>
         </nav>
 
         <div id="contents">

ui/src/components/Controls.js

@@ -31,7 +31,7 @@ class Controls extends Component {
     }
 
     render() {
-        const {currentSQL, files, fileHovering} = MainStore.toJS();
+        const {currentSQL, files} = MainStore.toJS();
 
         return (
             <div id="controls-container">

ui/src/components/FileList.js

@@ -8,10 +8,6 @@ const path = window.require('path');
 const {shell} = window.require('electron')
 
 class FileList extends Component {
-    constructor(props) {
-        super(props);
-    }
-
     render() {
         const {files} = MainStore.toJS();
         return (
@@ -28,7 +24,7 @@ class FileList extends Component {
                             }}
                             onClick={() => shell.showItemInFolder(file)}
                         >
-                            <strong>${i}</strong> {path.basename(file)}
+                            <strong>${i+1}</strong> {path.basename(file)}
                         </Tag>
                     )
                 })}

ui/src/components/Results.js

@@ -9,7 +9,7 @@ import {Table, Column, Cell, ColumnHeaderCell} from '@blueprintjs/table';
 class Results extends Component {
 
     render() {
-        const {latestResults, currentSQL, queryError} = MainStore.toJS();
+        const {latestResults, queryError} = MainStore.toJS();
         const columns = (latestResults && !_.isEmpty(latestResults.preview)) ? _.keys(latestResults.preview[0]) : [];
 
         return (

ui/src/components/SQL.js

@@ -1,6 +1,5 @@
 import React, {Component} from 'react';
 import {observer} from 'mobx-react';
-import _ from 'lodash';
 import MainStore from 'stores/MainStore';
 import AceEditor from 'react-ace';
 import brace from 'brace';
@@ -22,7 +21,7 @@ class SQL extends Component {
     }
 
     render() {
-        const {files, currentSQL} = MainStore.toJS();
+        const {currentSQL} = MainStore.toJS();
         return (
             <div id="sql-container" onKeyPress={this.onKeyPress}>
                 <AceEditor

ui/src/stores/MainStore.js

@@ -1,4 +1,4 @@
-import {extendObservable, observable, toJS} from 'mobx';
+import {extendObservable, toJS} from 'mobx';
 import _ from 'lodash';
 const {app} = window.require('electron').remote;
 
@@ -9,7 +9,7 @@ class MainStore {
             sqlHistory: [],
             latestResults: undefined,
             queryError: null,
-            files: observable.map(),
+            files: [],
             fileHovering: false
         });
 
@@ -27,7 +27,8 @@ class MainStore {
         const {currentSQL, files} = this.toJS();
         this.latestResults = null;
         this.queryError = null;
-        window.worker.alasql(currentSQL, files, app.getPath('userData'))
+        const fileMap = _.reduce(files, (accum, filePath, i) => ({...accum, [i+1]: filePath}), {});
+        window.worker.alasql(currentSQL, fileMap, app.getPath('userData'))
             .then(res => {
                 this.latestResults = res;
                 console.log(res)
@@ -39,15 +40,13 @@ class MainStore {
     }
 
     loadFile(filePath) {
-        const fileCount = this.files.size;
         const alreadyLoaded = _.includes(this.files.values(), filePath)
         if (alreadyLoaded) return;
-        this.files.set(`${fileCount + 1}`, filePath);
+        this.files.push(filePath);
     }
 
-    removeFile(filePathKey) {
-        const {files} = this.toJS();
-        this.files.delete(filePathKey)
+    removeFile(filePathIndex) {
+        this.files.splice(filePathIndex, 1);
     }
 
     toJS() {

ui/yarn.lock

@@ -4265,9 +4265,9 @@ mobx-react@^4.3.3:
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
-mobx@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/mobx/-/mobx-3.3.0.tgz#1bc1dd7e78547065af04b49bdb7f2098cada47aa"
+mobx@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/mobx/-/mobx-3.3.1.tgz#c38fc1a287a0dda3f5d4b85efe1137fedd9dcdf0"
 
 [email protected]:
   version "2.0.0"