Merge upstream main

.github/workflows/cipp_dev_build.yml

@@ -54,7 +54,7 @@ jobs:
 
       # Upload to Azure Blob Storage
       - name: Azure Blob Upload
-        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.8.0
+        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.9.0
         with:
           connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
           container_name: cipp

.github/workflows/cipp_frontend_build.yml

@@ -47,7 +47,7 @@ jobs:
 
       # Upload to Azure Blob Storage
       - name: Azure Blob Upload
-        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.8.0
+        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.9.0
         with:
           connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
           container_name: cipp

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "10.2.2",
+  "version": "10.2.4",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -51,7 +51,7 @@
     "@tiptap/extension-table": "^3.19.0",
     "@tiptap/pm": "^3.4.1",
     "@tiptap/react": "^3.4.1",
-    "@tiptap/starter-kit": "^3.20.0",
+    "@tiptap/starter-kit": "^3.20.1",
     "@uiw/react-json-view": "^2.0.0-alpha.41",
     "@vvo/tzdb": "^6.198.0",
     "apexcharts": "5.3.5",
@@ -61,7 +61,7 @@
     "export-to-csv": "^1.3.0",
     "formik": "2.4.9",
     "gray-matter": "4.0.3",
-    "i18next": "25.8.13",
+    "i18next": "25.8.18",
     "javascript-time-ago": "^2.6.2",
     "jspdf": "^4.2.0",
     "jspdf-autotable": "^5.0.7",
@@ -98,7 +98,7 @@
     "react-redux": "9.2.0",
     "react-syntax-highlighter": "^16.1.0",
     "react-time-ago": "^7.3.3",
-    "react-virtuoso": "^4.18.1",
+    "react-virtuoso": "^4.18.3",
     "react-window": "^2.2.5",
     "recharts": "^3.7.0",
     "redux": "5.0.1",
@@ -110,7 +110,7 @@
     "simplebar": "6.3.3",
     "simplebar-react": "3.3.2",
     "stylis-plugin-rtl": "2.1.1",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "yup": "1.7.1"
   },
   "devDependencies": {

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "10.2.2"
+  "version": "10.2.4"
 }

src/components/CippComponents/CippApiDialog.jsx

