Merge branch 'KelvinTegelaar:main' into main

MattDunn12 · Nov 28, 2023 · 26eabb5 · 26eabb5
2 parents 5b9704a + 70d58ce
commit 26eabb5
Show file tree

Hide file tree

Showing 16 changed files with 453 additions and 26 deletions.
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-4.6.0
+4.7.0
diff --git a/src/_nav.jsx b/src/_nav.jsx
@@ -137,6 +137,11 @@ const _nav = [
         name: 'Enterprise Applications',
         to: '/tenant/administration/enterprise-apps',
       },
+      {
+        component: CNavItem,
+        name: 'App Consent Requests',
+        to: '/tenant/administration/app-consent-requests',
+      },
       {
         component: CNavItem,
         name: 'Tenant Offboarding',
@@ -268,16 +273,16 @@ const _nav = [
         name: 'GDAP Roles',
         to: '/tenant/administration/gdap-roles',
       },
-      {
-        component: CNavItem,
-        name: 'Migration Wizard',
-        to: '/tenant/administration/gdap',
-      },
-      {
-        component: CNavItem,
-        name: 'GDAP Migration Status',
-        to: '/tenant/administration/gdap-status',
-      },
+      // {
+      //   component: CNavItem,
+      //   name: 'Migration Wizard',
+      //   to: '/tenant/administration/gdap',
+      // },
+      // {
+      //   component: CNavItem,
+      //   name: 'GDAP Migration Status',
+      //   to: '/tenant/administration/gdap-status',
+      // },
       {
         component: CNavItem,
         name: 'Invite Wizard',

diff --git a/src/assets/images/ninjaone.png b/src/assets/images/ninjaone.png
diff --git a/src/components/layout/AppFooter.jsx b/src/components/layout/AppFooter.jsx
@@ -5,10 +5,11 @@ import huntressLogo from 'src/assets/images/huntress_teal.png'
 import dattoLogo from 'src/assets/images/datto.png'
 import rewstLogo from 'src/assets/images/rewst.png'
 import netfriends from 'src/assets/images/netfriends.png'
+import ninjaLogo from 'src/assets/images/ninjaone.png'
 //todo: Add darkmode detection and change logos accordingly.
 const AppFooter = () => {
   return (
-    <CFooter className="d-flex justify-content-between align-items-center" position="sticky">
+    <CFooter className="d-flex justify-content-between align-items-center stickyfooter">
       <div className="sponsors">
         <p>
           This application is sponsored by{' '}
@@ -24,6 +25,9 @@ const AppFooter = () => {
           <CLink href="https://netfriends.com">
             <CImage src={netfriends} alt="Netfriends" />
           </CLink>
+          <CLink href="https://ninjaone.com">
+            <CImage src={ninjaLogo} alt="NinjaOne" />
+          </CLink>
         </p>
       </div>
       <nav className="footer-nav">

diff --git a/src/data/Extensions.json b/src/data/Extensions.json
@@ -106,5 +106,55 @@
         "label": "Enable Integration"
       }
     ]
+  },
+  {
+    "name": "NinjaOne Integration",
+    "type": "NinjaOne",
+    "cat": "Documentation & Monitoring",
+    "forceSyncButton": true,
+    "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.",
+    "SettingOptions": [
+      {
+        "type": "input",
+        "fieldtype": "input",
+        "name": "NinjaOne.Instance",
+        "label": "Please enter your NinjaOne Instance",
+        "placeholder": "app.ninjarmm.com, eu.ninjarmm.com, oc.ninjarmm.com, ca.ninjarmm.com, us2.ninjarmm.com"
+      },
+      {
+        "type": "input",
+        "fieldtype": "password",
+        "name": "NinjaOne.ClientID",
+        "label": "NinjaOne API Client ID",
+        "placeholder": "Enter your NinjaOne API Client ID"
+      },
+      {
+        "type": "input",
+        "fieldtype": "password",
+        "name": "NinjaOne.APIKey",
+        "label": "NinjaOne API Client Secret",
+        "placeholder": "Enter your NinjaOne API Client Secret"
+      },
+      {
+        "type": "checkbox",
+        "name": "NinjaOne.UserDocumentsEnabled",
+        "label": "Synchronize Detailed User Information (Requires NinjaOne Documentation)"
+      },
+      {
+        "type": "checkbox",
+        "name": "NinjaOne.LicenseDocumentsEnabled",
+        "label": "Synchronize Detailed License Information (Requires NinjaOne Documentation)"
+      },
+      {
+        "type": "checkbox",
+        "name": "NinjaOne.LicensedOnly",
+        "label": "Only Synchronize Licensed Users"
+      },
+      {
+        "type": "checkbox",
+        "name": "NinjaOne.Enabled",
+        "label": "Enable Integration"
+      }
+    ]
   }
 ]
diff --git a/src/data/standards.json b/src/data/standards.json
@@ -186,6 +186,13 @@
     "helpText": "",
     "label": "Allow users to consent to applications with low security risk (Prevent OAuth phishing. Lower impact, less secure.)"
   },
