Merge pull request #2729 from kris6673/hidden-rules

Show/remove hidden mailbox rules too
KelvinTegelaar · Jul 26, 2024 · 0fe29d9 · 0fe29d9
2 parents f64a877 + d03b70e
commit 0fe29d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/views/identity/administration/UserMailboxRuleList.jsx b/src/views/identity/administration/UserMailboxRuleList.jsx
@@ -10,7 +10,7 @@ const rowStyle = (row, rowIndex) => {
  return style
 }
 
-export default function UserMailboxRuleList({ userId, tenantDomain, className = null }) {
+export default function UserMailboxRuleList({ userId, userEmail, tenantDomain, className = null }) {
  const formatter = (cell) => CellBoolean({ cell })
  const columns = [
  {
@@ -79,7 +79,7 @@ export default function UserMailboxRuleList({ userId, tenantDomain, className =
  datatable={{
  reportName: 'ListUserMailboxRules',
  path: '/api/ListUserMailboxRules',
- params: { tenantFilter: tenantDomain, userId },
+ params: { tenantFilter: tenantDomain, userId, userEmail },
  columns,
  keyField: 'id',
  responsive: true,
@@ -93,6 +93,7 @@ export default function UserMailboxRuleList({ userId, tenantDomain, className =
 
 UserMailboxRuleList.propTypes = {
  userId: PropTypes.string.isRequired,
+ userEmail: PropTypes.string,
  tenantDomain: PropTypes.string.isRequired,
  className: PropTypes.string,
 }
diff --git a/src/views/identity/administration/ViewUser.jsx b/src/views/identity/administration/ViewUser.jsx
@@ -91,7 +91,11 @@ const ViewUser = (props) => {
  <UserSigninLogs userId={userId} tenantDomain={tenantDomain} />
  </CippMasonryItem>
  <CippMasonryItem size="triple">
- <UserMailboxRuleList userId={userId} tenantDomain={tenantDomain} />
+ <UserMailboxRuleList
+ userId={userId}
+ tenantDomain={tenantDomain}
+ userEmail={userEmail}
+ />
  </CippMasonryItem>
  </CippMasonry>
  )}