Merge pull request #593 from AdamWillford/react

Add exportSelector to EVERYTHIG, Update Report Name & Remove CSV double extension

src/components/cipp/CsvButton.js

@@ -7,7 +7,7 @@ import { faFileCsv } from '@fortawesome/free-solid-svg-icons'
 
 function ExportCsvButton(props) {
  return (
- <CSVDownloader data={props.csvData} filename={`${props.reportName}.csv`}>
+ <CSVDownloader data={props.csvData} filename={`${props.reportName}`}>
  <CButton size="sm" className="m-1">
  <FontAwesomeIcon icon={faFileCsv} className="pe-1" size="lg" />
  CSV

src/views/cipp/Logs.js

@@ -25,31 +25,37 @@ const columns = [
  name: 'Date',
  selector: (row) => row['DateTime'],
  sortable: true,
+ exportSelector: 'DateTime',
  },
  {
  name: 'Tenant',
  selector: (row) => row['Tenant'],
  sortable: true,
+ exportSelector: 'Tenant',
  },
  {
  name: 'API',
  selector: (row) => row['API'],
  sortable: true,
+ exportSelector: 'API',
  },
  {
  name: 'Message',
  selector: (row) => row['Message'],
  sortable: true,
+ exportSelector: 'Message',
  },
  {
  name: 'User',
  selector: (row) => row['User'],
  sortable: true,
+ exportSelector: 'User',
  },
  {
  name: 'Severity',
  selector: (row) => row['Severity'],
  sortable: true,
+ exportSelector: 'Severity',
  },
 ]
 
@@ -171,7 +177,7 @@ const Logs = () => {
  <hr />
  <CippPage title="LogBook Results" tenantSelector={false}>
  <CippDatatable
- reportName={`${tenant?.defaultDomainName}-Messagetrace`}
+ reportName={`CIPP-Logbook`}
  path="/api/Listlogs"
  // params={{
  // tenantFilter: tenant.defaultDomainName,

src/views/email-exchange/administration/ContactsList.js

@@ -24,16 +24,19 @@ const columns = [
  selector: (row) => row['displayName'],
  name: 'Display Name',
  sortable: true,
+ exportSelector: 'displayName',
  },
  {
  selector: (row) => row['mail'],
  name: 'E-Mail Address',
  sortable: true,
+ exportSelector: 'mail',
  },
  {
  selector: (row) => row['company'],
  name: 'Company',
  sortable: true,
+ exportSelector: 'company',
  },
  {
  selector: (row) => row['id'],
@@ -44,6 +47,7 @@ const columns = [
  selector: (row) => row['onPremisesSyncEnabled'],
  name: 'On Premises Sync',
  sortable: true,
+ exportSelector: 'onPremisesSyncEnabled',
  cell: cellBooleanFormatter(),
  },
  {

src/views/email-exchange/administration/MailboxesList.js

@@ -81,30 +81,36 @@ const MailboxList = () => {
  selector: (row) => row['UPN'],
  name: 'User Prinicipal Name',
  sortable: true,
+ exportSelector: 'UPN',
  },
  {
  selector: (row) => row['displayName'],
  name: 'Display Name',
  sortable: true,
+ exportSelector: 'displayName',
  },
  {
  selector: (row) => row['primarySmtpAddress'],
  name: 'Primary E-mail Address',
  sortable: true,
+ exportSelector: 'primarySmtpAddress',
  },
  {
  selector: (row) => row['recipientType'],
  name: 'Recipient Type',
  sortable: true,
+ exportSelector: 'recipientType',
  },
  {
  selector: (row) => row['recipientTypeDetails'],
  name: 'Recipient Type Details',
  sortable: true,
+ exportSelector: 'recipientTypeDetails',
  },
  {
  name: 'Additional Email Addresses',
  selector: (row) => 'Click to Expand',
+ exportSelector: 'AdditionalEmailAddresses',
  sortable: true,
  omit: true,
  },

src/views/email-exchange/administration/ViewMobileDevices.js

@@ -8,56 +8,67 @@ const columns = [
  selector: (row) => row['clientType'],
  name: 'Client Type',
  sortable: true,
+ exportSelector: 'clientType',
  },
  {
  selector: (row) => row['clientVersion'],
  name: 'Client Version',
  sortable: true,
+ exportSelector: 'clientVersion',
  },
  {
  selector: (row) => row['deviceAccessState'],
  name: 'Access State',
  sortable: true,
+ exportSelector: 'deviceAccessState',
  },
  {
  selector: (row) => row['deviceFriendlyName'],
  name: 'Friendly Name',
  sortable: true,
+ exportSelector: 'deviceFriendlyName',
  },
  {
  selector: (row) => row['deviceModel'],
  name: 'Model',
  sortable: true,
+ exportSelector: 'deviceModel',
  },
  {
  selector: (row) => row['deviceOS'],
  name: 'OS',
  sortable: true,
+ exportSelector: 'deviceOS',
  },
  {
  selector: (row) => row['deviceType'],
  name: 'Device Type',
  sortable: true,
+ exportSelector: 'deviceType',
  },
  {
  selector: (row) => row['firstSync'],
  name: 'First Sync',
  sortable: true,
+ exportSelector: 'firstSync',
  },
  {
  selector: (row) => row['lastSyncAttempt'],
  name: 'Last Sync Attempt',
  sortable: true,
+ exportSelector: 'lastSyncAttempt',
  },
  {
  selector: (row) => row['lastSuccessSync'],
  name: 'Last Succesfull Sync',
  sortable: true,
+ exportSelector: 'lastSuccessSync',
  },
  {
  selector: (row) => row['status'],
  name: 'Status',
  sortable: true,
+ exportSelector: 'status',
  },
 ]
 

src/views/email-exchange/reports/MailboxClientAccessSettingsList.js

@@ -8,60 +8,69 @@ const columns = [
  selector: (row) => row['displayName'],
  name: 'Display Name',
  sortable: true,
+ exportSelector: 'displayName',
  },
  {
  selector: (row) => row['primarySmtpAddress'],
  name: 'Primary E-mail',
  sortable: true,
+ exportSelector: 'primarySmtpAddress',
  },
  {
  selector: (row) => row['ecpenabled'],
  name: 'ECP Enabled',
  sortable: true,
  cell: cellBooleanFormatter(),
  center: true,
+ exportSelector: 'ecpenabled',
  },
  {
  selector: (row) => row['ewsenabled'],
  name: 'EWS Enabled',
  sortable: true,
  cell: cellBooleanFormatter(),
  center: true,
+ exportSelector: 'ewsenabled',
  },
  {
  selector: (row) => row['imapenabled'],
  name: 'IMAP Enabled',
  sortable: true,
  cell: cellBooleanFormatter(),
  center: true,
+ exportSelector: 'imapenabled',
  },
  {
  selector: (row) => row['mapienabled'],
  name: 'MAPI Enabled',
  sortable: true,
  cell: cellBooleanFormatter(),
  center: true,
+ exportSelector: 'mapienabled',
  },
  {
  selector: (row) => row['owaenabled'],
  name: 'OWA Enabled',
  sortable: true,
  cell: cellBooleanFormatter(),
  center: true,
+ exportSelector: 'owaenabled',
  },
  {
  selector: (row) => row['popenabled'],
  name: 'POP Enabled',
  sortable: true,
  cell: cellBooleanFormatter(),
  center: true,
+ exportSelector: 'popenabled',
  },
  {
  selector: (row) => row['activesyncenabled'],
  name: 'ActiveSync Enabled',
  sortable: true,
  cell: cellBooleanFormatter(),
  center: true,
+ exportSelector: 'activesyncenabled',
  },
 ]
 

src/views/email-exchange/reports/MailboxStatisticsList.js

@@ -9,32 +9,38 @@ const columns = [
  selector: (row) => row['UPN'],
  name: 'User Prinicipal Name',
  sortable: true,
+ exportSelector: 'UPN',
  },
  {
  selector: (row) => row['displayName'],
  name: 'Display Name',
  sortable: true,
+ exportSelector: 'displayName',
  },
  {
  selector: (row) => row['LastActive'],
  name: 'Last Active',
  sortable: true,
+ exportSelector: 'LastActive',
  },
  {
  selector: (row) => row['UsedGB'],
  name: 'Used Space(GB)',
  sortable: true,
+ exportSelector: 'UsedGB',
  },
  {
  selector: (row) => row['ItemCount'],
  name: 'Item Count (Total)',
  sortable: true,
+ exportSelector: 'ItemCount',
  },
  {
  selector: (row) => row['HasArchive'],
  name: 'Archiving Enabled',
  sortable: true,
  cell: cellBooleanFormatter(),
+ exportSelector: 'HasArchive',
  },
 ]
 

src/views/email-exchange/reports/MessageTrace.js

@@ -25,26 +25,31 @@ const columns = [
  name: 'Date',
  selector: (row) => row['Date'],
  sortable: true,
+ exportSelector: 'Date',
  },
  {
  name: 'Recipient',
  selector: (row) => row['RecipientAddress'],
  sortable: true,
+ exportSelector: 'Recipient',
  },
  {
  name: 'Sender',
  selector: (row) => row['SenderAddress'],
  sortable: true,
+ exportSelector: 'Sender',
  },
  {
  name: 'Subject',
  selector: (row) => row['Subject'],
  sortable: true,
+ exportSelector: 'Subject',
  },
  {
  name: 'Status',
  selector: (row) => row['Status'],
  sortable: true,
+ exportSelector: 'Status',
  },
 ]
 

