Merge 703c5e7 into 12a4876

entaxy-project · Aug 9, 2019 · facd24e · facd24e
2 parents 12a4876 + 703c5e7
commit facd24e
Show file tree

Hide file tree

Showing 16 changed files with 518 additions and 454 deletions.
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
         "lint": "eslint src --ext '.js,.jsx' --config .eslintrc",
         "lint:fix": "npm run lint --fix",
         "deploy:staging": "npm run build && aws s3 sync build/ s3://entaxy-staging",
+        "deploy:production": "npm run build && aws s3 sync build/ s3://entaxy-production",
         "deploy:test": "npm run build && aws s3 sync build/ s3://entaxy-test"
     },
     "dependencies": {
@@ -102,4 +103,4 @@
             "git add"
         ]
     }
-}
+}
diff --git a/src/common/Header/__tests__/__snapshots__/index.test.jsx.snap b/src/common/Header/__tests__/__snapshots__/index.test.jsx.snap
@@ -57,31 +57,6 @@ exports[`Header matches snapshot 1`] = `
             Dashboard
           </span>
         </a>
-        <a
-          aria-disabled={false}
-          className="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-colorInherit"
-          href="/accounts"
-          onBlur={[Function]}
-          onClick={[Function]}
-          onDragLeave={[Function]}
-          onFocus={[Function]}
-          onKeyDown={[Function]}
-          onKeyUp={[Function]}
-          onMouseDown={[Function]}
-          onMouseLeave={[Function]}
-          onMouseUp={[Function]}
-          onTouchEnd={[Function]}
-          onTouchMove={[Function]}
-          onTouchStart={[Function]}
-          role="button"
-          tabIndex={0}
-        >
-          <span
-            className="MuiButton-label"
-          >
-            Accounts
-          </span>
-        </a>
         <button
           aria-owns={null}
           className="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-colorInherit"

diff --git a/src/common/Header/__tests__/index.test.jsx b/src/common/Header/__tests__/index.test.jsx
@@ -6,7 +6,6 @@ import store from '../../../store'
 import Header from '..'
 
 jest.mock('../../LoginButton', () => 'LoginButton')
-jest.mock('../../../core/Accounts', () => 'Accounts')
 
 describe('Header', () => {
   it('matches snapshot', () => {

diff --git a/src/common/Header/index.jsx b/src/common/Header/index.jsx
@@ -71,12 +71,6 @@ const Header = ({ children, match }) => {
               >
                 Dashboard
               </Button>
-              <Button
-                color={buttonColourFor(['/accounts', '/institutions'])}
-                component={LinkTo('/accounts')}
-              >
-                Accounts
-              </Button>
               <Button
                 color={buttonColourFor('/budget')}
                 aria-owns={open ? 'budget-menu-list-grow' : null}

diff --git a/src/common/ModalDialog/index.jsx b/src/common/ModalDialog/index.jsx
@@ -12,7 +12,7 @@ import CloseIcon from '@material-ui/icons/Close'
 import Typography from '@material-ui/core/Typography'
 
 const styles = () => ({
-  formwrapper: {
+  formWrapper: {
     marginLeft: 15,
     marginRight: 15
   },
@@ -48,7 +48,7 @@ const ModalDialog = ({
     onClose={onCancel}
     className={className}
   >
-    <div className={classes.formwrapper}>
+    <div className={classes.formWrapper}>
       <DialogTitle disableTypography className={classes.formHeader}>
         <Typography variant="h6">{title}</Typography>
         <IconButton aria-label="Close" onClick={onCancel} className={classes.closeButton}>

diff --git a/src/core/Accounts/Transactions/TransactionDialog.jsx b/src/core/Accounts/Transactions/TransactionDialog.jsx
@@ -5,6 +5,7 @@ import { withStyles } from '@material-ui/core/styles'
 import { withFormik } from 'formik'
 import * as Yup from 'yup'
 import PropTypes from 'prop-types'
+import Grid from '@material-ui/core/Grid'
 import TextField from '@material-ui/core/TextField'
 import format from 'date-fns/format'
 import parse from 'date-fns/parse'
@@ -15,6 +16,7 @@ import { createTransaction, updateTransaction } from '../../../store/transaction
 
 const styles = theme => ({
   root: {
+    minWidth: 600
   },
   input: {
     marginBottom: theme.spacing(1),
@@ -89,61 +91,65 @@ export const TransactionDialogComponent = ({
     onCancel={onCancel}
     className={classes.root}
   >
-    <TextField
-      label="Description"
-      inputProps={{
-        'aria-label': 'Description',
-        maxLength: 256
-      }}
-      className={classes.input}
-      value={values.description}
-      name="description"
-      onChange={handleChange}
-      error={errors.description && touched.description}
-      helperText={errors.description}
-    />
-    <AutoComplete
-      className={classes.input}
-      label="Category"
-      name="categoryId"
-      value={values.categoryId}
-      options={budget.categoryTree}
-      onChange={setFieldValue}
-      error={errors.categoryId && touched.categoryId}
-      helperText={errors.categoryId}
-      styles={colourStyles}
-    />
-    <TextField
-      type="number"
-      label="Amount"
-      inputProps={{
-        'aria-label': 'Amount',
-        maxLength: 10,
-        min: Number.MIN_SAFE_INTEGER,
-        max: Number.MAX_SAFE_INTEGER,
-        step: 0.01
-      }}
-      className={classes.input}
-      value={values.amount}
-      name="amount"
-      onChange={handleChange}
-      error={errors.amount && touched.amount}
-      helperText={errors.amount}
-    />
-    <TextField
-      type="date"
-      label="Date"
-      InputLabelProps={{
-        shrink: true,
-        'aria-label': 'Date'
-      }}
-      name="createdAt"
-      className={classes.input}
-      value={values.createdAt}
-      onChange={handleChange}
-      error={errors.createdAt && touched.createdAt}
-      helperText={errors.createdAt}
-    />
+    <Grid container>
+      <Grid item xs={12}>
+        <TextField
+          label="Description"
+          inputProps={{
+            'aria-label': 'Description',
+            maxLength: 256
+          }}
+          className={classes.input}
+          value={values.description}
+          name="description"
+          onChange={handleChange}
+          error={errors.description && touched.description}
+          helperText={errors.description}
+        />
+        <AutoComplete
+          className={classes.input}
+          label="Category"
+          name="categoryId"
+          value={values.categoryId}
+          options={budget.categoryTree}
+          onChange={setFieldValue}
+          error={errors.categoryId && touched.categoryId}
+          helperText={errors.categoryId}
+          styles={colourStyles}
+        />
+        <TextField
+          type="number"
+          label="Amount"
+          inputProps={{
+            'aria-label': 'Amount',
+            maxLength: 10,
+            min: Number.MIN_SAFE_INTEGER,
+            max: Number.MAX_SAFE_INTEGER,
+            step: 0.01
+          }}
+          className={classes.input}
+          value={values.amount}
+          name="amount"
+          onChange={handleChange}
+          error={errors.amount && touched.amount}
+          helperText={errors.amount}
+        />
+        <TextField
+          type="date"
+          label="Date"
+          InputLabelProps={{
+            shrink: true,
+            'aria-label': 'Date'
+          }}
+          name="createdAt"
+          className={classes.input}
+          value={values.createdAt}
+          onChange={handleChange}
+          error={errors.createdAt && touched.createdAt}
+          helperText={errors.createdAt}
+        />
+      </Grid>
+    </Grid>
   </ModalDialog>
 )
 

diff --git a/src/core/Accounts/Transactions/TransactionsTable.jsx b/src/core/Accounts/Transactions/TransactionsTable.jsx
@@ -166,7 +166,11 @@ export class TransactionsTableComponent extends React.Component {
 
   handleSelectAllClick = (event, filteredTransactions) => {
     if (event.target.checked) {
-      this.setState({ selected: filteredTransactions.map(n => n.id) })
+      this.setState({
+        selected: filteredTransactions.reduce((result, transaction) => {
+          return [...result, ...('id' in transaction ? [transaction.id] : [])]
+        }, [])
+      })
       return
     }
     this.resetSelection()
@@ -186,12 +190,18 @@ export class TransactionsTableComponent extends React.Component {
     })
   }
 
-  renderCellAmount = ({ cellData }) => (
-    {
+  renderCellAmount = ({ cellData, rowData }) => {
+    if (cellData.amount === 0 && rowData.id === undefined) {
+      return {
+        positiveAmount: this.props.formatDecimal(cellData.amount),
+        negativeAmount: null
+      }[cellData.restrictTo]
+    }
+    return {
       positiveAmount: cellData.amount > 0 ? this.props.formatDecimal(cellData.amount) : null,
       negativeAmount: cellData.amount < 0 ? this.props.formatDecimal(cellData.amount) : null
     }[cellData.restrictTo]
-  )
+  }
 
   render() {
     const {
@@ -251,8 +261,8 @@ export class TransactionsTableComponent extends React.Component {
                       key="label"
                     >
                       <Checkbox
-                        indeterminate={selected.length > 0 && selected.length < filteredTransactions.length}
-                        checked={selected.length > 0 && selected.length === filteredTransactions.length}
+                        indeterminate={selected.length > 0 && selected.length < filteredTransactions.length - 1}
+                        checked={selected.length > 0 && selected.length === filteredTransactions.length - 1}
                         onChange={event => this.handleSelectAllClick(event, filteredTransactions)}
                       />
                     </span>

diff --git a/src/core/Accounts/Transactions/__tests__/TransactionsTable.test.jsx b/src/core/Accounts/Transactions/__tests__/TransactionsTable.test.jsx
@@ -173,15 +173,60 @@ describe('TransactionsTable', () => {
 
     describe('renderCellAmount', () => {
       it('should render for positive amounts', () => {
-        expect(instance.renderCellAmount({ cellData: { amount: 1, restrictTo: 'positiveAmount' } })).not.toBeNull()
-        expect(instance.renderCellAmount({ cellData: { amount: 0, restrictTo: 'positiveAmount' } })).toBeNull()
-        expect(instance.renderCellAmount({ cellData: { amount: -1, restrictTo: 'positiveAmount' } })).toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: 1, restrictTo: 'positiveAmount' },
+          rowData: { id: 1 }
+        })).not.toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: 0, restrictTo: 'positiveAmount' },
+          rowData: { id: 1 }
+        })).toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: -1, restrictTo: 'positiveAmount' },
+          rowData: { id: 1 }
+        })).toBeNull()
       })
 
       it('should render for negative amounts', () => {
-        expect(instance.renderCellAmount({ cellData: { amount: -11, restrictTo: 'negativeAmount' } })).not.toBeNull()
-        expect(instance.renderCellAmount({ cellData: { amount: 0, restrictTo: 'negativeAmount' } })).toBeNull()
-        expect(instance.renderCellAmount({ cellData: { amount: 1, restrictTo: 'negativeAmount' } })).toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: -11, restrictTo: 'negativeAmount' },
+          rowData: { id: 1 }
+        })).not.toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: 0, restrictTo: 'negativeAmount' },
+          rowData: { id: 1 }
+        })).toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: 1, restrictTo: 'negativeAmount' },
+          rowData: { id: 1 }
+        })).toBeNull()
+      })
+
+      it('should render opening balance amounts', () => {
+        expect(instance.renderCellAmount({
+          cellData: { amount: 1, restrictTo: 'positiveAmount' },
+          rowData: { }
+        })).not.toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: 0, restrictTo: 'positiveAmount' },
+          rowData: { }
+        })).not.toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: -1, restrictTo: 'positiveAmount' },
+          rowData: { }
+        })).toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: 1, restrictTo: 'negativeAmount' },
+          rowData: { }
+        })).toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: 0, restrictTo: 'negativeAmount' },
+          rowData: { }
+        })).toBeNull()
+        expect(instance.renderCellAmount({
+          cellData: { amount: -1, restrictTo: 'negativeAmount' },
+          rowData: { }
+        })).not.toBeNull()
       })
     })
 

diff --git a/src/core/Accounts/Transactions/index.jsx b/src/core/Accounts/Transactions/index.jsx
@@ -49,7 +49,8 @@ export class TransactionsComponent extends React.Component {
       accountId: account.id,
       description: 'Opening balance',
       amount: account.openingBalance,
-      createdAt: account.openingBalanceDate
+      createdAt: account.openingBalanceDate,
+      type: 'openingBalance'
     }
     return [openingBalanceTransaction, ...transactions].filter(transaction => (
       transaction.accountId === account.id