Merge pull request #284 from ZBoxApp/manager_performance

enable all status for domain list to know what state means when users…

.vagrant/machines/default/virtualbox/action_set_name

-1468357419
\ No newline at end of file
+1478881770
\ No newline at end of file

package.json

@@ -35,9 +35,9 @@
   },
   "devDependencies": {
     "assets-webpack-plugin": "^3.4.0",
-    "babel-cli": "^6.7.5",
+    "babel-cli": "^6.18.0",
     "babel-eslint": "6.0.4",
-    "babel-loader": "6.2.4",
+    "babel-loader": "^6.2.7",
     "babel-plugin-transform-runtime": "6.7.5",
     "babel-polyfill": "6.7.4",
     "babel-preset-es2015": "^6.13.2",

path.json

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

src/components/domain/domains.jsx

@@ -216,14 +216,26 @@ export default class Domains extends React.Component {
                     status = 'Activo';
                     statusClass += 'btn-info';
                     break;
-                case 'inactive':
-                    status = 'Inactivo';
-                    statusClass += 'btn-default';
+                case 'closed':
+                    status = 'Cerrado';
+                    statusClass += 'btn-primary';
                     break;
-                default:
-                    status = 'Migrando';
+                case 'locked':
+                    status = 'Bloqueado';
+                    statusClass += 'btn-danger';
+                    break;
+                case 'suspended':
+                    status = 'Suspendido';
+                    statusClass += 'btn-primary';
+                    break;
+                case 'maintenance':
+                    status = 'En Mantención';
                     statusClass += 'btn-warning2';
                     break;
+                default:
+                    status = 'Desconocido';
+                    statusClass += 'btn-danger';
+                    break;
                 }
 
                 let mailboxes;

src/utils/client.jsx

@@ -76,8 +76,10 @@ function initZimbra() {
 export function getClientConfig(success, error) {
     return $.ajax({
         url: 'https://manager-api.zboxapp.com/parse/functions/getConfigManager',
+        //url: './config/config.json',
         dataType: 'json',
         method: 'POST',
+        //method: 'GET',
         headers: {
             'X-Parse-Application-Id': 'salesZboxManagerApp'
         },
@@ -644,7 +646,10 @@ export function getAllCos(success, error) {
       if (UserStore.isGlobalAdmin()) {
         zimbra.getAllCos((err, data) => {
           if (err) {
-            return error(handleError('getAllCos', err));
+              if (error && typeof error === 'function') {
+                  error(handleError('getAllCos', err));
+              }
+              return;
           }
           return success(data);
         });
@@ -657,7 +662,10 @@ export function getAllCos(success, error) {
 
         zimbra.makeBatchRequest(batchRequests, (err, data) => {
           if (err) {
-            return error(handleError('getCos', err));
+              if (error && typeof error === 'function') {
+                  error(handleError('getCos', err));
+              }
+              return;
           }
           const allCos = data.GetCosResponse.map((r) => {
             return r.cos[0];
@@ -667,7 +675,10 @@ export function getAllCos(success, error) {
       }
     },
     (err) => {
-      return error(handleError('getAllCos', err));
+        if (error && typeof error === 'function') {
+            error(handleError('getAllCos', err));
+        }
+        return;
     }
   );
 }

webpack.config.js

@@ -40,7 +40,7 @@ var config = {
         loaders: [
             {
                 test: /\.jsx?$/,
-                loader: 'babel',
+                loader: 'babel-loader',
                 exclude: /(node_modules)/,
                 query: {
                     presets: ['react', 'es2015', 'stage-0'],
@@ -88,12 +88,12 @@ var config = {
         }),
         htmlExtract,
         new webpack.LoaderOptionsPlugin({
-            minimize: !DEV,
+            minimize: true,
             debug: false
         }),
-        new webpack.optimize.UglifyJsPlugin({
+        /*new webpack.optimize.UglifyJsPlugin({
             compress: { warnings: false }
-        })
+        })*/
     ],
     resolve: {
         alias: {
@@ -112,15 +112,15 @@ var config = {
 // Development mode configuration
 if (DEV) {
     if (FULLMAP) {
-        config.devtool = 'source-map';
+        //config.devtool = 'source-map';
     } else {
-        config.devtool = 'eval-cheap-module-source-map';
+        //config.devtool = 'eval-cheap-module-source-map';
     }
 }
 
 // Production mode configuration
 if (!DEV) {
-    config.devtool = 'source-map';
+    //config.devtool = 'source-map';
     config.plugins.push(
         new webpack.optimize.UglifyJsPlugin({
             'screw-ie8': true,