[pull] main from KelvinTegelaar:main

.github/workflows/Assign_Issue_Volunteer.yml

@@ -1,10 +1,12 @@
 ---
-name: "Assign Issue to Volunteer"
-on: [issue_comment] # yamllint disable-line rule:truthy
+name: "Issue volunteer assignment"
+on:
+  issue_comment:
+    types: [created]
 jobs:
-  build:
+  volunteer:
     runs-on: ubuntu-slim
     steps:
-      - uses: bhermann/issue-volunteer@v0.1.20
+      - uses: kris6673/issue-volunteer@v0.2.0
         with:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/Node_Project_Check.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v6.2.0
+        uses: actions/setup-node@v6.3.0
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install and Build Test

.github/workflows/cipp_dev_build.yml

@@ -26,7 +26,7 @@ jobs:
           echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT
 
       - name: Set up Node.js
-        uses: actions/setup-node@v6.2.0
+        uses: actions/setup-node@v6.3.0
         with:
           node-version: ${{ steps.get_node_version.outputs.node_version }}
 
@@ -47,7 +47,7 @@ jobs:
 
       # Upload to Azure Blob Storage
       - name: Azure Blob Upload
-        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.7.0
+        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.8.0
         with:
           connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
           container_name: cipp

.github/workflows/cipp_frontend_build.yml

@@ -26,7 +26,7 @@ jobs:
           echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT
 
       - name: Set up Node.js
-        uses: actions/setup-node@v6.2.0
+        uses: actions/setup-node@v6.3.0
         with:
           node-version: ${{ steps.get_node_version.outputs.node_version }}
 
@@ -47,7 +47,7 @@ jobs:
 
       # Upload to Azure Blob Storage
       - name: Azure Blob Upload
-        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.7.0
+        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.8.0
         with:
           connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
           container_name: cipp

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "10.1.2",
+  "version": "10.2.0",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -77,15 +77,15 @@
     "numeral": "2.0.6",
     "prop-types": "15.8.1",
     "punycode": "^2.3.1",
-    "react": "19.2.3",
-    "react-apexcharts": "1.7.0",
+    "react": "19.2.4",
+    "react-apexcharts": "1.9.0",
     "react-beautiful-dnd": "13.1.1",
     "react-copy-to-clipboard": "^5.1.0",
-    "react-dom": "19.2.3",
+    "react-dom": "19.2.4",
     "react-dropzone": "14.3.8",
-    "react-error-boundary": "^6.1.0",
-    "react-grid-layout": "^1.5.0",
-    "react-hook-form": "^7.71.1",
+    "react-error-boundary": "^6.1.1",
+    "react-grid-layout": "^2.2.2",
+    "react-hook-form": "^7.71.2",
     "react-hot-toast": "2.6.0",
     "react-html-parser": "^2.0.2",
     "react-i18next": "16.2.4",
@@ -118,4 +118,4 @@
     "eslint": "9.39.2",
     "eslint-config-next": "16.1.6"
   }
-}
+}

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "10.1.2"
+  "version": "10.2.0"
 }

src/components/CippCards/CippUniversalSearchV2.jsx

@@ -10,27 +10,32 @@ import {
   CircularProgress,
   InputAdornment,
   Portal,
+  Button,
 } from "@mui/material";
 import { Search as SearchIcon } from "@mui/icons-material";
 import { ApiGetCall } from "../../api/ApiCall";
-import { useSettings } from "../../hooks/use-settings";
 import { useRouter } from "next/router";
 import { BulkActionsMenu } from "../bulk-actions-menu";
