@jmruthers/pace-core 0.5.79 → 0.5.80

package/dist/{chunk-GXWREXH7.js → chunk-CBSD3BZ3.js}

@@ -3,7 +3,7 @@ import {
   init_useOrganisationService,
   useEventService2 as useEventService,
   useOrganisationService2 as useOrganisationService
-} from "./chunk-WYKXRCXB.js";
+} from "./chunk-5BN3YGNK.js";
 import {
   __esm
 } from "./chunk-PLDDJCW6.js";
@@ -61,4 +61,4 @@ export {
   init_useOrganisations,
   useEvents
 };
-//# sourceMappingURL=chunk-GXWREXH7.js.map
+//# sourceMappingURL=chunk-CBSD3BZ3.js.map

package/dist/{chunk-CALYF6HH.js → chunk-I2VVV5PQ.js}

@@ -4,7 +4,7 @@ import {
   init_InactivityServiceProvider,
   init_OrganisationServiceProvider,
   init_UnifiedAuthProvider
-} from "./chunk-WYKXRCXB.js";
+} from "./chunk-5BN3YGNK.js";
 
 // src/providers/index.ts
 init_UnifiedAuthProvider();
@@ -12,4 +12,4 @@ init_EventServiceProvider();
 init_OrganisationServiceProvider();
 init_InactivityServiceProvider();
 init_AuthServiceProvider();
-//# sourceMappingURL=chunk-CALYF6HH.js.map
+//# sourceMappingURL=chunk-I2VVV5PQ.js.map

package/dist/{chunk-3WFKFBVQ.js → chunk-KUYWZVR2.js}

@@ -1,17 +1,17 @@
 import {
   init_useOrganisations,
   useOrganisations
-} from "./chunk-GXWREXH7.js";
+} from "./chunk-CBSD3BZ3.js";
 import {
   init_UnifiedAuthProvider
-} from "./chunk-HQ7KTKC3.js";
+} from "./chunk-RIXPZJUB.js";
 import {
   OrganisationServiceContext,
   OrganisationServiceProvider,
   init_OrganisationServiceProvider,
   useOrganisationService,
   useUnifiedAuth
-} from "./chunk-WYKXRCXB.js";
+} from "./chunk-5BN3YGNK.js";
 import {
   __esm,
   __export
@@ -417,4 +417,4 @@ export {
   clearPublicLogoCache,
   getPublicLogoCacheStats
 };
-//# sourceMappingURL=chunk-3WFKFBVQ.js.map
+//# sourceMappingURL=chunk-KUYWZVR2.js.map

package/dist/{chunk-TI67X46U.js → chunk-MJWN5JKI.js}

@@ -22,7 +22,7 @@ import {
   SelectSeparator,
   SelectTrigger,
   SelectValue
-} from "./chunk-RMK6FOHF.js";
+} from "./chunk-MVFZYTIZ.js";
 import {
   isPermitted,
   isSuperAdmin
@@ -34,25 +34,25 @@ import {
   useAppConfig,
   usePublicEventLogo,
   usePublicPageContext
-} from "./chunk-3WFKFBVQ.js";
+} from "./chunk-KUYWZVR2.js";
 import {
   useToast
 } from "./chunk-YCKPEMJA.js";
 import {
   useEvents,
   useOrganisations
-} from "./chunk-GXWREXH7.js";
+} from "./chunk-CBSD3BZ3.js";
 import {
   UnifiedAuthProvider_exports,
   init_UnifiedAuthProvider
-} from "./chunk-HQ7KTKC3.js";
+} from "./chunk-RIXPZJUB.js";
 import {
   EventServiceContext,
   EventServiceProvider,
   init_EventServiceProvider,
   useEventService,
   useUnifiedAuth
-} from "./chunk-WYKXRCXB.js";
+} from "./chunk-5BN3YGNK.js";
 import {
   LoadingSpinner
 } from "./chunk-CDQ3PX7L.js";
@@ -1398,7 +1398,7 @@ function PaceAppLayout({
         }
       }
       if (hasAccess && currentRoute.roles && currentRoute.roles.length > 0 && user?.id) {
-        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-TSHK77PL.js");
+        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-K2IZAY5F.js");
         hasAccess = true;
       }
       if (!isMounted) return;
