Merge pull request #167 from KelvinTegelaar/dev

JohnDuprey · Apr 29, 2024 · b3bc2a5 · b3bc2a5
2 parents 33e4346 + a8675b3
commit b3bc2a5
Show file tree

Hide file tree

Showing 9 changed files with 259 additions and 145 deletions.
diff --git a/src/_nav.jsx b/src/_nav.jsx
@@ -613,6 +613,11 @@ const _nav = [
         name: 'Quarantine',
         to: '/email/administration/quarantine',
       },
+      {
+        component: CNavItem,
+        name: 'Tenant Allow/Block Lists',
+        to: '/email/administration/tenant-allow-block-lists',
+      },
     ],
   },
   {

diff --git a/src/components/forms/RFFComponents.jsx b/src/components/forms/RFFComponents.jsx
@@ -157,10 +157,11 @@ export const RFFCFormInput = ({
   spellCheck = true,
   autoFocus = false,
   hiddenValue,
+  defaultValue,
   onChange,
 }) => {
   return (
-    <Field initialValue={hiddenValue} name={name} validate={validate}>
+    <Field defaultValue={defaultValue} initialValue={hiddenValue} name={name} validate={validate}>
       {({ input, meta }) => {
         const handleChange = onChange
           ? (e) => {

diff --git a/src/data/standards.json b/src/data/standards.json
@@ -308,7 +308,8 @@
       {
         "type": "number",
         "name": "standards.NudgeMFA.snoozeDurationInDays",
-        "label": "Number of days to allow users to skip registering Authenticator (0-14, default is 1)"
+        "label": "Number of days to allow users to skip registering Authenticator (0-14, default is 1)",
+        "default": 1
       }
     ],
     "label": "Sets the state for the request to setup Authenticator",
@@ -578,7 +579,8 @@
         "type": "number",
         "name": "standards.EnableMailTips.MailTipsLargeAudienceThreshold",
         "label": "Number of recipients to trigger the large audience MailTip (Default is 25)",
-        "placeholder": "Enter a profile name"
+        "placeholder": "Enter a profile name",
+        "default": 25
       }
     ],
     "label": "Enable all MailTips",
@@ -634,12 +636,14 @@
       {
         "type": "number",
         "name": "standards.SendReceiveLimitTenant.SendLimit",
-        "label": "Send limit in MB (Default is 35)"
+        "label": "Send limit in MB (Default is 35)",
+        "default": 35
       },
       {
         "type": "number",
         "name": "standards.SendReceiveLimitTenant.ReceiveLimit",
-        "label": "Receive Limit in MB (Default is 36)"
+        "label": "Receive Limit in MB (Default is 36)",
+        "default": 36
       }
     ],
     "label": "Set send/receive size limits",

diff --git a/src/importsMap.jsx b/src/importsMap.jsx
diff --git a/src/routes.json b/src/routes.json
@@ -768,6 +768,12 @@
     "component": "views/email-exchange/administration/QuarantineList",
     "allowedRoles": ["admin", "editor", "readonly"]
   },
+  {
+    "name": "List Tenant Allow/Block Lists",
+    "path": "/email/administration/tenant-allow-block-lists",
+    "component": "views/email-exchange/administration/ListTenantAllowBlockList",
+    "allowedRoles": ["admin", "editor", "readonly"]
+  },
   {
     "name": "Email Reports",
     "path": "/email/reports",

diff --git a/src/views/cipp/app-settings/SettingsExtensionMappings.jsx b/src/views/cipp/app-settings/SettingsExtensionMappings.jsx
@@ -519,7 +519,7 @@ export function SettingsExtensionMappings() {
                 initialValues={listBackendNinjaFieldsResult.data?.Mappings}
                 render={({ handleSubmit, submitting, values }) => {
                   return (
-                    <CForm id="NinjaFields" onSubmit={handleSubmit}>
+                    <CForm id="ninjaFields" onSubmit={handleSubmit}>
                       <CCardText>
                         <h5>Organization Global Custom Field Mapping</h5>
                         <p>

diff --git a/src/views/email-exchange/administration/ListTenantAllowBlockList.jsx b/src/views/email-exchange/administration/ListTenantAllowBlockList.jsx
@@ -0,0 +1,96 @@
+import React from 'react'
+import { useSelector } from 'react-redux'
+import { CButton } from '@coreui/react'
+import { faEdit } from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { Link } from 'react-router-dom'
+import { CippPageList } from 'src/components/layout'
+import { CellTip } from 'src/components/tables'
+
+const AllowBlockList = () => {
+  const tenant = useSelector((state) => state.app.currentTenant)
+  const Actions = (row, rowIndex, formatExtraData) => (
+    <>
+      <Link
+        to={`/email/administration/edit-tenant-allow-block-lists?tenantDomain=${tenant.defaultDomainName}?Entry=${row.value}?ListType=${row.ListType}`}
+      >
+        <CButton size="sm" variant="ghost" color="warning">
+          <FontAwesomeIcon icon={faEdit} />
+        </CButton>
+      </Link>
+      <Link
+        to={`/email/administration/delete-tenant-allow-block-lists?tenantDomain=${tenant.defaultDomainName}?Entry=${row.value}?ListType=${row.ListType}`}
+      >
+        <CButton size="sm" variant="ghost" color="danger">
+          <FontAwesomeIcon icon={'trash'} />
+        </CButton>
+      </Link>
+    </>
+  )
+
+  const columns = [
+    {
+      name: 'Value',
+      selector: (row) => row['Value'],
+      sortable: true,
+      cell: (row) => CellTip(row['Value']),
+      exportSelector: 'Value',
+    },
+    {
+      name: 'ListType',
+      selector: (row) => row['ListType'],
+      sortable: true,
+      cell: (row) => CellTip(row['ListType']),
+      exportSelector: 'ListType',
+      maxWidth: '80px',
+    },
+    {
+      name: 'Action',
+      selector: (row) => row['Action'],
+      sortable: true,
+      cell: (row) => CellTip(row['Action']),
+      exportSelector: 'Action',
+      maxWidth: '80px',
+    },
+    {
+      name: 'Notes',
+      selector: (row) => row['Notes'],
+      sortable: true,
+      cell: (row) => CellTip(row['Notes']),
+      exportSelector: 'Notes',
+    },
+    {
+      name: 'LastModifiedDateTime',
+      selector: (row) => row['LastModifiedDateTime'],
+      sortable: true,
+      cell: (row) => CellTip(row['LastModifiedDateTime']),
+      exportSelector: 'LastModifiedDateTime',
+    },
+    {
+      name: 'ExpirationDate',
+      selector: (row) => row['ExpirationDate'],
+      sortable: true,
+      cell: (row) => CellTip(row['ExpirationDate']),
+      exportSelector: 'ExpirationDate',
+    },
+    // {
+    //   name: 'Actions',
+    //  cell: Actions,
+    //  maxWidth: '80px',
+    // },
+  ]
+
+  return (
+    <CippPageList
+      title="Tenant Allow/Block Lists"
+      datatable={{
+        columns,
+        path: '/api/ListTenantAllowBlockList',
+        reportName: `${tenant?.defaultDomainName}-TenantAllowBlockList`,
+        params: { TenantFilter: tenant?.defaultDomainName },
+      }}
+    />
+  )
+}
+
+export default AllowBlockList
diff --git a/src/views/home/Home.jsx b/src/views/home/Home.jsx
@@ -420,7 +420,7 @@ const TenantDashboard = () => {
                   'No SharePoint Information available'}
                 {sharepoint && !isFetchingSPQuota && sharepoint.GeoUsedStorageMB && (
                   <CChart
-                    type="doughnut"
+                    type="pie"
                     data={{
                       labels: ['Used', 'Free'],
                       datasets: [

diff --git a/src/views/tenant/standards/ListAppliedStandards.jsx b/src/views/tenant/standards/ListAppliedStandards.jsx
@@ -611,6 +611,7 @@ const ApplyNewStandard = () => {
                                                   className="mb-3"
                                                   name={component.name}
                                                   label={component.label}
+                                                  defaultValue={component.default}
                                                 />
                                               )}
                                               {component.type === 'boolean' && (