Merge branch 'KelvinTegelaar:main' into main

OITApps · Jan 30, 2024 · 6270a1a · 6270a1a
2 parents eda795a + be0ef04
commit 6270a1a
Show file tree

Hide file tree

Showing 59 changed files with 7,025 additions and 3,494 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/img/NinjaOne┬« Logo white@4x.png b/public/img/NinjaOne┬« Logo white@4x.png
diff --git a/public/img/data-report.svg b/public/img/data-report.svg
diff --git a/src/assets/images/datto.png → public/img/datto.png b/src/assets/images/datto.png → public/img/datto.png
diff --git a/src/assets/images/huntress_teal.png → public/img/huntress_teal.png b/src/assets/images/huntress_teal.png → public/img/huntress_teal.png
diff --git a/src/assets/images/netfriends.png → public/img/netfriends.png b/src/assets/images/netfriends.png → public/img/netfriends.png
diff --git a/...RGB_Net_Friends_Logo_White_Color_Icon.png → public/img/netfriends_dark.png b/...RGB_Net_Friends_Logo_White_Color_Icon.png → public/img/netfriends_dark.png
diff --git a/src/assets/images/ninjaone.png → public/img/ninjaone.png b/src/assets/images/ninjaone.png → public/img/ninjaone.png
diff --git a/public/img/ninjaone_dark.png b/public/img/ninjaone_dark.png
diff --git a/src/assets/images/rewst.png → public/img/rewst.png b/src/assets/images/rewst.png → public/img/rewst.png
diff --git a/public/img/rewst_dark.png b/public/img/rewst_dark.png
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-4.8.0
+5.0.1
diff --git a/src/_nav.jsx b/src/_nav.jsx
@@ -124,13 +124,13 @@ const _nav = [
       },
       {
         component: CNavItem,
-        name: 'Alerts Wizard',
-        to: '/tenant/administration/alertswizard',
+        name: 'Alerts (Classic)',
+        to: '/tenant/administration/alertsqueue',
       },
       {
         component: CNavItem,
-        name: 'Alerts Configuration',
-        to: '/tenant/administration/alertsqueue',
+        name: 'Alert Rules',
+        to: '/tenant/administration/AlertRules',
       },
       {
         component: CNavItem,
@@ -142,6 +142,11 @@ const _nav = [
         name: 'App Consent Requests',
         to: '/tenant/administration/app-consent-requests',
       },
+      {
+        component: CNavItem,
+        name: 'Tenant Onboarding',
+        to: '/tenant/administration/tenant-onboarding-wizard',
+      },
       {
         component: CNavItem,
         name: 'Tenant Offboarding',
@@ -234,6 +239,11 @@ const _nav = [
         name: 'Deploy CA Policies',
         to: '/tenant/conditional/deploy',
       },
+      {
+        component: CNavItem,
+        name: 'CA Vacation Mode',
+        to: '/tenant/conditional/deploy-vacation',
+      },
       {
         component: CNavItem,
         name: 'CA Templates',

diff --git a/src/adminRoutes.js b/src/adminRoutes.js
@@ -14,6 +14,9 @@ const appapproval = React.lazy(() => import('src/views/cipp/AppApproval'))
 const TenantOffboardingWizard = React.lazy(() =>
   import('src/views/tenant/administration/TenantOffboardingWizard'),
 )
+const TenantOnboardingWizard = React.lazy(() =>
+  import('src/views/tenant/administration/TenantOnboardingWizard'),
+)
 
 const adminRoutes = [
   { path: '/cipp', name: 'CIPP' },
@@ -46,6 +49,11 @@ const adminRoutes = [
     name: 'Tenant Offboarding',
     component: TenantOffboardingWizard,
   },
+  {
+    path: '/tenant/administration/tenant-onboarding-wizard',
+    name: 'Tenant Onboarding',
+    component: TenantOnboardingWizard,
+  },
 ]
 
 export default adminRoutes
diff --git a/src/assets/images/CIPP.png b/src/assets/images/CIPP.png
diff --git a/src/components/buttons/TableModalButton.jsx b/src/components/buttons/TableModalButton.jsx
@@ -3,8 +3,16 @@ import { CButton } from '@coreui/react'
 import { ModalService } from '../utilities'
 import { cellGenericFormatter } from '../tables/CellGenericFormat'
 import PropTypes from 'prop-types'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
-export default function TableModalButton({ data, title, className, countOnly = false, ...input }) {
+export default function TableModalButton({
+  data,
+  title,
+  className,
+  countOnly = false,
+  icon = '',
+  ...input
+}) {
   const handleTable = (data) => {
     const QueryColumns = []
     const columns = Object.keys(data[0]).map((key) => {
@@ -31,6 +39,7 @@ export default function TableModalButton({ data, title, className, countOnly = f
 
   return (
     <CButton {...input} className={buttonClass} onClick={() => handleTable(data)}>
+      {icon != '' && <FontAwesomeIcon icon={icon} className="me-2" />}
       <>{countOnly === true ? data.length : `${title} (${data.length})`}</>
     </CButton>
   )