Merge pull request #206 from ZBoxApp/issues_resolved_manager

fix error when add or remove admin, add more delay to refresh DL, fix…

src/components/domain/domain_admin_list.jsx

@@ -50,8 +50,6 @@ export default class DomainAdminList extends React.Component {
         }
 
         return Client.getDomain(domain.name, (data) => {
-            this.props.domain = data;
-
             return data.getAdmins((err, res) => {
                 const admins = res.account || [];
                 if (this.isStoreEnabled) {

src/components/domain/domain_distribution_list.jsx

@@ -44,7 +44,6 @@ export default class DomainDistributionList extends React.Component {
         setTimeout(() => {
             domain.getAllDistributionLists(
                 (err, lists) => {
-                    console.log('getAllDL', lists); //eslint-disable-line no-console
                     if (this.isStoreEnabled) {
                         DomainStore.setDistibutionLists(domain, lists);
                     }
@@ -52,7 +51,7 @@ export default class DomainDistributionList extends React.Component {
                     this.setState({lists});
                 }
             );
-        }, 100);
+        }, 1000);
     }
     componentWillReceiveProps(nextProps) {
         const page = parseInt(nextProps.location.query.page, 10) || 1;
@@ -64,7 +63,6 @@ export default class DomainDistributionList extends React.Component {
     onListsChange() {
         const lists = this.isStoreEnabled ? DomainStore.getDistributionLists(this.props.domain) : null;
         if (!lists) {
-            console.log('no store'); //eslint-disable-line no-console
             return this.getLists();
         }
 

src/components/domain/domains.jsx

@@ -68,7 +68,11 @@ export default class Domains extends React.Component {
                 });
                 data.total = data.domain.length;
                 domains = data.domain;
+
+                if (this.isStoreEnabled) {
                     DomainStore.setDomains(data);
+                }
+
                 this.getPlans(domains).
                 then(() => {
                     self.setState({
@@ -256,7 +260,9 @@ export default class Domains extends React.Component {
                                 <a
                                     href='#'
                                     onClick={(e) => {
+                                        if (this.isStoreEnabled) {
                                             DomainStore.setCurrent(d);
+                                        }
                                         Utils.handleLink(e, `/domains/${d.id}`);
                                     }}
                                 >

src/components/import_massive_modal.jsx

@@ -14,6 +14,9 @@ export default class ImportMassiveModal extends React.Component {
     constructor(props) {
         super(props);
 
+        this.isDEV = window.manager_config.DEV;
+        this.createMassiveAccounts = this.createMassiveAccounts.bind(this);
+        this.onSubmit = this.onSubmit.bind(this);
         this.buildCols = this.buildCols.bind(this);
         this.options = {
             email: 'email',
@@ -287,7 +290,8 @@ export default class ImportMassiveModal extends React.Component {
 
         for (const account in accounts) {
             if (accounts.hasOwnProperty(account)) {
-                accounts[account].zimbraCOSId = this.plans[accounts[account].zimbraCOSId.toLowerCase()];
+                const zimbraCOS = this.isDEV ? accounts[account].zimbraCOSId.trim().toLowerCase() : Utils.titleCase(accounts[account].zimbraCOSId.trim());
+                accounts[account].zimbraCOSId = this.plans[zimbraCOS];
                 const email = accounts[account].email;
                 const passwd = accounts[account].passwd;
                 if (passwd.length < 8) {
@@ -352,6 +356,19 @@ export default class ImportMassiveModal extends React.Component {
                 this.props.onHide();
             }
 
+            if (response.Fault) {
+                const total = response.Fault.length;
+                const message = total === 1 ? `Hubo un error en ${total} casilla : ${response.Fault[0].Reason.Text}` : `Hubo un error en ${total} casillas`;
+                return GlobalActions.emitEndTask({
+                    id: 'casillamasiva',
+                    toast: {
+                        message,
+                        title: 'Mailbox - Carga Masiva',
+                        type: 'error'
+                    }
+                });
+            }
+
             return GlobalActions.emitEndTask({
                 id: 'casillamasiva',
                 toast: {

src/components/progress_task.jsx

@@ -32,7 +32,7 @@ export default class ProgressTask extends React.Component {
                 if (arrTasks[i].id === params.id) {
                     this.tasks.splice(i, 1);
                     EventStore.emitToast({
-                        type: 'success',
+                        type: params.toast.type || 'success',
                         title: params.toast.title,
                         body: params.toast.message,
                         options: {

src/config/config.json

 {
     "debug": true,
+    "DEV": true,
     "enableStores" : false,
     "zimbraUrl": "http://zimbra.zboxapp.dev:9081/zimbra_proxy/service/admin/soap",
     "zimbraProxy": "https://192.168.1.8:7071",