@@ -52,7 +52,7 @@ export const CippApiDialog = (props) => {
   useEffect(() => {
     if (createDialog.open) {
       setIsFormSubmitted(false);
-      formHook.reset(defaultvalues || {});
+      formHook.reset(typeof defaultvalues === "function" ? defaultvalues(row) : defaultvalues || {});
     }
   }, [createDialog.open, defaultvalues]);
 

src/components/CippComponents/CippAutopilotProfileDrawer.jsx

@@ -109,8 +109,8 @@ export const CippAutopilotProfileDrawer = ({
                 {createProfile.isLoading
                   ? "Creating..."
                   : createProfile.isSuccess
-                  ? "Create Another"
-                  : "Create Profile"}
+                    ? "Create Another"
+                    : "Create Profile"}
               </Button>
               <Button variant="outlined" onClick={handleCloseDrawer}>
                 Close
@@ -154,10 +154,14 @@ export const CippAutopilotProfileDrawer = ({
               type="autoComplete"
               label="Language"
               name="languages"
-              options={languageList.map(({ language, tag, "Geographic area": geographicArea }) => ({
-                value: tag,
-                label: `${language} - ${geographicArea}`, // Format as "language - geographic area" for display
-              }))}
+              options={[
+                { value: "os-default", label: "Operating system default" },
+                { value: "user-select", label: "User Select" },
+                ...languageList.map(({ language, tag, "Geographic area": geographicArea }) => ({
+                  value: tag,
+                  label: `${language} - ${geographicArea}`, // Format as "language - geographic area" for display
+                })),
+              ]}
               formControl={formControl}
               multiple={false}
             />

src/components/CippComponents/CippInviteGuestDrawer.jsx

@@ -70,11 +70,23 @@ export const CippInviteGuestDrawer = ({
     });
   };
 
+  const handleOpenDrawer = () => {
+    formControl.reset({
+      tenantFilter: userSettingsDefaults.currentTenant,
+      displayName: "",
+      mail: "",
+      redirectUri: "",
+      message: "",
+      sendInvite: true,
+    });
+    setDrawerVisible(true);
+  };
+
   return (
     <>
       <PermissionButton
         requiredPermissions={requiredPermissions}
-        onClick={() => setDrawerVisible(true)}
+        onClick={handleOpenDrawer}
         startIcon={<Send />}
       >
         {buttonText}

src/components/CippComponents/CippRoleOverview.jsx

@@ -0,0 +1,125 @@
+import React from "react";
+import { Box, Typography, Chip, Paper, Grid, Tooltip } from "@mui/material";
+import {
+  CheckCircle,
+  Cancel,
+  Warning,
+  Security,
+  Info,
+} from "@mui/icons-material";
+
+/**
+ * Visual Role Overview Component
+ * Displays all roles in a grid with visual status indicators
+ */
+export const CippRoleOverview = ({ roles = [], onRoleClick }) => {
+  if (!roles || roles.length === 0) return null;
+
+  const getRoleStatus = (role) => {
+    if (role.isUserHasAccess) {
+      return {
+        icon: <CheckCircle />,
+        color: "success",
+        label: "Has Access",
+        bgColor: "success.light",
+      };
+    } else if (role.isAssigned) {
+      return {
+        icon: <Warning />,
+        color: "warning",
+        label: "Assigned but No Access",
+        bgColor: "warning.light",
+      };
+    } else if (role.roleExistsInRelationship) {
+      return {
+        icon: <Info />,
+        color: "info",
+        label: "In Relationship but Not Assigned",
+        bgColor: "info.light",
+      };
+    } else {
+      return {
+        icon: <Cancel />,
+        color: "default",
+        label: "Not In Any Relationship",
+        bgColor: "grey.200",
+      };
+    }
+  };
+
+  return (
+    <Grid container spacing={2}>
+      {roles.map((role) => {
+        const status = getRoleStatus(role);
+        return (
+          <Grid item xs={12} sm={6} md={4} key={role.roleId}>
+            <Tooltip title={role.roleDescription || role.roleName} arrow>
+              <Paper
+                elevation={2}
+                sx={{
+                  p: 2,
+                  height: "100%",
+                  cursor: onRoleClick ? "pointer" : "default",
+                  backgroundColor: status.bgColor,
+                  border: 2,
+                  borderColor: `${status.color}.main`,
+                  transition: "all 0.2s",
+                  "&:hover": onRoleClick
+                    ? {
+                        elevation: 4,
+                        transform: "translateY(-2px)",
+                      }
+                    : {},
+                }}
+                onClick={() => onRoleClick && onRoleClick(role)}
+              >
+                <Box sx={{ display: "flex", alignItems: "flex-start", gap: 1 }}>
+                  <Box
+                    sx={{
+                      color: `${status.color}.main`,
+                      display: "flex",
+                      alignItems: "center",
+                    }}
+                  >
+                    <Security />
+                  </Box>
+                  <Box sx={{ flex: 1, minWidth: 0 }}>
+                    <Typography
+                      variant="subtitle2"
+                      sx={{
+                        fontWeight: "bold",
+                        mb: 0.5,
+                        overflow: "hidden",
+                        textOverflow: "ellipsis",
+                        whiteSpace: "nowrap",
+                      }}
+                    >
+                      {role.roleName}
+                    </Typography>
+                    <Chip
+                      icon={status.icon}
+                      label={status.label}
+                      color={status.color}
+                      size="small"
+                      sx={{ fontSize: "0.7rem" }}
+                    />
+                    {role.accessPaths && role.accessPaths.length > 0 && (
+                      <Typography variant="caption" color="text.secondary" sx={{ display: "block", mt: 0.5 }}>
+                        {role.accessPaths.length} access path{role.accessPaths.length !== 1 ? "s" : ""}
+                      </Typography>
+                    )}
+                    {role.relationshipsWithRole && role.relationshipsWithRole.length > 0 && (
+                      <Typography variant="caption" color="text.secondary" sx={{ display: "block", mt: 0.5 }}>
+                        {role.relationshipsWithRole.length} group{role.relationshipsWithRole.length !== 1 ? "s" : ""}
+                      </Typography>
+                    )}
+                  </Box>
+                </Box>
+              </Paper>
+            </Tooltip>
+          </Grid>
+        );
+      })}
+    </Grid>
+  );
+};

src/components/CippComponents/CippScheduledTaskActions.jsx

@@ -2,7 +2,7 @@ import { EyeIcon, TrashIcon } from "@heroicons/react/24/outline";
 import { CopyAll, Edit, PlayArrow } from "@mui/icons-material";
 import { usePermissions } from "../../hooks/use-permissions";
 
-export const CippScheduledTaskActions = (drawerHandlers = {}) => {
+export const CippScheduledTaskActions = (drawerHandlers = {}, { hideActions = [] } = {}) => {
   const { checkPermissions } = usePermissions();
   const canWriteScheduler = checkPermissions(["CIPP.Scheduler.ReadWrite"]);
   const canReadScheduler = checkPermissions(["CIPP.Scheduler.Read", "CIPP.Scheduler.ReadWrite"]);
@@ -29,7 +29,6 @@ export const CippScheduledTaskActions = (drawerHandlers = {}) => {
       customFunction:
         drawerHandlers.openEditDrawer ||
         ((row) => {
-          // Fallback to page navigation if no drawer handler provided
           window.location.href = `/cipp/scheduler/job?id=${row.RowKey}`;
         }),
       multiPost: false,
@@ -44,7 +43,6 @@ export const CippScheduledTaskActions = (drawerHandlers = {}) => {
       customFunction:
         drawerHandlers.openCloneDrawer ||
         ((row) => {
-          // Fallback to page navigation if no drawer handler provided
           window.location.href = `/cipp/scheduler/job?id=${row.RowKey}&Clone=True`;
         }),
       multiPost: false,
@@ -64,7 +62,7 @@ export const CippScheduledTaskActions = (drawerHandlers = {}) => {
       multiPost: false,
       condition: () => canWriteScheduler,
     },
-  ];
+  ].filter((action) => !hideActions.includes(action.label));
 };
 
 export default CippScheduledTaskActions;

src/components/CippComponents/CippSettingsSideBar.jsx

@@ -65,6 +65,12 @@ export const CippSettingsSideBar = (props) => {
       // Table Filter Preferences
       persistFilters: formValues.persistFilters,
 
+      // Navigation Settings
+      bookmarkSidebar: formValues.bookmarkSidebar,
+      bookmarkPopover: formValues.bookmarkPopover,
+      bookmarkReorderMode: formValues.bookmarkReorderMode,
+      compactNav: formValues.compactNav,
+
       // Portal Links Configuration
       portalLinks: {
         M365_Portal: formValues.portalLinks?.M365_Portal,
@@ -137,9 +143,6 @@ export const CippSettingsSideBar = (props) => {
               Settings on this page can be saved for the current user, or all users. Select the
               desired option below.
             </Typography>
-            <Alert severity="info" variant="outlined" icon={false} sx={{ py: 0.5, px: 2 }}>
-              Navigation settings are per-device and stored locally, regardless of the user selector.
-            </Alert>
             <CippFormComponent
               type="autoComplete"
               disableClearable={true}

src/components/CippSettings/CippBackupRetentionSettings.jsx

@@ -1,8 +1,7 @@
-import { Button, ButtonGroup, SvgIcon, Typography, TextField, Box } from "@mui/material";
+import { Button, Typography, TextField, Box } from "@mui/material";
 import CippButtonCard from "../CippCards/CippButtonCard";
 import { ApiGetCall, ApiPostCall } from "../../api/ApiCall";
 import { CippApiResults } from "../CippComponents/CippApiResults";
-import { History } from "@mui/icons-material";
 import { useState, useEffect } from "react";
 
 const CippBackupRetentionSettings = () => {
@@ -55,40 +54,36 @@ const CippBackupRetentionSettings = () => {
     }
   };
 
-  const RetentionControls = () => {
-    return (
-      <Box sx={{ display: "flex", gap: 1, alignItems: "flex-start" }}>
-        <TextField
-          size="small"
-          type="number"
-          value={retentionDays}
-          onChange={handleInputChange}
-          disabled={retentionChange.isPending || retentionSetting.isLoading}
-          inputProps={{ min: 7 }}
-          error={!!error}
-          helperText={error}
-          sx={{ width: "120px" }}
-          label="Days"
-        />
-        <Button
-          variant="contained"
-          color="primary"
-          size="small"
-          disabled={retentionChange.isPending || retentionSetting.isLoading || !!error}
-          onClick={handleRetentionChange}
-          sx={{ mt: 0.5 }}
-        >
-          Save
-        </Button>
-      </Box>
-    );
-  };
-
   return (
     <CippButtonCard
       title="Backup Retention"
       cardSx={{ display: "flex", flexDirection: "column", height: "100%" }}
-      CardButton={<RetentionControls />}
+      CardButton={
+        <Box sx={{ display: "flex", gap: 1, alignItems: "flex-start" }}>
+          <TextField
+            size="small"
+            type="number"
+            value={retentionDays}
+            onChange={handleInputChange}
+            disabled={retentionChange.isPending || retentionSetting.isLoading}
+            inputProps={{ min: 7 }}
+            error={!!error}
+            helperText={error}
+            sx={{ width: "120px" }}
+            label="Days"
+          />
+          <Button
+            variant="contained"
+            color="primary"
+            size="small"
+            disabled={retentionChange.isPending || retentionSetting.isLoading || !!error}
+            onClick={handleRetentionChange}
+            sx={{ mt: 0.5 }}
+          >
+            Save
+          </Button>
+        </Box>
+      }
     >
       <Typography variant="body2">
         Configure how long to keep backup files. Both CIPP system backups and tenant backups will be