Commit 412da2f5 authored by Juorder Gonzalez's avatar Juorder Gonzalez Committed by Juorder Antonio

create watcher for review if account is not remove yet

parents 2e16cbba 56cfdf1d
1468357419
\ No newline at end of file
1478881770
\ No newline at end of file
module.exports = {"main":{"js":"/018497bundle.js"}}
\ No newline at end of file
module.exports = {"main":{"js":"/209210bundle.js"}}
\ No newline at end of file
......@@ -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;
......
......@@ -38,6 +38,9 @@ export default class EditMailBox extends React.Component {
this.handleRenameAccount = this.handleRenameAccount.bind(this);
this.addBlurListeneronInput = this.addBlurListeneronInput.bind(this);
this.getEnableAccountsFromDomain = this.getEnableAccountsFromDomain.bind(this);
this.watcherRemoveAccount = this.watcherRemoveAccount.bind(this);
this.isRemove = false;
this.cos = Utils.getEnabledPlansByCos(ZimbraStore.getAllCos());
this.editUrlFromParams = this.props.params.domain_id ? `/domains/${this.props.params.domain_id}/mailboxes/` : '/mailboxes/';
......@@ -217,6 +220,18 @@ export default class EditMailBox extends React.Component {
}, options);
}
watcherRemoveAccount(id, resolve) {
setTimeout(() => {
Client.getAccount(id, () => {
if (!this.isRemove) {
this.watcherRemoveAccount(id, resolve);
}
}, () => {
return resolve(true);
});
}, 5000);
}
removeAccount() {
const account = this.state.data;
const response = {
......@@ -240,16 +255,20 @@ export default class EditMailBox extends React.Component {
new Promise((resolve, reject) => {
// start loading
GlobalActions.emitStartLoading();
this.isRemove = false;
Client.removeAccount(
account.id,
() => {
this.isRemove = true;
return resolve(true);
},
(error) => {
this.isRemove = true;
return reject(error);
}
);
this.watcherRemoveAccount(account.id, resolve);
}).then(() => {
if (this.isStoreEnabled) {
MailboxStore.removeAccount(account);
......
......@@ -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;
}
);
}
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment