fix not show domain archive on compnay detail view, and fix button logout and...

fix not show domain archive on compnay detail view, and fix button logout and fix selects on firefox

src/components/companies/company_domains.jsx

@@ -13,7 +13,7 @@ import * as Utils from '../../utils/utils.jsx';
 
 export default class CompanyDomains extends React.Component {
     render() {
-        const domains = this.props.company.domains || [];
+        const domains = this.props.company.domains ? Utils.getDomainsCleaned(this.props.company.domains) : [];
         const isAdmin = UserStore.isGlobalAdmin();
 
         let buttons;

src/components/companies/company_mailbox_plans.jsx

@@ -17,11 +17,10 @@ export default class CompanyMailboxPlans extends React.Component {
     }
     handleBuy(e) {
         e.preventDefault();
-        alert('llevar al usuario a la página que permita comprar más casillas'); //eslint-disable-line no-alert
     }
     render() {
         const company = this.props.company;
-        const headerButtons = [
+        /*const headerButtons = [
             {
                 label: 'Comprar',
                 props: {
@@ -29,7 +28,8 @@ export default class CompanyMailboxPlans extends React.Component {
                     onClick: this.handleBuy
                 }
             }
-        ];
+        ];*/
+        const headerButtons = [];
 
         const mailboxPlans = [];
         const cos = Utils.getEnabledPlansByCosId(ZimbraStore.getAllCos());
@@ -75,9 +75,11 @@ export default class CompanyMailboxPlans extends React.Component {
                 }
 
                 Object.keys(domainPlans).forEach((id) => {
-                    used = domainPlans[id].used;
-                    plans[id].noLimit = true;
-                    plans[id].used += used;
+                    if (plans[id]) {
+                        used = domainPlans[id].used;
+                        plans[id].noLimit = true;
+                        plans[id].used += used;
+                    }
                 });
             }
         });

src/components/domain/domains.jsx

@@ -64,10 +64,9 @@ export default class Domains extends React.Component {
             attrs,
             (data) => {
                 if (data.domain) {
-                    data.domain = data.domain.filter((dom) => {
-                        return !dom.isAliasDomain;
-                    });
-                    data.total = data.domain.length;
+                    const domainCleaned = Utils.getDomainsCleaned(data.domain);
+                    data.domain = domainCleaned;
+                    data.total = domainCleaned.length;
                 }
                 domains = data.domain;
 

src/components/header.jsx

@@ -47,7 +47,10 @@ export default class Header extends React.Component {
                         alt='ZBox Manager'
                     />
                 </div>
-                <nav role='navigation'>
+                <nav
+                    role='navigation'
+                    className='overflow'
+                >
                     <div
                         className='header-link hide-menu'
                         onClick={() => this.toggleSidebar()}
@@ -60,38 +63,40 @@ export default class Header extends React.Component {
                         </span>
                     </div>
 
-                    <form
-                        className='navbar-form-custom'
-                        acceptCharset='UTF-8'
-                        onSubmit={(e) => this.handleSearch(e)}
-                    >
-                        <input
-                            ref='utf8'
-                            name='utf8'
-                            type='hidden'
-                            value='✓'
-                        />
-                        <input
-                            ref='query'
-                            type='text'
-                            name='query'
-                            id='query'
-                            placeholder='Buscar'
-                            autoComplete='off'
-                            className='form-control'
-                        />
-                    </form>
+                    <div className='overflow'>
+                        <form
+                            className='navbar-form-custom'
+                            acceptCharset='UTF-8'
+                            onSubmit={(e) => this.handleSearch(e)}
+                        >
+                            <input
+                                ref='utf8'
+                                name='utf8'
+                                type='hidden'
+                                value='✓'
+                            />
+                            <input
+                                ref='query'
+                                type='text'
+                                name='query'
+                                id='query'
+                                placeholder='Buscar'
+                                autoComplete='off'
+                                className='form-control'
+                            />
+                        </form>
 
-                    <div className='navbar-right'>
-                        <ul className='nav navbar-nav no-borders'>
-                            <li className='dropdown'>
-                                <Link
-                                    to='/logout'
-                                >
-                                    <i className='fa fa-sign-out'></i>
-                                </Link>
-                            </li>
-                        </ul>
+                        <div className='navbar-right'>
+                            <ul className='nav navbar-nav no-borders'>
+                                <li className='dropdown'>
+                                    <Link
+                                        to='/logout'
+                                    >
+                                        <i className='fa fa-sign-out'></i>
+                                    </Link>
+                                </li>
+                            </ul>
+                        </div>
                     </div>
                 </nav>
             </div>

src/components/panel.jsx

@@ -25,8 +25,8 @@ export default class Panel extends React.Component {
         if (this.props.hasHeader && (this.props.btnsHeader || this.props.title || this.props.filter)) {
             panelHeader = (
                 <div className='panel-heading hbuilt clearfix'>
-                    <div className='pull-right'>{btns}</div>
-                    <div className='heading-buttons pull-left'>
+                    <div className='pull-right text-right'>{btns}</div>
+                    <div className='heading-buttons pull-left text-left'>
                         {this.props.title || this.props.filter}
                     </div>
                 </div>

src/sass/components/_panels.scss

@@ -22,6 +22,11 @@
     padding: 10px 4px;
     transition: all .3s;
 
+    > div {
+      max-width: 50%;
+      width: 100%;
+    }
+
     .heading-buttons {
       max-width: 50%;
     }

src/sass/components/_various.scss

@@ -616,7 +616,7 @@ a {
   float: left;
   height: 52px;
   padding: 0;
-  width: 70%;
+  width: 85%;
 
   .form-control {
     background: none repeat scroll 0 0 $transparent;
@@ -1640,3 +1640,7 @@ label {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.overflow {
+  overflow: hidden;
+}