Merge pull request #109 from ZBoxApp/issues_resolved_manager

fixed filter mailboxes, fixed sum to domain, fixed mx, fixed mailbox …

.vagrant/machines/default/virtualbox/action_set_name

-1464106868
+1464204428
\ No newline at end of file

path.json

-module.exports = {"main":{"js":"/699779bundle.js"}}
+module.exports = {"main":{"js":"/896467bundle.js"}}
\ No newline at end of file

src/components/companies/companies.jsx

@@ -35,7 +35,8 @@ export default class Companies extends React.Component {
 
         this.state = {
             page,
-            offset: ((page - 1) * Constants.QueryOptions.DEFAULT_LIMIT)
+            offset: ((page - 1) * Constants.QueryOptions.DEFAULT_LIMIT),
+            loading: true
         };
 
         this.isGlobalAdmin = UserStore.isGlobalAdmin();
@@ -68,13 +69,15 @@ export default class Companies extends React.Component {
                     CompaniesStore.setCompanies(comps);
 
                     self.setState({
-                        companies: comps
+                        companies: comps,
+                        loading: false
                     });
                 }).
                 catch((error) => {
                     self.setState({error: {
                         message: error,
-                        type: messageTypes.ERROR
+                        type: messageTypes.ERROR,
+                        loading: false
                     }});
                 });
             }).catch((error) => {
@@ -91,7 +94,8 @@ export default class Companies extends React.Component {
             }, (error) => {
                 self.setState({error: {
                     message: error,
-                    type: messageTypes.ERROR
+                    type: messageTypes.ERROR,
+                    loading: false
                 }});
             });
         } else {
@@ -103,13 +107,15 @@ export default class Companies extends React.Component {
                 }, (error) => {
                     self.setState({error: {
                         message: error,
-                        type: messageTypes.ERROR
+                        type: messageTypes.ERROR,
+                        loading: false
                     }});
                 });
             }, (error) => {
                 self.setState({
                     error,
-                    type: messageTypes.ERROR
+                    type: messageTypes.ERROR,
+                    loading: false
                 });
             });
         }
@@ -194,6 +200,16 @@ export default class Companies extends React.Component {
         let panelBody;
         let noLimitError;
         let pagination = null;
+        const textLoading = this.isGlobalAdmin ? 'Cargando Empresas...' : 'Cargando Mi Empresa...';
+
+        if (this.state.loading) {
+            panelBody = (
+                <div className='text-center'>
+                    <i className='fa fa-spinner fa-spin fa-4x fa-fw'></i>
+                    <p>{textLoading}</p>
+                </div>
+            );
+        }
 
         if (this.state.companies.length === 0) {
             panelBody = (
@@ -213,7 +229,7 @@ export default class Companies extends React.Component {
                 const totalPages = Math.ceil(data.length / Constants.QueryOptions.DEFAULT_LIMIT);
                 pagination = (
                     <Pagination
-                        key='panelPaginationCompanies'
+                        key='paginationCompany'
                         url='companies'
                         currentPage={this.state.page}
                         totalPages={totalPages}

src/components/domain/domain_general_info.jsx

@@ -29,25 +29,23 @@ export default class DomainGeneralInfo extends React.Component {
     }
     componentWillMount() {
         const domain = this.props.domain;
-        this.getMXRecord(domain.name);
+        this.getMXRecord(domain);
         this.getCompany(domain.attrs.businessCategory);
     }
-    getMXRecord(name) {
+    getMXRecord(domain) {
         const self = this;
 
-        Client.getDnsInfo(
-            name,
-            (data) => {
-                self.setState({
-                    mx: data.mx
-                });
-            },
-            (err) => {
-                self.setState({
+        domain.checkMxRecord((err, data) => {
+            if (err) {
+                return self.setState({
                     mx: err
                 });
             }
-        );
+
+            return self.setState({
+                mx: data.entry
+            });
+        });
     }
     getCompany(id) {
         const company = CompanyStore.getCompanyById(id);

src/components/domain/domain_mailbox_plans.jsx

@@ -30,13 +30,13 @@ export default class DomainMailboxPlans extends React.Component {
                 plans
             });
         }
-
         return this.props.domain.countAccounts(
             (err, data) => {
                 if (err) {
                     return this.setState({plans: {}});
                 }
 
+                this.props.domain.plans = data;
                 return this.setState({plans: data});
             }
         );
@@ -94,12 +94,12 @@ export default class DomainMailboxPlans extends React.Component {
             });
         }
 
-        for (const key in plans) {
+        for (const key in this.state.plans) {
             if (plans.hasOwnProperty(key)) {
                 const plan = plans[key];
-                totalUsed += plan.used;
+                totalUsed += (parseInt(plan.used, 10)) ? parseInt(plan.used, 10) : 0;
                 if (plan.limit === 0) {
-                    totalLimit = '\u221e';
+                    //totalLimit = '\u221e';
 
                     if (!noLimitError) {
                         noLimitError = (
@@ -111,7 +111,6 @@ export default class DomainMailboxPlans extends React.Component {
                         );
                     }
                 } else {
-                    console.log(totalLimit); //eslint-disable-line no-console
                     totalLimit += plan.limit;
                 }
 

src/components/mailbox/stats_mailbox.jsx

@@ -107,7 +107,7 @@ export default class BlockGeneralInfoMailbox extends React.Component {
                             <div className='col-xs-6'>
                                 {sizeEnaled && (
                                     <p>
-                                        <span className='center-block'>Espacio Disponible</span>
+                                        <span className='center-block'>Espacio Total</span>
                                         <strong>{sizeEnaled}</strong>
                                     </p>
                                 )}

src/config/config.json

@@ -12,13 +12,16 @@
     "autoincrementOnFailRequestZimbra": 500,
     "plans": {
         "basic": {
-            "statusCos": "btn-success"
+            "statusCos": "btn-success",
+            "label": "Básica"
         },
         "premium": {
-            "statusCos": "btn-primary2"
+            "statusCos": "btn-primary2",
+            "label": "Premium"
         },
         "professional": {
-            "statusCos": "btn-primary"
+            "statusCos": "btn-primary",
+            "label": "Profesional"
         },
         "default": false
     },