MM-8810: Add CSV Compliance export (mattermost#1355)

jespino · Jun 22, 2018 · 5fd32dc · 5fd32dc
1 parent aa0b357
commit 5fd32dc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/components/admin_console/message_export_settings.jsx b/components/admin_console/message_export_settings.jsx
@@ -15,6 +15,7 @@ import TextSetting from './text_setting.jsx';
 import RadioSetting from './radio_setting';
 
 const exportFormats = {
+ EXPORT_FORMAT_CSV: 'csv',
  EXPORT_FORMAT_ACTIANCE: 'actiance',
  EXPORT_FORMAT_GLOBALRELAY: 'globalrelay',
 };
@@ -70,6 +71,7 @@ export default class MessageExportSettings extends AdminSettings {
 
  renderSettings() {
  const exportFormatOptions = [
+ {value: exportFormats.EXPORT_FORMAT_CSV, text: Utils.localizeMessage('admin.complianceExport.exportFormat.csv', 'CSV')},
  {value: exportFormats.EXPORT_FORMAT_ACTIANCE, text: Utils.localizeMessage('admin.complianceExport.exportFormat.actiance', 'Actiance XML')},
  {value: exportFormats.EXPORT_FORMAT_GLOBALRELAY, text: Utils.localizeMessage('admin.complianceExport.exportFormat.globalrelay', 'GlobalRelay EML')},
  ];

diff --git a/i18n/en.json b/i18n/en.json
@@ -230,8 +230,9 @@
  "admin.complianceExport.createJob.help": "Initiates a Compliance Export job immediately.",
  "admin.complianceExport.createJob.title": "Run Compliance Export Job Now",
  "admin.complianceExport.description": "This feature supports compliance exports to the Actiance XML and Global Relay EML formats, and is currently in beta. Support for the Mattermost CSV format is scheduled for a future release, and will replace the existing <a href=\"/admin_console/general/compliance\">Compliance</a> feature.",
+ "admin.complianceExport.exportFormat.csv": "CSV",
  "admin.complianceExport.exportFormat.actiance": "Actiance XML",
- "admin.complianceExport.exportFormat.description": "Format of the compliance export. Corresponds to the system that you want to import the data into.<br><br>For Actiance XML, compliance export files are written to the \"exports\" subdirectory of the configured <a href=\"/admin_console/files/storage\">Local Storage Directory</a>. For Global Relay EML, they are emailed to the configured email address.",
+ "admin.complianceExport.exportFormat.description": "Format of the compliance export. Corresponds to the system that you want to import the data into.<br><br>For Actiance XML or CSV, compliance export files are written to the \"exports\" subdirectory of the configured <a href=\"/admin_console/files/storage\">Local Storage Directory</a>. For Global Relay EML, they are emailed to the configured email address.",
  "admin.complianceExport.exportFormat.globalrelay": "Global Relay EML",
  "admin.complianceExport.exportFormat.title": "Export Format:",
  "admin.complianceExport.exportJobStartTime.description": "Set the start time of the daily scheduled compliance export job. Choose a time when fewer people are using your system. Must be a 24-hour time stamp in the form HH:MM.",

diff --git a/tests/components/admin_console/__snapshots__/message_export_settings.test.jsx.snap b/tests/components/admin_console/__snapshots__/message_export_settings.test.jsx.snap
@@ -116,6 +116,10 @@ exports[`components/MessageExportSettings should match snapshot, disabled, actia
  value="actiance"
  values={
  Array [
+ Object {
+ "text": "CSV",
+ "value": "csv",
+ },
  Object {
  "text": "Actiance XML",
  "value": "actiance",
@@ -302,6 +306,10 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
  value="globalrelay"
  values={
  Array [
+ Object {
+ "text": "CSV",
+ "value": "csv",
+ },
  Object {
  "text": "Actiance XML",
  "value": "actiance",
@@ -598,6 +606,10 @@ exports[`components/MessageExportSettings should match snapshot, enabled, actian
  value="actiance"
  values={
  Array [
+ Object {
+ "text": "CSV",
+ "value": "csv",
+ },
  Object {
  "text": "Actiance XML",
  "value": "actiance",
@@ -784,6 +796,10 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
  value="globalrelay"
  values={
  Array [
+ Object {
+ "text": "CSV",
+ "value": "csv",
+ },
  Object {
  "text": "Actiance XML",
  "value": "actiance",