@@ -3883,4 +3883,4 @@ export {
   PublicPageDiagnostic,
   PublicPageContextChecker
 };
-//# sourceMappingURL=chunk-TI67X46U.js.map
+//# sourceMappingURL=chunk-MJWN5JKI.js.map

package/dist/{chunk-RMK6FOHF.js → chunk-MVFZYTIZ.js}

@@ -1,17 +1,17 @@
 import {
   useCan,
   useResolvedScope
-} from "./chunk-IQFITAE3.js";
+} from "./chunk-YVUZWLQG.js";
 import {
   toast,
   useDataTablePerformance
 } from "./chunk-YCKPEMJA.js";
 import {
   init_UnifiedAuthProvider
-} from "./chunk-HQ7KTKC3.js";
+} from "./chunk-RIXPZJUB.js";
 import {
   useUnifiedAuth
-} from "./chunk-WYKXRCXB.js";
+} from "./chunk-5BN3YGNK.js";
 import {
   cn
 } from "./chunk-PYUXFQJ3.js";
@@ -8043,9 +8043,9 @@ function PaginationControls({
     "footer",
     {
       "aria-label": "pagination",
-      className: "mx-auto grid grid-cols-[auto_auto_1fr_auto_auto_auto_auto] gap-4",
+      className: "mx-auto grid grid-cols-[auto_auto_1fr_auto_auto_auto_auto] gap-4 items-center my-2",
       children: [
-        /* @__PURE__ */ jsx15("p", { className: "text-sm text-sec-600", children: "Rows per page" }),
+        /* @__PURE__ */ jsx15("label", { className: "text-sec-600", children: "Rows per page" }),
         /* @__PURE__ */ jsxs11(
           Select,
           {
@@ -8073,7 +8073,7 @@ function PaginationControls({
           getModeIcon(),
           /* @__PURE__ */ jsx15("span", { children: getModeLabel() })
         ] }),
-        /* @__PURE__ */ jsxs11("p", { className: "justify-self-center text-sm text-sec-600", children: [
+        /* @__PURE__ */ jsxs11("p", { className: "justify-self-center text-sm text-sec-600 my-0 py-0", children: [
           "Page ",
           currentPageIndex + 1,
           " of ",
@@ -9662,10 +9662,11 @@ function useEffectiveColumnOrder({
     return columns.map((column) => column.id || column.accessorKey || "").filter((identifier) => Boolean(identifier));
   }, [columns, externalColumnOrder]);
   return useMemo9(() => {
-    if (selectionEnabled && !baseOrder.includes("select")) {
-      return ["select", ...baseOrder];
+    if (!selectionEnabled) {
+      return baseOrder;
     }
-    return baseOrder;
+    const orderWithoutSelect = baseOrder.filter((id) => id !== "select");
+    return ["select", ...orderWithoutSelect];
   }, [baseOrder, selectionEnabled]);
 }
 
@@ -9726,12 +9727,13 @@ function useTableHandlers({
   }, [actions, stateSnapshot.pagination]);
   const handleColumnOrderChange = useCallback8((updaterOrValue) => {
     const nextValue = typeof updaterOrValue === "function" ? updaterOrValue(stateSnapshot.columnOrder) : updaterOrValue;
-    actions.setColumnOrder(nextValue);
+    const normalizedOrder = nextValue.includes("select") ? ["select", ...nextValue.filter((id) => id !== "select")] : nextValue;
+    actions.setColumnOrder(normalizedOrder);
     if (canPersistOrder) {
-      updateColumnOrder(nextValue);
+      updateColumnOrder(normalizedOrder);
     }
     onLayoutChange?.({
-      columnOrder: nextValue,
+      columnOrder: normalizedOrder,
       columnVisibility: stateSnapshot.columnVisibility
     });
   }, [actions, stateSnapshot.columnOrder, stateSnapshot.columnVisibility, canPersistOrder, updateColumnOrder, onLayoutChange]);
@@ -9777,38 +9779,45 @@ function useDataTableConfiguration({
   finalDataCount,
   pageSize
 }) {
-  return useMemo11(() => ({
-    data,
-    columns,
-    state: {
-      sorting: stateSnapshot.sorting,
-      columnFilters: stateSnapshot.columnFilters,
-      columnVisibility: stateSnapshot.columnVisibility,
-      rowSelection: stateSnapshot.rowSelection,
-      grouping: stateSnapshot.grouping,
-      expanded: stateSnapshot.expanded,
-      pagination: stateSnapshot.pagination,
-      globalFilter: stateSnapshot.globalFilter,
-      columnOrder: stateSnapshot.columnOrder
-    },
-    initialState: {
-      expanded: features.grouping ? {} : void 0
-    },
-    enableRowSelection: features.selection,
-    enableGrouping: features.grouping,
-    getRowId,
-    ...handlers,
-    getCoreRowModel: getCoreRowModel(),
-    getFilteredRowModel: finalPaginationMode === "client" ? getFilteredRowModel() : void 0,
-    getSortedRowModel: finalPaginationMode === "client" ? getSortedRowModel() : void 0,
-    getPaginationRowModel: features.pagination ? getPaginationRowModel() : void 0,
-    getGroupedRowModel: features.grouping ? getGroupedRowModel() : void 0,
-    getExpandedRowModel: features.grouping ? getExpandedRowModel() : void 0,
-    manualSorting: finalPaginationMode === "server",
-    manualFiltering: finalPaginationMode === "server",
-    manualPagination: finalPaginationMode === "server",
-    pageCount: finalPaginationMode === "server" ? Math.ceil(finalDataCount / pageSize) : void 0
-  }), [
+  return useMemo11(() => {
+    let normalizedColumnOrder = [...stateSnapshot.columnOrder];
+    if (features.selection) {
+      normalizedColumnOrder = normalizedColumnOrder.filter((id) => id !== "select");
+      normalizedColumnOrder = ["select", ...normalizedColumnOrder];
+    }
+    return {
+      data,
+      columns,
+      state: {
+        sorting: stateSnapshot.sorting,
+        columnFilters: stateSnapshot.columnFilters,
+        columnVisibility: stateSnapshot.columnVisibility,
+        rowSelection: stateSnapshot.rowSelection,
+        grouping: stateSnapshot.grouping,
+        expanded: stateSnapshot.expanded,
+        pagination: stateSnapshot.pagination,
+        globalFilter: stateSnapshot.globalFilter,
+        columnOrder: normalizedColumnOrder
+      },
+      initialState: {
+        expanded: features.grouping ? {} : void 0
+      },
+      enableRowSelection: features.selection,
+      enableGrouping: features.grouping,
+      getRowId,
+      ...handlers,
+      getCoreRowModel: getCoreRowModel(),
+      getFilteredRowModel: finalPaginationMode === "client" ? getFilteredRowModel() : void 0,
+      getSortedRowModel: finalPaginationMode === "client" ? getSortedRowModel() : void 0,
+      getPaginationRowModel: features.pagination ? getPaginationRowModel() : void 0,
+      getGroupedRowModel: features.grouping ? getGroupedRowModel() : void 0,
+      getExpandedRowModel: features.grouping ? getExpandedRowModel() : void 0,
+      manualSorting: finalPaginationMode === "server",
+      manualFiltering: finalPaginationMode === "server",
+      manualPagination: finalPaginationMode === "server",
+      pageCount: finalPaginationMode === "server" ? Math.ceil(finalDataCount / pageSize) : void 0
+    };
+  }, [
     data,
     columns,
     stateSnapshot,
@@ -10472,16 +10481,18 @@ function useTableColumns({
       meta: { align: "right" }
     }) : null;
     const finalColumns = [];
+    if (selectionColumn) {
+      finalColumns.push(selectionColumn);
+    }
     if (columnOrder && columnOrder.length > 0) {
-      const usedColumnIds = new Set(columnOrder);
-      if (selectionColumn && !usedColumnIds.has("select")) {
-        finalColumns.unshift(selectionColumn);
-      }
+      const usedColumnIds = new Set(
+        columnOrder.filter((id) => id !== "select" && id !== "actions")
+      );
       for (const columnId of columnOrder) {
-        if (columnId === "select" && selectionColumn) {
-          finalColumns.push(selectionColumn);
+        if (columnId === "select") {
+          continue;
         } else if (columnId === "actions" && actionsColumn) {
-          finalColumns.push(actionsColumn);
+          continue;
         } else {
           const dataColumn = baseColumns.find(
             (col) => col.id === columnId || "accessorKey" in col && String(col.accessorKey) === columnId
@@ -10496,13 +10507,10 @@ function useTableColumns({
         return !usedColumnIds.has(colId);
       });
       finalColumns.push(...remainingDataColumns);
-      if (actionsColumn && !usedColumnIds.has("actions")) {
+      if (actionsColumn) {
         finalColumns.push(actionsColumn);
       }
     } else {
-      if (selectionColumn) {
-        finalColumns.push(selectionColumn);
-      }
       finalColumns.push(...baseColumns);
       if (actionsColumn) {
         finalColumns.push(actionsColumn);
@@ -11138,9 +11146,25 @@ function DataTableInternal({
   });
   useEffect12(() => {
     if (secureFeatures.columnReordering && isColumnOrderLoaded && savedColumnOrder && savedColumnOrder.length > 0) {
-      stateActions.setColumnOrder(savedColumnOrder);
+      const normalizedOrder = secureFeatures.selection && savedColumnOrder.includes("select") ? ["select", ...savedColumnOrder.filter((id) => id !== "select")] : savedColumnOrder;
+      stateActions.setColumnOrder(normalizedOrder);
+    }
+  }, [secureFeatures.columnReordering, secureFeatures.selection, isColumnOrderLoaded, savedColumnOrder, stateActions]);
+  useEffect12(() => {
+    if (secureFeatures.selection && state.columnOrder.includes("select") && state.columnOrder[0] !== "select") {
+      const normalizedOrder = ["select", ...state.columnOrder.filter((id) => id !== "select")];
+      if (import.meta.env?.MODE === "development") {
+        console.warn("[DataTable] Correcting column order state - moving select to first position:", {
+          before: state.columnOrder,
+          after: normalizedOrder
+        });
+      }
+      stateActions.setColumnOrder(normalizedOrder);
+      if (secureFeatures.columnReordering) {
+        updateColumnOrder(normalizedOrder);
+      }
     }
-  }, [secureFeatures.columnReordering, isColumnOrderLoaded, savedColumnOrder, stateActions]);
+  }, [secureFeatures.selection, secureFeatures.columnReordering, state.columnOrder, stateActions, updateColumnOrder]);
   const finalPageSizeOptions = optimizedPageSizeOptions;
   const validatedInitialPageSize = useMemo14(() => {
     if (!secureFeatures.pagination || !finalPageSizeOptions.length) {
@@ -11160,6 +11184,24 @@ function DataTableInternal({
     }
     return closestOption;
   }, [initialPageSize, finalPageSizeOptions, secureFeatures.pagination]);
+  useEffect12(() => {
+    if (secureFeatures.pagination && validatedInitialPageSize !== state.pagination.pageSize && finalPageSizeOptions.includes(validatedInitialPageSize)) {
+      stateActions.setPagination({
+        ...state.pagination,
+        pageSize: validatedInitialPageSize,
+        pageIndex: 0
+      });
+    }
+  }, [validatedInitialPageSize, secureFeatures.pagination, finalPageSizeOptions, stateActions, state.pagination.pageSize]);
+  const effectivePageSize = useMemo14(() => {
+    if (!secureFeatures.pagination || !finalPageSizeOptions.length) {
+      return state.pagination.pageSize;
+    }
+    if (!finalPageSizeOptions.includes(state.pagination.pageSize)) {
+      return validatedInitialPageSize;
+    }
+    return state.pagination.pageSize;
+  }, [state.pagination.pageSize, validatedInitialPageSize, secureFeatures.pagination, finalPageSizeOptions]);
   const isLoading = externalIsLoading || performanceLoading;
   const handleSearch = useCallback10((value) => {
     stateActions.setSearchQuery(value);
@@ -11246,32 +11288,56 @@ function DataTableInternal({
     }
     return result;
   }, [actions, secureFeatures, permissions, secureHandlers, resolvedGetRowId, stateActions, data]);
+  const normalizedColumnOrderForColumns = useMemo14(() => {
+    if (secureFeatures.selection && state.columnOrder.includes("select")) {
+      return ["select", ...state.columnOrder.filter((id) => id !== "select")];
+    }
+    return state.columnOrder;
+  }, [state.columnOrder, secureFeatures.selection]);
   const { enhancedColumns } = useTableColumns({
     columns,
     features: secureFeatures,
     effectiveActions,
-    columnOrder: state.columnOrder
+    columnOrder: normalizedColumnOrderForColumns
   });
-  const tableStateSnapshot = useMemo14(() => ({
-    sorting: state.sorting,
-    columnFilters: state.columnFilters,
-    columnVisibility: state.columnVisibility,
-    rowSelection,
-    grouping: state.grouping,
-    expanded: state.expanded,
-    pagination: state.pagination,
-    globalFilter: searchQuery,
-    columnOrder: state.columnOrder
-  }), [
+  const paginationStateWithValidatedSize = useMemo14(() => ({
+    ...state.pagination,
+    pageSize: effectivePageSize
+  }), [state.pagination, effectivePageSize]);
+  const tableStateSnapshot = useMemo14(() => {
+    const normalizedColumnOrder = secureFeatures.selection && state.columnOrder.includes("select") ? ["select", ...state.columnOrder.filter((id) => id !== "select")] : state.columnOrder;
+    if (import.meta.env?.MODE === "development" && secureFeatures.selection) {
+      if (state.columnOrder[0] !== "select") {
+        console.warn("[DataTable] Column order normalized:", {
+          original: state.columnOrder,
+          normalized: normalizedColumnOrder,
+          firstColumnOriginal: state.columnOrder[0],
+          firstColumnNormalized: normalizedColumnOrder[0]
+        });
+      }
+    }
+    return {
+      sorting: state.sorting,
+      columnFilters: state.columnFilters,
+      columnVisibility: state.columnVisibility,
+      rowSelection,
+      grouping: state.grouping,
+      expanded: state.expanded,
+      pagination: paginationStateWithValidatedSize,
+      globalFilter: searchQuery,
+      columnOrder: normalizedColumnOrder
+    };
+  }, [
     state.sorting,
     state.columnFilters,
     state.columnVisibility,
     rowSelection,
     state.grouping,
     state.expanded,
-    state.pagination,
+    paginationStateWithValidatedSize,
     searchQuery,
-    state.columnOrder
+    state.columnOrder,
+    secureFeatures.selection
   ]);
   const tableHandlers = useTableHandlers({
     state,
@@ -11295,7 +11361,7 @@ function DataTableInternal({
     getRowId: resolvedGetRowId,
     finalPaginationMode,
     finalDataCount,
-    pageSize: state.pagination.pageSize
+    pageSize: effectivePageSize
   });
   const table = useReactTable(tableConfig);
   if (!user) {
@@ -11319,7 +11385,8 @@ function DataTableInternal({
       "table",
       {
         className: getTableClasses({
-          isFixed: true,
+          isFixed: false,
+          // Use auto table-layout so columns size based on content
           variant,
           className: cn("border-collapse relative w-full", className)
         }),
@@ -11393,7 +11460,7 @@ function DataTableInternal({
             ) })
           ] }),
           /* @__PURE__ */ jsxs17("colgroup", { children: [
-            hasSelectColumn && /* @__PURE__ */ jsx24("col", { span: 1, "data-col-type": "select", className: "w-12" }),
+            hasSelectColumn && /* @__PURE__ */ jsx24("col", { span: 1, "data-col-type": "select" }),
             /* @__PURE__ */ jsx24("col", { span: dataColumns, "data-col-type": "data" }),
             hasActionsColumn && /* @__PURE__ */ jsx24("col", { span: 1, "data-col-type": "actions" })
           ] }),
@@ -11793,4 +11860,4 @@ lodash/lodash.js:
    * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
    *)
 */
-//# sourceMappingURL=chunk-RMK6FOHF.js.map
+//# sourceMappingURL=chunk-MVFZYTIZ.js.map