@snapdragonsnursery/react-components 1.15.0 → 1.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapdragonsnursery/react-components",
-  "version": "1.15.0",
+  "version": "1.16.1",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -55,14 +55,14 @@
     "lucide-react": "^0.526.0",
     "react": "^18.0.0 || ^19.0.0",
     "react-day-picker": "^9.8.1",
-    "react-dom": "^18.3.1",
     "tailwind-merge": "^3.3.1",
     "tailwindcss": "^4.1.11",
     "tailwindcss-animate": "^1.0.7"
   },
   "peerDependencies": {
     "@azure/msal-react": ">=1.0.0",
-    "react": "^18.0.0 || ^19.0.0"
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0"
   },
   "module": "src/index.js",
   "types": "src/index.d.ts",

package/src/EmployeeSearchModal.jsx

@@ -14,6 +14,7 @@ import {
 import { trackEvent } from "./telemetry";
 import { Button } from "./components/ui/button";
 import { Input } from "./components/ui/input";
+import { Avatar, AvatarFallback, AvatarImage } from "./components/ui/avatar";
 import {
   Table,
   TableBody,
@@ -74,12 +75,17 @@ const EmployeeSearchModal = ({
   showEndDateFilter = true,
   showDbsFilter = true,
   showWorkingHoursFilter = true,
+  // Profile pictures
+  showProfilePics = false,
   // Layout controls
   zIndex = 60,
   maxHeightVh = 85,
   // Auth options: provide token directly or a function to fetch it
   authToken = null,
   getAccessToken = null,
+  // Graph auth options specifically for Microsoft Graph calls (e.g., profile photos)
+  graphAuthToken = null,
+  getGraphAccessToken = null,
   // Column customization
   visibleColumns = null,
   columnLabels = {},
@@ -118,18 +124,122 @@ const EmployeeSearchModal = ({
 
   // Table sorting state
   const [sorting, setSorting] = useState([]);
-  const [debouncedAdvancedFilters, setDebouncedAdvancedFilters] = useState(advancedFilters);
+  const [debouncedAdvancedFilters, setDebouncedAdvancedFilters] =
+    useState(advancedFilters);
 
   // State for multi-select mode
   const [selectedEmployeesState, setSelectedEmployeesState] = useState(
     selectedEmployees || []
   );
 
+  // State for profile pictures
+  const [profilePics, setProfilePics] = useState(new Map());
+  const [loadingProfilePics, setLoadingProfilePics] = useState(new Set());
+
   const { instance, accounts } = useMsal();
 
   // Column helper for TanStack table
   const columnHelper = createColumnHelper();
 
+  // Function to fetch profile picture from Microsoft Graph
+  const fetchProfilePicture = useCallback(
+    async (entraId) => {
+      if (
+        !entraId ||
+        profilePics.has(entraId) ||
+        loadingProfilePics.has(entraId)
+      ) {
+        return;
+      }
+
+      setLoadingProfilePics((prev) => new Set(prev).add(entraId));
+
+      try {
+        // Get Graph API token (prefer explicit Graph token accessors to avoid APIM token misuse)
+        let graphToken = null;
+
+        if (typeof getGraphAccessToken === "function") {
+          graphToken = await getGraphAccessToken();
+        } else if (graphAuthToken) {
+          graphToken = graphAuthToken;
+        } else if (instance && accounts[0]) {
+          // Fallback: acquire Graph token via MSAL
+          // Prefer broader scopes that allow reading other users' profiles/photos when consented
+          const graphScopes = ["User.Read", "Directory.Read.All"]; // host app should consent these
+          try {
+            const response = await instance.acquireTokenSilent({
+              account: accounts[0],
+              scopes: graphScopes,
+            });
+            graphToken = response.accessToken;
+          } catch (silentErr) {
+            try {
+              const response = await instance.acquireTokenPopup({
+                scopes: graphScopes,
+              });
+              graphToken = response.accessToken;
+            } catch (popupErr) {
+              console.warn(
+                "Failed to get Graph token for profile picture:",
+                popupErr
+              );
+              return;
+            }
+          }
+        }
+
+        if (!graphToken) {
+          console.warn("No Graph token available for profile picture");
+          return;
+        }
+
+        // Try different Graph photo endpoints (small size first)
+        const tryUrls = [
+          `https://graph.microsoft.com/v1.0/users/${entraId}/photos/48x48/$value`,
+          `https://graph.microsoft.com/v1.0/users/${entraId}/photo/$value`,
+        ];
+
+        for (const url of tryUrls) {
+          const response = await fetch(url, {
+            headers: {
+              Authorization: `Bearer ${graphToken}`,
+            },
+          });
+
+          if (response.ok) {
+            const blob = await response.blob();
+            const imageUrl = URL.createObjectURL(blob);
+            setProfilePics((prev) => new Map(prev).set(entraId, imageUrl));
+            return; // success
+          }
+          if (response.status === 404) {
+            // No profile picture available - store null to avoid retrying
+            setProfilePics((prev) => new Map(prev).set(entraId, null));
+            return;
+          }
+        }
+
+        console.warn(`Failed to fetch profile picture for ${entraId}: Non-200 response`);
+      } catch (error) {
+        console.warn(`Error fetching profile picture for ${entraId}:`, error);
+      } finally {
+        setLoadingProfilePics((prev) => {
+          const newSet = new Set(prev);
+          newSet.delete(entraId);
+          return newSet;
+        });
+      }
+    },
+    [
+      instance,
+      accounts,
+      getGraphAccessToken,
+      graphAuthToken,
+      profilePics,
+      loadingProfilePics,
+    ]
+  );
+
   // Helper function to create sortable header
   const createSortableHeader = (column, label) => {
     return ({ column: tableColumn }) => {
@@ -159,22 +269,75 @@ const EmployeeSearchModal = ({
     };
   };
 
+  // Profile picture column
+  const profilePicColumn = columnHelper.display({
+    id: "profile_pic",
+    header: columnLabels.profile_pic || "Photo",
+    cell: ({ row }) => {
+      const entraId = row.original.entra_id;
+      const profilePic = profilePics.get(entraId);
+      const isLoading = loadingProfilePics.has(entraId);
+
+      // Generate initials for fallback
+      const initials =
+        row.original.full_name
+          ?.split(" ")
+          .map((name) => name.charAt(0))
+          .join("")
+          .toUpperCase()
+          .slice(0, 2) || "??";
+
+      if (isLoading) {
+        return (
+          <Avatar className="w-8 h-8">
+            <AvatarFallback className="bg-gray-200 dark:bg-gray-700">
+              <div className="animate-spin rounded-full h-4 w-4 border-b-2 border-blue-500"></div>
+            </AvatarFallback>
+          </Avatar>
+        );
+      }
+
+      return (
+        <Avatar className="w-8 h-8">
+          {profilePic && (
+            <AvatarImage
+              src={profilePic}
+              alt={`${row.original.full_name} profile`}
+            />
+          )}
+          <AvatarFallback className="bg-blue-500 text-white text-sm font-medium">
+            {initials}
+          </AvatarFallback>
+        </Avatar>
+      );
+    },
+    size: 60,
+  });
+
   // Define default data columns (excluding optional select)
   const defaultDataColumns = [
     columnHelper.accessor("full_name", {
-      header: createSortableHeader("full_name", columnLabels.full_name || "Name"),
+      header: createSortableHeader(
+        "full_name",
+        columnLabels.full_name || "Name"
+      ),
       cell: ({ row }) =>
         columnRenderers.full_name ? (
           columnRenderers.full_name(row.original)
         ) : (
           <div>
             <div className="font-medium">{row.original.full_name}</div>
-            <div className="text-sm text-gray-500">ID: {row.original.employee_id}</div>
+            <div className="text-sm text-gray-500">
+              ID: {row.original.employee_id}
+            </div>
           </div>
         ),
     }),
     columnHelper.accessor("site_name", {
-      header: createSortableHeader("site_name", columnLabels.site_name || "Site"),
+      header: createSortableHeader(
+        "site_name",
+        columnLabels.site_name || "Site"
+      ),
       cell: ({ row }) =>
         columnRenderers.site_name ? (
           columnRenderers.site_name(row.original)
@@ -183,7 +346,10 @@ const EmployeeSearchModal = ({
         ),
     }),
     columnHelper.accessor("role_name", {
-      header: createSortableHeader("role_name", columnLabels.role_name || "Role"),
+      header: createSortableHeader(
+        "role_name",
+        columnLabels.role_name || "Role"
+      ),
       cell: ({ row }) =>
         columnRenderers.role_name ? (
           columnRenderers.role_name(row.original)
@@ -201,7 +367,10 @@ const EmployeeSearchModal = ({
         ),
     }),
     columnHelper.accessor("start_date", {
-      header: createSortableHeader("start_date", columnLabels.start_date || "Start Date"),
+      header: createSortableHeader(
+        "start_date",
+        columnLabels.start_date || "Start Date"
+      ),
       cell: ({ row }) =>
         columnRenderers.start_date ? (
           columnRenderers.start_date(row.original)
@@ -214,24 +383,33 @@ const EmployeeSearchModal = ({
         ),
     }),
     columnHelper.accessor("employee_status", {
-      header: createSortableHeader("employee_status", columnLabels.employee_status || "Status"),
+      header: createSortableHeader(
+        "employee_status",
+        columnLabels.employee_status || "Status"
+      ),
       cell: ({ row }) => {
-        if (columnRenderers.employee_status) return columnRenderers.employee_status(row.original);
+        if (columnRenderers.employee_status)
+          return columnRenderers.employee_status(row.original);
         const status = row.original.employee_status;
         const statusColors = {
-          Active: 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200',
-          Inactive: 'bg-gray-100 text-gray-800 dark:bg-gray-900 dark:text-gray-200',
-          'On Leave': 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200',
-          Terminated: 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200',
+          Active:
+            "bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200",
+          Inactive:
+            "bg-gray-100 text-gray-800 dark:bg-gray-900 dark:text-gray-200",
+          "On Leave":
+            "bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200",
+          Terminated:
+            "bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200",
         };
         return (
           <span
             className={cn(
-              'px-2 py-1 text-xs rounded-full',
-              statusColors[status] || 'bg-gray-100 text-gray-800 dark:bg-gray-900 dark:text-gray-200'
+              "px-2 py-1 text-xs rounded-full",
+              statusColors[status] ||
+                "bg-gray-100 text-gray-800 dark:bg-gray-900 dark:text-gray-200"
             )}
           >
-            {status || 'Unknown'}
+            {status || "Unknown"}
           </span>
         );
       },
@@ -274,8 +452,17 @@ const EmployeeSearchModal = ({
 
   let dataColumns = defaultDataColumns;
   if (Array.isArray(visibleColumns) && visibleColumns.length > 0) {
-    const mapByKey = new Map(defaultDataColumns.map((c) => [c.accessorKey || c.id, c]));
-    dataColumns = visibleColumns.map((key) => mapByKey.get(key)).filter(Boolean);
+    const mapByKey = new Map(
+      defaultDataColumns.map((c) => [c.accessorKey || c.id, c])
+    );
+    dataColumns = visibleColumns
+      .map((key) => mapByKey.get(key))
+      .filter(Boolean);
+  }
+
+  // Add profile picture column if enabled
+  if (showProfilePics) {
+    dataColumns = [profilePicColumn, ...dataColumns];
   }
 
   const columns = multiSelect ? [selectColumn, ...dataColumns] : dataColumns;
@@ -289,7 +476,9 @@ const EmployeeSearchModal = ({
     state: {
       sorting,
       rowSelection: selectedEmployeesState.reduce((acc, selectedEmployee) => {
-        const rowIndex = employees.findIndex(employee => employee.entra_id === selectedEmployee.entra_id);
+        const rowIndex = employees.findIndex(
+          (employee) => employee.entra_id === selectedEmployee.entra_id
+        );
         if (rowIndex !== -1) {
           acc[rowIndex] = true;
         }
@@ -302,13 +491,19 @@ const EmployeeSearchModal = ({
       // instead of replacing it, so selection is retained across searches/pages.
 
       // Build current selection map (for visible rows only)
-      const prevSelection = selectedEmployeesState.reduce((acc, selectedEmployee) => {
-        const rowIndex = employees.findIndex((employee) => employee.entra_id === selectedEmployee.entra_id);
-        if (rowIndex !== -1) acc[rowIndex] = true;
-        return acc;
-      }, {});
+      const prevSelection = selectedEmployeesState.reduce(
+        (acc, selectedEmployee) => {
+          const rowIndex = employees.findIndex(
+            (employee) => employee.entra_id === selectedEmployee.entra_id
+          );
+          if (rowIndex !== -1) acc[rowIndex] = true;
+          return acc;
+        },
+        {}
+      );
 
-      const updatedSelection = typeof updater === 'function' ? updater(prevSelection) : updater;
+      const updatedSelection =
+        typeof updater === "function" ? updater(prevSelection) : updater;
 
       // Determine which visible employees are selected after the change
       const visibleSelected = Object.keys(updatedSelection)
@@ -317,11 +512,15 @@ const EmployeeSearchModal = ({
         .filter(Boolean);
 
       // Start from the previous global selection keyed by entra_id
-      const prevById = new Map(selectedEmployeesState.map((e) => [e.entra_id, e]));
+      const prevById = new Map(
+        selectedEmployeesState.map((e) => [e.entra_id, e])
+      );
 
       // Remove any currently visible employees that are now unselected
       const visibleIds = new Set(employees.map((e) => e.entra_id));
-      const visibleSelectedIds = new Set(visibleSelected.map((e) => e.entra_id));
+      const visibleSelectedIds = new Set(
+        visibleSelected.map((e) => e.entra_id)
+      );
       employees.forEach((e) => {
         if (visibleIds.has(e.entra_id) && !visibleSelectedIds.has(e.entra_id)) {
           prevById.delete(e.entra_id);
@@ -413,13 +612,19 @@ const EmployeeSearchModal = ({
       if (siteIds && siteIds.length > 0) {
         params.append("site_ids", siteIds.join(","));
       } else if (debouncedAdvancedFilters.selectedSiteId) {
-        params.append("site_id", debouncedAdvancedFilters.selectedSiteId.toString());
+        params.append(
+          "site_id",
+          debouncedAdvancedFilters.selectedSiteId.toString()
+        );
       } else if (siteId) {
         params.append("site_id", siteId.toString());
       }
 
       // Handle status filtering
-      if (debouncedAdvancedFilters.status && debouncedAdvancedFilters.status !== "all") {
+      if (
+        debouncedAdvancedFilters.status &&
+        debouncedAdvancedFilters.status !== "all"
+      ) {
         params.append("status", debouncedAdvancedFilters.status);
       } else if (activeOnly) {
         params.append("active_only", "true");
@@ -437,7 +642,10 @@ const EmployeeSearchModal = ({
 
       // Add start date filters
       if (debouncedAdvancedFilters.startDateFrom) {
-        params.append("start_date_from", debouncedAdvancedFilters.startDateFrom);
+        params.append(
+          "start_date_from",
+          debouncedAdvancedFilters.startDateFrom
+        );
       }
       if (debouncedAdvancedFilters.startDateTo) {
         params.append("start_date_to", debouncedAdvancedFilters.startDateTo);
@@ -458,7 +666,10 @@ const EmployeeSearchModal = ({
 
       // Add maternity leave filter
       if (debouncedAdvancedFilters.onMaternityLeave) {
-        params.append("on_maternity_leave", debouncedAdvancedFilters.onMaternityLeave);
+        params.append(
+          "on_maternity_leave",
+          debouncedAdvancedFilters.onMaternityLeave
+        );
       }
 
       // Add DBS number filter
@@ -468,7 +679,10 @@ const EmployeeSearchModal = ({
 
       // Add working hours filter
       if (debouncedAdvancedFilters.minHoursPerWeek) {
-        params.append("min_hours_per_week", debouncedAdvancedFilters.minHoursPerWeek);
+        params.append(
+          "min_hours_per_week",
+          debouncedAdvancedFilters.minHoursPerWeek
+        );
       }
 
       // Add sorting
@@ -496,9 +710,9 @@ const EmployeeSearchModal = ({
           employees: data.data.employees.length,
           pagination: data.data.pagination,
           totalCount: data.data.pagination.totalCount,
-          totalPages: data.data.pagination.totalPages
+          totalPages: data.data.pagination.totalPages,
         });
-        
+
         setEmployees(data.data.employees);
         setPagination(data.data.pagination);
         trackEvent("employee_search_modal_success", {
@@ -547,6 +761,17 @@ const EmployeeSearchModal = ({
     }
   }, [isOpen, instance, accounts, searchEmployees]);
 
+  // Fetch profile pictures when employees change and showProfilePics is enabled
+  useEffect(() => {
+    if (showProfilePics && employees.length > 0) {
+      employees.forEach((employee) => {
+        if (employee.entra_id) {
+          fetchProfilePicture(employee.entra_id);
+        }
+      });
+    }
+  }, [employees, showProfilePics, fetchProfilePicture]);
+
   const handlePageChange = (newPage) => {
     setPagination((prev) => ({ ...prev, page: newPage }));
   };
@@ -609,15 +834,22 @@ const EmployeeSearchModal = ({
 
   // Calculate pagination display values
   const actualTotalCount = pagination.totalCount || employees.length;
-  const startItem = actualTotalCount > 0 ? (pagination.page - 1) * pagination.pageSize + 1 : 0;
-  const endItem = Math.min(pagination.page * pagination.pageSize, actualTotalCount);
+  const startItem =
+    actualTotalCount > 0 ? (pagination.page - 1) * pagination.pageSize + 1 : 0;
+  const endItem = Math.min(
+    pagination.page * pagination.pageSize,
+    actualTotalCount
+  );
 
   if (!isOpen) return null;
 
   return (
     <div className="fixed inset-0 overflow-y-auto" style={{ zIndex }}>
       <div className="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-        <div className="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity" onClick={onClose}></div>
+        <div
+          className="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"
+          onClick={onClose}
+        ></div>
 
         <div
           className="relative transform overflow-hidden rounded-lg bg-white dark:bg-gray-800 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-7xl flex flex-col"
@@ -662,7 +894,9 @@ const EmployeeSearchModal = ({
               managers={managers}
               activeOnly={activeOnly}
               isAdvancedFiltersOpen={isAdvancedFiltersOpen}
-              onToggleAdvancedFilters={() => setIsAdvancedFiltersOpen(!isAdvancedFiltersOpen)}
+              onToggleAdvancedFilters={() =>
+                setIsAdvancedFiltersOpen(!isAdvancedFiltersOpen)
+              }
               onClearFilters={clearFilters}
               showRoleFilter={showRoleFilter}
               showManagerFilter={showManagerFilter}
@@ -695,7 +929,7 @@ const EmployeeSearchModal = ({
                   {/* Results Header */}
                   <div className="px-6 py-4 border-b border-gray-200 dark:border-gray-700">
                     <div className="text-sm text-gray-600 dark:text-gray-400">
-                      {(pagination.totalCount > 0 || employees.length > 0)
+                      {pagination.totalCount > 0 || employees.length > 0
                         ? `Showing ${startItem} to ${endItem} of ${actualTotalCount} employees`
                         : "No employees found"}
                     </div>
@@ -727,7 +961,9 @@ const EmployeeSearchModal = ({
                               <TableRow
                                 key={row.id}
                                 data-state={row.getIsSelected() && "selected"}
-                                onClick={() => handleEmployeeSelect(row.original)}
+                                onClick={() =>
+                                  handleEmployeeSelect(row.original)
+                                }
                                 className="cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700"
                               >
                                 {row.getVisibleCells().map((cell) => (
@@ -771,7 +1007,7 @@ const EmployeeSearchModal = ({
                           <Pagination>
                             <PaginationContent>
                               <PaginationItem>
-                                <PaginationPrevious 
+                                <PaginationPrevious
                                   href="#"
                                   onClick={(e) => {
                                     e.preventDefault();
@@ -793,7 +1029,10 @@ const EmployeeSearchModal = ({
                               )
                                 .filter((page) => {
                                   const current = pagination.page;
-                                  const total = Math.max(pagination.totalPages, 1);
+                                  const total = Math.max(
+                                    pagination.totalPages,
+                                    1
+                                  );
                                   return (
                                     page === 1 ||
                                     page === total ||
@@ -801,7 +1040,10 @@ const EmployeeSearchModal = ({
                                   );
                                 })
                                 .map((page, index, array) => {
-                                  if (index > 0 && array[index - 1] !== page - 1) {
+                                  if (
+                                    index > 0 &&
+                                    array[index - 1] !== page - 1
+                                  ) {
                                     return (
                                       <React.Fragment key={`ellipsis-${page}`}>
                                         <PaginationItem>
@@ -839,7 +1081,7 @@ const EmployeeSearchModal = ({
                                 })}
 
                               <PaginationItem>
-                                <PaginationNext 
+                                <PaginationNext
                                   href="#"
                                   onClick={(e) => {
                                     e.preventDefault();
@@ -868,15 +1110,21 @@ const EmployeeSearchModal = ({
           <div className="bg-gray-50 dark:bg-gray-700 px-6 py-3 flex items-center justify-between gap-3">
             {/* Selection preview */}
             <div className="flex-1 min-w-0">
-              {multiSelect && selectedEmployeesState.length > 0 && (
+              {multiSelect &&
+                selectedEmployeesState.length > 0 &&
                 (() => {
                   const total = selectedEmployeesState.length;
                   const preview = selectedEmployeesState.slice(0, 5);
                   const extra = Math.max(total - preview.length, 0);
-                  const previewText = `${total} selected${maxSelections ? ` / ${maxSelections}` : ''}: ` +
-                    preview.map((e) => e.full_name).join(', ') +
-                    (extra > 0 ? ` + ${extra} more` : '');
-                  const fullList = selectedEmployeesState.map((e) => e.full_name).join(', ');
+                  const previewText =
+                    `${total} selected${
+                      maxSelections ? ` / ${maxSelections}` : ""
+                    }: ` +
+                    preview.map((e) => e.full_name).join(", ") +
+                    (extra > 0 ? ` + ${extra} more` : "");
+                  const fullList = selectedEmployeesState
+                    .map((e) => e.full_name)
+                    .join(", ");
                   return (
                     <div
                       className="text-sm text-gray-600 dark:text-gray-300 truncate"
@@ -885,12 +1133,15 @@ const EmployeeSearchModal = ({
                       {previewText}
                     </div>
                   );
-                })()
-              )}
+                })()}
             </div>
             <div className="flex items-center gap-2">
               {multiSelect && (
-                <Button variant="outline" onClick={handleClearSelection} disabled={selectedEmployeesState.length === 0}>
+                <Button
+                  variant="outline"
+                  onClick={handleClearSelection}
+                  disabled={selectedEmployeesState.length === 0}
+                >
                   Clear
                 </Button>
               )}
@@ -898,12 +1149,14 @@ const EmployeeSearchModal = ({
                 Go Back
               </Button>
               {multiSelect && (
-                <Button 
-                  onClick={handleConfirmSelection} 
+                <Button
+                  onClick={handleConfirmSelection}
                   disabled={selectedEmployeesState.length === 0}
                   aria-label={`Confirm ${selectedEmployeesState.length} selected`}
                 >
-                  {`Confirm (${selectedEmployeesState.length}${maxSelections ? `/${maxSelections}` : ''})`}
+                  {`Confirm (${selectedEmployeesState.length}${
+                    maxSelections ? `/${maxSelections}` : ""
+                  })`}
                 </Button>
               )}
             </div>
@@ -914,4 +1167,4 @@ const EmployeeSearchModal = ({
   );
 };
 
-export default EmployeeSearchModal; 
+export default EmployeeSearchModal;