@juicemantics/veloiq-ui 0.7.0 → 0.8.3

package/dist/index.d.mts

@@ -444,6 +444,10 @@ declare const useAllModels: () => ModelDef[];
 declare const ColorModeContext: React$1.Context<{
     mode: "light" | "dark";
     setMode: (mode: "light" | "dark") => void;
+    /** Increments every time the color schema (plain-color / color-coded / hex)
+     *  changes via setColorSchemas().  Components that depend on derived tones
+     *  use this to re-render when the schema updates. */
+    schemaVersion: number;
 }>;
 
 declare const ColorModeContextProvider: React.FC<PropsWithChildren>;

package/dist/index.d.ts

@@ -444,6 +444,10 @@ declare const useAllModels: () => ModelDef[];
 declare const ColorModeContext: React$1.Context<{
     mode: "light" | "dark";
     setMode: (mode: "light" | "dark") => void;
+    /** Increments every time the color schema (plain-color / color-coded / hex)
+     *  changes via setColorSchemas().  Components that depend on derived tones
+     *  use this to re-render when the schema updates. */
+    schemaVersion: number;
 }>;
 
 declare const ColorModeContextProvider: React.FC<PropsWithChildren>;

package/dist/index.js

@@ -46,7 +46,7 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
 var ColorModeContext = React5.createContext({ mode: "light", setMode: () => {
-} });
+}, schemaVersion: 0 });
 
 // src/utils/modelTone.ts
 var MODEL_TONES_LIGHT = [
@@ -85,6 +85,16 @@ var _modulesColorSchema = typeof localStorage !== "undefined" && localStorage.ge
 var _modelsColorSchema = typeof localStorage !== "undefined" && localStorage.getItem("jm_modelsColorSchema") || "plain-color";
 var _customPlainToneLight = null;
 var _customPlainToneDark = null;
+var _colorSchemaListeners = [];
+var onColorSchemaChange = (listener) => {
+  _colorSchemaListeners.push(listener);
+  return () => {
+    _colorSchemaListeners = _colorSchemaListeners.filter((l) => l !== listener);
+  };
+};
+var _notifyColorSchemaListeners = () => {
+  for (const l of [..._colorSchemaListeners]) l();
+};
 var hexToRgb = (hex) => {
   const match = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
   if (!match) return null;
@@ -219,6 +229,7 @@ var setColorSchemas = (schemas) => {
       }
     }
   }