-import { Button } from "@mui/material";
+import { CippOffCanvas } from "../CippComponents/CippOffCanvas";
+import { CippBitlockerKeySearch } from "../CippComponents/CippBitlockerKeySearch";
 
 export const CippUniversalSearchV2 = React.forwardRef(
   ({ onConfirm = () => {}, onChange = () => {}, maxResults = 10, value = "" }, ref) => {
     const [searchValue, setSearchValue] = useState(value);
     const [searchType, setSearchType] = useState("Users");
+    const [bitlockerLookupType, setBitlockerLookupType] = useState("keyId");
     const [showDropdown, setShowDropdown] = useState(false);
+    const [bitlockerDrawerVisible, setBitlockerDrawerVisible] = useState(false);
+    const [bitlockerDrawerDefaults, setBitlockerDrawerDefaults] = useState({
+      searchTerm: "",
+      searchType: "keyId",
+    });
     const [dropdownPosition, setDropdownPosition] = useState({ top: 0, left: 0, width: 0 });
     const containerRef = useRef(null);
     const textFieldRef = useRef(null);
     const router = useRouter();
-    const settings = useSettings();
-    const { currentTenant } = settings;
 
-    const search = ApiGetCall({
+    const universalSearch = ApiGetCall({
       url: `/api/ExecUniversalSearchV2`,
       data: {
         searchTerms: searchValue,
@@ -41,6 +46,17 @@ export const CippUniversalSearchV2 = React.forwardRef(
       waiting: false,
     });
 
+    const bitlockerSearch = ApiGetCall({
+      url: "/api/ExecBitlockerSearch",
+      data: {
+        [bitlockerLookupType]: searchValue,
+      },
+      queryKey: `bitlocker-universal-${bitlockerLookupType}-${searchValue}`,
+      waiting: false,
+    });
+
+    const activeSearch = searchType === "BitLocker" ? bitlockerSearch : universalSearch;
+
     const handleChange = (event) => {
       const newValue = event.target.value;
       setSearchValue(newValue);
@@ -71,7 +87,7 @@ export const CippUniversalSearchV2 = React.forwardRef(
     const handleSearch = () => {
       if (searchValue.length > 0) {
         updateDropdownPosition();
-        search.refetch();
+        activeSearch.refetch();
         setShowDropdown(true);
       }
     };
@@ -93,6 +109,21 @@ export const CippUniversalSearchV2 = React.forwardRef(
 
     const handleTypeChange = (type) => {
       setSearchType(type);
+      if (type === "BitLocker") {
+        setBitlockerLookupType("keyId");
+      }
+      setShowDropdown(false);
+    };
+
+    const handleBitlockerResultClick = (match) => {
+      setBitlockerDrawerDefaults({
+        searchTerm:
+          bitlockerLookupType === "deviceId"
+            ? match?.deviceId || searchValue
+            : match?.keyId || searchValue,
+        searchType: bitlockerLookupType,
+      });
+      setBitlockerDrawerVisible(true);
       setShowDropdown(false);
     };
 
@@ -107,6 +138,24 @@ export const CippUniversalSearchV2 = React.forwardRef(
         icon: "Group",
         onClick: () => handleTypeChange("Groups"),
       },
+      {
+        label: "BitLocker",
+        icon: "FilePresent",
+        onClick: () => handleTypeChange("BitLocker"),
+      },
+    ];
+
+    const bitlockerLookupActions = [
+      {
+        label: "Key ID",
+        icon: "FilePresent",
+        onClick: () => setBitlockerLookupType("keyId"),
+      },
+      {
+        label: "Device ID",
+        icon: "Laptop",
+        onClick: () => setBitlockerLookupType("deviceId"),
+      },
     ];
 
     // Close dropdown when clicking outside
@@ -144,14 +193,23 @@ export const CippUniversalSearchV2 = React.forwardRef(
       }
     }, [showDropdown]);
 
-    const hasResults = Array.isArray(search?.data) && search.data.length > 0;
+    const bitlockerResults = Array.isArray(bitlockerSearch?.data?.Results)
+      ? bitlockerSearch.data.Results
+      : [];
+    const universalResults = Array.isArray(universalSearch?.data) ? universalSearch.data : [];
+    const hasResults =
+      searchType === "BitLocker" ? bitlockerResults.length > 0 : universalResults.length > 0;
     const shouldShowDropdown = showDropdown && searchValue.length > 0;
 
     const getLabel = () => {
       if (searchType === "Users") {
         return "Search users by UPN or Display Name";
       } else if (searchType === "Groups") {
         return "Search groups by Display Name";
+      } else if (searchType === "BitLocker") {
+        return bitlockerLookupType === "deviceId"
+          ? "Search BitLocker by Device ID"
+          : "Search BitLocker by Recovery Key ID";
       }
       return "Search";
     };
@@ -163,6 +221,12 @@ export const CippUniversalSearchV2 = React.forwardRef(
             buttonName={searchType}
             actions={typeMenuActions}
           />
+          {searchType === "BitLocker" && (
+            <BulkActionsMenu
+              buttonName={bitlockerLookupType === "deviceId" ? "Device ID" : "Key ID"}
+              actions={bitlockerLookupActions}
+            />
+          )}
           <TextField
             ref={(node) => {
               textFieldRef.current = node;
@@ -187,7 +251,7 @@ export const CippUniversalSearchV2 = React.forwardRef(
                   <SearchIcon color="action" sx={{ fontSize: 20 }} />
                 </InputAdornment>
               ),
-              endAdornment: search.isFetching ? (
+              endAdornment: activeSearch.isFetching ? (
                 <InputAdornment position="end">
                   <CircularProgress size={20} />
                 </InputAdornment>
@@ -203,7 +267,7 @@ export const CippUniversalSearchV2 = React.forwardRef(
           <Button
             variant="contained"
             onClick={handleSearch}
-            disabled={searchValue.length === 0 || search.isFetching}
+            disabled={searchValue.length === 0 || activeSearch.isFetching}
             startIcon={<SearchIcon />}
             sx={{ flexShrink: 0 }}
           >
@@ -229,18 +293,25 @@ export const CippUniversalSearchV2 = React.forwardRef(
                 borderColor: "divider",
               }}
             >
-              {search.isFetching ? (
+              {activeSearch.isFetching ? (
                 <Box sx={{ p: 2 }}>
                   <Skeleton height={60} sx={{ mb: 1 }} />
                   <Skeleton height={60} />
                 </Box>
               ) : hasResults ? (
-                <Results
-                  items={search.data}
-                  searchValue={searchValue}
-                  onResultClick={handleResultClick}
-                  searchType={searchType}
-                />
+                searchType === "BitLocker" ? (
+                  <BitlockerResults
+                    items={bitlockerResults}
+                    onResultClick={handleBitlockerResultClick}
+                  />
+                ) : (
+                  <Results
+                    items={universalResults}
+                    searchValue={searchValue}
+                    onResultClick={handleResultClick}
+                    searchType={searchType}
+                  />
+                )
               ) : (
                 <Box sx={{ p: 3, textAlign: "center" }}>
                   <Typography variant="body2" color="text.secondary">
@@ -251,6 +322,20 @@ export const CippUniversalSearchV2 = React.forwardRef(
             </Paper>
           </Portal>
         )}
+
+        <CippOffCanvas
+          title="BitLocker Key Details"
+          visible={bitlockerDrawerVisible}
+          onClose={() => setBitlockerDrawerVisible(false)}
+          size="xl"
+          contentPadding={0}
+        >
+          <CippBitlockerKeySearch
+            initialSearchTerm={bitlockerDrawerDefaults.searchTerm}
+            initialSearchType={bitlockerDrawerDefaults.searchType}
+            autoSearch={true}
+          />
+        </CippOffCanvas>
       </>
     );
   },
@@ -337,3 +422,46 @@ const Results = ({ items = [], searchValue, onResultClick, searchType = "Users"
     </>
   );
 };
+
+const BitlockerResults = ({ items = [], onResultClick }) => {
+  return (
+    <>
+      {items.map((result, index) => (
+        <MenuItem
+          key={result.keyId || index}
+          onClick={() => onResultClick(result)}
+          sx={{
+            py: 1.5,
+            px: 2,
+            borderBottom: index < items.length - 1 ? "1px solid" : "none",
+            borderColor: "divider",
+            "&:hover": {
+              backgroundColor: "action.hover",
+            },
+          }}
+        >
+          <ListItemText
+            primary={
+              <Typography variant="body1" fontWeight="medium">
+                {result.deviceName || "Unknown Device"}
+              </Typography>
+            }
+            secondary={
+              <Box>
+                <Typography variant="body2" color="text.secondary">
+                  Key ID: {result.keyId || "N/A"}
+                </Typography>
+                <Typography variant="body2" color="text.secondary">
+                  Device ID: {result.deviceId || "N/A"}
+                </Typography>
+                <Typography variant="caption" color="text.secondary" sx={{ display: "block", mt: 0.5 }}>
+                  Tenant: {result.tenant || "N/A"}
+                </Typography>
+              </Box>
+            }
+          />
+        </MenuItem>
+      ))}
+    </>
+  );
+};

src/components/CippCards/CippUserInfoCard.jsx

@@ -18,13 +18,17 @@ import { getCippFormatting } from "../../utils/get-cipp-formatting";
 import { Stack, Grid, Box } from "@mui/system";
 import { useState, useRef, useCallback } from "react";
 import { ApiPostCall } from "../../api/ApiCall";
+import { useLicenseBackfill } from "../../hooks/use-license-backfill";
 
 export const CippUserInfoCard = (props) => {
   const { user, tenant, isFetching = false, ...other } = props;
   const [photoTimestamp, setPhotoTimestamp] = useState(Date.now());
   const [uploadError, setUploadError] = useState(null);
   const [successMessage, setSuccessMessage] = useState(null);
   const fileInputRef = useRef(null);
+
+  // Hook to trigger re-render when license backfill completes
+  const { updateTrigger } = useLicenseBackfill();
 
   // API mutations
   const setPhotoMutation = ApiPostCall({ urlFromData: true });
@@ -280,6 +284,7 @@ export const CippUserInfoCard = (props) => {
         <PropertyListItem
           divider
           label="Licenses"
+          key={`licenses-${updateTrigger}`}
           value={
             isFetching ? (
               <Skeleton variant="text" width={180} />