@nubitio/crud 0.5.2 → 0.5.4

package/dist/index.cjs

@@ -5309,6 +5309,84 @@ function useCrudPage(resource, externalFormRef) {
 	};
 }
 //#endregion
+//#region packages/crud/crud/AuditTrail.ts
+function createAuditFieldLabelResolver(config, fields) {
+	const fieldLabelByName = new Map(fields.map((field) => [field.name, field.label || field.name]));
+	return (field) => {
+		const fromConfig = config?.fieldLabels;
+		if (fromConfig) {
+			if (typeof fromConfig === "function") {
+				const resolved = fromConfig(field);
+				if (resolved) return resolved;
+			} else if (fromConfig[field]) return fromConfig[field];
+		}
+		return fieldLabelByName.get(field) ?? field;
+	};
+}
+function normalizeAuditScalar(value) {
+	if (value == null || value === "") return null;
+	return value;
+}
+function auditValuesEqual(before, after) {
+	return JSON.stringify(normalizeAuditScalar(before)) === JSON.stringify(normalizeAuditScalar(after));
+}
+function mergeAuditEntryGroup(entries) {
+	const chronological = [...entries].sort((left, right) => {
+		if (left.id < right.id) return -1;
+		if (left.id > right.id) return 1;
+		return 0;
+	});
+	const mergedChanges = {};
+	const fields = /* @__PURE__ */ new Set();
+	for (const entry of chronological) for (const field of Object.keys(entry.changes)) fields.add(field);
+	for (const field of fields) {
+		const first = chronological.find((entry) => field in entry.changes);
+		const last = [...chronological].reverse().find((entry) => field in entry.changes);
+		if (!first || !last) continue;
+		const before = first.changes[field].before;
+		const after = last.changes[field].after;
+		if (!auditValuesEqual(before, after)) mergedChanges[field] = {
+			before,
+			after
+		};
+	}
+	if (Object.keys(mergedChanges).length === 0) return null;
+	return {
+		...chronological[chronological.length - 1],
+		changes: mergedChanges
+	};
+}
+/**
+* Merges burst audit rows that share the same second, user, and action.
+* Keeps the earliest "before" and latest "after" per field, and drops
+* entries whose net diff is empty (e.g. clear-then-restore in one save).
+*/
+function consolidateAuditEntries(entries) {
+	if (entries.length <= 1) return entries;
+	const consolidated = [];
+	let group = [];
+	const flushGroup = () => {
+		if (group.length === 0) return;
+		if (group.length === 1) consolidated.push(group[0]);
+		else {
+			const merged = mergeAuditEntryGroup(group);
+			if (merged) consolidated.push(merged);
+		}
+		group = [];
+	};
+	const groupKey = (entry) => `${entry.timestamp.slice(0, 19)}|${entry.user}|${entry.action}`;
+	for (const entry of entries) {
+		if (group.length === 0 || groupKey(group[0]) === groupKey(entry)) {
+			group.push(entry);
+			continue;
+		}
+		flushGroup();
+		group.push(entry);
+	}
+	flushGroup();
+	return consolidated;
+}
+//#endregion
 //#region packages/crud/crud/AuditTrailPanel.tsx
 const ACTION_BADGE = {
 	create: "success",
@@ -5433,7 +5511,7 @@ function AuditTrailPanel({ url, renderEntry, visible, onClose, recordSubtitle, r
 		httpClient.get(url).then((response) => {
 			setFetchState({
 				status: "success",
-				entries: response.data
+				entries: consolidateAuditEntries(response.data)
 			});
 		}).catch(() => {
 			setFetchState({ status: "error" });
@@ -5446,10 +5524,16 @@ function AuditTrailPanel({ url, renderEntry, visible, onClose, recordSubtitle, r
 		}
 		loadEntries();
 	}, [loadEntries, visible]);
-	const drawerTitle = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: t("auditTrail.title") }), recordSubtitle && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-		className: "nb-audit-trail__subtitle",
-		children: recordSubtitle
-	})] });
+	const drawerTitle = recordSubtitle ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "nb-audit-trail__header",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+			className: "nb-audit-trail__record",
+			children: recordSubtitle
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+			className: "nb-audit-trail__drawer-label",
+			children: t("auditTrail.title")
+		})]
+	}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: t("auditTrail.title") });
 	const body = (() => {
 		if (url === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_nubitio_ui.EmptyState, {
 			fill: true,
@@ -5511,21 +5595,6 @@ function AuditTrailPanel({ url, renderEntry, visible, onClose, recordSubtitle, r
 	});
 }
 //#endregion
-//#region packages/crud/crud/AuditTrail.ts
-function createAuditFieldLabelResolver(config, fields) {
-	const fieldLabelByName = new Map(fields.map((field) => [field.name, field.label || field.name]));
-	return (field) => {
-		const fromConfig = config?.fieldLabels;
-		if (fromConfig) {
-			if (typeof fromConfig === "function") {
-				const resolved = fromConfig(field);
-				if (resolved) return resolved;
-			} else if (fromConfig[field]) return fromConfig[field];
-		}
-		return fieldLabelByName.get(field) ?? field;
-	};
-}
-//#endregion
 //#region packages/crud/crud/dialogStore.ts
 function initialDialogState() {
 	return {

package/dist/index.mjs

@@ -5285,6 +5285,84 @@ function useCrudPage(resource, externalFormRef) {
 	};
 }
 //#endregion
+//#region packages/crud/crud/AuditTrail.ts
+function createAuditFieldLabelResolver(config, fields) {
+	const fieldLabelByName = new Map(fields.map((field) => [field.name, field.label || field.name]));
+	return (field) => {
+		const fromConfig = config?.fieldLabels;
+		if (fromConfig) {
+			if (typeof fromConfig === "function") {
+				const resolved = fromConfig(field);
+				if (resolved) return resolved;
+			} else if (fromConfig[field]) return fromConfig[field];
+		}
+		return fieldLabelByName.get(field) ?? field;
+	};
+}
+function normalizeAuditScalar(value) {
+	if (value == null || value === "") return null;
+	return value;
+}
+function auditValuesEqual(before, after) {
+	return JSON.stringify(normalizeAuditScalar(before)) === JSON.stringify(normalizeAuditScalar(after));
+}
+function mergeAuditEntryGroup(entries) {
+	const chronological = [...entries].sort((left, right) => {
+		if (left.id < right.id) return -1;
+		if (left.id > right.id) return 1;
+		return 0;
+	});
+	const mergedChanges = {};
+	const fields = /* @__PURE__ */ new Set();
+	for (const entry of chronological) for (const field of Object.keys(entry.changes)) fields.add(field);
+	for (const field of fields) {
+		const first = chronological.find((entry) => field in entry.changes);
+		const last = [...chronological].reverse().find((entry) => field in entry.changes);
+		if (!first || !last) continue;
+		const before = first.changes[field].before;
+		const after = last.changes[field].after;
+		if (!auditValuesEqual(before, after)) mergedChanges[field] = {
+			before,
+			after
+		};
+	}
+	if (Object.keys(mergedChanges).length === 0) return null;
+	return {
+		...chronological[chronological.length - 1],
+		changes: mergedChanges
+	};
+}
+/**
+* Merges burst audit rows that share the same second, user, and action.
+* Keeps the earliest "before" and latest "after" per field, and drops
+* entries whose net diff is empty (e.g. clear-then-restore in one save).
+*/
+function consolidateAuditEntries(entries) {
+	if (entries.length <= 1) return entries;
+	const consolidated = [];
+	let group = [];
+	const flushGroup = () => {
+		if (group.length === 0) return;
+		if (group.length === 1) consolidated.push(group[0]);
+		else {
+			const merged = mergeAuditEntryGroup(group);
+			if (merged) consolidated.push(merged);
+		}
+		group = [];
+	};
+	const groupKey = (entry) => `${entry.timestamp.slice(0, 19)}|${entry.user}|${entry.action}`;
+	for (const entry of entries) {
+		if (group.length === 0 || groupKey(group[0]) === groupKey(entry)) {
+			group.push(entry);
+			continue;
+		}
+		flushGroup();
+		group.push(entry);
+	}
+	flushGroup();
+	return consolidated;
+}
+//#endregion
 //#region packages/crud/crud/AuditTrailPanel.tsx
 const ACTION_BADGE = {
 	create: "success",
@@ -5409,7 +5487,7 @@ function AuditTrailPanel({ url, renderEntry, visible, onClose, recordSubtitle, r
 		httpClient.get(url).then((response) => {
 			setFetchState({
 				status: "success",
-				entries: response.data
+				entries: consolidateAuditEntries(response.data)
 			});
 		}).catch(() => {
 			setFetchState({ status: "error" });
@@ -5422,10 +5500,16 @@ function AuditTrailPanel({ url, renderEntry, visible, onClose, recordSubtitle, r
 		}
 		loadEntries();
 	}, [loadEntries, visible]);
-	const drawerTitle = /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx("div", { children: t("auditTrail.title") }), recordSubtitle && /* @__PURE__ */ jsx("p", {
-		className: "nb-audit-trail__subtitle",
-		children: recordSubtitle
-	})] });
+	const drawerTitle = recordSubtitle ? /* @__PURE__ */ jsxs("div", {
+		className: "nb-audit-trail__header",
+		children: [/* @__PURE__ */ jsx("p", {
+			className: "nb-audit-trail__record",
+			children: recordSubtitle
+		}), /* @__PURE__ */ jsx("p", {
+			className: "nb-audit-trail__drawer-label",
+			children: t("auditTrail.title")
+		})]
+	}) : /* @__PURE__ */ jsx("div", { children: t("auditTrail.title") });
 	const body = (() => {
 		if (url === null) return /* @__PURE__ */ jsx(EmptyState, {
 			fill: true,
@@ -5487,21 +5571,6 @@ function AuditTrailPanel({ url, renderEntry, visible, onClose, recordSubtitle, r
 	});
 }
 //#endregion
-//#region packages/crud/crud/AuditTrail.ts
-function createAuditFieldLabelResolver(config, fields) {
-	const fieldLabelByName = new Map(fields.map((field) => [field.name, field.label || field.name]));
-	return (field) => {
-		const fromConfig = config?.fieldLabels;
-		if (fromConfig) {
-			if (typeof fromConfig === "function") {
-				const resolved = fromConfig(field);
-				if (resolved) return resolved;
-			} else if (fromConfig[field]) return fromConfig[field];
-		}
-		return fieldLabelByName.get(field) ?? field;
-	};
-}
-//#endregion
 //#region packages/crud/crud/dialogStore.ts
 function initialDialogState() {
 	return {

package/dist/style.css

@@ -3298,11 +3298,25 @@ html[data-density=compact] .nb-crud-page-shell__footer {
   min-height: 0;
 }
 
-.nb-audit-trail__subtitle {
-  color: var(--text-secondary);
+.nb-audit-trail__header {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-1);
+}
+
+.nb-audit-trail__record {
+  color: var(--text-primary);
   font-size: var(--font-size-sm, 0.8125rem);
+  font-weight: 600;
   line-height: 1.4;
-  margin: calc(var(--space-1) * -1) 0 0;
+  margin: 0;
+}
+
+.nb-audit-trail__drawer-label {
+  color: var(--text-secondary);
+  font-size: var(--font-size-xs, 0.75rem);
+  line-height: 1.4;
+  margin: 0;
 }
 
 .nb-audit-trail__meta {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nubitio/crud",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "type": "module",
   "description": "Declarative CRUD engine with field DSL, forms, datagrids, RBAC, conditional logic and pluggable adapters (Hydra/REST).",
   "license": "MIT",
@@ -56,8 +56,8 @@
     "react-dom": "^19.0.0",
     "react-i18next": "^14.0.0",
     "react-router-dom": "^6.0.0",
-    "@nubitio/core": "^0.5.2",
-    "@nubitio/ui": "^0.5.2"
+    "@nubitio/core": "^0.5.4",
+    "@nubitio/ui": "^0.5.4"
   },
   "dependencies": {
     "react-dropzone": "^15.0.0"