+  _notifyColorSchemaListeners();
 };
 var hashString = (input) => {
   let hash = 0;
@@ -248,7 +259,7 @@ var getModelTone = (modelLike, darkMode) => {
   return tones[hashString(seed) % tones.length];
 };
 var useModelTone = (modelLike) => {
-  const { mode } = React5.useContext(ColorModeContext);
+  const { mode, schemaVersion } = React5.useContext(ColorModeContext);
   return getModelTone(modelLike, mode === "dark");
 };
 var getContrastingTextColor = (background) => isDarkColor(background) ? "#f8fafc" : "#0f172a";
@@ -303,6 +314,7 @@ function getNavEntry(navConfig, key) {
   return navConfig.find((e) => e.key === key);
 }
 function sortItemsByNavConfig(items, navConfig) {
+  if (!Array.isArray(items)) return [];
   return [...items].sort((a, b) => {
     const aSeq = getNavEntry(navConfig, a.key ?? a.name ?? "")?.sequence ?? 999;
     const bSeq = getNavEntry(navConfig, b.key ?? b.name ?? "")?.sequence ?? 999;
@@ -358,6 +370,7 @@ function useJourneyMenuItems() {
   return byModule;
 }
 function injectJourneyMenuItems(items, byModule) {
+  if (!Array.isArray(items)) return [];
   if (!byModule || Object.keys(byModule).length === 0) return items;
   const moduleNameOf = (item) => {
     let key = String(item?.key ?? item?.name ?? "");
@@ -366,16 +379,20 @@ function injectJourneyMenuItems(items, byModule) {
     if (byModule[key]) return key;
     return null;
   };
-  const walk = (list) => list.map((item) => {
-    const childrenWalked = Array.isArray(item?.children) && item.children.length ? walk(item.children) : item?.children;
-    const moduleName = moduleNameOf(item);
-    const extra = moduleName ? byModule[moduleName] : void 0;
-    if (extra && extra.length) {
-      return { ...item, children: [...extra, ...childrenWalked || []] };
-    }
-    if (childrenWalked !== item?.children) return { ...item, children: childrenWalked };
-    return item;
-  });
+  const walk = (list) => {
+    if (!Array.isArray(list)) return [];
+    return list.map((item) => {
+      const safeChildren = Array.isArray(item?.children) ? item.children : [];
+      const childrenWalked = safeChildren.length ? walk(safeChildren) : safeChildren;
+      const moduleName = moduleNameOf(item);
+      const extra = moduleName ? byModule[moduleName] : void 0;
+      if (extra && extra.length) {
+        return { ...item, children: [...extra, ...Array.isArray(childrenWalked) ? childrenWalked : []] };
+      }
+      if (childrenWalked !== item?.children) return { ...item, children: Array.isArray(childrenWalked) ? childrenWalked : item?.children };
+      return item;
+    });
+  };
   return walk(items);
 }
 var HorizontalMenu = ({ navConfig = [] }) => {
@@ -422,8 +439,10 @@ var HorizontalMenu = ({ navConfig = [] }) => {
     );
   };
   const transformItems = (items2, depth = 0) => {
+    if (!Array.isArray(items2)) return [];
     return items2.map((item) => {
-      const hasChildren = item.children && item.children.length > 0;
+      const safeChildren = Array.isArray(item?.children) ? item.children : [];
+      const hasChildren = safeChildren.length > 0;
       return {
         key: item.key,
         label: renderLabel(item, depth, hasChildren),
@@ -494,8 +513,10 @@ var CustomSider = ({ collapsed, logo, appTitle, navConfig = [] }) => {
     );
   };
   const transformItems = (items2, depth = 0) => {
+    if (!Array.isArray(items2)) return [];
     return items2.map((item) => {
-      const hasChildren = item.children && item.children.length > 0;
+      const safeChildren = Array.isArray(item?.children) ? item.children : [];
+      const hasChildren = safeChildren.length > 0;
       return {
         key: item.key,
         label: renderLabel(item, depth, hasChildren),
@@ -524,7 +545,7 @@ var CustomSider = ({ collapsed, logo, appTitle, navConfig = [] }) => {
       theme: mode === "dark" ? "dark" : "light",
       style: {
         borderRight: `1px solid ${token.colorBorderSecondary}`,
-        background: token.colorBgContainer,
+        background: mode === "dark" ? token.colorBgContainer : token.colorBgLayout,
         height: "100vh",
         position: "sticky",
         top: 0,
@@ -1569,7 +1590,6 @@ function useNavModules() {
   const navConfig = useNavConfig();
   return (navConfig || []).filter((e) => e.type === "module" && String(e.key || "").startsWith("module:")).map((e) => ({ value: String(e.key).slice("module:".length), label: e.label || String(e.key).slice("module:".length) }));
 }
-var API_URL4 = "/api";
 var DefaultLogo = ({ logo, appTitle, collapsed, isHeader = false, hideTitle = false }) => {
   const logoEl = typeof logo === "string" ? /* @__PURE__ */ jsxRuntime.jsx("img", { src: logo, alt: appTitle || "App", style: { height: isHeader ? "32px" : "40px", width: "auto", marginRight: collapsed || hideTitle ? 0 : 10 } }) : logo ? /* @__PURE__ */ jsxRuntime.jsx("span", { style: { marginRight: collapsed || hideTitle ? 0 : 10, display: "flex", alignItems: "center" }, children: logo }) : null;
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { display: "flex", alignItems: "center", justifyContent: collapsed ? "center" : "flex-start", padding: isHeader ? 0 : "10px 0" }, children: [
@@ -1580,16 +1600,19 @@ var DefaultLogo = ({ logo, appTitle, collapsed, isHeader = false, hideTitle = fa
 var MobileMenuContent = ({ onClose }) => {
   const { menuItems, selectedKey } = core.useMenu();
   const go = core.useGo();
-  const transformItems = (items) => items.map((item) => ({
-    key: item.key,
-    label: item.label || item.name || item.key,
-    icon: item.icon,
-    onClick: item.children?.length ? void 0 : () => {
-      go({ to: item.route });
-      onClose();
-    },
-    children: item.children?.length ? transformItems(item.children) : void 0
-  }));
+  const transformItems = (items) => {
+    if (!Array.isArray(items)) return [];
+    return items.map((item) => ({
+      key: item.key,
+      label: item.label || item.name || item.key,
+      icon: item.icon,
+      onClick: item.children?.length ? void 0 : () => {
+        go({ to: item.route });
+        onClose();
+      },
+      children: item.children?.length ? transformItems(item.children) : void 0
+    }));
+  };
   return /* @__PURE__ */ jsxRuntime.jsx(
     antd.Menu,
     {
@@ -1642,7 +1665,7 @@ var LayoutWrapper = ({
   const handleChangePassword = async (values) => {
     setPwdLoading(true);
     try {
-      const res = await authenticatedFetch(`${API_URL4}/auth/change-password`, {
+      const res = await authenticatedFetch(`/auth/change-password`, {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify(values)
@@ -4019,6 +4042,12 @@ var getRecordId = (record, fields) => {
   }
   return record.eid ?? record.id;
 };
+var isPkField = (field, model) => {
+  if (field.isPk === true) return true;
+  if (model?.pkField != null && field.key === model.pkField) return true;
+  return false;
+};
+var isReferenceField = (field) => !!field.reference;
 var getListViewFields = (model, filterField) => {
   const baseFields = filterField ? model.fields.filter((field) => field.key !== filterField) : model.fields;
   return baseFields.slice(0, 6);
@@ -4489,9 +4518,14 @@ var resolveRelationFromConfig = (relations, item) => {
     (rel) => (rel.relationName || "").toLowerCase() === target || (rel.resource || "").toLowerCase() === target || (rel.label || "").toLowerCase() === target
   );
   if (exact) return exact;
-  return relations.find(
+  const byVariant = relations.find(
     (rel) => targetVariants.has((rel.relationName || "").toLowerCase()) || targetVariants.has((rel.resource || "").toLowerCase()) || targetVariants.has((rel.label || "").toLowerCase())
   );
+  if (byVariant) return byVariant;
+  const relPathBase = (rel) => String(rel.resourcePath || "").toLowerCase().replace(/_relation$/, "");
+  return relations.find(
+    (rel) => relPathBase(rel) === target || targetVariants.has(relPathBase(rel))
+  );
 };
 var buildConfiguredRelationKeys = (rows) => {
   const keys = /* @__PURE__ */ new Set();
@@ -8460,7 +8494,7 @@ function buildColumnFilterOptions({
 }) {
   const filtersMap = /* @__PURE__ */ new Map();
   for (const field of fields) {
-    if (field.key === "eid") {
+    if (isPkField(field)) {
       const labelValues = [];
       for (const record of data) {
         const lbl = record?._label;
@@ -8567,7 +8601,7 @@ function buildColumnFilterOptions({
     for (const record of data) {
       let value = record?.[field.key];
       let label = value;
-      if (field.key === "eid" && record?._label) {
+      if (isPkField(field) && record?._label) {
         value = record.eid;
         label = record._label;
       }
@@ -8608,7 +8642,7 @@ function matchesColumnFilterValue(field, record, value) {
     const recordVal = String(record?.[field.key] ?? "");
     return recordVal.localeCompare(lo) >= 0 && recordVal.localeCompare(hi) <= 0;
   }
-  if (field.key === "eid" && strValue.startsWith("__catrange__:")) {
+  if (isPkField(field) && strValue.startsWith("__catrange__:")) {
     const sub = strValue.substring("__catrange__:".length);
     const sepIdx = sub.indexOf(":");
     const lo = decodeURIComponent(sub.substring(0, sepIdx));
@@ -8616,7 +8650,7 @@ function matchesColumnFilterValue(field, record, value) {
     const recordLabel = String(record?._label ?? "");
     return recordLabel.localeCompare(lo) >= 0 && recordLabel.localeCompare(hi) <= 0;
   }
-  if (field.key === "eid" && record?._label) {
+  if (isPkField(field) && record?._label) {
     return String(record._label) === strValue || String(record.eid) === strValue;
   }
   return String(record?.[field.key]) === strValue;
@@ -12734,11 +12768,11 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
     }
   }, [apiUrl, categoryField1, categoryField2, chartType, selectedSeriesKeys, summaryFn, rankingMode, rankingFieldKey, rankingN, crosstabFilterFields, relatedModel.name, relatedModel.resource, allModels]);
   const categoricalFields = React5.useMemo(() => {
-    return relatedModel.fields.filter((field) => field.key === "eid" || (field.type !== "number" || field.reference));
-  }, [relatedModel.fields]);
+    return relatedModel.fields.filter((field) => isPkField(field, relatedModel) || (field.type !== "number" || field.reference));
+  }, [relatedModel]);
   const numericFields = React5.useMemo(() => {
-    return relatedModel.fields.filter((field) => field.key !== "eid" && field.type === "number" && !field.reference);
-  }, [relatedModel.fields]);
+    return relatedModel.fields.filter((field) => !isPkField(field, relatedModel) && field.type === "number" && !field.reference);
+  }, [relatedModel]);
   const resetLayoutDefaults = React5.useCallback(() => {
     setListVisible(true);
     setAnalyzeOpen(false);
@@ -13307,7 +13341,7 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
         if (!rowValues) return;
         const payload = {};
         relatedModel.fields.forEach((field) => {
-          if (field.key === "eid") return;
+          if (isPkField(field, relatedModel)) return;
           if (!Object.prototype.hasOwnProperty.call(rowValues, field.key)) return;
           const newVal = normalizeFieldValue(field, rowValues[field.key]);
           const oldVal = normalizeFieldValue(field, row?.[field.key]);
@@ -13408,7 +13442,7 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
   const getSortValue = React5.useCallback((field, recordRow) => {
     const raw = recordRow?.[field.key];
     if (raw === void 0 || raw === null) return null;
-    if (field.key === "eid" && recordRow?._label) return recordRow._label;
+    if (isPkField(field, relatedModel) && recordRow?._label) return recordRow._label;
     if (field.reference) {
       const cacheKey = `${field.reference}:${raw}`;
       return labelCache[cacheKey] ?? raw;
@@ -13684,7 +13718,7 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
     if (!field) return _34("All");
     const raw = recordRow?.[field.key];
     if (raw === void 0 || raw === null) return "-";
-    if (field.key === "eid" && recordRow?._label) return recordRow._label;
+    if (isPkField(field, relatedModel) && recordRow?._label) return recordRow._label;
     if (field.reference) {
       const cacheKey = `${field.reference}:${raw}`;
       return labelCache[cacheKey] || String(raw);
@@ -13704,7 +13738,7 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
     return parts.filter(Boolean).join(" \u2022 ");
   }, [categoryField1, categoryField2, relatedModel.fields, relatedModel.label, relatedModel.name]);
   const chartData = React5.useMemo(() => {
-    const data = columnFilteredRows || [];
+    const data = Array.isArray(columnFilteredRows) ? columnFilteredRows : [];
     const cat1Field = categoryField1 ? relatedModel.fields.find((field) => field.key === categoryField1) : void 0;
     const cat2Field = categoryField2 ? relatedModel.fields.find((field) => field.key === categoryField2) : void 0;
     const groupMap = /* @__PURE__ */ new Map();
@@ -13965,7 +13999,7 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
                     setSelectedSeriesKeys(value);
                   },
                   style: { width: "100%" },
-                  options: relatedModel.fields.filter((field) => !field.isPk && field.key !== "eid").map((field) => ({ label: field.label, value: field.key })),
+                  options: relatedModel.fields.filter((field) => !isPkField(field, relatedModel)).map((field) => ({ label: field.label, value: field.key })),
                   placeholder: _34("All numeric fields"),
                   maxTagCount: "responsive"
                 }
@@ -14232,9 +14266,9 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
   }, [columnFilteredRows, displayFields, labelCache]);
   const isTotalsDetailsVariant = viewVariant === "totals-details";
   const getDefaultTotalsSummaryFn = React5.useCallback((field) => {
-    if (field.key === "eid") return "count";
+    if (isPkField(field, relatedModel)) return "count";
     return "sum";
-  }, []);
+  }, [relatedModel]);
   const resolveTotalsSummaryFn = React5.useCallback((field) => {
     return totalsSummaryFunctions[field.key] || getDefaultTotalsSummaryFn(field);
   }, [getDefaultTotalsSummaryFn, totalsSummaryFunctions]);
@@ -15068,10 +15102,15 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
                     allowInlineEdit && /* @__PURE__ */ jsxRuntime.jsx(
                       antd.Table.Column,
                       {
-                        title: rel.otherKey || "Related",
+                        title: relatedModel.label || relatedModel.name,
+                        sorter: { compare: (a, b) => getRecordDisplayLabel(a).localeCompare(getRecordDisplayLabel(b)) },
+                        filters: Array.from(new Set((filteredRows || []).map((r) => getRecordDisplayLabel(r)))).map((label) => ({ text: label, value: label })),
+                        filterSearch: true,
+                        onFilter: (value, row) => getRecordDisplayLabel(row) === String(value),
                         render: (_unused, row) => {
                           const id = row?.eid ?? row?.id;
-                          if (!id) return "-";
+                          const label = getRecordDisplayLabel(row);
+                          if (!id) return label;
                           return /* @__PURE__ */ jsxRuntime.jsx(
                             "a",
                             {
@@ -15086,7 +15125,7 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
                                 }
                               },
                               style: { cursor: "pointer", color: "inherit", textDecoration: "none" },
-                              children: String(id)
+                              children: label
                             }
                           );
                         }
@@ -15111,15 +15150,15 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
                           }
                         }),
                         onFilter: (value, recordRow) => {
-                          if (field.key === "eid" && recordRow?._label) {
+                          if (isPkField(field, relatedModel) && recordRow?._label) {
                             return String(recordRow._label) === String(value) || String(recordRow.eid) === String(value);
                           }
                           const recordValue = recordRow?.[field.key];
                           return String(recordValue) === String(value);
                         },
-                        align: field.type === "number" && !field.reference && !["eid", "eid_from", "eid_to"].includes(field.key) ? "right" : void 0,
+                        align: field.type === "number" && !isReferenceField(field) && !isPkField(field, relatedModel) ? "right" : void 0,
                         render: (value, row) => {
-                          if (allowInlineEdit && field.key !== "eid") {
+                          if (allowInlineEdit && !isPkField(field, relatedModel)) {
                             const rowId = row?.eid ?? row?.id ?? row?.__relationKey;
                             return /* @__PURE__ */ jsxRuntime.jsx(
                               antd.Form.Item,
@@ -15141,7 +15180,7 @@ var RelatedObjectsTable = ({ rel, record, relatedModel, parentModel, showActions
                               const cacheKey = `${field.reference}:${value}`;
                               return labelCache[cacheKey] || value;
                             }
-                            if (field.key === "eid" && row._label) return row._label;
+                            if (isPkField(field, relatedModel) && row._label) return row._label;
                             if (field.type === "boolean") return /* @__PURE__ */ jsxRuntime.jsx(antd.Checkbox, { checked: value, disabled: true });
                             if (field.type === "number" && !field.reference) {
                               const formatted = formatNumberValue(value);
@@ -16676,7 +16715,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
   const getSortValue = React5.useCallback((field, record) => {
     const raw = record?.[field.key];
     if (raw === void 0 || raw === null) return null;
-    if (field.key === "eid" && record?._label) return record._label;
+    if (isPkField(field, model) && record?._label) return record._label;
     if (field.reference) {
       const cacheKey = `${field.reference}:${raw}`;
       return labelCache[cacheKey] ?? raw;
@@ -16855,7 +16894,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
   }, [allRowsData, useLocalSearch, localSearch, model.fields, labelCache]);
   const isClientFiltering = allRowsLoaded && !allRowsError;
   const filteredDataSource = React5.useMemo(() => {
-    if (!isClientFiltering) return tableProps.dataSource || [];
+    if (!isClientFiltering) return Array.isArray(tableProps.dataSource) ? tableProps.dataSource : [];
     const baseRows = allRows || [];
     return applyFilterRules(applyGlobalSearch(baseRows));
   }, [allRows, applyFilterRules, applyGlobalSearch, isClientFiltering, tableProps.dataSource]);
@@ -16874,7 +16913,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
     setGalleryPage(1);
   }, [localSearch, filterRules, resolvedListViewType]);
   const columnFilters = React5.useMemo(() => {
-    const data = allRowsData.length > 0 ? allRowsData : tableProps.dataSource || [];
+    const data = allRowsData.length > 0 ? allRowsData : Array.isArray(tableProps.dataSource) ? tableProps.dataSource : [];
     const rangeCount = viewSettings?.maxDistinctColumnFilterValuesToRanges ?? 20;
     return buildColumnFilterOptions({ fields: displayFields, data, rangeCount });
   }, [allRowsData, displayFields, tableProps.dataSource, viewSettings]);
@@ -16961,10 +17000,10 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
     };
   }, [handleTablePageChange, isClientFiltering, pageSize, tableProps.pagination]);
   const categoricalFields = React5.useMemo(() => {
-    return model.fields.filter((field) => field.key === "eid" || (field.type !== "number" || field.reference));
+    return model.fields.filter((field) => isPkField(field, model) || (field.type !== "number" || field.reference));
   }, [model.fields]);
   const numericFields = React5.useMemo(() => {
-    return model.fields.filter((field) => field.key !== "eid" && field.type === "number" && !field.reference);
+    return model.fields.filter((field) => !isPkField(field, model) && field.type === "number" && !field.reference);
   }, [model.fields]);
   const hasActiveRangeColumnFilter = React5.useMemo(() => {
     return Object.values(columnFiltersSelected).some(
@@ -17563,7 +17602,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
     if (!field) return _36("All");
     const raw = record?.[field.key];
     if (raw === void 0 || raw === null) return "-";
-    if (field.key === "eid" && record?._label) return record._label;
+    if (isPkField(field, model) && record?._label) return record._label;
     if (field.reference) {
       const cacheKey = `${field.reference}:${raw}`;
       return labelCache[cacheKey] || String(raw);
@@ -17578,7 +17617,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
     return String(raw);
   }, [labelCache]);
   const chartData = React5.useMemo(() => {
-    const data = columnFilteredDataSource || [];
+    const data = Array.isArray(columnFilteredDataSource) ? columnFilteredDataSource : [];
     const cat1Field = categoryField1 ? model.fields.find((field) => field.key === categoryField1) : void 0;
     const cat2Field = categoryField2 ? model.fields.find((field) => field.key === categoryField2) : void 0;
     const groupMap = /* @__PURE__ */ new Map();
@@ -17760,7 +17799,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
   }, [isCrosstabView, categoryField1, categoryField2, crosstabFilterFields, allRowsData, columnFilteredDataSource, model.fields, allModels, apiUrl, handleReferenceLabel]);
   const crosstabFilterOptions = React5.useMemo(() => {
     if (crosstabFilterFields.length === 0) return /* @__PURE__ */ new Map();
-    const data = allRowsData.length > 0 ? allRowsData : tableProps.dataSource || [];
+    const data = allRowsData.length > 0 ? allRowsData : Array.isArray(tableProps.dataSource) ? tableProps.dataSource : [];
     const rangeCount = viewSettings?.maxDistinctColumnFilterValuesToRanges ?? 20;
     const fields = crosstabFilterFields.map((k) => model.fields.find((f) => f.key === k)).filter((f) => Boolean(f));
     return buildColumnFilterOptions({ fields, data, rangeCount });
@@ -17833,7 +17872,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
                     setSelectedSeriesKeys(value);
                   },
                   style: { width: "100%" },
-                  options: model.fields.filter((field) => !field.isPk && field.key !== "eid").map((field) => ({ label: field.label, value: field.key })),
+                  options: model.fields.filter((field) => !isPkField(field, model)).map((field) => ({ label: field.label, value: field.key })),
                   placeholder: _36("All numeric fields"),
                   maxTagCount: "responsive"
                 }
@@ -17984,7 +18023,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
     });
   }, [isTotalsDetailsView, allRows, displayFields, labelCache]);
   const getDefaultTotalsSummaryFn = React5.useCallback((field) => {
-    if (["eid", "eid_from", "eid_to"].includes(field.key)) return "count";
+    if (isPkField(field, model) || isReferenceField(field)) return "count";
     return "sum";
   }, []);
   const resolveTotalsSummaryFn = React5.useCallback((field) => {
@@ -18281,8 +18320,8 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
     }
     const resourceName = model.isNamedQuery && model.primaryResource ? model.primaryResource : model.resource || model.name;
     const explicitPk = model.pkField ? record[model.pkField] : void 0;
-    const isPkField = model.fields?.find((f) => f.isPk)?.key;
-    const pkValue = explicitPk ?? (isPkField ? record[isPkField] : void 0) ?? record.eid ?? record.id ?? null;
+    const isPkField2 = model.fields?.find((f) => f.isPk)?.key;
+    const pkValue = explicitPk ?? (isPkField2 ? record[isPkField2] : void 0) ?? record.eid ?? record.id ?? null;
     if (pkValue != null) {
       return { resource: resourceName, id: pkValue, isLinkRow: false };
     }
@@ -18427,7 +18466,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
   getRowKeyRef.current = getRowKey;
   const handleBulkRowSelectionChange = React5.useCallback(
     (newKeys, newRowsOnPage) => {
-      const currentPageData = isClientFiltering ? filteredDataSource : tableProps.dataSource || [];
+      const currentPageData = isClientFiltering ? filteredDataSource : Array.isArray(tableProps.dataSource) ? tableProps.dataSource : [];
       const currentPageKeys = new Set(currentPageData.map((r) => String(getRowKeyRef.current(r))));
       const newKeySet = new Set(newKeys.map((k) => String(k)));
       newRowsOnPage.forEach((row) => {
@@ -19679,7 +19718,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
                   dataIndex: field.key,
                   title: field.label,
                   sorter: { compare: (a, b) => compareSortValues(field, a, b), multiple: getSortPriority(columnSort, field.key) },
-                  align: field.type === "number" && !field.reference && !["eid", "eid_from", "eid_to"].includes(field.key) ? "right" : void 0,
+                  align: field.type === "number" && !isReferenceField(field) && !isPkField(field, model) ? "right" : void 0,
                   filters: columnFilters.get(field.key),
                   filteredValue: columnFiltersSelected[field.key] || null,
                   sortOrder: columnSort.find((item) => item.fieldKey === field.key)?.order ?? null,
@@ -19714,7 +19753,7 @@ var DynamicList = ({ model: modelProp, allModels, filter, relationConfig, isEmbe
                           }
                         );
                       }
-                      if (field.key === "eid" && record._label) return record._label;
+                      if (isPkField(field, model) && record._label) return record._label;
                       if (field.type === "boolean") return /* @__PURE__ */ jsxRuntime.jsx(antd.Checkbox, { checked: value, disabled: true });
                       if (field.type === "number" && !field.reference) {
                         const formatted = formatNumberValue(value);
@@ -20866,6 +20905,10 @@ var ColorModeContextProvider = ({
     colorModeFromLocalStorage === "dark" || colorModeFromLocalStorage === "light" ? colorModeFromLocalStorage : systemPreference
   );
   const initializedFromServer = React5.useRef(false);
+  const [schemaVersion, setSchemaVersion] = React5.useState(0);
+  React5.useEffect(() => {
+    return onColorSchemaChange(() => setSchemaVersion((v) => v + 1));
+  }, []);
   React5.useEffect(() => {
     let cancelled = false;
     const load = async () => {
@@ -20907,7 +20950,7 @@ var ColorModeContextProvider = ({
     void saveToServer(newMode);
   }, [saveToServer]);
   const { darkAlgorithm, defaultAlgorithm } = antd.theme;
-  return /* @__PURE__ */ jsxRuntime.jsx(ColorModeContext.Provider, { value: { mode, setMode: setColorMode }, children: /* @__PURE__ */ jsxRuntime.jsx(
+  return /* @__PURE__ */ jsxRuntime.jsx(ColorModeContext.Provider, { value: { mode, setMode: setColorMode, schemaVersion }, children: /* @__PURE__ */ jsxRuntime.jsx(
     antd.ConfigProvider,
     {
       theme: {