Merge pull request #3643 from KelvinTegelaar/dev

JohnDuprey · web-flow · commit aae20a06a032 · 2025-02-13T17:52:45.000-05:00
Dev to hotfix
diff --git a/Tools/Start-CippDevEmulatorsWithKitty.ps1 b/Tools/Start-CippDevEmulatorsWithKitty.ps1
@@ -15,13 +15,13 @@ if ($Process -eq 'y') {
   kitty @new-window --new-tab --tab-title `"Azurite`" --cwd $Path -- azurite ;
   kitty @new-window --new-tab --tab-title `"FunctionApp`" --cwd (Join-Path $Path `"CIPP-API`") -- func start;
   kitty @new-window --new-tab --tab-title `"CIPP Frontend`" --cwd (Join-Path $Path `"CIPP`") -- yarn run dev ;
-  kitty @new-window --new-tab --tab-title `"SWA`" --cwd (Join-Path $Path `"CIPP`") -- npm run start-swa;
+  kitty @new-window --new-tab --tab-title `"SWA`" --cwd (Join-Path $Path `"CIPP`") -- yarn run start-swa;
   kitty @new-window --new-tab --tab-title `"CIPP-API-Processor`" --cwd (Join-Path $Path `"CIPP-API-Processor`") -- func start --port 7072"
   
 } else {
   kitty --detach --title 'CIPP' -o allow_remote_control=yes -- pwsh -c "
   kitty @new-window --new-tab --tab-title `"Azurite`" --cwd $Path -- azurite ;
   kitty @new-window --new-tab --tab-title `"FunctionApp`" --cwd (Join-Path $Path `"CIPP-API`") -- func start;
   kitty @new-window --new-tab --tab-title `"CIPP Frontend`" --cwd (Join-Path $Path `"CIPP`") -- yarn run dev ;
-  kitty @new-window --new-tab --tab-title `"SWA`" --cwd (Join-Path $Path `"CIPP`") -- npm run start-swa"
+  kitty @new-window --new-tab --tab-title `"SWA`" --cwd (Join-Path $Path `"CIPP`") -- yarn run start-swa"
 }
diff --git a/deployment/AzureDeploymentTemplate.json b/deployment/AzureDeploymentTemplate.json
@@ -241,6 +241,19 @@
         "functionAppResourceId": "[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]",
         "functionAppRegion": "[resourceGroup().location]"
       }
+    },
+    {
+      "type": "Microsoft.Authorization/roleAssignments",
+      "apiVersion": "2022-04-01",
+      "name": "[guid(resourceGroup().id, variables('funcAppName'), 'Contributor')]",
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"
+      ],
+      "properties": {
+        "roleDefinitionId": "[concat(subscription().id, '/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c')]",
+        "principalId": "[reference(resourceId('Microsoft.Web/sites', variables('funcAppName')),'2019-08-01', 'full').identity.principalId]",
+        "scope": "[resourceGroup().id]"
+      }
     }
   ],
   "outputs": {}
diff --git a/deployment/AzureDeploymentTemplate_regionoptions.json b/deployment/AzureDeploymentTemplate_regionoptions.json
@@ -241,6 +241,19 @@
         "functionAppResourceId": "[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]",
         "functionAppRegion": "[resourceGroup().location]"
       }
+    },
+    {
+      "type": "Microsoft.Authorization/roleAssignments",
+      "apiVersion": "2022-04-01",
+      "name": "[guid(resourceGroup().id, variables('funcAppName'), 'Contributor')]",
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"
+      ],
+      "properties": {
+        "roleDefinitionId": "[concat(subscription().id, '/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c')]",
+        "principalId": "[reference(resourceId('Microsoft.Web/sites', variables('funcAppName')),'2019-08-01', 'full').identity.principalId]",
+        "scope": "[resourceGroup().id]"
+      }
     }
   ],
   "outputs": {}
diff --git a/public/version.json b/public/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "7.2.1"
+  "version": "7.2.2"
 }
diff --git a/src/components/CippCards/CippPropertyListCard.jsx b/src/components/CippCards/CippPropertyListCard.jsx
@@ -152,22 +152,18 @@ export const CippPropertyListCard = (props) => {
                 key={`${item.label}-${index}-ActionList-OffCanvas`}
                 icon={<SvgIcon fontSize="small">{item.icon}</SvgIcon>}
                 label={item.label}
-                onClick={
-                  item.link
-                    ? () => window.open(item.link, "_blank")
-                    : () => {
-                        setActionData({
-                          data: data,
-                          action: item,
-                          ready: true,
-                        });
-                        if (item?.noConfirm) {
-                          item.customFunction(item, data, {});
-                        } else {
-                          createDialog.handleOpen();
-                        }
-                      }
-                }
+                onClick={() => {
+                  setActionData({
+                    data: data,
+                    action: item,
+                    ready: true,
+                  });
+                  if (item?.noConfirm) {
+                    item.customFunction(item, data, {});
+                  } else {
+                    createDialog.handleOpen();
+                  }
+                }}
                 disabled={handleActionDisabled(data, item)}
               />
             ))}
