Merge branch 'KelvinTegelaar:main' into main

infoxchange · Mar 25, 2024 · 3343a39 · 3343a39
2 parents 86de43d + f052bc9
commit 3343a39
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 6,549 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {

diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-5.3.1
+5.3.2
diff --git a/src/data/standards.json b/src/data/standards.json
@@ -299,6 +299,16 @@
     "impact": "Low Impact",
     "impactColour": "info"
   },
+  {
+    "name": "standards.DisableAppCreation",
+    "cat": "Entra (AAD) Standards",
+    "tag": ["lowimpact", "CIS"],
+    "helpText": "Disables the ability for users to create App registrations in the tenant.",
+    "addedComponent": [],
+    "label": "Disable App creation by users",
+    "impact": "Low Impact",
+    "impactColour": "info"
+  },
   {
     "name": "standards.DisableSecurityGroupUsers",
     "cat": "Entra (AAD) Standards",

diff --git a/src/views/cipp/Scheduler.jsx b/src/views/cipp/Scheduler.jsx
@@ -149,7 +149,7 @@ const Scheduler = () => {
       name: 'Parameters',
       selector: (row) => row['Parameters'],
       sortable: true,
-      cell: (row) => CellTip(row['Parameters']),
+      cell: cellGenericFormatter(),
       exportSelector: 'Parameters',
     },
     {

diff --git a/src/views/cipp/Statistics.jsx b/src/views/cipp/Statistics.jsx
@@ -68,7 +68,7 @@ const Statistics = () => {
   const { data, isFetching, error, isSuccess } = useGenericGetRequestQuery({
     path: '/api/ListFunctionStats',
     params: {
-      FunctionType: 'Queue',
+      FunctionType: 'Durable',
       Interval: interval,
       Time: time,
       TenantFilter: tenant?.defaultDomainName,

diff --git a/src/views/identity/administration/Users.jsx b/src/views/identity/administration/Users.jsx
@@ -15,9 +15,12 @@ import CippGraphUserFilter from 'src/components/utilities/CippGraphUserFilter'
 const Offcanvas = (row, rowIndex, formatExtraData) => {
   const tenant = useSelector((state) => state.app.currentTenant)
   const [ocVisible, setOCVisible] = useState(false)
-  const viewLink = `/identity/administration/users/view?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}&userEmail=${row.userPrincipalName}`
-  const editLink = `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}`
-  const OffboardLink = `/identity/administration/offboarding-wizard?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}`
+  const viewLink = row?.tenant
+    ? `/identity/administration/users/view?userId=${row.id}&tenantDomain=${row.Tenant}&userEmail=${row.userPrincipalName}`
+    : `/identity/administration/users/view?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}&userEmail=${row.userPrincipalName}`
+  const editLink = row?.tenant
+    ? `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${row.Tenant}`
+    : `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}`
   const entraLink = `https://entra.microsoft.com/${tenant.defaultDomainName}/#view/Microsoft_AAD_UsersAndTenants/UserProfileMenuBlade/~/UserAuthMethods/userId/${row.id}/hidePreviewBanner~/true`
 
   let licenses = []
@@ -31,7 +34,6 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
   })
   var licJoined = licenses.join(', ')
 
-  //console.log(row)
   return (
     <>
       <Link to={viewLink}>

diff --git a/src/views/tenant/administration/AlertRules.jsx b/src/views/tenant/administration/AlertRules.jsx
@@ -114,14 +114,14 @@ const AlertRules = () => {
       name: 'If',
       selector: (row) => row['if'],
       sortable: true,
-      cell: cellBadgeFormatter(),
+      cell: cellGenericFormatter(),
       exportSelector: 'if',
     },
     {
       name: 'Execute',
       selector: (row) => row['execution'],
       sortable: true,
-      cell: (row) => CellTip(row['execution']),
+      cell: cellGenericFormatter(),
       exportSelector: 'execution',
     },
     {

diff --git a/src/views/tenant/standards/ListAppliedStandards.jsx b/src/views/tenant/standards/ListAppliedStandards.jsx
@@ -493,6 +493,13 @@ const ApplyNewStandard = () => {
                                                   label={component.label}
                                                 />
                                               )}
+                                              {component.type === 'boolean' && (
+                                                <RFFCFormSwitch
+                                                  name={component.name}
+                                                  label={component.label}
+                                                  initialValue={component.default}
+                                                />
+                                              )}
                                               {component.type === 'AdminRolesMultiSelect' && (
                                                 <RFFSelectSearch
                                                   multi={true}

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-5.3.1
+5.3.2