+  {
+    "cat": "AAD",
+    "name": "standards.EnableAppConsentRequests",
+    "helpText": "Enables App consent admin requests for the tenant via the GA role. Does not overwrite existing reviewer settings",
+    "addedComponent": null,
+    "label": "Enable App consent admin requests"
+  },
   {
     "cat": "AAD",
     "name": "standards.LegacyMFACleanup",
@@ -242,6 +249,7 @@
     "addedComponent": null,
     "label": "Enable FIDO2 capabilities"
   },
+
   {
     "name": "standards.OutBoundSpamAlert.Enabled",
     "cat": "Exchange",
@@ -345,7 +353,7 @@
   {
     "name": "standards.calDefault.Enabled",
     "cat": "Exchange",
-    "helpText": "Sets the default calendar sharing level for all calendars, for all users",
+    "helpText": "Sets the default sharing level for the default calendar, for all users",
     "addedComponent": {
       "type": "Select",
       "label": "Select Sharing Level",

diff --git a/src/routes.js b/src/routes.js
@@ -226,6 +226,9 @@ const ServiceHealth = React.lazy(() => import('src/views/tenant/administration/S
 const EnterpriseApplications = React.lazy(() =>
   import('src/views/tenant/administration/ListEnterpriseApps'),
 )
+const AppConsentRequests = React.lazy(() =>
+  import('src/views/tenant/administration/ListAppConsentRequests'),
+)
 const MailboxRestoreWizard = React.lazy(() =>
   import('src/views/email-exchange/tools/MailboxRestoreWizard'),
 )
@@ -324,6 +327,11 @@ const routes = [
     name: 'Enterprise Applications',
     component: EnterpriseApplications,
   },
+  {
+    path: '/tenant/administration/app-consent-requests',
+    name: 'App Consent Requests',
+    component: AppConsentRequests,
+  },
   {
     path: '/tenant/conditional/list-policies',
     name: 'Conditional Access',

diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss
@@ -706,3 +706,10 @@ i.glyphicon {
 .array-item-remove::after {
   content: 'Remove';
 }
+
+.stickyfooter {
+  position: sticky;
+  bottom: 0;
+  z-index: 0; /* Adjust this value as needed, should be lower than dropdowns */
+  /* Other styling as needed */
+}
diff --git a/src/scss/_themes.scss b/src/scss/_themes.scss
@@ -264,7 +264,7 @@
   --cui-input-focus-bg: var(--cyberdrain-light-striped);
   --cui-input-focus-border-colour: var(--cyberdrain-primary);
   --cui-input-focus-color: var(--cyberdrain-dark);
-  --cui-link-color: var(--cyberdrain-dark);
+  --cui-link-color-rgb: var(--cyberdrain-dark);
   --cui-link-hover-color: var(--cyberdrain-primary);
   --cui-list-group-bg: var(--cui-color-white) !important;
   --cui-list-group-color: var(--cyberdrain-dark);
@@ -312,7 +312,7 @@
   --cipp-table-primary-colour: var(--cyberdrain-dark);
   --cipp-table-secondary-colour: var(--cyberdrain-secondary);
   --cipp-table-sort-focus-bg: var(--cyberdrain-secondary);
-  --cipp-table-highlight-on-hover-bg: rgb(150, 150, 150);
+  //--cipp-table-highlight-on-hover-bg: rgb(150, 150, 150);
   --cipp-table-highlight-on-hover-color: rgb(150, 150, 150);
   --cipp-table-striped-bg: var(--cyberdrain-light-striped);
   --cipp-table-striped-colour: var(--cyberdrain-dark-striped);
@@ -452,7 +452,7 @@
   --cui-input-focus-bg: var(--cyberdrain-dark-striped);
   --cui-input-focus-border-color: var(--cyberdrain-primary);
   --cui-input-focus-color: var(--cyberdrain-primary);
-  --cui-link-color: var(--cyberdrain-light);
+  --cui-link-color-rgb: var(--cyberdrain-light);
   --cui-link-hover-color: var(--cyberdrain-primary);
   --cui-list-group-bg: var(--cyberdrain-dark);
   --cui-list-group-color: var(--cyberdrain-light);
@@ -500,7 +500,7 @@
   --cipp-table-primary-colour: var(--cyberdrain-light);
   --cipp-table-secondary-colour: var(--cui-gray-100);
   --cipp-table-sort-focus-bg: var(--cyberdrain-secondary);
-  --cipp-table-highlight-on-hover-bg: rgb(138, 136, 136);
+  // --cipp-table-highlight-on-hover-bg: rgb(138, 136, 136);
   --cipp-table-highlight-on-hover-color: rgb(138, 136, 136);
   --cipp-table-striped-bg: var(--cyberdrain-dark-striped);
   --cipp-table-striped-colour: var(--cyberdrain-light-striped);

diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
@@ -86,10 +86,10 @@ $secondary-base: rgba(0, 48, 73) !default;
 $secondary-50: rgba(0, 47, 73, 0.479) !default;
 $secondary-25: rgba(0, 47, 73, 0.205) !default;
 
-$link-color: rgb(247, 247, 247) !default;
+//$link-color: var(--cui-link-color) !default;
 $link-decoration: underline !default;
 $link-shade-percentage: 20% !default;
-$link-hover-color: rgba($link-color, $link-shade-percentage) !default;
+//$link-hover-color: rgba($link-color, $link-shade-percentage) !default;
 $link-hover-decoration: null !default;
 
 $search-bg-color: #ffffff;