diff --git a/src/components/CippComponents/CippAutocomplete.jsx b/src/components/CippComponents/CippAutocomplete.jsx
@@ -27,7 +27,6 @@ const MemoTextField = React.memo(function MemoTextField({
       {...otherParams}
       label={label}
       placeholder={placeholder}
-      variant="outlined"
       {...otherProps}
       slotProps={{
         inputLabel: {
@@ -275,7 +274,13 @@ export const CippAutoComplete = (props) => {
       sx={sx}
       renderInput={(params) => (
         <Stack direction="row" spacing={1}>
-          <MemoTextField params={params} label={label} placeholder={placeholder} required={required} {...other} />
+          <MemoTextField
+            params={params}
+            label={label}
+            placeholder={placeholder}
+            required={required}
+            {...other}
+          />
           {api?.url && api?.showRefresh && (
             <IconButton
               size="small"
diff --git a/src/components/CippFormPages/CippJSONView.jsx b/src/components/CippFormPages/CippJSONView.jsx
@@ -238,14 +238,17 @@ function CippJsonView({
           <CippCodeBlock type="editor" code={JSON.stringify(cleanObject(object), null, 2)} />
         ) : (
           <Grid container spacing={2}>
-            {drilldownData.slice(0, 4).map((data, index) => (
+            {drilldownData?.map((data, index) => (
               <Grid
                 item
                 xs={12}
                 sm={type === "intune" ? 12 : 3}
                 key={index}
                 sx={{
-                  borderRight: index < 3 && type !== "intune" ? "1px solid lightgrey" : "none",
+                  //give a top border if the item is > 4, and add spacing between the top and bottom items
+                  paddingTop: index === 0 ? 0 : 2,
+                  borderTop: index >= 4 && type !== "intune" ? "1px solid lightgrey" : "none",
+                  borderRight: index < drilldownData.length - 1 ? "1px solid lightgrey" : "none",
                   overflowWrap: "anywhere",
                   whiteSpace: "pre-line",
                   paddingRight: 2,
diff --git a/src/components/CippTable/CIPPTableToptoolbar.js b/src/components/CippTable/CIPPTableToptoolbar.js
@@ -64,6 +64,10 @@ export const CIPPTableToptoolbar = ({
   const pageName = router.pathname.split("/").slice(1).join("/");
   const currentTenant = useSettings()?.currentTenant;
 
+  useEffect(() => {
+    //if usedData changes, deselect all rows
+    table.toggleAllRowsSelected(false);
+  }, [usedData]);
   //if the currentTenant Switches, remove Graph filters
   useEffect(() => {
     if (currentTenant) {
diff --git a/src/components/CippTable/CippDataTable.js b/src/components/CippTable/CippDataTable.js
@@ -274,7 +274,7 @@ export const CippDataTable = (props) => {
               refreshFunction={refreshFunction}
               setColumnVisibility={setColumnVisibility}
               filters={filters}
-              queryKeys={queryKey}
+              queryKeys={queryKey ? queryKey : title}
               graphFilterData={graphFilterData}
               setGraphFilterData={setGraphFilterData}
               setConfiguredSimpleColumns={setConfiguredSimpleColumns}
diff --git a/src/components/CippWizard/CIPPDeploymentStep.js b/src/components/CippWizard/CIPPDeploymentStep.js
@@ -16,7 +16,7 @@ import { CippWizardStepButtons } from "./CippWizardStepButtons";
 import { ApiGetCall } from "../../api/ApiCall";
 import CippButtonCard from "../CippCards/CippButtonCard";
 import { CippCopyToClipBoard } from "../CippComponents/CippCopyToClipboard";
-import { CheckCircle, Sync } from "@mui/icons-material";
+import { CheckCircle, OpenInNew, Sync } from "@mui/icons-material";
 import CippPermissionCheck from "../CippSettings/CippPermissionCheck";
 import { useQueryClient } from "@tanstack/react-query";
 import { CippApiResults } from "../CippComponents/CippApiResults";
@@ -265,12 +265,15 @@ export const CippDeploymentStep = (props) => {
                   }
                   onClick={() => openPopup(appId?.data?.refreshUrl)}
                   color="primary"
+                  startIcon={
+                    <OpenInNew />
+                  }
                 >
                   Refresh Graph Token
                 </Button>
                 <Button
                   onClick={() => appId.refetch()}
-                  variant="contained"
+                  variant="outlined"
                   color="primary"
                   startIcon={<Sync />}
                   disabled={appId.isFetching}
diff --git a/src/data/Extensions.json b/src/data/Extensions.json
@@ -28,10 +28,6 @@
     "helpText": "This integration allows you to manage your CSP licensing from CIPP. Purchase new licenses while adding or editing users in CIPP. Not a Sherweb partner? Sign up for the Sherweb Cloud Services for MSPs program.",
     "mappingRequired": true,
     "links": [
-      {
-        "name": "Register for beta",
-        "url": "https://go.cyberdrain.com/sherweb"
-      },
       {
         "name": "Sherweb Cloud Services for MSPs",
         "url": "https://info.sherweb.com/sherweb-cloud-services-for-msps"
@@ -495,7 +491,7 @@
         "label": "Enable Integration"
       },
       {
-        "type": "password",
+        "type": "textField",
         "name": "CFZTNA.ClientID",
         "label": "CloudFlare Tunnel Service Account Client ID"
       },
diff --git a/src/pages/cipp/advanced/table-maintenance.js b/src/pages/cipp/advanced/table-maintenance.js
@@ -274,15 +274,15 @@ const Page = () => {
   };
 
   return (
-    <Container maxWidth="xl" sx={{ mt: 4 }}>
+    <Container maxWidth={false} sx={{ mt: 4, width: "100%" }}>
       <Typography variant="h4" gutterBottom>
         {pageTitle}
       </Typography>
       <Alert severity="warning" sx={{ mb: 2 }}>
         This page allows you to view and manage data in Azure Tables. This is advanced functionality
         that should only be used when directed by CyberDrain support.
       </Alert>
-      <Grid container spacing={2}>
+      <Grid sx={{ flexGrow: 1, display: "flex" }} container spacing={2}>
         <Grid item size={3}>
           <CippPropertyListCard
             title="Tables"
diff --git a/src/pages/endpoint/MEM/list-policies/index.js b/src/pages/endpoint/MEM/list-policies/index.js
@@ -13,7 +13,7 @@ const Page = () => {
       url: "/api/AddIntuneTemplate",
       data: {
         ID: "id",
-        ODataType: "@odata.type",
+        URLName: "URLName",
       },
       confirmText: "Are you sure you want to create a template based on this policy?",
       icon: <Book />,
diff --git a/src/pages/identity/administration/users/user/bec.jsx b/src/pages/identity/administration/users/user/bec.jsx
@@ -111,7 +111,7 @@ const Page = () => {
   const getUserMessage = () => {
     if (!becPollingCall.data) return null;
     if (becPollingCall.data.NewUsers && becPollingCall.data.NewUsers.length > 0) {
-      return "Suspicious new users have been found in the last 14 days. Please review the list below and take action as needed.";
+      return "New users have been found in the last 14 days. Please review the list below and take action as needed.";
     }
     return "No new users found.";
   };
@@ -126,7 +126,7 @@ const Page = () => {
       if (hasPotentialBreach) {
         return "Potential Breach found.";
       }
-      return "Suspicious new applications have been found. Please review the list below and take action as needed.";
+      return "New applications have been found. Please review the list below and take action as needed.";
     }
     return "No new applications found.";
   };
@@ -137,7 +137,7 @@ const Page = () => {
       becPollingCall.data.MailboxPermissionChanges &&
       becPollingCall.data.MailboxPermissionChanges.length > 0
     ) {
-      return "Suspicious mailbox permission changes have been found.";
+      return "Mailbox permission changes have been found.";
     }
     return "No mailbox permission changes found.";
   };
diff --git a/src/pages/tenant/standards/bpa-report/view.js b/src/pages/tenant/standards/bpa-report/view.js
@@ -28,7 +28,7 @@ const Page = () => {
   const [layoutMode, setLayoutMode] = useState("Table");
   const bpaTemplateList = ApiGetCall({
     url: "/api/listBPATemplates",
-    queryKey: "ListBPATemplates",
+    queryKey: "ListBPATemplates-All",
   });
   const tenantFilter = useSettings().currentTenant;
   const bpaData = ApiGetCall({

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "version": "7.2.1"`
	`2`	`+ "version": "7.2.2"`
`3`	`3`	`}`