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

Fixed bug - files/uploaded had wrong owner

Browse source 
Upgrade to React 16
This commit is contained in:
Tomas Bures 2018-12-26 04:38:02 +01:00
parent dce5ba7464
commit cfdcaf65d8
84 changed files with 2381 additions and 1546 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/src/lists/CUD.js
View file

@ -36,12 +36,15 @@ import styles
import mailtrainConfig
from 'mailtrainConfig';
import {getMailerTypes} from "../send-configurations/helpers";
import {withComponentMixins} from "../lib/decorator-helpers";
@withTranslation()
@withForm
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withForm,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class CUD extends Component {
constructor(props) {
super(props);

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

@ -1,11 +1,19 @@
'use strict';
import React, { Component } from 'react';
import { withTranslation } from '../lib/i18n';
import {requiresAuthenticatedUser, withPageHelpers, Title, Toolbar, NavButton} from '../lib/page';
import { withErrorHandling, withAsyncErrorHandler } from '../lib/error-handling';
import { Table } from '../lib/table';
import axios from '../lib/axios';
import React, {Component} from 'react';
import {withTranslation} from '../lib/i18n';
import {
NavButton,
requiresAuthenticatedUser,
Title,
Toolbar,
withPageHelpers
} from '../lib/page';
import {
withAsyncErrorHandler,
withErrorHandling
} from '../lib/error-handling';
import {Table} from '../lib/table';
import {Link} from "react-router-dom";
import {Icon} from "../lib/bootstrap-components";
import {checkPermissions} from "../lib/permissions";
@ -14,11 +22,16 @@ import {
tableRestActionDialogInit,
tableRestActionDialogRender
} from "../lib/modals";
import {withComponentMixins} from "../lib/decorator-helpers";
import {withForm} from "../lib/form";
@withTranslation()
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withForm,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class List extends Component {
constructor(props) {
super(props);

19
client/src/lists/TriggersList.js
View file

@ -1,8 +1,9 @@
'use strict';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from '../lib/i18n';
import PropTypes
from 'prop-types';
import {withTranslation} from '../lib/i18n';
import {
requiresAuthenticatedUser,
Title,
@ -12,17 +13,21 @@ import {withErrorHandling} from '../lib/error-handling';
import {Table} from '../lib/table';
import {getTriggerTypes} from '../campaigns/triggers/helpers';
import {Icon} from "../lib/bootstrap-components";
import mailtrainConfig from 'mailtrainConfig';
import mailtrainConfig
from 'mailtrainConfig';
import {
tableAddDeleteButton,
tableRestActionDialogInit,
tableRestActionDialogRender
} from "../lib/modals";
import {withComponentMixins} from "../lib/decorator-helpers";
@withTranslation()
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class List extends Component {
constructor(props) {
super(props);

13
client/src/lists/fields/CUD.js
View file

@ -40,12 +40,15 @@ import styles
from "../../lib/styles.scss";
import 'brace/mode/json';
import 'brace/mode/handlebars';
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withForm
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withForm,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class CUD extends Component {
constructor(props) {
super(props);

32
client/src/lists/fields/List.js
View file

@ -1,23 +1,33 @@
'use strict';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from '../../lib/i18n';
import {requiresAuthenticatedUser, withPageHelpers, Title, Toolbar, NavButton} from '../../lib/page';
import { withErrorHandling } from '../../lib/error-handling';
import { Table } from '../../lib/table';
import { getFieldTypes } from './helpers';
import React, {Component} from 'react';
import PropTypes
from 'prop-types';
import {withTranslation} from '../../lib/i18n';
import {
NavButton,
requiresAuthenticatedUser,
Title,
Toolbar,
withPageHelpers
} from '../../lib/page';
import {withErrorHandling} from '../../lib/error-handling';
import {Table} from '../../lib/table';
import {getFieldTypes} from './helpers';
import {Icon} from "../../lib/bootstrap-components";
import {
tableAddDeleteButton,
tableRestActionDialogInit,
tableRestActionDialogRender
} from "../../lib/modals";
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class List extends Component {
constructor(props) {
super(props);

15
client/src/lists/forms/CUD.js
View file

@ -16,7 +16,6 @@ import {
AlignedRow,
Button,
ButtonRow,
CheckBox,
Dropdown,
Fieldset,
Form,
@ -48,13 +47,15 @@ import formsStyles
from "./styles.scss";
import axios
from "../../lib/axios";
import {UntrustedContentHost} from "../../lib/untrusted";
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withForm
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withForm,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class CUD extends Component {
constructor(props) {
super(props);

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

@ -1,11 +1,19 @@
'use strict';
import React, { Component } from 'react';
import { withTranslation } from '../../lib/i18n';
import {requiresAuthenticatedUser, withPageHelpers, Title, Toolbar, NavButton} from '../../lib/page';
import { withErrorHandling, withAsyncErrorHandler } from '../../lib/error-handling';
import { Table } from '../../lib/table';
import axios from '../../lib/axios';
import React, {Component} from 'react';
import {withTranslation} from '../../lib/i18n';
import {
NavButton,
requiresAuthenticatedUser,
Title,
Toolbar,
withPageHelpers
} from '../../lib/page';
import {
withAsyncErrorHandler,
withErrorHandling
} from '../../lib/error-handling';
import {Table} from '../../lib/table';
import {Icon} from "../../lib/bootstrap-components";
import {checkPermissions} from "../../lib/permissions";
import {
@ -13,11 +21,14 @@ import {
tableRestActionDialogInit,
tableRestActionDialogRender
} from "../../lib/modals";
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class List extends Component {
constructor(props) {
super(props);

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

@ -1,8 +1,9 @@
'use strict';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from '../../lib/i18n';
import PropTypes
from 'prop-types';
import {withTranslation} from '../../lib/i18n';
import {
NavButton,
requiresAuthenticatedUser,
@ -32,15 +33,18 @@ import {
ImportSource,
inProgress,
MappingType,
prepInProgress,
runInProgress
prepInProgress
} from '../../../../shared/imports';
import axios from "../../lib/axios";
import axios
from "../../lib/axios";
import {getUrl} from "../../lib/urls";
import listStyles from "../styles.scss";
import styles from "../../lib/styles.scss";
import listStyles
from "../styles.scss";
import styles
from "../../lib/styles.scss";
import interoperableErrors
from "../../../../shared/interoperable-errors";
import {withComponentMixins} from "../../lib/decorator-helpers";
function truncate(str, len, ending = '...') {
@ -54,11 +58,13 @@ function truncate(str, len, ending = '...') {
}
@withTranslation()
@withForm
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withForm,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class CUD extends Component {
constructor(props) {
super(props);

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

@ -1,8 +1,9 @@
'use strict';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from '../../lib/i18n';
import PropTypes
from 'prop-types';
import {withTranslation} from '../../lib/i18n';
import {
NavButton,
requiresAuthenticatedUser,
@ -14,19 +15,24 @@ import {withErrorHandling} from '../../lib/error-handling';
import {Table} from '../../lib/table';
import {getImportLabels} from './helpers';
import {Icon} from "../../lib/bootstrap-components";
import mailtrainConfig from 'mailtrainConfig';
import moment from "moment";
import mailtrainConfig
from 'mailtrainConfig';
import moment
from "moment";
import {inProgress} from '../../../../shared/imports';
import {
tableAddDeleteButton,
tableRestActionDialogInit,
tableRestActionDialogRender
} from "../../lib/modals";
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class List extends Component {
constructor(props) {
super(props);

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

@ -1,8 +1,9 @@
'use strict';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from '../../lib/i18n';
import PropTypes
from 'prop-types';
import {withTranslation} from '../../lib/i18n';
import {
requiresAuthenticatedUser,
Title,
@ -14,16 +15,21 @@ import {
withErrorHandling
} from '../../lib/error-handling';
import {getImportLabels} from './helpers';
import axios from "../../lib/axios";
import axios
from "../../lib/axios";
import {getUrl} from "../../lib/urls";
import moment from "moment";
import moment
from "moment";
import {runStatusInProgress} from "../../../../shared/imports";
import {Table} from "../../lib/table";
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class Status extends Component {
constructor(props) {
super(props);

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

@ -1,8 +1,9 @@
'use strict';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from '../../lib/i18n';
import PropTypes
from 'prop-types';
import {withTranslation} from '../../lib/i18n';
import {
requiresAuthenticatedUser,
Title,
@ -10,8 +11,7 @@ import {
} from '../../lib/page';
import {
AlignedRow,
ButtonRow,
Fieldset
ButtonRow
} from '../../lib/form';
import {
withAsyncErrorHandler,
@ -21,7 +21,6 @@ import {getImportLabels} from './helpers';
import {
prepFinishedAndNotInProgress,
runInProgress,
RunStatus,
runStatusInProgress
} from '../../../../shared/imports';
import {Table} from "../../lib/table";
@ -29,15 +28,21 @@ import {
Button,
Icon
} from "../../lib/bootstrap-components";
import axios from "../../lib/axios";
import axios
from "../../lib/axios";
import {getUrl} from "../../lib/urls";
import moment from "moment";
import interoperableErrors from '../../../../shared/interoperable-errors';
import moment
from "moment";
import interoperableErrors
from '../../../../shared/interoperable-errors';
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class Status extends Component {
constructor(props) {
super(props);

34
client/src/lists/segments/CUD.js
View file

@ -1,8 +1,9 @@
'use strict';
import React, {Component} from "react";
import PropTypes from "prop-types";
import { withTranslation } from '../../lib/i18n';
import PropTypes
from "prop-types";
import {withTranslation} from '../../lib/i18n';
import {
NavButton,
requiresAuthenticatedUser,
@ -22,28 +23,37 @@ import {
import {withErrorHandling} from "../../lib/error-handling";
import {DeleteModalDialog} from "../../lib/modals";
import styles from "./CUD.scss";
import styles
from "./CUD.scss";
import {DragDropContext} from "react-dnd";
import HTML5Backend from "react-dnd-html5-backend";
import TouchBackend from "react-dnd-touch-backend";
import SortableTree from "react-sortable-tree";
import HTML5Backend
from "react-dnd-html5-backend";
import TouchBackend
from "react-dnd-touch-backend";
import SortableTree
from "react-sortable-tree";
import 'react-sortable-tree/style.css';
import {
ActionLink,
Button,
Icon
} from "../../lib/bootstrap-components";
import {getRuleHelpers} from "./helpers";
import RuleSettingsPane from "./RuleSettingsPane";
import RuleSettingsPane
from "./RuleSettingsPane";
import {withComponentMixins} from "../../lib/decorator-helpers";
// https://stackoverflow.com/a/4819886/1601953
const isTouchDevice = !!('ontouchstart' in window || navigator.maxTouchPoints);
@DragDropContext(isTouchDevice ? TouchBackend : HTML5Backend)
@withTranslation()
@withForm
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withForm,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class CUD extends Component {
// The code below keeps the segment settings in form value. However, it uses it as a mutable datastructure.
// After initilization, segment settings is never set using setState. This is OK we update the state.rulesTree

30
client/src/lists/segments/List.js
View file

@ -1,22 +1,32 @@
'use strict';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from '../../lib/i18n';
import {requiresAuthenticatedUser, withPageHelpers, Title, Toolbar, NavButton} from '../../lib/page';
import { withErrorHandling } from '../../lib/error-handling';
import { Table } from '../../lib/table';
import React, {Component} from 'react';
import PropTypes
from 'prop-types';
import {withTranslation} from '../../lib/i18n';
import {
NavButton,
requiresAuthenticatedUser,
Title,
Toolbar,
withPageHelpers
} from '../../lib/page';
import {withErrorHandling} from '../../lib/error-handling';
import {Table} from '../../lib/table';
import {Icon} from "../../lib/bootstrap-components";
import {
tableAddDeleteButton,
tableRestActionDialogInit,
tableRestActionDialogRender
} from "../../lib/modals";
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class List extends Component {
constructor(props) {
super(props);

35
client/src/lists/segments/RuleSettingsPane.js
View file

@ -1,21 +1,36 @@
'use strict';
import React, {Component} from "react";
import PropTypes from "prop-types";
import { withTranslation } from '../../lib/i18n';
import {requiresAuthenticatedUser, withPageHelpers} from "../../lib/page";
import {Button, ButtonRow, Dropdown, Form, TableSelect, withForm} from "../../lib/form";
import PropTypes
from "prop-types";
import {withTranslation} from '../../lib/i18n';
import {
requiresAuthenticatedUser,
withPageHelpers
} from "../../lib/page";
import {
Button,
ButtonRow,
Dropdown,
Form,
TableSelect,
withForm
} from "../../lib/form";
import {withErrorHandling} from "../../lib/error-handling";
import {getRuleHelpers} from "./helpers";
import {getFieldTypes} from "../fields/helpers";
import styles from "./CUD.scss";
import styles
from "./CUD.scss";
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withForm
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withForm,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class CUD extends Component {
constructor(props) {
super(props);

13
client/src/lists/subscriptions/CUD.js
View file

@ -33,12 +33,15 @@ import {
} from './helpers';
import moment
from 'moment-timezone';
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withForm
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withForm,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class CUD extends Component {
constructor(props) {
super(props);

67
client/src/lists/subscriptions/List.js
View file

@ -1,37 +1,56 @@
'use strict';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from '../../lib/i18n';
import {requiresAuthenticatedUser, withPageHelpers, Title, Toolbar, NavButton} from '../../lib/page';
import {withAsyncErrorHandler, withErrorHandling} from '../../lib/error-handling';
import { Table } from '../../lib/table';
import { SubscriptionStatus } from '../../../../shared/lists';
import moment from 'moment';
import React, {Component} from 'react';
import PropTypes
from 'prop-types';
import {withTranslation} from '../../lib/i18n';
import {
Dropdown, Form,
NavButton,
requiresAuthenticatedUser,
Title,
Toolbar,
withPageHelpers
} from '../../lib/page';
import {withErrorHandling} from '../../lib/error-handling';
import {Table} from '../../lib/table';
import {SubscriptionStatus} from '../../../../shared/lists';
import moment
from 'moment';
import {
Dropdown,
Form,
withForm
} from '../../lib/form';
import {Icon, Button} from "../../lib/bootstrap-components";
import {HTTPMethod} from '../../lib/axios';
import {getFieldTypes, getSubscriptionStatusLabels} from './helpers';
import {getUrl, getPublicUrl} from "../../lib/urls";
import {
DeleteModalDialog,
RestActionModalDialog,
Button,
Icon
} from "../../lib/bootstrap-components";
import {HTTPMethod} from '../../lib/axios';
import {
getFieldTypes,
getSubscriptionStatusLabels
} from './helpers';
import {
getPublicUrl,
getUrl
} from "../../lib/urls";
import {
tableAddDeleteButton,
tableAddRestActionButton,
tableRestActionDialogInit,
tableRestActionDialogRender,
tableAddRestActionButton
tableRestActionDialogRender
} from "../../lib/modals";
import listStyles from "../styles.scss";
import styles from '../../lib/styles.scss';
import listStyles
from "../styles.scss";
import {withComponentMixins} from "../../lib/decorator-helpers";
@withTranslation()
@withForm
@withPageHelpers
@withErrorHandling
@requiresAuthenticatedUser
@withComponentMixins([
withTranslation,
withForm,
withErrorHandling,
withPageHelpers,
requiresAuthenticatedUser
])
export default class List extends Component {
constructor(props) {
super(props);