From 134622ea3ade5b2fa6bbb55735948d111561ca9e Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Mon, 14 Nov 2016 18:34:05 +0100
Subject: [PATCH 1/2] Adds error handler in Importer // Import AddressBook
 #2885

---
 js/src/ui/Actionbar/Import/import.js     | 34 +++++++++++--
 js/src/ui/IdentityName/identityName.js   | 12 +++--
 js/src/views/Accounts/Summary/summary.js | 56 +++++++++++++++++----
 js/src/views/Addresses/addresses.js      | 64 +++++++++++++++++++++++-
 4 files changed, 146 insertions(+), 20 deletions(-)

diff --git a/js/src/ui/Actionbar/Import/import.js b/js/src/ui/Actionbar/Import/import.js
index 776e5bb08..081fe1a17 100644
--- a/js/src/ui/Actionbar/Import/import.js
+++ b/js/src/ui/Actionbar/Import/import.js
@@ -29,6 +29,8 @@ const initialState = {
   show: false,
   validate: false,
   validationBody: null,
+  error: false,
+  errorText: '',
   content: ''
 };
 
@@ -65,7 +67,7 @@ export default class ActionbarImport extends Component {
 
   renderModal () {
     const { title, renderValidation } = this.props;
-    const { show, step } = this.state;
+    const { show, step, error } = this.state;
 
     if (!show) {
       return null;
@@ -73,7 +75,7 @@ export default class ActionbarImport extends Component {
 
     const hasSteps = typeof renderValidation === 'function';
 
-    const steps = hasSteps ? [ 'select a file', 'validate' ] : null;
+    const steps = hasSteps ? [ 'select a file', error ? 'error' : 'validate' ] : null;
 
     return (
       <Modal
@@ -89,7 +91,7 @@ export default class ActionbarImport extends Component {
   }
 
   renderActions () {
-    const { validate } = this.state;
+    const { validate, error } = this.state;
 
     const cancelBtn = (
       <Button
@@ -100,6 +102,10 @@ export default class ActionbarImport extends Component {
       />
     );
 
+    if (error) {
+      return [ cancelBtn ];
+    }
+
     if (validate) {
       const confirmBtn = (
         <Button
@@ -117,7 +123,15 @@ export default class ActionbarImport extends Component {
   }
 
   renderBody () {
-    const { validate } = this.state;
+    const { validate, errorText, error } = this.state;
+
+    if (error) {
+      return (
+        <div>
+          <p>An error occured: { errorText }</p>
+        </div>
+      );
+    }
 
     if (validate) {
       return this.renderValidation();
@@ -169,10 +183,20 @@ export default class ActionbarImport extends Component {
         return this.onCloseModal();
       }
 
+      const validationBody = renderValidation(content);
+
+      if (validationBody && validationBody.error) {
+        return this.setState({
+          step: 1,
+          error: true,
+          errorText: validationBody.error
+        });
+      }
+
       this.setState({
         step: 1,
         validate: true,
-        validationBody: renderValidation(content),
+        validationBody,
         content
       });
     };
diff --git a/js/src/ui/IdentityName/identityName.js b/js/src/ui/IdentityName/identityName.js
index 6b6c75be2..f19e2bb2e 100644
--- a/js/src/ui/IdentityName/identityName.js
+++ b/js/src/ui/IdentityName/identityName.js
@@ -28,11 +28,12 @@ class IdentityName extends Component {
     tokens: PropTypes.object,
     empty: PropTypes.bool,
     shorten: PropTypes.bool,
-    unknown: PropTypes.bool
+    unknown: PropTypes.bool,
+    name: PropTypes.string
   }
 
   render () {
-    const { address, accountsInfo, tokens, empty, shorten, unknown, className } = this.props;
+    const { address, accountsInfo, tokens, empty, name, shorten, unknown, className } = this.props;
     const account = accountsInfo[address] || tokens[address];
     const hasAccount = account && (!account.meta || !account.meta.deleted);
 
@@ -43,13 +44,14 @@ class IdentityName extends Component {
     const addressFallback = shorten ? this.formatHash(address) : address;
     const fallback = unknown ? defaultName : addressFallback;
     const isUuid = hasAccount && account.name === account.uuid;
-    const name = hasAccount && !isUuid
+    const displayName = (name && name.toUpperCase().trim()) ||
+      (hasAccount && !isUuid
       ? account.name.toUpperCase().trim()
-      : fallback;
+      : fallback);
 
     return (
       <span className={ className }>
-        { name && name.length ? name : fallback }
+        { displayName && displayName.length ? displayName : fallback }
       </span>
     );
   }
diff --git a/js/src/views/Accounts/Summary/summary.js b/js/src/views/Accounts/Summary/summary.js
index 51bb81215..5a96f64ff 100644
--- a/js/src/views/Accounts/Summary/summary.js
+++ b/js/src/views/Accounts/Summary/summary.js
@@ -22,22 +22,28 @@ import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags, I
 export default class Summary extends Component {
   static contextTypes = {
     api: React.PropTypes.object
-  }
+  };
 
   static propTypes = {
     account: PropTypes.object.isRequired,
-    balance: PropTypes.object.isRequired,
+    balance: PropTypes.object,
     link: PropTypes.string,
+    name: PropTypes.string,
+    noLink: PropTypes.bool,
     children: PropTypes.node,
     handleAddSearchToken: PropTypes.func
-  }
+  };
+
+  static defaultProps = {
+    noLink: false
+  };
 
   state = {
     name: 'Unnamed'
-  }
+  };
 
   render () {
-    const { account, balance, children, link, handleAddSearchToken } = this.props;
+    const { account, children, handleAddSearchToken } = this.props;
     const { tags } = account.meta;
 
     if (!account) {
@@ -45,7 +51,6 @@ export default class Summary extends Component {
     }
 
     const { address } = account;
-    const viewLink = `/${link || 'account'}/${address}`;
 
     const addressComponent = (
       <Input
@@ -62,12 +67,45 @@ export default class Summary extends Component {
         <IdentityIcon
           address={ address } />
         <ContainerTitle
-          title={ <Link to={ viewLink }>{ <IdentityName address={ address } unknown /> }</Link> }
+          title={ this.renderLink() }
           byline={ addressComponent } />
-        <Balance
-          balance={ balance } />
+
+        { this.renderBalance() }
         { children }
       </Container>
     );
   }
+
+  renderLink () {
+    const { link, noLink, account, name } = this.props;
+
+    const { address } = account;
+    const viewLink = `/${link || 'account'}/${address}`;
+
+    const content = (
+      <IdentityName address={ address } name={ name } unknown />
+    );
+
+    if (noLink) {
+      return content;
+    }
+
+    return (
+      <Link to={ viewLink }>
+        { content }
+      </Link>
+    );
+  }
+
+  renderBalance () {
+    const { balance } = this.props;
+
+    if (!balance) {
+      return null;
+    }
+
+    return (
+      <Balance balance={ balance } />
+    );
+  }
 }
diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js
index 13c512713..0347f8fa2 100644
--- a/js/src/views/Addresses/addresses.js
+++ b/js/src/views/Addresses/addresses.js
@@ -21,8 +21,9 @@ import ContentAdd from 'material-ui/svg-icons/content/add';
 import { uniq } from 'lodash';
 
 import List from '../Accounts/List';
+import Summary from '../Accounts/Summary';
 import { AddAddress } from '../../modals';
-import { Actionbar, ActionbarExport, ActionbarSearch, ActionbarSort, Button, Page } from '../../ui';
+import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '../../ui';
 
 import styles from './addresses.css';
 
@@ -107,6 +108,12 @@ class Addresses extends Component {
         content={ contacts }
         filename='addressbook.json' />,
 
+      <ActionbarImport
+        key='importAddressbook'
+        onConfirm={ this.onImport }
+        renderValidation={ this.renderValidation }
+      />,
+
       this.renderSearchButton(),
       this.renderSortButton()
     ];
@@ -134,6 +141,61 @@ class Addresses extends Component {
     );
   }
 
+  renderValidation = (content) => {
+    let addresses;
+
+    try {
+      addresses = JSON.parse(content);
+    } catch (e) {
+      return {
+        error: 'The provided file is invalid...'
+      };
+    }
+
+    const body = Object.values(addresses).map((address, index) => (
+      <Summary
+        key={ index }
+        account={ address }
+        name={ address.name }
+        noLink
+      />
+    ));
+
+    return (
+      <div>
+        { body }
+      </div>
+    );
+  }
+
+  onImport = (content) => {
+    try {
+      const addresses = JSON.parse(content);
+
+      Object.values(addresses).forEach((account) => {
+        this.onAddAccount(account);
+      });
+    } catch (e) {
+      console.error('onImport', content, e);
+    }
+  }
+
+  onAddAccount = (account) => {
+    const { api } = this.context;
+    const { address, name, meta } = account;
+
+    Promise.all([
+      api.parity.setAccountName(address, name),
+      api.parity.setAccountMeta(address, {
+        ...meta,
+        timestamp: Date.now(),
+        deleted: false
+      })
+    ]).catch((error) => {
+      console.error('onAddAccount', error);
+    });
+  }
+
   onAddSearchToken = (token) => {
     const { searchTokens } = this.state;
     const newSearchTokens = uniq([].concat(searchTokens, token));

From 09ec0c1f2f62c2e0c26710b0af4d73dc5191a23c Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Mon, 14 Nov 2016 20:26:21 +0100
Subject: [PATCH 2/2] More robust import #2885

---
 js/src/views/Addresses/addresses.js | 45 ++++++++++++++++-------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js
index 0347f8fa2..8b5fc0818 100644
--- a/js/src/views/Addresses/addresses.js
+++ b/js/src/views/Addresses/addresses.js
@@ -142,30 +142,35 @@ class Addresses extends Component {
   }
 
   renderValidation = (content) => {
-    let addresses;
+    const error = {
+      error: 'The provided file is invalid...'
+    };
 
     try {
-      addresses = JSON.parse(content);
-    } catch (e) {
-      return {
-        error: 'The provided file is invalid...'
-      };
-    }
+      const addresses = JSON.parse(content);
 
-    const body = Object.values(addresses).map((address, index) => (
-      <Summary
-        key={ index }
-        account={ address }
-        name={ address.name }
-        noLink
-      />
-    ));
+      if (!addresses || Object.keys(addresses).length === 0) {
+        return error;
+      }
 
-    return (
-      <div>
-        { body }
-      </div>
-    );
+      const body = Object
+        .values(addresses)
+        .filter((account) => account && account.address)
+        .map((account, index) => (
+          <Summary
+            key={ index }
+            account={ account }
+            name={ account.name }
+            noLink
+          />
+        ));
+
+      return (
+        <div>
+          { body }
+        </div>
+      );
+    } catch (e) { return error; }
   }
 
   onImport = (content) => {