src/views/email-exchange/reports/PhishingPoliciesList.js

@@ -9,40 +9,47 @@ const columns = [
  selector: (row) => row['Name'],
  name: 'Name',
  sortable: true,
+ exportSelector: 'Name',
  },
  {
  selector: (row) => row['PhishThresholdLevel'],
  name: 'Phish Threshold Level',
  sortable: true,
+ exportSelector: 'PhishThresholdLevel',
  },
  {
  selector: (row) => row['Enabled'],
  name: 'Enabled',
  sortable: true,
  cell: cellBooleanFormatter(),
+ exportSelector: 'Enabled',
  },
  {
  selector: (row) => row['ExcludedSenders'],
  name: 'Excluded Senders',
  sortable: true,
  cell: cellBooleanFormatter(),
+ exportSelector: 'ExcludedSenders',
  },
  {
  selector: (row) => row['ExcludedDomains'],
  name: 'Excluded Domains',
  sortable: true,
  cell: cellBooleanFormatter(),
+ exportSelector: 'ExcludedDomains',
  },
  {
  selector: (row) => row['WhenChangedUTC'],
  name: 'Last Change Date',
  sortable: true,
  cell: cellDateFormatter(),
+ exportSelector: 'WhenChangedUTC',
  },
  {
  selector: (row) => row['Priority'],
  name: 'Priority',
  sortable: true,
+ exportSelector: 'Priority',
  },
 ]
 

src/views/endpoint/MEM/MEMListPolicies.js

@@ -22,11 +22,13 @@ const columns = [
  selector: (row) => row['displayName'],
  name: 'Name',
  sortable: true,
+ exportSelector: 'displayName',
  },
  {
  selector: (row) => row['PolicyTypeName'],
  name: 'Profile Type',
  sortable: true,
+ exportSelector: 'PolicyTypeName',
  },
  {
  selector: (row) => row['id'],