Skip to content

Commit 1502bc3

Browse files
KelvinTegelaarKelvinTegelaar
authored
Merge pull request #2707 from KelvinTegelaar/dev
Dev to release
2 parents 498e5ec + 3df0713 commit 1502bc3

31 files changed

+42427
-39934
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cipp",
3-
"version": "6.0.2",
3+
"version": "6.1.0",
44
"description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
55
"homepage": "https://cipp.app/",
66
"bugs": {

‎public/version_latest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.0.2
1+
6.1.0

‎src/_nav.jsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ const _nav = [
625625
component: CNavGroup,
626626
name: 'Administration',
627627
section: 'Email & Exchange',
628-
to: '/email/exchange',
628+
to: '/email/Administration',
629629
icon: <FontAwesomeIcon icon={faWrench} className="nav-icon" />,
630630
items: [
631631
{
@@ -688,7 +688,7 @@ const _nav = [
688688
component: CNavGroup,
689689
name: 'Transport',
690690
section: 'Email & Exchange',
691-
to: '/tenant/administration',
691+
to: '/email/Transport',
692692
icon: <FontAwesomeIcon icon={faBus} className="nav-icon" />,
693693
items: [
694694
{
@@ -727,7 +727,7 @@ const _nav = [
727727
component: CNavGroup,
728728
name: 'Spamfilter',
729729
section: 'Email & Exchange',
730-
to: '/tenant/administration',
730+
to: '/email/spamfilter',
731731
icon: <FontAwesomeIcon icon={faEnvelope} className="nav-icon" />,
732732
items: [
733733
{
@@ -749,20 +749,20 @@ const _nav = [
749749
},
750750
{
751751
component: CNavGroup,
752-
name: ' Room Management',
752+
name: 'Resource Management',
753753
section: 'Email & Exchange',
754-
to: '/rooms/management',
754+
to: '/resources/management',
755755
icon: <FontAwesomeIcon icon={faToolbox} className="nav-icon" />,
756756
items: [
757757
{
758758
component: CNavItem,
759759
name: 'Rooms',
760-
to: '/rooms/management/list-rooms',
760+
to: '/resources/management/list-rooms',
761761
},
762762
{
763763
component: CNavItem,
764764
name: 'Room Lists',
765-
to: '/rooms/management/room-lists',
765+
to: '/resources/management/room-lists',
766766
},
767767
],
768768
},

‎src/components/utilities/CippActionsOffcanvas.jsx

+10-3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import ReactTimeAgo from 'react-time-ago'
3636
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
3737
import { faGlobe } from '@fortawesome/free-solid-svg-icons'
3838
import { cellGenericFormatter } from '../tables/CellGenericFormat'
39+
import ReactSelect from 'react-select'
3940

4041
const CippOffcanvasCard = ({ action, key }) => {
4142
const [offcanvasVisible, setOffcanvasVisible] = useState(false)
@@ -111,11 +112,14 @@ export default function CippActionsOffcanvas(props) {
111112
const handleModal = useCallback(
112113
(modalMessage, modalUrl, modalType = 'GET', modalBody, modalInput, modalDropdown) => {
113114
const handlePostConfirm = () => {
114-
const selectedValue = inputRef.current.value
115+
console.log(inputRef)
116+
const selectedValue = inputRef.current.props?.id
117+
? inputRef.current.props.value.value
118+
: inputRef.current.value
115119
//console.log(inputRef)
116120
let additionalFields = {}
117121

118-
if (inputRef.current.nodeName === 'SELECT') {
122+
if (inputRef.current.props?.id) {
119123
const selectedItem = dropDownInfo.data.find(
120124
(item) => item[modalDropdown.valueField] === selectedValue,
121125
)
@@ -190,7 +194,10 @@ export default function CippActionsOffcanvas(props) {
190194
{modalDropdown && (
191195
<div>
192196
{dropDownInfo.isSuccess && (
193-
<CFormSelect
197+
<ReactSelect
198+
id="react-select-offcanvas"
199+
classNamePrefix="react-select"
200+
className="react-select-container"
194201
ref={inputRef}
195202
options={dropDownInfo.data.map((data) => ({
196203
value: data[modalDropdown.valueField],

‎src/data/AuditLogSchema.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@
5050
"ClientMachinename": "String",
5151
"ClientProcessname": "String",
5252
"ClientVersion": "String",
53-
"MoveToFolder": "String"
53+
"MoveToFolder": "String",
54+
"ForwardTo": "String",
55+
"RedirectTo": "String"
5456
},
5557
"Audit.AzureActiveDirectory": {
5658
"AzureActiveDirectoryEventType": "List:AzureActiveDirectoryEventType",

‎src/data/AuditLogTemplates.json

+112-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"Property": { "value": "List:Operation", "label": "Operation" },
1111
"Operator": { "value": "EQ", "label": "Equals to" },
1212
"Input": {
13-
"value": "new-inboxrule",
13+
"value": "New-InboxRule",
1414
"label": "created new inbox rule in outlook web app"
1515
}
1616
}
@@ -31,7 +31,7 @@
3131
"Property": { "value": "List:Operation", "label": "Operation" },
3232
"Operator": { "value": "EQ", "label": "Equals to" },
3333
"Input": {
34-
"value": "new-inboxrule",
34+
"value": "New-InboxRule",
3535
"label": "created new inbox rule in outlook web app"
3636
}
3737
},
@@ -43,6 +43,58 @@
4343
]
4444
}
4545
},
46+
{
47+
"value": "New-InboxRuleForward",
48+
"name": "A new Inbox rule is created that forwards e-mails to a different email address",
49+
"template": {
50+
"preset": {
51+
"value": "New-InboxRuleForward",
52+
"label": "A new Inbox rule is created that forwards e-mails to a different email address"
53+
},
54+
"logbook": { "value": "Audit.Exchange", "label": "Exchange" },
55+
"conditions": [
56+
{
57+
"Property": { "value": "List:Operation", "label": "Operation" },
58+
"Operator": { "value": "EQ", "label": "Equals to" },
59+
"Input": {
60+
"value": "New-InboxRule",
61+
"label": "created new inbox rule in outlook web app"
62+
}
63+
},
64+
{
65+
"Property": { "value": "String", "label": "ForwardTo" },
66+
"Operator": { "value": "like", "label": "Like" },
67+
"Input": { "value": "*@*" }
68+
}
69+
]
70+
}
71+
},
72+
{
73+
"value": "New-InboxRuleRedirect",
74+
"name": "A new Inbox rule is created that redirects e-mails to a different email address",
75+
"template": {
76+
"preset": {
77+
"value": "New-InboxRuleRedirect",
78+
"label": "A new Inbox rule is created that redirects e-mails to a different email address"
79+
},
80+
"logbook": { "value": "Audit.Exchange", "label": "Exchange" },
81+
"conditions": [
82+
{
83+
"Property": { "value": "List:Operation", "label": "Operation" },
84+
"Operator": { "value": "EQ", "label": "Equals to" },
85+
"Input": {
86+
"value": "New-InboxRule",
87+
"label": "created new inbox rule in outlook web app"
88+
}
89+
},
90+
{
91+
"Property": { "value": "String", "label": "RedirectTo" },
92+
"Operator": { "value": "like", "label": "Like" },
93+
"Input": { "value": "*@*" }
94+
}
95+
]
96+
}
97+
},
4698
{
4799
"value": "Set-InboxRule",
48100
"name": "A existing Inbox rule is edited",
@@ -54,7 +106,7 @@
54106
"Property": { "value": "List:Operation", "label": "Operation" },
55107
"Operator": { "value": "EQ", "label": "Equals to" },
56108
"Input": {
57-
"value": "set-inboxrule",
109+
"value": "Set-InboxRule",
58110
"label": "Updated inbox rule in outlook web app"
59111
}
60112
}
@@ -65,14 +117,17 @@
65117
"value": "Set-InboxRuleRSS",
66118
"name": "A existing Inbox rule is edited that forwards e-mails to the RSS feeds folder",
67119
"template": {
68-
"preset": { "value": "Set-InboxRuleRSS", "label": "A existing Inbox rule is edited" },
120+
"preset": {
121+
"value": "Set-InboxRuleRSS",
122+
"label": "A existing Inbox rule is edited that forwards e-mails to the RSS feeds folder"
123+
},
69124
"logbook": { "value": "Audit.Exchange", "label": "Exchange" },
70125
"conditions": [
71126
{
72127
"Property": { "value": "List:Operation", "label": "Operation" },
73128
"Operator": { "value": "EQ", "label": "Equals to" },
74129
"Input": {
75-
"value": "set-inboxrule",
130+
"value": "Set-InboxRule",
76131
"label": "Updated inbox rule in outlook web app"
77132
}
78133
},
@@ -84,6 +139,58 @@
84139
]
85140
}
86141
},
142+
{
143+
"value": "Set-InboxRuleForward",
144+
"name": "A existing Inbox rule is edited that forwards e-mails to a different email address",
145+
"template": {
146+
"preset": {
147+
"value": "Set-InboxRuleForward",
148+
"label": "A existing Inbox rule is edited that forwards e-mails to a different email address"
149+
},
150+
"logbook": { "value": "Audit.Exchange", "label": "Exchange" },
151+
"conditions": [
152+
{
153+
"Property": { "value": "List:Operation", "label": "Operation" },
154+
"Operator": { "value": "EQ", "label": "Equals to" },
155+
"Input": {
156+
"value": "Set-InboxRule",
157+
"label": "Updated inbox rule in outlook web app"
158+
}
159+
},
160+
{
161+
"Property": { "value": "String", "label": "ForwardTo" },
162+
"Operator": { "value": "like", "label": "Like" },
163+
"Input": { "value": "*@*" }
164+
}
165+
]
166+
}
167+
},
168+
{
169+
"value": "Set-InboxRuleRedirect",
170+
"name": "A existing Inbox rule is edited that redirects e-mails to a different email address",
171+
"template": {
172+
"preset": {
173+
"value": "Set-InboxRuleRedirect",
174+
"label": "A existing Inbox rule is edited that redirects e-mails to a different email address"
175+
},
176+
"logbook": { "value": "Audit.Exchange", "label": "Exchange" },
177+
"conditions": [
178+
{
179+
"Property": { "value": "List:Operation", "label": "Operation" },
180+
"Operator": { "value": "EQ", "label": "Equals to" },
181+
"Input": {
182+
"value": "Set-InboxRule",
183+
"label": "Updated inbox rule in outlook web app"
184+
}
185+
},
186+
{
187+
"Property": { "value": "String", "label": "RedirectTo" },
188+
"Operator": { "value": "like", "label": "Like" },
189+
"Input": { "value": "*@*" }
190+
}
191+
]
192+
}
193+
},
87194
{
88195
"value": "Add member to role.",
89196
"name": "A user has been added to an admin role",

0 commit comments

Comments
 (0)