Skip to content

Commit 70d58ce

Browse files
KelvinTegelaarKelvinTegelaar
authored
Merge pull request #1919 from KelvinTegelaar/dev
Dev to release
2 parents 54cb8e9 + 4ec05f5 commit 70d58ce

File tree

16 files changed

+453
-26
lines changed

16 files changed

+453
-26
lines changed

‎public/version_latest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.6.0
1+
4.7.0

‎src/_nav.jsx

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@ const _nav = [
137137
name: 'Enterprise Applications',
138138
to: '/tenant/administration/enterprise-apps',
139139
},
140+
{
141+
component: CNavItem,
142+
name: 'App Consent Requests',
143+
to: '/tenant/administration/app-consent-requests',
144+
},
140145
{
141146
component: CNavItem,
142147
name: 'Tenant Offboarding',
@@ -268,16 +273,16 @@ const _nav = [
268273
name: 'GDAP Roles',
269274
to: '/tenant/administration/gdap-roles',
270275
},
271-
{
272-
component: CNavItem,
273-
name: 'Migration Wizard',
274-
to: '/tenant/administration/gdap',
275-
},
276-
{
277-
component: CNavItem,
278-
name: 'GDAP Migration Status',
279-
to: '/tenant/administration/gdap-status',
280-
},
276+
// {
277+
// component: CNavItem,
278+
// name: 'Migration Wizard',
279+
// to: '/tenant/administration/gdap',
280+
// },
281+
// {
282+
// component: CNavItem,
283+
// name: 'GDAP Migration Status',
284+
// to: '/tenant/administration/gdap-status',
285+
// },
281286
{
282287
component: CNavItem,
283288
name: 'Invite Wizard',

‎src/assets/images/ninjaone.png

13.3 KB
Loading

‎src/components/layout/AppFooter.jsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import huntressLogo from 'src/assets/images/huntress_teal.png'
55
import dattoLogo from 'src/assets/images/datto.png'
66
import rewstLogo from 'src/assets/images/rewst.png'
77
import netfriends from 'src/assets/images/netfriends.png'
8+
import ninjaLogo from 'src/assets/images/ninjaone.png'
89
//todo: Add darkmode detection and change logos accordingly.
910
const AppFooter = () => {
1011
return (
11-
<CFooter className="d-flex justify-content-between align-items-center" position="sticky">
12+
<CFooter className="d-flex justify-content-between align-items-center stickyfooter">
1213
<div className="sponsors">
1314
<p>
1415
This application is sponsored by{' '}
@@ -24,6 +25,9 @@ const AppFooter = () => {
2425
<CLink href="https://netfriends.com">
2526
<CImage src={netfriends} alt="Netfriends" />
2627
</CLink>
28+
<CLink href="https://ninjaone.com">
29+
<CImage src={ninjaLogo} alt="NinjaOne" />
30+
</CLink>
2731
</p>
2832
</div>
2933
<nav className="footer-nav">

‎src/data/Extensions.json

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,55 @@
106106
"label": "Enable Integration"
107107
}
108108
]
109+
},
110+
{
111+
"name": "NinjaOne Integration",
112+
"type": "NinjaOne",
113+
"cat": "Documentation & Monitoring",
114+
"forceSyncButton": true,
115+
"helpText": "NOTE: This integration requires version 5.6 of NinjaOne, which rolls out regionally between the end of November and mid-December. This integration allows you to populate custom fields with Tenant information, monitor device compliance state, document other items and generate relationships inside NinjaOne.",
116+
"SettingOptions": [
117+
{
118+
"type": "input",
119+
"fieldtype": "input",
120+
"name": "NinjaOne.Instance",
121+
"label": "Please enter your NinjaOne Instance",
122+
"placeholder": "app.ninjarmm.com, eu.ninjarmm.com, oc.ninjarmm.com, ca.ninjarmm.com, us2.ninjarmm.com"
123+
},
124+
{
125+
"type": "input",
126+
"fieldtype": "password",
127+
"name": "NinjaOne.ClientID",
128+
"label": "NinjaOne API Client ID",
129+
"placeholder": "Enter your NinjaOne API Client ID"
130+
},
131+
{
132+
"type": "input",
133+
"fieldtype": "password",
134+
"name": "NinjaOne.APIKey",
135+
"label": "NinjaOne API Client Secret",
136+
"placeholder": "Enter your NinjaOne API Client Secret"
137+
},
138+
{
139+
"type": "checkbox",
140+
"name": "NinjaOne.UserDocumentsEnabled",
141+
"label": "Synchronize Detailed User Information (Requires NinjaOne Documentation)"
142+
},
143+
{
144+
"type": "checkbox",
145+
"name": "NinjaOne.LicenseDocumentsEnabled",
146+
"label": "Synchronize Detailed License Information (Requires NinjaOne Documentation)"
147+
},
148+
{
149+
"type": "checkbox",
150+
"name": "NinjaOne.LicensedOnly",
151+
"label": "Only Synchronize Licensed Users"
152+
},
153+
{
154+
"type": "checkbox",
155+
"name": "NinjaOne.Enabled",
156+
"label": "Enable Integration"
157+
}
158+
]
109159
}
110160
]

‎src/data/standards.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,13 @@
186186
"helpText": "",
187187
"label": "Allow users to consent to applications with low security risk (Prevent OAuth phishing. Lower impact, less secure.)"
188188
},
189+
{
190+
"cat": "AAD",
191+
"name": "standards.EnableAppConsentRequests",
192+
"helpText": "Enables App consent admin requests for the tenant via the GA role. Does not overwrite existing reviewer settings",
193+
"addedComponent": null,
194+
"label": "Enable App consent admin requests"
195+
},
189196
{
190197
"cat": "AAD",
191198
"name": "standards.LegacyMFACleanup",
@@ -242,6 +249,7 @@
242249
"addedComponent": null,
243250
"label": "Enable FIDO2 capabilities"
244251
},
252+
245253
{
246254
"name": "standards.OutBoundSpamAlert.Enabled",
247255
"cat": "Exchange",
@@ -345,7 +353,7 @@
345353
{
346354
"name": "standards.calDefault.Enabled",
347355
"cat": "Exchange",
348-
"helpText": "Sets the default calendar sharing level for all calendars, for all users",
356+
"helpText": "Sets the default sharing level for the default calendar, for all users",
349357
"addedComponent": {
350358
"type": "Select",
351359
"label": "Select Sharing Level",

‎src/routes.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@ const ServiceHealth = React.lazy(() => import('src/views/tenant/administration/S
226226
const EnterpriseApplications = React.lazy(() =>
227227
import('src/views/tenant/administration/ListEnterpriseApps'),
228228
)
229+
const AppConsentRequests = React.lazy(() =>
230+
import('src/views/tenant/administration/ListAppConsentRequests'),
231+
)
229232
const MailboxRestoreWizard = React.lazy(() =>
230233
import('src/views/email-exchange/tools/MailboxRestoreWizard'),
231234
)
@@ -324,6 +327,11 @@ const routes = [
324327
name: 'Enterprise Applications',
325328
component: EnterpriseApplications,
326329
},
330+
{
331+
path: '/tenant/administration/app-consent-requests',
332+
name: 'App Consent Requests',
333+
component: AppConsentRequests,
334+
},
327335
{
328336
path: '/tenant/conditional/list-policies',
329337
name: 'Conditional Access',

‎src/scss/_custom.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,3 +706,10 @@ i.glyphicon {
706706
.array-item-remove::after {
707707
content: 'Remove';
708708
}
709+
710+
.stickyfooter {
711+
position: sticky;
712+
bottom: 0;
713+
z-index: 0; /* Adjust this value as needed, should be lower than dropdowns */
714+
/* Other styling as needed */
715+
}

‎src/scss/_themes.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@
264264
--cui-input-focus-bg: var(--cyberdrain-light-striped);
265265
--cui-input-focus-border-colour: var(--cyberdrain-primary);
266266
--cui-input-focus-color: var(--cyberdrain-dark);
267-
--cui-link-color: var(--cyberdrain-dark);
267+
--cui-link-color-rgb: var(--cyberdrain-dark);
268268
--cui-link-hover-color: var(--cyberdrain-primary);
269269
--cui-list-group-bg: var(--cui-color-white) !important;
270270
--cui-list-group-color: var(--cyberdrain-dark);
@@ -312,7 +312,7 @@
312312
--cipp-table-primary-colour: var(--cyberdrain-dark);
313313
--cipp-table-secondary-colour: var(--cyberdrain-secondary);
314314
--cipp-table-sort-focus-bg: var(--cyberdrain-secondary);
315-
--cipp-table-highlight-on-hover-bg: rgb(150, 150, 150);
315+
//--cipp-table-highlight-on-hover-bg: rgb(150, 150, 150);
316316
--cipp-table-highlight-on-hover-color: rgb(150, 150, 150);
317317
--cipp-table-striped-bg: var(--cyberdrain-light-striped);
318318
--cipp-table-striped-colour: var(--cyberdrain-dark-striped);
@@ -452,7 +452,7 @@
452452
--cui-input-focus-bg: var(--cyberdrain-dark-striped);
453453
--cui-input-focus-border-color: var(--cyberdrain-primary);
454454
--cui-input-focus-color: var(--cyberdrain-primary);
455-
--cui-link-color: var(--cyberdrain-light);
455+
--cui-link-color-rgb: var(--cyberdrain-light);
456456
--cui-link-hover-color: var(--cyberdrain-primary);
457457
--cui-list-group-bg: var(--cyberdrain-dark);
458458
--cui-list-group-color: var(--cyberdrain-light);
@@ -500,7 +500,7 @@
500500
--cipp-table-primary-colour: var(--cyberdrain-light);
501501
--cipp-table-secondary-colour: var(--cui-gray-100);
502502
--cipp-table-sort-focus-bg: var(--cyberdrain-secondary);
503-
--cipp-table-highlight-on-hover-bg: rgb(138, 136, 136);
503+
// --cipp-table-highlight-on-hover-bg: rgb(138, 136, 136);
504504
--cipp-table-highlight-on-hover-color: rgb(138, 136, 136);
505505
--cipp-table-striped-bg: var(--cyberdrain-dark-striped);
506506
--cipp-table-striped-colour: var(--cyberdrain-light-striped);

‎src/scss/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ $secondary-base: rgba(0, 48, 73) !default;
8686
$secondary-50: rgba(0, 47, 73, 0.479) !default;
8787
$secondary-25: rgba(0, 47, 73, 0.205) !default;
8888

89-
$link-color: rgb(247, 247, 247) !default;
89+
//$link-color: var(--cui-link-color) !default;
9090
$link-decoration: underline !default;
9191
$link-shade-percentage: 20% !default;
92-
$link-hover-color: rgba($link-color, $link-shade-percentage) !default;
92+
//$link-hover-color: rgba($link-color, $link-shade-percentage) !default;
9393
$link-hover-decoration: null !default;
9494

9595
$search-bg-color: #ffffff;

0 commit comments

Comments
 (0)