[MM-31934]Custom policy data retention form (#7906)

* adding new page for custom retention policies Co-authored-by: Benjamin Cooke <[email protected]> Co-authored-by: Mattermod <[email protected]>
mattermost · Apr 30, 2021 · c9c9fd0 · c9c9fd0
1 parent 15be100
commit c9c9fd0
Show file tree

Hide file tree

Showing 43 changed files with 3,593 additions and 120 deletions.
diff --git a/actions/views/search.js b/actions/views/search.js
@@ -37,3 +37,24 @@ export function setSystemUsersSearch(term, team = '', filter = '') {
  data: {term, team, filter},
  };
 }
+
+export function setTeamListSearch(term) {
+ return {
+ type: SearchTypes.SET_TEAM_LIST_SEARCH,
+ data: term,
+ };
+}
+
+export function setChannelListSearch(term) {
+ return {
+ type: SearchTypes.SET_CHANNEL_LIST_SEARCH,
+ data: term,
+ };
+}
+
+export function setChannelListFilters(filters = {}) {
+ return {
+ type: SearchTypes.SET_CHANNEL_LIST_FILTERS,
+ data: filters,
+ };
+}
diff --git a/components/admin_console/admin_definition.jsx b/components/admin_console/admin_definition.jsx
@@ -50,6 +50,7 @@ import PushNotificationsSettings from './push_settings.jsx';
 import DataRetentionSettingsOld from './data_retention_settings.jsx';
 import DataRetentionSettings from './data_retention_settings/index.ts';
 import GlobalDataRetentionForm from './data_retention_settings/global_policy_form';
+import CustomDataRetentionForm from './data_retention_settings/custom_policy_form';
 import MessageExportSettings from './message_export_settings.jsx';
 import DatabaseSettings from './database_settings.jsx';
 import ElasticSearchSettings from './elasticsearch_settings.jsx';
@@ -5201,6 +5202,34 @@ const AdminDefinition = {
  sectionTitle: t('admin.sidebar.compliance'),
  sectionTitleDefault: 'Compliance',
  isHidden: it.not(it.userHasReadPermissionOnSomeResources(RESOURCE_KEYS.COMPLIANCE)),
+ custom_policy_form_edit: {
+ url: 'compliance/data_retention_settings/custom_policy/:policy_id',
+ isHidden: it.any(
+ it.not(it.licensedForFeature('DataRetention')),
+ it.not(it.userHasReadPermissionOnSomeResources(RESOURCE_KEYS.COMPLIANCE.DATA_RETENTION_POLICY)),
+ it.configIsFalse('FeatureFlags', 'CustomDataRetentionEnabled'),
+ ),
+ isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.COMPLIANCE.DATA_RETENTION_POLICY)),
+ schema: {
+ id: 'CustomDataRetentionForm',
+ component: CustomDataRetentionForm,
+ },
+
+ },
+ custom_policy_form: {
+ url: 'compliance/data_retention_settings/custom_policy',
+ isHidden: it.any(
+ it.not(it.licensedForFeature('DataRetention')),
+ it.not(it.userHasReadPermissionOnSomeResources(RESOURCE_KEYS.COMPLIANCE.DATA_RETENTION_POLICY)),
+ it.configIsFalse('FeatureFlags', 'CustomDataRetentionEnabled'),
+ ),
+ isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.COMPLIANCE.DATA_RETENTION_POLICY)),
+ schema: {
+ id: 'CustomDataRetentionForm',
+ component: CustomDataRetentionForm,
+ },
+
+ },
  global_policy_form: {
  url: 'compliance/data_retention_settings/global_policy',
  isHidden: it.any(

diff --git a/...admin_console/data_retention_settings/__snapshots__/data_retention_settings.test.tsx.snap b/...admin_console/data_retention_settings/__snapshots__/data_retention_settings.test.tsx.snap
@@ -38,7 +38,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <DataGrid
  className="customTable"
  columns={
@@ -156,7 +158,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <DataGrid
  className="customTable"
  columns={
@@ -286,7 +290,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <Connect(injectIntl(JobTable))
  className="job-table__data-retention"
  createJobButtonText={
@@ -373,7 +379,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <DataGrid
  className="customTable"
  columns={
@@ -501,7 +509,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <DataGrid
  className="customTable"
  columns={
@@ -636,7 +646,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <Connect(injectIntl(JobTable))
  className="job-table__data-retention"
  createJobButtonText={
@@ -723,7 +735,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <DataGrid
  className="customTable"
  columns={
@@ -851,7 +865,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <DataGrid
  className="customTable"
  columns={
@@ -981,7 +997,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <Connect(injectIntl(JobTable))
  className="job-table__data-retention"
  createJobButtonText={
@@ -1068,7 +1086,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <DataGrid
  className="customTable"
  columns={
@@ -1196,7 +1216,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <DataGrid
  className="customTable"
  columns={
@@ -1269,7 +1291,9 @@ exports[`components/admin_console/data_retention_settings/data_retention_setting
  }
  />
  </CardHeader>
- <CardBody>
+ <CardBody
+ expanded={true}
+ >
  <Connect(injectIntl(JobTable))
  className="job-table__data-retention"
  createJobButtonText={