Skip to content

Z
zimbra-admin-api-js
Commit 28415fc5 authored by Juorder Gonzalez's avatar Juorder Gonzalez Committed by GitHub
Browse files
Options

Merge pull request #216 from ZBoxApp/issues_beta_v1 

fix the wat on we identify archive account, throw regexp store in jso…
parents e2674fe9 7668dd06
Show whitespace changes
Inline Side-by-side
Showing with 204 additions and 55 deletions
path.json
View file @ 28415fc5
module.exports = {"main":{"js":"/275274bundle.js"}} module.exports = {"main":{"js":"/280485bundle.js"}}
\ No newline at end of file \ No newline at end of file
src/components/domain/edit_domain.jsx
View file @ 28415fc5
...@@ -94,6 +94,7 @@ export default class EditDomain extends React.Component { ...@@ -94,6 +94,7 @@ export default class EditDomain extends React.Component {
const businessCategory = this.refs.company.value.trim(); const businessCategory = this.refs.company.value.trim();
const description = this.refs.description.value.trim(); const description = this.refs.description.value.trim();
const zimbraNotes = this.refs.notes.value.trim(); const zimbraNotes = this.refs.notes.value.trim();
const zimbraDomainMaxAccounts = this.refs.mailboxLimit.value;
const plans = this.state.plans; const plans = this.state.plans;
const plansKeys = Object.keys(plans); const plansKeys = Object.keys(plans);
const zimbraDomainCOSMaxAccounts = []; const zimbraDomainCOSMaxAccounts = [];
...@@ -108,7 +109,8 @@ export default class EditDomain extends React.Component { ...@@ -108,7 +109,8 @@ export default class EditDomain extends React.Component {
businessCategory, businessCategory,
description, description,
zimbraNotes, zimbraNotes,
zimbraDomainCOSMaxAccounts zimbraDomainCOSMaxAccounts,
zimbraDomainMaxAccounts
} }
}; };
......
src/components/mailbox/create_mailbox.jsx
View file @ 28415fc5
...@@ -33,7 +33,9 @@ export default class CreateMailBox extends React.Component { ...@@ -33,7 +33,9 @@ export default class CreateMailBox extends React.Component {
this.reset = null; this.reset = null;
this.cacheDomain = null; this.cacheDomain = null;
this.state = {}; this.state = {
zimbraCOSId: ''
};
this.s = true; this.s = true;
} }
...@@ -96,8 +98,10 @@ export default class CreateMailBox extends React.Component { ...@@ -96,8 +98,10 @@ export default class CreateMailBox extends React.Component {
const maxCosAccounts = Utils.parseMaxCOSAccounts(thatDomainExists.attrs.zimbraDomainCOSMaxAccounts); const maxCosAccounts = Utils.parseMaxCOSAccounts(thatDomainExists.attrs.zimbraDomainCOSMaxAccounts);
this.setState({ this.setState({
loadingEnableAccounts: true, loadingEnableAccounts: true,
error: false error: false,
zimbraCOSId: ''
}); });
return Client.batchCountAccount([thatDomainExists.name], return Client.batchCountAccount([thatDomainExists.name],
(s) => { (s) => {
const usedAccounts = s.pop(); const usedAccounts = s.pop();
...@@ -175,6 +179,9 @@ export default class CreateMailBox extends React.Component { ...@@ -175,6 +179,9 @@ export default class CreateMailBox extends React.Component {
const domain = document.querySelector('input[list=\'domain\']'); const domain = document.querySelector('input[list=\'domain\']');
const passwd = this.refs.passwd.value; const passwd = this.refs.passwd.value;
const maskPasswd = document.getElementById('password'); const maskPasswd = document.getElementById('password');
let shouldEnableArchive = false;
const plans = this.state.plans;
let plan = null;
if (domain.value === '') { if (domain.value === '') {
GlobalActions.emitMessage({ GlobalActions.emitMessage({
...@@ -206,11 +213,20 @@ export default class CreateMailBox extends React.Component { ...@@ -206,11 +213,20 @@ export default class CreateMailBox extends React.Component {
sn: this.refs.sn.value, sn: this.refs.sn.value,
displayName: `${this.refs.givenName.value} ${this.refs.sn.value}`, displayName: `${this.refs.givenName.value} ${this.refs.sn.value}`,
description: this.refs.description.value, description: this.refs.description.value,
zimbraCOSId: this.refs.zimbraCOSId.value, zimbraCOSId: this.state.zimbraCOSId,
zimbraAccountStatus: this.refs.zimbraAccountStatus.value, zimbraAccountStatus: this.refs.zimbraAccountStatus.value,
zimbraIsDelegatedAdminAccount: this.refs.zimbraIsDelegatedAdminAccount.checked.toString().toUpperCase() zimbraIsDelegatedAdminAccount: this.refs.zimbraIsDelegatedAdminAccount.checked.toString().toUpperCase()
}; };
const keysPlans = Object.keys(this.state.plans);
keysPlans.forEach((p) => {
if (plans[p] === this.state.zimbraCOSId) {
plan = p;
shouldEnableArchive = window.manager_config.plans[p].archiving;
}
});
Client.createAccount( Client.createAccount(
email, email,
passwd, passwd,
...@@ -222,7 +238,17 @@ export default class CreateMailBox extends React.Component { ...@@ -222,7 +238,17 @@ export default class CreateMailBox extends React.Component {
MailboxStore.setMailbox(data); MailboxStore.setMailbox(data);
if (shouldEnableArchive) {
data.enableArchiving(plan, (err) => {
if (err) {
return err;
}
return Utils.handleLink(event, `/mailboxes/${data.id}`, this.props.location);
});
} else {
return Utils.handleLink(event, `/mailboxes/${data.id}`, this.props.location); return Utils.handleLink(event, `/mailboxes/${data.id}`, this.props.location);
}
/*GlobalActions.emitMessage({ /*GlobalActions.emitMessage({
message: 'Se ha creado su cuenta con éxito.', message: 'Se ha creado su cuenta con éxito.',
...@@ -249,7 +275,9 @@ export default class CreateMailBox extends React.Component { ...@@ -249,7 +275,9 @@ export default class CreateMailBox extends React.Component {
} }
handleRadioChanged(val) { handleRadioChanged(val) {
this.refs.zimbraCOSId.value = val; this.setState({
zimbraCOSId: val
});
} }
getAllDomains() { getAllDomains() {
...@@ -364,15 +392,12 @@ export default class CreateMailBox extends React.Component { ...@@ -364,15 +392,12 @@ export default class CreateMailBox extends React.Component {
this.s = false; this.s = false;
} }
shouldComponentUpdate() {
return true;
}
controllerDataList(controller) { controllerDataList(controller) {
this.reset = controller; this.reset = controller;
} }
render() { render() {
const {zimbraCOSId} = this.state;
let message; let message;
let domains = []; let domains = [];
let form = null; let form = null;
...@@ -458,14 +483,18 @@ export default class CreateMailBox extends React.Component { ...@@ -458,14 +483,18 @@ export default class CreateMailBox extends React.Component {
return null; return null;
}); });
for (let plan in plans) { const keyPlans = Object.keys(plans);
if (plans.hasOwnProperty(plan)) {
keyPlans.forEach((plan) => {
if (plans[plan]) {
let isDisabled = null; let isDisabled = null;
let classCss = null; let classCss = null;
let info = null; let info = null;
let hasPlan = false;
if (this.state.enabledAccounts) { if (this.state.enabledAccounts) {
this.state.enabledAccounts.forEach((p) => { this.state.enabledAccounts.forEach((p) => {
if (plans[plan] === p.cosId) { if (plans[plan] === p.cosId) {
hasPlan = true;
isDisabled = p.enabled < 1 ? true : null; isDisabled = p.enabled < 1 ? true : null;
classCss = p.classCss; classCss = p.classCss;
info = ( info = (
...@@ -482,6 +511,18 @@ export default class CreateMailBox extends React.Component { ...@@ -482,6 +511,18 @@ export default class CreateMailBox extends React.Component {
} }
}); });
} }
if (this.state.enabledAccounts && !hasPlan && null) {
isDisabled = true;
info = (
<div>
<span className='text-danger'>
Este plan no esta contratado
</span>
</div>
);
}
const disabledCss = isDisabled ? 'disabled' : ''; const disabledCss = isDisabled ? 'disabled' : '';
const item = ( const item = (
...@@ -510,7 +551,61 @@ export default class CreateMailBox extends React.Component { ...@@ -510,7 +551,61 @@ export default class CreateMailBox extends React.Component {
); );
checkboxes.push(item); checkboxes.push(item);
} }
});
/*for (let plan in plans) {
if (plans.hasOwnProperty(plan)) {
let isDisabled = null;
let classCss = null;
let info = null;
if (this.state.enabledAccounts) {
this.state.enabledAccounts.forEach((p) => {
if (plans[plan] === p.cosId) {
isDisabled = p.enabled < 1 ? true : null;
classCss = p.classCss;
info = (
<div>
<span>
Usadas: {p.used}
</span>
<span> - </span>
<span className={p.enabled <= 0 ? 'text-danger' : 'text-success'}>
Libres: {p.enabled}
</span>
</div>
);
} }
});
}
const disabledCss = isDisabled ? 'disabled' : '';
const item = (
<label
className={`radio radio-info radio-inline pretty-input ${disabledCss}`}
key={plan}
>
<div className='pretty-radio'>
<input
type='radio'
className='pretty'
name='mailbox'
onChange={() => {
this.handleRadioChanged(plans[plan]);
}}
disabled={isDisabled}
/>
<span></span>
</div>
<span className={`${classCss} status-plan`}>
{Utils.titleCase(plan)}
</span>
{info}
</label>
);
checkboxes.push(item);
}
}*/
form = ( form = (
<form <form
...@@ -646,6 +741,7 @@ export default class CreateMailBox extends React.Component { ...@@ -646,6 +741,7 @@ export default class CreateMailBox extends React.Component {
type='hidden' type='hidden'
ref='zimbraCOSId' ref='zimbraCOSId'
data-required='true' data-required='true'
value={zimbraCOSId}
data-message='El plan de su casilla es requerido, por favor verificar.' data-message='El plan de su casilla es requerido, por favor verificar.'
/> />
</div> </div>
...@@ -686,14 +782,20 @@ export default class CreateMailBox extends React.Component { ...@@ -686,14 +782,20 @@ export default class CreateMailBox extends React.Component {
<div className='form-group'> <div className='form-group'>
<div className='col-sm-8 col-sm-offset-3'> <div className='col-sm-8 col-sm-offset-3'>
{counterPlans > 0 && ( /*{counterPlans > 0 && (
<input
type='submit'
name='commit'
value='Guardar'
className='btn btn-primary action-save'
/>
)}*/
<input <input
type='submit' type='submit'
name='commit' name='commit'
value='Guardar' value='Guardar'
className='btn btn-primary action-save' className='btn btn-primary action-save'
/> />
)}
<Button <Button
btnAttrs={ btnAttrs={
{ {
......
src/components/mailbox/edit_mailbox.jsx
View file @ 28415fc5
...@@ -8,14 +8,16 @@ import Button from '../button.jsx'; ...@@ -8,14 +8,16 @@ import Button from '../button.jsx';
import MessageBar from '../message_bar.jsx'; import MessageBar from '../message_bar.jsx';
import Panel from '../panel.jsx'; import Panel from '../panel.jsx';
import DataList from 'react-datalist'; import DataList from 'react-datalist';
import UserStore from '../../stores/user_store.jsx';
import Promise from 'bluebird'; import Promise from 'bluebird';
import MailboxStore from '../../stores/mailbox_store.jsx';
import * as Client from '../../utils/client.jsx'; import * as Client from '../../utils/client.jsx';
import * as GlobalActions from '../../action_creators/global_actions.jsx'; import * as GlobalActions from '../../action_creators/global_actions.jsx';
import * as Utils from '../../utils/utils.jsx'; import * as Utils from '../../utils/utils.jsx';
import UserStore from '../../stores/user_store.jsx';
import EventStore from '../../stores/event_store.jsx'; import EventStore from '../../stores/event_store.jsx';
import MailboxStore from '../../stores/mailbox_store.jsx';
import ZimbraStore from '../../stores/zimbra_store.jsx';
import Constants from '../../utils/constants.jsx'; import Constants from '../../utils/constants.jsx';
...@@ -25,6 +27,7 @@ export default class EditMailBox extends React.Component { ...@@ -25,6 +27,7 @@ export default class EditMailBox extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.isStoreEnabled = window.manager_config.enableStores;
this.handleEdit = this.handleEdit.bind(this); this.handleEdit = this.handleEdit.bind(this);
this.handleRadioChanged = this.handleRadioChanged.bind(this); this.handleRadioChanged = this.handleRadioChanged.bind(this);
this.getMailbox = this.getMailbox.bind(this); this.getMailbox = this.getMailbox.bind(this);
...@@ -33,7 +36,9 @@ export default class EditMailBox extends React.Component { ...@@ -33,7 +36,9 @@ export default class EditMailBox extends React.Component {
this.handleRenameAccount = this.handleRenameAccount.bind(this); this.handleRenameAccount = this.handleRenameAccount.bind(this);
this.editUrlFromParams = this.props.params.domain_id ? `/domains/${this.props.params.domain_id}/mailboxes/` : '/mailboxes/'; this.editUrlFromParams = this.props.params.domain_id ? `/domains/${this.props.params.domain_id}/mailboxes/` : '/mailboxes/';
this.state = {}; this.state = {
zimbraCOSId: ''
};
} }
showMessage(attrs) { showMessage(attrs) {
...@@ -44,7 +49,9 @@ export default class EditMailBox extends React.Component { ...@@ -44,7 +49,9 @@ export default class EditMailBox extends React.Component {
} }
handleRadioChanged(val) { handleRadioChanged(val) {
this.refs.zimbraCOSId.value = val; this.setState({
zimbraCOSId: val
});
} }
removeAccount() { removeAccount() {
...@@ -81,7 +88,9 @@ export default class EditMailBox extends React.Component { ...@@ -81,7 +88,9 @@ export default class EditMailBox extends React.Component {
} }
); );
}).then(() => { }).then(() => {
if (this.isStoreEnabled) {
MailboxStore.removeAccount(account); MailboxStore.removeAccount(account);
}
response.text = 'Será redireccionado a Casillas.'; response.text = 'Será redireccionado a Casillas.';
this.editUrlFromParams = this.props.params.domain_id ? `/domains/${this.props.params.domain_id}/mailboxes/` : '/mailboxes/'; this.editUrlFromParams = this.props.params.domain_id ? `/domains/${this.props.params.domain_id}/mailboxes/` : '/mailboxes/';
return sweetAlert( return sweetAlert(
...@@ -157,7 +166,7 @@ export default class EditMailBox extends React.Component { ...@@ -157,7 +166,7 @@ export default class EditMailBox extends React.Component {
} }
handleRenameAccount(email) { handleRenameAccount(email) {
const account = MailboxStore.getCurrent(); const account = this.isStoreEnabled ? MailboxStore.getCurrent() : null;
if (account) { if (account) {
const oldName = this.refs.rename.innerHTML; const oldName = this.refs.rename.innerHTML;
...@@ -179,14 +188,14 @@ export default class EditMailBox extends React.Component { ...@@ -179,14 +188,14 @@ export default class EditMailBox extends React.Component {
}); });
} }
let newAccount = MailboxStore.changeAccount(success); let newAccount = this.isStoreEnabled ? MailboxStore.changeAccount(success) : null;
if (!newAccount) { if (!newAccount) {
newAccount = success; newAccount = success;
} }
this.setState({ this.setState({
data: newAccount data: newAccount || success
}); });
this.refs.rename.innerHTML = 'Renombrar'; this.refs.rename.innerHTML = 'Renombrar';
...@@ -216,7 +225,12 @@ export default class EditMailBox extends React.Component { ...@@ -216,7 +225,12 @@ export default class EditMailBox extends React.Component {
handleEdit(e) { handleEdit(e) {
e.preventDefault(); e.preventDefault();
Utils.toggleStatusButtons('.action-button', true); let shouldEnableArchiving = false;
let shouldDisabledArchiving = false;
const plans = this.state.cos;
const mailbox = this.state.data.attrs;
let p;
//Utils.toggleStatusButtons('.action-button', true);
Utils.validateInputRequired(this.refs).then(() => { Utils.validateInputRequired(this.refs).then(() => {
// fill new attrs // fill new attrs
...@@ -229,6 +243,19 @@ export default class EditMailBox extends React.Component { ...@@ -229,6 +243,19 @@ export default class EditMailBox extends React.Component {
displayName: `${this.refs.givenName.value} ${this.refs.sn.value}` displayName: `${this.refs.givenName.value} ${this.refs.sn.value}`
}; };
const keysPlans = Object.keys(this.state.cos);
const plansConfig = window.manager_config.plans;
keysPlans.forEach((plan) => {
if (plans[plan] === attrs.zimbraCOSId && plansConfig[plan].archiving) {
shouldEnableArchiving = !shouldEnableArchiving;
p = plan;
}
});
if (mailbox.zimbraCOSId !== attrs.zimbraCOSId && mailbox.zimbraArchiveEnabled === 'TRUE') {
shouldDisabledArchiving = !shouldDisabledArchiving;
}
GlobalActions.emitStartLoading(); GlobalActions.emitStartLoading();
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
...@@ -243,9 +270,31 @@ export default class EditMailBox extends React.Component { ...@@ -243,9 +270,31 @@ export default class EditMailBox extends React.Component {
} }
); );
}).then((account) => { }).then((account) => {
if (this.isStoreEnabled) {
MailboxStore.changeAccount(account); MailboxStore.changeAccount(account);
}
if (shouldDisabledArchiving && !shouldEnableArchiving) {
account.disableArchiving((err) => {
if (err) {
return err;
}
Utils.handleLink(e, `/mailboxes/${this.props.params.id}`, this.props.location); return Utils.handleLink(e, `/mailboxes/${this.props.params.id}`, this.props.location);
});
}
if (shouldEnableArchiving && !shouldDisabledArchiving && mailbox.zimbraArchiveEnabled === 'FALSE') {
account.enableArchiving(p, (err) => {
if (err) {
return err;
}
return Utils.handleLink(e, `/mailboxes/${this.props.params.id}`, this.props.location);
});
}
return Utils.handleLink(e, `/mailboxes/${this.props.params.id}`, this.props.location);
}).catch((error) => { }).catch((error) => {
GlobalActions.emitMessage({ GlobalActions.emitMessage({
message: error.message, message: error.message,
...@@ -271,8 +320,10 @@ export default class EditMailBox extends React.Component { ...@@ -271,8 +320,10 @@ export default class EditMailBox extends React.Component {
let data = null; let data = null;
const max = 200; const max = 200;
Utils.toggleStatusButtons('.action-save', true); Utils.toggleStatusButtons('.action-save', true);
const cos = Utils.getEnabledPlansByCos(ZimbraStore.getAllCos());
const hasMailboxes = this.isStoreEnabled ? MailboxStore.hasMailboxes() : null;
if (MailboxStore.hasMailboxes()) { if (hasMailboxes) {
data = MailboxStore.getMailboxById(id); data = MailboxStore.getMailboxById(id);
const domains = new Promise((resolve, reject) => { const domains = new Promise((resolve, reject) => {
...@@ -289,22 +340,17 @@ export default class EditMailBox extends React.Component { ...@@ -289,22 +340,17 @@ export default class EditMailBox extends React.Component {
); );
}); });
const cos = new Promise((resolve, reject) => { promises.push(domains);
Client.getAllCos((success) => {
resolve(success);
}, (error) => {
reject(error);
});
});
promises.push(domains, cos);
Promise.all(promises).then((result) => { Promise.all(promises).then((result) => {
if (this.isStoreEnabled) {
MailboxStore.setCurrent(data); MailboxStore.setCurrent(data);
}
this.setState({ this.setState({
data, data,
zimbraCOSId: data.attrs.zimbraCOSId,
domains: result.shift().domain, domains: result.shift().domain,
cos: Utils.getEnabledPlansByCos(result.shift()) cos
}); });
Utils.toggleStatusButtons('.action-save', false); Utils.toggleStatusButtons('.action-save', false);
}).catch((error) => { }).catch((error) => {
...@@ -342,27 +388,22 @@ export default class EditMailBox extends React.Component { ...@@ -342,27 +388,22 @@ export default class EditMailBox extends React.Component {
); );
}); });
const cos = new Promise((resolve, reject) => { promises.push(mailbox, doms);
Client.getAllCos((success) => {
resolve(success);
}, (error) => {
reject(error);
});
});
promises.push(mailbox, doms, cos);
Promise.all(promises).then((result) => { Promise.all(promises).then((result) => {
const account = result.shift(); const account = result.shift();
this.setState({ this.setState({
data: account, data: account,
zimbraCOSId: account.attrs.zimbraCOSId,
domains: result.shift().domain, domains: result.shift().domain,
cos: Utils.getEnabledPlansByCos(result.shift()) cos
}); });
Utils.toggleStatusButtons('.action-save', false); Utils.toggleStatusButtons('.action-save', false);
if (this.isStoreEnabled) {
MailboxStore.setCurrent(account); MailboxStore.setCurrent(account);
}
}).catch((error) => { }).catch((error) => {
GlobalActions.emitMessage({ GlobalActions.emitMessage({
message: error.message, message: error.message,
...@@ -391,7 +432,6 @@ export default class EditMailBox extends React.Component { ...@@ -391,7 +432,6 @@ export default class EditMailBox extends React.Component {
this.refs.givenName.value = attrs.givenName || ''; this.refs.givenName.value = attrs.givenName || '';
this.refs.sn.value = attrs.sn; this.refs.sn.value = attrs.sn;
this.refs.description.value = attrs.description || ''; this.refs.description.value = attrs.description || '';
this.refs.zimbraCOSId.value = attrs.zimbraCOSId || '';
this.refs.zimbraAccountStatus.value = attrs.zimbraAccountStatus; this.refs.zimbraAccountStatus.value = attrs.zimbraAccountStatus;
} }
...@@ -404,6 +444,7 @@ export default class EditMailBox extends React.Component { ...@@ -404,6 +444,7 @@ export default class EditMailBox extends React.Component {
const domains = []; const domains = [];
let currentDomain = ''; let currentDomain = '';
const cosElements = []; const cosElements = [];
const {zimbraCOSId} = this.state;
let datalist = ( let datalist = (
<input <input
type='text' type='text'
...@@ -487,7 +528,7 @@ export default class EditMailBox extends React.Component { ...@@ -487,7 +528,7 @@ export default class EditMailBox extends React.Component {
/> />
<span></span> <span></span>
</div> </div>
{cosName} {Utils.titleCase(cosName)}
</label> </label>
); );
cosElements.push(checkbox); cosElements.push(checkbox);
...@@ -626,6 +667,7 @@ export default class EditMailBox extends React.Component { ...@@ -626,6 +667,7 @@ export default class EditMailBox extends React.Component {
<input <input
type='hidden' type='hidden'
ref='zimbraCOSId' ref='zimbraCOSId'
value={zimbraCOSId}
data-required='true' data-required='true'
data-message='El plan de su cuenta es requerido, por favor verificar.' data-message='El plan de su cuenta es requerido, por favor verificar.'
/> />
......
src/components/mailbox/info_general_mailbox.jsx
View file @ 28415fc5
...@@ -64,7 +64,7 @@ export default class BlockGeneralInfoMailbox extends React.Component { ...@@ -64,7 +64,7 @@ export default class BlockGeneralInfoMailbox extends React.Component {
let AdminStatus = null; let AdminStatus = null;
const description = attrs.description; const description = attrs.description;
const mailhost = attrs.zimbraMailHost; const mailhost = attrs.zimbraMailHost;
const archive = attrs.zimbraArchiveAccount; const archive = data.archiveEnabled ? attrs.zimbraArchiveAccount : data.archiveEnabled;
const isAdminDelegated = attrs.zimbraIsDelegatedAdminAccount === 'TRUE'; const isAdminDelegated = attrs.zimbraIsDelegatedAdminAccount === 'TRUE';
if (isAdminDelegated) { if (isAdminDelegated) {
statusCos += ' margin-left'; statusCos += ' margin-left';
......
src/components/mailbox/mailbox.jsx
View file @ 28415fc5
...@@ -36,6 +36,8 @@ export default class Mailboxes extends React.Component { ...@@ -36,6 +36,8 @@ export default class Mailboxes extends React.Component {
super(props); super(props);
this.isStoreEnabled = window.manager_config.enableStores; this.isStoreEnabled = window.manager_config.enableStores;
this.archivingConfig = window.manager_config.plans.archiving;
this.regexp = new RegExp(this.archivingConfig.regexp, 'gi');
this.showMessage = this.showMessage.bind(this); this.showMessage = this.showMessage.bind(this);
this.refreshAllAccounts = this.refreshAllAccounts.bind(this); this.refreshAllAccounts = this.refreshAllAccounts.bind(this);
this.handleChangeFilter = this.handleChangeFilter.bind(this); this.handleChangeFilter = this.handleChangeFilter.bind(this);
...@@ -365,7 +367,7 @@ export default class Mailboxes extends React.Component { ...@@ -365,7 +367,7 @@ export default class Mailboxes extends React.Component {
} }
if (!tipo) { if (!tipo) {
tipo = row.archiveEnabled ? 'Archiving' : 'Desconocido'; tipo = row.name.match(this.regexp) ? 'Archiving' : 'Desconocido';
} }
displayName = attrs.displayName || `${attrs.givenName || attrs.cn} ${attrs.sn}`; displayName = attrs.displayName || `${attrs.givenName || attrs.cn} ${attrs.sn}`;
......
src/config/config.json
View file @ 28415fc5
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
"archiving": { "archiving": {
"statusCos": "btn-warning", "statusCos": "btn-warning",
"label": "Archiving", "label": "Archiving",
"isEnabledToEdit": false "isEnabledToEdit": false,
"regexp": ".archive$"
} }
}, },
"multiFormDomain": { "multiFormDomain": {
......
src/utils/utils.jsx
View file @ 28415fc5
...@@ -690,5 +690,5 @@ export function parseMaxCOSAccounts(maxCosAccounts) { ...@@ -690,5 +690,5 @@ export function parseMaxCOSAccounts(maxCosAccounts) {
return response; return response;
} }
return arrCos; return response;
} }
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