@aduptive/strapi-blockscene 2.0.0-alpha.13 → 2.0.0-alpha.14

package/dist/admin.cjs

@@ -9244,7 +9244,7 @@ var Drawer = import_styled_components7.default.aside`
 var Entry = import_styled_components7.default.button`
   display: block; width: 100%; text-align: left; padding: 12px; margin: 4px 0;
   border: 1px solid ${({ theme }) => theme.colors.neutral200}; border-radius: 4px;
-  background: ${({ theme }) => theme.colors.neutral0}; cursor: pointer;
+  background: ${({ theme }) => theme.colors.neutral0}; color: ${({ theme }) => theme.colors.neutral800}; cursor: pointer;
   &[aria-pressed="true"] { background: ${({ theme }) => theme.colors.primary100}; border-color: ${({ theme }) => theme.colors.primary600}; }
   &:focus-visible { outline: 2px solid ${({ theme }) => theme.colors.primary600}; outline-offset: 2px; }
   &:disabled { cursor: default; opacity: .65; }
@@ -9384,6 +9384,7 @@ function useVersions(host, config2) {
             const day = when2(event.at, true), heading = day !== previousDay;
             previousDay = day;
             const blocks = event.summary?.blocks;
+            const actions = (Array.isArray(event.actions) && event.actions.length ? event.actions : [event.action]).map((action) => t.historyActions[action] || action).join(" \xB7 ");
             const counted = ["total", "added", "removed", "changed"].every((key) => Number.isInteger(blocks?.[key]));
             return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(React11.Fragment, { children: [
               heading && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(import_design_system7.Typography, { tag: "h3", variant: "omega", fontWeight: "bold", style: { marginTop: 12 }, children: day }),
@@ -9400,7 +9401,7 @@ function useVersions(host, config2) {
                     /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(import_design_system7.Typography, { tag: "p", variant: "pi", children: [
                       when2(event.at),
                       " \xB7 ",
-                      t.historyActions[event.action] || event.action
+                      actions
                     ] }),
                     counted ? /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(import_jsx_runtime12.Fragment, { children: [
                       /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(import_design_system7.Typography, { tag: "p", variant: "pi", textColor: "neutral600", children: t.f("versionsCounts", blocks) }),

package/dist/admin.mjs

@@ -9274,7 +9274,7 @@ var Drawer = styled7.aside`
 var Entry = styled7.button`
   display: block; width: 100%; text-align: left; padding: 12px; margin: 4px 0;
   border: 1px solid ${({ theme }) => theme.colors.neutral200}; border-radius: 4px;
-  background: ${({ theme }) => theme.colors.neutral0}; cursor: pointer;
+  background: ${({ theme }) => theme.colors.neutral0}; color: ${({ theme }) => theme.colors.neutral800}; cursor: pointer;
   &[aria-pressed="true"] { background: ${({ theme }) => theme.colors.primary100}; border-color: ${({ theme }) => theme.colors.primary600}; }
   &:focus-visible { outline: 2px solid ${({ theme }) => theme.colors.primary600}; outline-offset: 2px; }
   &:disabled { cursor: default; opacity: .65; }
@@ -9414,6 +9414,7 @@ function useVersions(host, config2) {
             const day = when2(event.at, true), heading = day !== previousDay;
             previousDay = day;
             const blocks = event.summary?.blocks;
+            const actions = (Array.isArray(event.actions) && event.actions.length ? event.actions : [event.action]).map((action) => t.historyActions[action] || action).join(" \xB7 ");
             const counted = ["total", "added", "removed", "changed"].every((key) => Number.isInteger(blocks?.[key]));
             return /* @__PURE__ */ jsxs9(React11.Fragment, { children: [
               heading && /* @__PURE__ */ jsx12(Typography7, { tag: "h3", variant: "omega", fontWeight: "bold", style: { marginTop: 12 }, children: day }),
@@ -9430,7 +9431,7 @@ function useVersions(host, config2) {
                     /* @__PURE__ */ jsxs9(Typography7, { tag: "p", variant: "pi", children: [
                       when2(event.at),
                       " \xB7 ",
-                      t.historyActions[event.action] || event.action
+                      actions
                     ] }),
                     counted ? /* @__PURE__ */ jsxs9(Fragment10, { children: [
                       /* @__PURE__ */ jsx12(Typography7, { tag: "p", variant: "pi", textColor: "neutral600", children: t.f("versionsCounts", blocks) }),

package/dist/server.cjs

@@ -1460,6 +1460,18 @@ var require_history = __commonJS({
     var hashOf = (text) => createHash("sha256").update(text).digest("hex");
     var covers2 = (history, uid) => Boolean(history?.enabled) && uid.startsWith("api::") && (history.contentTypes === "all" || Array.isArray(history.contentTypes) && history.contentTypes.includes(uid));
     var retention = ({ retentionDays, eventDays }, now = Date.now()) => ({ snapshotsBefore: new Date(now - retentionDays * DAY), eventsBefore: new Date(now - eventDays * DAY) });
+    var hasChanges = (summary) => Boolean(summary?.initial || summary?.fields?.length || ["added", "removed", "changed"].some((key) => summary?.blocks?.[key] > 0));
+    function collapseVersions(events) {
+      const versions = [];
+      for (const event of events) {
+        const previous = versions[versions.length - 1];
+        if (event.hash && previous?.hash === event.hash) {
+          if (!previous.actions.includes(event.action)) previous.actions.push(event.action);
+          if (!hasChanges(previous.summary) && hasChanges(event.summary)) previous.summary = event.summary;
+        } else versions.push({ ...event, actions: [event.action] });
+      }
+      return versions;
+    }
     function actorOf(strapi) {
       let ctx;
       try {
@@ -1561,12 +1573,14 @@ var require_history = __commonJS({
         async list({ uid, documentId, locale, actor = "", page = 1, pageSize = 25 }) {
           const scope2 = { contentType: uid, relatedDocumentId: documentId, locale: locale || null };
           const where = { ...scope2, ...actor && { actor } };
-          const [list, kept, total, people] = await Promise.all([
-            events().findMany({ select: ["id", "action", "actor", "actorName", "at", "summary", "hash", "size"], where, orderBy: [{ at: "desc" }, { id: "desc" }], offset: (page - 1) * pageSize, limit: pageSize }),
+          const [timeline, kept, people] = await Promise.all([
+            events().findMany({ select: ["id", "action", "actor", "actorName", "at", "summary", "hash", "size"], where, orderBy: [{ at: "desc" }, { id: "desc" }] }),
             events().findMany({ select: ["hash"], where: { ...scope2, size: { $gt: 0 } } }),
-            events().count({ where }),
             events().findMany({ select: ["actor", "actorName"], where: scope2, orderBy: [{ at: "desc" }, { id: "desc" }] })
           ]);
+          const versions = collapseVersions(timeline);
+          const total = versions.length;
+          const list = versions.slice((page - 1) * pageSize, page * pageSize);
           const hashes = new Set(kept.map((row) => row.hash));
           const actors2 = [...new Map(people.slice().reverse().map(({ actor: actor2, actorName }) => [actor2, { actor: actor2, actorName }])).values()];
           return {
@@ -1814,7 +1828,7 @@ var require_history = __commonJS({
         };
       }
     });
-    module2.exports = { EVENT_UID, ACTIONS, CAPTURED, CRON: CRON2, BATCH, eventContentType: eventContentType2, covers: covers2, retention, actorOf, refsOf, can, readableTypes, historyService: historyService2, registerHistory: registerHistory2, registerPurge: registerPurge2, historyController: historyController2 };
+    module2.exports = { EVENT_UID, ACTIONS, CAPTURED, CRON: CRON2, BATCH, eventContentType: eventContentType2, covers: covers2, retention, actorOf, refsOf, collapseVersions, can, readableTypes, historyService: historyService2, registerHistory: registerHistory2, registerPurge: registerPurge2, historyController: historyController2 };
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aduptive/strapi-blockscene",
-  "version": "2.0.0-alpha.13",
+  "version": "2.0.0-alpha.14",
   "description": "Visual component gallery for native Strapi dynamic zones.",
   "license": "MIT",
   "author": "Andrea Scarpello <aduptive@gmail.com>",