Merge branch 'KelvinTegelaar:main' into main

lcsnetworks · Aug 30, 2024 · 2b80c41 · 2b80c41
2 parents e6d380b + 3439e33
commit 2b80c41
Show file tree

Hide file tree

Showing 40 changed files with 849 additions and 215 deletions.
diff --git a/deployment/AzureDeploymentTemplate.json b/deployment/AzureDeploymentTemplate.json
@@ -200,7 +200,7 @@
       "name": "[variables('funcStorageName')]",
       "location": "[resourceGroup().location]",
       "tags": {
-        "displayName": "funStorageName"
+        "displayName": "funcStorageName"
       },
       "sku": {
         "name": "Standard_LRS"

diff --git a/deployment/AzureDeploymentTemplate_regionoptions.json b/deployment/AzureDeploymentTemplate_regionoptions.json
@@ -6,7 +6,7 @@
       "defaultValue": "CIPP",
       "type": "string",
       "metadata": {
-        "description": "Name use as base-template to named the resources deployed in Azure."
+        "description": "Name used as base-template to name the resources deployed in Azure."
       }
     },
     "GithubRepository": {
@@ -20,7 +20,7 @@
       "defaultValue": "GeneratedPassword",
       "type": "string",
       "metadata": {
-        "description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token"
+        "description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token)"
       }
     },
     "GithubAPIRepository": {
@@ -197,7 +197,7 @@
       "name": "[variables('funcStorageName')]",
       "location": "[resourceGroup().location]",
       "tags": {
-        "displayName": "funStorageName"
+        "displayName": "funcStorageName"
       },
       "sku": {
         "name": "Standard_LRS"

diff --git a/deployment/DevAzureDeploymentTemplate.json b/deployment/DevAzureDeploymentTemplate.json
@@ -6,7 +6,7 @@
       "defaultValue": "CIPPDev",
       "type": "string",
       "metadata": {
-        "description": "Name use as base-template to named the resources deployed in Azure."
+        "description": "Name used as base-template to name the resources deployed in Azure."
       }
     },
     "TenantID": {
@@ -48,7 +48,7 @@
       "defaultValue": "GeneratedPassword",
       "type": "string",
       "metadata": {
-        "description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token"
+        "description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token)"
       }
     },
     "GithubAPIRepository": {
@@ -250,7 +250,7 @@
       "name": "[variables('funcStorageName')]",
       "location": "[resourceGroup().location]",
       "tags": {
-        "displayName": "funStorageName"
+        "displayName": "funcStorageName"
       },
       "sku": {
         "name": "Standard_LRS"

diff --git a/deployment/DevAzureDeploymentTemplate_regionoptions.json b/deployment/DevAzureDeploymentTemplate_regionoptions.json
@@ -6,7 +6,7 @@
       "defaultValue": "CIPP",
       "type": "string",
       "metadata": {
-        "description": "Name use as base-template to named the resources deployed in Azure."
+        "description": "Name used as base-template to name the resources deployed in Azure."
       }
     },
     "TenantID": {
@@ -48,7 +48,7 @@
       "defaultValue": "GeneratedPassword",
       "type": "string",
       "metadata": {
-        "description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token"
+        "description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token)"
       }
     },
     "GithubAPIRepository": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "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/img/RoB-light.svg b/public/img/RoB-light.svg
diff --git a/public/img/RoB.svg b/public/img/RoB.svg
diff --git a/public/img/datto.png b/public/img/datto.png
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-6.3.0
+6.4.0
diff --git a/src/components/layout/AppFooter.jsx b/src/components/layout/AppFooter.jsx
@@ -10,7 +10,7 @@ const AppFooter = () => {
   const isDark =
     currentTheme === 'impact' || (currentTheme === 'default' && preferredTheme === 'impact')
 
-  const datto = isDark ? '/img/datto.png' : '/img/datto.png'
+  const RoB = isDark ? '/img/RoB.svg' : '/img/RoB-light.svg'
   const huntress = isDark ? '/img/huntress_teal.png' : '/img/huntress_teal.png'
   const rewst = isDark ? '/img/rewst_dark.png' : '/img/rewst.png'
   const ninjaone = isDark ? '/img/ninjaone_dark.png' : '/img/ninjaone.png'
@@ -24,8 +24,12 @@ const AppFooter = () => {
           <CLink className="mx-2" href="https://www.huntress.com/" target="_blank">
             <CImage src={huntress} alt="Huntress" />
           </CLink>
-          <CLink className="me-2" href="https://datto.com/" target="_blank">
-            <CImage src={datto} alt="Datto" />
+          <CLink
+            className="me-2"
+            href="https://www.rightofboom.com/rob-2025/register?promo=EarlyBird2025#register"
+            target="_blank"
+          >
+            <CImage src={RoB} alt="RoB" />
           </CLink>
           <CLink className="me-2" href="https://rewst.io/" target="_blank">
             <CImage src={rewst} alt="Rewst" />

diff --git a/src/components/tables/CippDatatable.jsx b/src/components/tables/CippDatatable.jsx
@@ -14,16 +14,18 @@ export default function CippDatatable({ path, params, ...rest }) {
     refetch,
   } = useListDatatableQuery({ path, params: { $filter: graphFilter, ...params } })
 
-  let anonimized = false // Assuming default value is false
+  let anonymized = false // Assuming default value is false
   const regex = new RegExp('^[A-Z0-9]+$')
   const principalNameOrUPN =
     data[0]?.userPrincipalName ??
     data[0]?.UPN ??
+    data[0]?.Owner ??
     data.Results?.[0]?.upn ??
-    data.Results?.[0]?.userPrincipalName
+    data.Results?.[0]?.userPrincipalName ??
+    data.Results?.[0]?.Owner
 
   if (principalNameOrUPN && regex.test(principalNameOrUPN)) {
-    anonimized = true
+    anonymized = true
   }
 
   var defaultFilterText = ''
@@ -32,7 +34,7 @@ export default function CippDatatable({ path, params, ...rest }) {
   }
   return (
     <>
-      {anonimized && (
+      {anonymized && (
         <CCallout color="info">
           This table might contain anonymized data. Please check this
           <a