public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Work on sending campaigns. Campaign status page half-way done, but does not work yet.

Browse source
This commit is contained in:
Tomas Bures 2018-09-10 00:55:44 +02:00
parent 67d7129f7b
commit d1fa4f4211
66 changed files with 1653 additions and 525 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/src/lists/List.js
View file

@ -36,6 +36,7 @@ export default class List extends Component {
}
componentDidMount() {
// noinspection JSIgnoredPromiseFromCall
this.fetchPermissions();
}

1
client/src/lists/forms/List.js
View file

@ -35,6 +35,7 @@ export default class List extends Component {
}
componentDidMount() {
// noinspection JSIgnoredPromiseFromCall
this.fetchPermissions();
}

4
client/src/lists/imports/CUD.js
View file

@ -27,7 +27,7 @@ import {
withErrorHandling
} from '../../lib/error-handling';
import {DeleteModalDialog} from "../../lib/modals";
import {getImportTypes} from './helpers';
import {getImportLabels} from './helpers';
import {
ImportSource,
inProgress,
@ -62,7 +62,7 @@ export default class CUD extends Component {
this.state = {};
const {importSourceLabels, mappingTypeLabels} = getImportTypes(props.t);
const {importSourceLabels, mappingTypeLabels} = getImportLabels(props.t);
this.importSourceLabels = importSourceLabels;

4
client/src/lists/imports/List.js
View file

@ -12,7 +12,7 @@ import {
} from '../../lib/page';
import {withErrorHandling} from '../../lib/error-handling';
import {Table} from '../../lib/table';
import {getImportTypes} from './helpers';
import {getImportLabels} from './helpers';
import {Icon} from "../../lib/bootstrap-components";
import mailtrainConfig from 'mailtrainConfig';
import moment from "moment";
@ -28,7 +28,7 @@ export default class List extends Component {
this.state = {};
const {importSourceLabels, importStatusLabels} = getImportTypes(props.t);
const {importSourceLabels, importStatusLabels} = getImportLabels(props.t);
this.importSourceLabels = importSourceLabels;
this.importStatusLabels = importStatusLabels;
}

5
client/src/lists/imports/RunStatus.js
View file

@ -13,7 +13,7 @@ import {
withAsyncErrorHandler,
withErrorHandling
} from '../../lib/error-handling';
import {getImportTypes} from './helpers';
import {getImportLabels} from './helpers';
import axios from "../../lib/axios";
import {getUrl} from "../../lib/urls";
import moment from "moment";
@ -32,7 +32,7 @@ export default class Status extends Component {
entity: props.entity
};
const {importSourceLabels, importStatusLabels, runStatusLabels} = getImportTypes(props.t);
const {importSourceLabels, importStatusLabels, runStatusLabels} = getImportLabels(props.t);
this.importSourceLabels = importSourceLabels;
this.importStatusLabels = importStatusLabels;
this.runStatusLabels = runStatusLabels;
@ -69,6 +69,7 @@ export default class Status extends Component {
}
componentDidMount() {
// noinspection JSIgnoredPromiseFromCall
this.periodicRefreshTask();
}

5
client/src/lists/imports/Status.js
View file

@ -17,7 +17,7 @@ import {
withAsyncErrorHandler,
withErrorHandling
} from '../../lib/error-handling';
import {getImportTypes} from './helpers';
import {getImportLabels} from './helpers';
import {
prepFinishedAndNotInProgress,
runInProgress,
@ -46,7 +46,7 @@ export default class Status extends Component {
entity: props.entity
};
const {importSourceLabels, importStatusLabels, runStatusLabels} = getImportTypes(props.t);
const {importSourceLabels, importStatusLabels, runStatusLabels} = getImportLabels(props.t);
this.importSourceLabels = importSourceLabels;
this.importStatusLabels = importStatusLabels;
this.runStatusLabels = runStatusLabels;
@ -77,6 +77,7 @@ export default class Status extends Component {
}
componentDidMount() {
// noinspection JSIgnoredPromiseFromCall
this.periodicRefreshTask();
}

2
client/src/lists/imports/helpers.js
View file

@ -3,7 +3,7 @@
import React from 'react';
import {ImportSource, MappingType, ImportStatus, RunStatus} from '../../../../shared/imports';
export function getImportTypes(t) {
export function getImportLabels(t) {
const importSourceLabels = {
[ImportSource.CSV_FILE]: t('CSV file'),