Merge branch 'KelvinTegelaar:main' into main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {

public/version_latest.txt

@@ -1 +1 @@
-6.0.2
+6.1.0

src/_nav.jsx

@@ -625,7 +625,7 @@ const _nav = [
     component: CNavGroup,
     name: 'Administration',
     section: 'Email & Exchange',
-    to: '/email/exchange',
+    to: '/email/Administration',
     icon: <FontAwesomeIcon icon={faWrench} className="nav-icon" />,
     items: [
       {
@@ -688,7 +688,7 @@ const _nav = [
     component: CNavGroup,
     name: 'Transport',
     section: 'Email & Exchange',
-    to: '/tenant/administration',
+    to: '/email/Transport',
     icon: <FontAwesomeIcon icon={faBus} className="nav-icon" />,
     items: [
       {
@@ -727,7 +727,7 @@ const _nav = [
     component: CNavGroup,
     name: 'Spamfilter',
     section: 'Email & Exchange',
-    to: '/tenant/administration',
+    to: '/email/spamfilter',
     icon: <FontAwesomeIcon icon={faEnvelope} className="nav-icon" />,
     items: [
       {
@@ -749,20 +749,20 @@ const _nav = [
   },
   {
     component: CNavGroup,
-    name: ' Room Management',
+    name: 'Resource Management',
     section: 'Email & Exchange',
-    to: '/rooms/management',
+    to: '/resources/management',
     icon: <FontAwesomeIcon icon={faToolbox} className="nav-icon" />,
     items: [
       {
         component: CNavItem,
         name: 'Rooms',
-        to: '/rooms/management/list-rooms',
+        to: '/resources/management/list-rooms',
       },
       {
         component: CNavItem,
         name: 'Room Lists',
-        to: '/rooms/management/room-lists',
+        to: '/resources/management/room-lists',
       },
     ],
   },

src/components/utilities/CippActionsOffcanvas.jsx

@@ -36,6 +36,7 @@ import ReactTimeAgo from 'react-time-ago'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faGlobe } from '@fortawesome/free-solid-svg-icons'
 import { cellGenericFormatter } from '../tables/CellGenericFormat'
+import ReactSelect from 'react-select'
 
 const CippOffcanvasCard = ({ action, key }) => {
   const [offcanvasVisible, setOffcanvasVisible] = useState(false)
@@ -111,11 +112,14 @@ export default function CippActionsOffcanvas(props) {
   const handleModal = useCallback(
     (modalMessage, modalUrl, modalType = 'GET', modalBody, modalInput, modalDropdown) => {
       const handlePostConfirm = () => {
-        const selectedValue = inputRef.current.value
+        console.log(inputRef)
+        const selectedValue = inputRef.current.props?.id
+          ? inputRef.current.props.value.value
+          : inputRef.current.value
         //console.log(inputRef)
         let additionalFields = {}
 
-        if (inputRef.current.nodeName === 'SELECT') {
+        if (inputRef.current.props?.id) {
           const selectedItem = dropDownInfo.data.find(
             (item) => item[modalDropdown.valueField] === selectedValue,
           )
@@ -190,7 +194,10 @@ export default function CippActionsOffcanvas(props) {
               {modalDropdown && (
                 <div>
                   {dropDownInfo.isSuccess && (
-                    <CFormSelect
+                    <ReactSelect
+                      id="react-select-offcanvas"
+                      classNamePrefix="react-select"
+                      className="react-select-container"
                       ref={inputRef}
                       options={dropDownInfo.data.map((data) => ({
                         value: data[modalDropdown.valueField],

src/data/AuditLogSchema.json

@@ -50,7 +50,9 @@
     "ClientMachinename": "String",
     "ClientProcessname": "String",
     "ClientVersion": "String",
-    "MoveToFolder": "String"
+    "MoveToFolder": "String",
+    "ForwardTo": "String",
+    "RedirectTo": "String"
   },
   "Audit.AzureActiveDirectory": {
     "AzureActiveDirectoryEventType": "List:AzureActiveDirectoryEventType",

src/data/AuditLogTemplates.json

@@ -10,7 +10,7 @@
           "Property": { "value": "List:Operation", "label": "Operation" },
           "Operator": { "value": "EQ", "label": "Equals to" },
           "Input": {
-            "value": "new-inboxrule",
+            "value": "New-InboxRule",
             "label": "created new inbox rule in outlook web app"
           }
         }
@@ -31,7 +31,7 @@
           "Property": { "value": "List:Operation", "label": "Operation" },
           "Operator": { "value": "EQ", "label": "Equals to" },
           "Input": {
-            "value": "new-inboxrule",
+            "value": "New-InboxRule",
             "label": "created new inbox rule in outlook web app"
           }
         },
@@ -43,6 +43,58 @@
       ]
     }
   },
+  {
+    "value": "New-InboxRuleForward",
+    "name": "A new Inbox rule is created that forwards e-mails to a different email address",
+    "template": {
+      "preset": {
+        "value": "New-InboxRuleForward",
+        "label": "A new Inbox rule is created that forwards e-mails to a different email address"
+      },
+      "logbook": { "value": "Audit.Exchange", "label": "Exchange" },
+      "conditions": [
+        {
+          "Property": { "value": "List:Operation", "label": "Operation" },
+          "Operator": { "value": "EQ", "label": "Equals to" },
+          "Input": {
+            "value": "New-InboxRule",
+            "label": "created new inbox rule in outlook web app"
+          }
+        },
+        {
+          "Property": { "value": "String", "label": "ForwardTo" },
+          "Operator": { "value": "like", "label": "Like" },
+          "Input": { "value": "*@*" }
+        }
+      ]
+    }
+  },
+  {
+    "value": "New-InboxRuleRedirect",
+    "name": "A new Inbox rule is created that redirects e-mails to a different email address",
+    "template": {
+      "preset": {
+        "value": "New-InboxRuleRedirect",
+        "label": "A new Inbox rule is created that redirects e-mails to a different email address"
+      },
+      "logbook": { "value": "Audit.Exchange", "label": "Exchange" },
+      "conditions": [
+        {
+          "Property": { "value": "List:Operation", "label": "Operation" },
+          "Operator": { "value": "EQ", "label": "Equals to" },
+          "Input": {
+            "value": "New-InboxRule",
+            "label": "created new inbox rule in outlook web app"
+          }
+        },
+        {
+          "Property": { "value": "String", "label": "RedirectTo" },
+          "Operator": { "value": "like", "label": "Like" },
+          "Input": { "value": "*@*" }
+        }
+      ]
+    }
+  },
   {
     "value": "Set-InboxRule",
     "name": "A existing Inbox rule is edited",
@@ -54,7 +106,7 @@
           "Property": { "value": "List:Operation", "label": "Operation" },
           "Operator": { "value": "EQ", "label": "Equals to" },
           "Input": {
-            "value": "set-inboxrule",
+            "value": "Set-InboxRule",
             "label": "Updated inbox rule in outlook web app"
           }
         }
@@ -65,14 +117,17 @@
     "value": "Set-InboxRuleRSS",
     "name": "A existing Inbox rule is edited that forwards e-mails to the RSS feeds folder",
     "template": {
-      "preset": { "value": "Set-InboxRuleRSS", "label": "A existing Inbox rule is edited" },
+      "preset": {
+        "value": "Set-InboxRuleRSS",
+        "label": "A existing Inbox rule is edited that forwards e-mails to the RSS feeds folder"
+      },
       "logbook": { "value": "Audit.Exchange", "label": "Exchange" },
       "conditions": [
         {
           "Property": { "value": "List:Operation", "label": "Operation" },
           "Operator": { "value": "EQ", "label": "Equals to" },
           "Input": {
-            "value": "set-inboxrule",
+            "value": "Set-InboxRule",
             "label": "Updated inbox rule in outlook web app"
           }
         },
@@ -84,6 +139,58 @@
       ]
     }
   },
+  {
+    "value": "Set-InboxRuleForward",
+    "name": "A existing Inbox rule is edited that forwards e-mails to a different email address",
+    "template": {
+      "preset": {
+        "value": "Set-InboxRuleForward",
+        "label": "A existing Inbox rule is edited that forwards e-mails to a different email address"
+      },
+      "logbook": { "value": "Audit.Exchange", "label": "Exchange" },
+      "conditions": [
+        {
+          "Property": { "value": "List:Operation", "label": "Operation" },
+          "Operator": { "value": "EQ", "label": "Equals to" },
+          "Input": {
+            "value": "Set-InboxRule",
+            "label": "Updated inbox rule in outlook web app"
+          }
+        },
+        {
+          "Property": { "value": "String", "label": "ForwardTo" },
+          "Operator": { "value": "like", "label": "Like" },
+          "Input": { "value": "*@*" }
+        }
+      ]
+    }
+  },
+  {
+    "value": "Set-InboxRuleRedirect",
+    "name": "A existing Inbox rule is edited that redirects e-mails to a different email address",
+    "template": {
+      "preset": {
+        "value": "Set-InboxRuleRedirect",
+        "label": "A existing Inbox rule is edited that redirects e-mails to a different email address"
+      },
+      "logbook": { "value": "Audit.Exchange", "label": "Exchange" },
+      "conditions": [
+        {
+          "Property": { "value": "List:Operation", "label": "Operation" },
+          "Operator": { "value": "EQ", "label": "Equals to" },
+          "Input": {
+            "value": "Set-InboxRule",
+            "label": "Updated inbox rule in outlook web app"
+          }
+        },
+        {
+          "Property": { "value": "String", "label": "RedirectTo" },
+          "Operator": { "value": "like", "label": "Like" },
+          "Input": { "value": "*@*" }
+        }
+      ]
+    }
+  },
   {
     "value": "Add member to role.",
     "name": "A user has been added to an admin role",