From 5982bd490b074752a1d979f028783e88f1554be7 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 16 Mar 2016 18:35:53 -0700 Subject: Fixing merge --- .../admin_console/compliance_reports.jsx | 384 --------------------- .../admin_console/compliance_settings.jsx | 271 --------------- 2 files changed, 655 deletions(-) delete mode 100644 web/react/components/admin_console/compliance_reports.jsx delete mode 100644 web/react/components/admin_console/compliance_settings.jsx (limited to 'web') diff --git a/web/react/components/admin_console/compliance_reports.jsx b/web/react/components/admin_console/compliance_reports.jsx deleted file mode 100644 index 2a94b6f1d..000000000 --- a/web/react/components/admin_console/compliance_reports.jsx +++ /dev/null @@ -1,384 +0,0 @@ -// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -import LoadingScreen from '../loading_screen.jsx'; -import * as Utils from '../../utils/utils.jsx'; -import AdminStore from '../../stores/admin_store.jsx'; -import UserStore from '../../stores/user_store.jsx'; - -import * as Client from '../../utils/client.jsx'; -import * as AsyncClient from '../../utils/async_client.jsx'; - -import {FormattedMessage, FormattedDate, FormattedTime} from 'mm-intl'; - -export default class ComplianceReports extends React.Component { - constructor(props) { - super(props); - - this.onComplianceReportsListenerChange = this.onComplianceReportsListenerChange.bind(this); - this.reload = this.reload.bind(this); - this.runReport = this.runReport.bind(this); - this.getDateTime = this.getDateTime.bind(this); - - this.state = { - reports: AdminStore.getComplianceReports(), - serverError: null - }; - } - - componentDidMount() { - AdminStore.addComplianceReportsChangeListener(this.onComplianceReportsListenerChange); - - if (global.window.mm_license.IsLicensed !== 'true' || global.window.mm_config.EnableCompliance !== 'true') { - return; - } - - AsyncClient.getComplianceReports(); - } - - componentWillUnmount() { - AdminStore.removeComplianceReportsChangeListener(this.onComplianceReportsListenerChange); - } - - onComplianceReportsListenerChange() { - this.setState({ - reports: AdminStore.getComplianceReports() - }); - } - - reload() { - AdminStore.saveComplianceReports(null); - this.setState({ - reports: null, - serverError: null - }); - - AsyncClient.getComplianceReports(); - } - - runReport(e) { - e.preventDefault(); - $('#run-button').button('loading'); - - var job = {}; - job.desc = ReactDOM.findDOMNode(this.refs.desc).value; - job.emails = ReactDOM.findDOMNode(this.refs.emails).value; - job.keywords = ReactDOM.findDOMNode(this.refs.keywords).value; - job.start_at = Date.parse(ReactDOM.findDOMNode(this.refs.from).value); - job.end_at = Date.parse(ReactDOM.findDOMNode(this.refs.to).value); - - Client.saveComplianceReports( - job, - () => { - ReactDOM.findDOMNode(this.refs.emails).value = ''; - ReactDOM.findDOMNode(this.refs.keywords).value = ''; - ReactDOM.findDOMNode(this.refs.desc).value = ''; - ReactDOM.findDOMNode(this.refs.from).value = ''; - ReactDOM.findDOMNode(this.refs.to).value = ''; - this.reload(); - $('#run-button').button('reset'); - }, - (err) => { - this.setState({serverError: err.message}); - $('#run-button').button('reset'); - } - ); - } - - getDateTime(millis) { - const date = new Date(millis); - return ( - - - {' - '} - - - ); - } - - render() { - var content = null; - - if (global.window.mm_license.IsLicensed !== 'true' || global.window.mm_config.EnableCompliance !== 'true') { - return
; - } - - if (this.state.reports === null) { - content = ; - } else { - var list = []; - - for (var i = 0; i < this.state.reports.length; i++) { - const report = this.state.reports[i]; - - var params = ''; - if (report.type === 'adhoc') { - params = ( - - {' '}{this.getDateTime(report.start_at)} -
- {' '}{this.getDateTime(report.end_at)} -
- {' '}{report.emails} -
- {' '}{report.keywords} - ); - } - - var download = ''; - if (report.status === 'finished') { - download = ( - - - - ); - } - - var status = report.status; - if (report.status === 'finished') { - status = ( - {report.status} - ); - } - - if (report.status === 'failed') { - status = ( - {report.status} - ); - } - - var user = report.user_id; - var profile = UserStore.getProfile(report.user_id); - if (profile) { - user = profile.email; - } - - list[i] = ( - - {download} - {this.getDateTime(report.create_at)} - {status} - {report.count} - {report.type} - {report.desc} - {user} - {params} - - ); - } - - content = ( -
- - - - - - - - - - - - - - - {list} - -
- - - - - - - - - - - - - -
-
- ); - } - - let serverError = ''; - if (this.state.serverError) { - serverError = ( -
- -
- ); - } - - return ( -
-

- -

- - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - -
- {serverError} -
- -
-
- {content} -
-
- ); - } -} diff --git a/web/react/components/admin_console/compliance_settings.jsx b/web/react/components/admin_console/compliance_settings.jsx deleted file mode 100644 index 8e6ca6340..000000000 --- a/web/react/components/admin_console/compliance_settings.jsx +++ /dev/null @@ -1,271 +0,0 @@ -// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -import * as Client from '../../utils/client.jsx'; -import * as AsyncClient from '../../utils/async_client.jsx'; - -import {injectIntl, intlShape, defineMessages, FormattedMessage, FormattedHTMLMessage} from 'mm-intl'; - -var holders = defineMessages({ - saving: { - id: 'admin.compliance.saving', - defaultMessage: 'Saving Config...' - }, - directoryExample: { - id: 'admin.compliance.directoryExample', - defaultMessage: 'Ex "./data/"' - } -}); - -class ComplianceSettings extends React.Component { - constructor(props) { - super(props); - - this.handleSubmit = this.handleSubmit.bind(this); - this.handleChange = this.handleChange.bind(this); - this.handleEnable = this.handleEnable.bind(this); - this.handleDisable = this.handleDisable.bind(this); - - this.state = { - saveNeeded: false, - serverError: null, - enable: this.props.config.ComplianceSettings.Enable - }; - } - handleChange() { - this.setState({saveNeeded: true}); - } - handleEnable() { - this.setState({saveNeeded: true, enable: true}); - } - handleDisable() { - this.setState({saveNeeded: true, enable: false}); - } - handleSubmit(e) { - e.preventDefault(); - $('#save-button').button('loading'); - - const config = this.props.config; - config.ComplianceSettings.Enable = this.refs.Enable.checked; - config.ComplianceSettings.Directory = ReactDOM.findDOMNode(this.refs.Directory).value; - config.ComplianceSettings.EnableDaily = this.refs.EnableDaily.checked; - - Client.saveConfig( - config, - () => { - AsyncClient.getConfig(); - this.setState({ - serverError: null, - saveNeeded: false - }); - $('#save-button').button('reset'); - }, - (err) => { - this.setState({ - serverError: err.message, - saveNeeded: true - }); - $('#save-button').button('reset'); - } - ); - } - render() { - const {formatMessage} = this.props.intl; - let serverError = ''; - if (this.state.serverError) { - serverError =
; - } - - let saveClass = 'btn'; - if (this.state.saveNeeded) { - saveClass = 'btn btn-primary'; - } - - const licenseEnabled = global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.Compliance === 'true'; - - let bannerContent; - if (!licenseEnabled) { - bannerContent = ( -
-
- -
-
- ); - } - - return ( -
- {bannerContent} -

- -

-
- -
- -
- - -

- -

-
-
- -
- -
- -

- -

-
-
- -
- -
- - -

- -

-
-
- -
-
- {serverError} - -
-
-
-
- ); - } -} -ComplianceSettings.defaultProps = { -}; - -ComplianceSettings.propTypes = { - intl: intlShape.isRequired, - config: React.PropTypes.object -}; - -export default injectIntl(ComplianceSettings); -- cgit v1.2.3-1-g7c22