Merge pull request KelvinTegelaar#5956 from KelvinTegelaar/dev

Dev to hotfix

Author: JohnDuprey

next.config.js

@@ -1,6 +1,27 @@
+const disableOptimizePackageImports = process.env.NEXT_DISABLE_OPTIMIZE_PACKAGE_IMPORTS === '1'
+
 /** @type {import('next').NextConfig} */
 const config = {
   reactStrictMode: false,
+  experimental: {
+    optimizePackageImports: disableOptimizePackageImports
+      ? []
+      : [
+          '@mui/material',
+          '@mui/icons-material',
+          '@mui/lab',
+          '@mui/system',
+          '@mui/x-date-pickers',
+          'material-react-table',
+          'mui-tiptap',
+          'recharts',
+          '@react-pdf/renderer',
+        ],
+    webpackMemoryOptimizations: true,
+    preloadEntriesOnStart: false,
+    turbopackFileSystemCacheForDev: false,
+    turbopackMemoryLimit: 4096,
+  },
   images: {
     unoptimized: true,
   },
@@ -12,12 +33,6 @@ const config = {
       },
     },
   },
-  experimental: {
-    webpackMemoryOptimizations: true,
-    preloadEntriesOnStart: false,
-    turbopackFileSystemCacheForDev: false,
-    turbopackMemoryLimit: 4096,
-  },
   async redirects() {
     return []
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "10.4.2",
+  "version": "10.4.3",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "dev": "next -H 127.0.0.1",
-    "build": "next build && rm -rf package.json yarn.lock",
+    "build": "next build --webpack && rm -rf package.json yarn.lock",
     "start": "next start",
     "export": "next export",
     "lint": "npx eslint .",

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "10.4.2"
+  "version": "10.4.3"
 }

src/components/CippComponents/CippApiResults.jsx

@@ -188,21 +188,23 @@ export const CippApiResults = (props) => {
     } else {
       setFetchingVisible(false);
     }
-    if (!errorsOnly) {
-      if (allResults.length > 0) {
-        setFinalResults(
-          allResults.map((res, index) => ({
-            id: index,
-            text: res.text,
-            copyField: res.copyField,
-            severity: res.severity,
-            visible: true,
-            ...res,
-          })),
-        );
-      } else {
-        setFinalResults([]);
-      }
+    const resultsToShow = errorsOnly
+      ? allResults.filter((r) => r.severity === "error")
+      : allResults;
+
+    if (resultsToShow.length > 0) {
+      setFinalResults(
+        resultsToShow.map((res, index) => ({
+          id: index,
+          text: res.text,
+          copyField: res.copyField,
+          severity: res.severity,
+          visible: true,
+          ...res,
+        })),
+      );
+    } else {
+      setFinalResults([]);
     }
   }, [
     apiObject.isError,

src/components/CippComponents/CippAuditLogSearchDrawer.jsx

@@ -98,13 +98,6 @@ export const CippAuditLogSearchDrawer = ({
       );
     }
 
-    // Extract values from ServiceFilters array
-    if (Array.isArray(formattedData.ServiceFilters)) {
-      formattedData.ServiceFilters = formattedData.ServiceFilters.map((item) =>
-        typeof item === "object" ? item.value : item
-      );
-    }
-
     // Extract values from OperationsFilters array
     if (Array.isArray(formattedData.OperationsFilters)) {
       formattedData.OperationsFilters = formattedData.OperationsFilters.map((item) =>
@@ -206,28 +199,6 @@ export const CippAuditLogSearchDrawer = ({
       validators: { required: "End time is required" },
       required: true,
     },
-    {
-      type: "autoComplete",
-      name: "ServiceFilters",
-      label: "Services",
-      multiple: true,
-      creatable: false,
-      options: [
-        { label: "Azure Active Directory", value: "AzureActiveDirectory" },
-        { label: "Dynamics 365", value: "CRM" },
-        { label: "Exchange Online", value: "Exchange" },
-        { label: "Microsoft Flow", value: "MicrosoftFlow" },
-        { label: "Microsoft Teams", value: "MicrosoftTeams" },
-        { label: "OneDrive for Business", value: "OneDrive" },
-        { label: "Power BI", value: "PowerBI" },
-        { label: "Security & Compliance", value: "ThreatIntelligence" },
-        { label: "SharePoint Online", value: "SharePoint" },
-        { label: "Yammer", value: "Yammer" },
-      ],
-      validators: {
-        validate: (values) => values?.length > 0 || "Please select at least one service",
-      },
-    },
     {
       type: "autoComplete",
       name: "RecordTypeFilters",

src/components/CippComponents/CippIntunePolicyDetails.jsx

@@ -0,0 +1,60 @@
+import { Alert, CircularProgress, Stack, Typography } from '@mui/material'
+import { ApiGetCall } from '../../api/ApiCall'
+import CippJsonView from '../CippFormPages/CippJSONView'
+
+export const CippIntunePolicyDetails = ({ row, tenant }) => {
+  const isConfigurationPolicy = row?.URLName?.toLowerCase() === 'configurationpolicies'
+  const tenantFilter = tenant === 'AllTenants' && row?.Tenant ? row.Tenant : tenant
+
+  const policyDetails = ApiGetCall({
+    url: '/api/ListIntunePolicy',
+    queryKey: `ListIntunePolicyDetails-${tenantFilter}-${row?.id}`,
+    data: {
+      TenantFilter: tenantFilter,
+      ID: row?.id,
+      URLName: 'configurationPolicies',
+      IncludeSettingDefinitions: true,
+    },
+    waiting: Boolean(isConfigurationPolicy && tenantFilter && row?.id),
+    retry: 1,
+    refetchOnWindowFocus: false,
+    toast: false,
+  })
+
+  if (!isConfigurationPolicy) {
+    return null
+  }
+
+  const details = Array.isArray(policyDetails.data) ? policyDetails.data[0] : policyDetails.data
+  const fallbackDetails = row?.settings ? row : null
+  const settingsObject = details?.settings ? details : fallbackDetails
+
+  if (policyDetails.isLoading || policyDetails.isFetching) {
+    return (
+      <Stack direction="row" spacing={1.5} alignItems="center" sx={{ py: 2 }}>
+        <CircularProgress size={18} />
+        <Typography variant="body2" color="text.secondary">
+          Loading policy settings and Microsoft descriptions...
+        </Typography>
+      </Stack>
+    )
+  }
+
+  if (policyDetails.isError && !settingsObject) {
+    return (
+      <Alert severity="warning" variant="outlined">
+        Could not load live Settings Catalog details for this policy.
+      </Alert>
+    )
+  }
+
+  if (!settingsObject) {
+    return (
+      <Alert severity="info" variant="outlined">
+        This Settings Catalog policy did not return any settings.
+      </Alert>
+    )
+  }
+
+  return <CippJsonView object={settingsObject} type="intune" defaultOpen title="Policy Settings" />
+}

src/components/CippFormPages/CippAddEditUser.jsx

@@ -846,7 +846,7 @@ const CippAddEditUser = (props) => {
               label: userGroups.DisplayName,
               value: userGroups.id,
               addedFields: {
-                groupType: userGroups.groupType,
+                groupType: userGroups.calculatedGroupType || userGroups.groupType,
               },
             }))}
             creatable={false}