@archiva/archiva-nextjs 0.2.94 → 0.3.1

package/dist/react/client.mjs

@@ -1,7 +1,7 @@
 "use client";
 import {
   normalizeAuditEventItem
-} from "../chunk-WA7TMG65.mjs";
+} from "../chunk-LOKBGU6S.mjs";
 import {
   useArchivaContext
 } from "../chunk-H4TGL57C.mjs";
@@ -76,8 +76,9 @@ var CloudCogIcon = ({ className }) => /* @__PURE__ */ jsxs(
   }
 );
 function eventToTimelineItem(event, getActorAvatar) {
-  const action = event.action.charAt(0).toUpperCase() + event.action.slice(1);
-  const description = action;
+  const actionValue = event.actionKey || event.action || "";
+  const action = actionValue.charAt(0).toUpperCase() + actionValue.slice(1);
+  const description = event.actionDescription || "";
   const actorId = event.actorId || "unknown";
   const userName = actorId.includes(":") ? actorId.split(":")[1] || actorId : actorId;
   const userHandle = userName;
@@ -124,7 +125,8 @@ function eventToTimelineItem(event, getActorAvatar) {
     // Matches ActivityLog.tsx line 361
     statusIndicator: false,
     // Can be set to true for recent items - matches ActivityLog.tsx line 362
-    data: event
+    data: event,
+    badge: action
   };
 }
 async function fetchEventsWithRetry(apiBaseUrl, getToken, forceRefreshToken, params) {
@@ -132,14 +134,21 @@ async function fetchEventsWithRetry(apiBaseUrl, getToken, forceRefreshToken, par
   if (params.entityId) {
     url.searchParams.set("entityId", params.entityId);
   }
+  if (params.tenantId) {
+    url.searchParams.set("tenantId", params.tenantId);
+  }
   if (params.actorId) {
     url.searchParams.set("actorId", params.actorId);
   }
   if (params.entityType) {
     url.searchParams.set("entityType", params.entityType);
   }
+  if (params.actionKey) {
+    url.searchParams.set("actionKey", params.actionKey);
+  }
   if (params.actorType) {
-    url.searchParams.set("actorType", params.actorType);
+    const actorTypeValue = Array.isArray(params.actorType) ? params.actorType.join(",") : params.actorType;
+    url.searchParams.set("actorType", actorTypeValue);
   }
   if (params.limit) {
     url.searchParams.set("limit", String(params.limit));
@@ -147,6 +156,9 @@ async function fetchEventsWithRetry(apiBaseUrl, getToken, forceRefreshToken, par
   if (params.cursor) {
     url.searchParams.set("cursor", params.cursor);
   }
+  if (params.q) {
+    url.searchParams.set("q", params.q);
+  }
   const makeRequest = async (token2) => {
     return fetch(url.toString(), {
       headers: {
@@ -279,8 +291,15 @@ function SimpleAvatar({
     }
   );
 }
-function applyClientSideFilters(events, searchQuery, showSystemAndServices) {
+function applyClientSideFilters(events, searchQuery, showSystemAndServices, actionDescription) {
   let filtered = events;
+  if (actionDescription) {
+    filtered = filtered.filter((event) => {
+      const eventActionDescription = (event.actionDescription || "").toLowerCase();
+      const filterActionDescription = actionDescription.toLowerCase();
+      return eventActionDescription.includes(filterActionDescription);
+    });
+  }
   if (!showSystemAndServices) {
     filtered = filtered.filter((event) => {
       if (event.actorType) {
@@ -298,13 +317,19 @@ function applyClientSideFilters(events, searchQuery, showSystemAndServices) {
   }
   const query = searchQuery.toLowerCase();
   return filtered.filter((event) => {
-    return event.action.toLowerCase().includes(query) || event.entityType.toLowerCase().includes(query) || event.entityId.toLowerCase().includes(query) || event.actorId && event.actorId.toLowerCase().includes(query) || event.source && event.source.toLowerCase().includes(query) || event.actorDisplay && event.actorDisplay.toLowerCase().includes(query);
+    const actionValue = (event.actionKey || event.action || "").toLowerCase();
+    const actionDescValue = (event.actionDescription || "").toLowerCase();
+    return actionValue.includes(query) || actionDescValue.includes(query) || event.entityType.toLowerCase().includes(query) || event.entityId.toLowerCase().includes(query) || event.actorId && event.actorId.toLowerCase().includes(query) || event.source && event.source.toLowerCase().includes(query) || event.actorDisplay && event.actorDisplay.toLowerCase().includes(query);
   });
 }
 function Timeline({
   entityId,
+  tenantId,
   actorId,
   entityType,
+  actionKey,
+  actionDescription,
+  actorType,
   initialLimit = 100,
   className,
   emptyMessage = "No events yet.",
@@ -321,25 +346,64 @@ function Timeline({
   const [error, setError] = React.useState(null);
   const [hasMore, setHasMore] = React.useState(false);
   const [searchQuery, setSearchQuery] = React.useState("");
+  const baseFilters = React.useMemo(() => {
+    const filters = {};
+    if (entityId) filters.entityId = entityId;
+    if (tenantId) filters.tenantId = tenantId;
+    if (actorId) filters.actorId = actorId;
+    if (entityType) filters.entityType = entityType;
+    if (actionKey) filters.actionKey = actionKey;
+    if (actorType) filters.actorType = actorType;
+    if (!showSystemAndServices && !actorType) {
+      filters.actorType = "user";
+    }
+    return filters;
+  }, [entityId, tenantId, actorId, entityType, actionKey, actorType, showSystemAndServices]);
+  const [uiFilters, setUiFilters] = React.useState({});
+  const mergedFilters = React.useMemo(() => {
+    const merged = {
+      ...baseFilters,
+      limit: initialLimit
+    };
+    if (!baseFilters.tenantId && uiFilters.tenantId) {
+      merged.tenantId = uiFilters.tenantId;
+    }
+    if (!baseFilters.actionKey && uiFilters.actionKey) {
+      merged.actionKey = uiFilters.actionKey;
+    }
+    if (!baseFilters.entityId && uiFilters.entityId) {
+      merged.entityId = uiFilters.entityId;
+    }
+    if (!baseFilters.entityType && uiFilters.entityType) {
+      merged.entityType = uiFilters.entityType;
+    }
+    if (!baseFilters.actorId && uiFilters.actorId) {
+      merged.actorId = uiFilters.actorId;
+    }
+    if (!baseFilters.actorType && uiFilters.actorType) {
+      merged.actorType = uiFilters.actorType;
+    }
+    return merged;
+  }, [baseFilters, uiFilters, initialLimit]);
+  const lockedFilters = React.useMemo(() => ({
+    tenantId: !!tenantId,
+    actionKey: !!actionKey,
+    entityId: !!entityId,
+    entityType: !!entityType,
+    actorId: !!actorId,
+    actorType: !!actorType
+  }), [tenantId, actionKey, entityId, entityType, actorId, actorType]);
   const queryParamsRef = React.useRef({});
   const queryParamsKeyRef = React.useRef("");
   const queryParams = React.useMemo(() => {
-    const params = {
-      entityId,
-      actorId,
-      entityType,
-      // Filter by actorType on API side
-      actorType: showSystemAndServices ? void 0 : "user",
-      limit: initialLimit
-    };
-    const key = JSON.stringify(params);
+    const key = JSON.stringify(mergedFilters);
     if (key !== queryParamsKeyRef.current) {
       queryParamsKeyRef.current = key;
-      queryParamsRef.current = params;
-      return params;
+      queryParamsRef.current = mergedFilters;
+      return mergedFilters;
     }
     return queryParamsRef.current;
-  }, [entityId, actorId, entityType, initialLimit, showSystemAndServices]);
+  }, [mergedFilters]);
   const allEventsRef = React.useRef([]);
   React.useEffect(() => {
     allEventsRef.current = allEvents;
@@ -386,12 +450,13 @@ function Timeline({
     },
     [queryParams, apiBaseUrl, getToken, forceRefreshToken, cursor]
   );
+  const filterKey = React.useMemo(() => JSON.stringify(mergedFilters), [mergedFilters]);
   React.useEffect(() => {
     setCursor(void 0);
     setAllEvents([]);
     setPreviousEvents([]);
     void load({ reset: true });
-  }, [entityId, actorId, entityType, showSystemAndServices, initialLimit]);
+  }, [filterKey]);
   const eventsToFilter = React.useMemo(() => {
     if (loading && allEvents.length === 0 && previousEvents.length > 0) {
       return previousEvents;
@@ -399,8 +464,8 @@ function Timeline({
     return allEvents;
   }, [allEvents, loading, previousEvents]);
   const filteredEvents = React.useMemo(() => {
-    return applyClientSideFilters(eventsToFilter, searchQuery, showSystemAndServices);
-  }, [eventsToFilter, searchQuery, showSystemAndServices]);
+    return applyClientSideFilters(eventsToFilter, searchQuery, showSystemAndServices, actionDescription);
+  }, [eventsToFilter, searchQuery, showSystemAndServices, actionDescription]);
   const timelineItems = React.useMemo(() => {
     return filteredEvents.slice(0, 10).map(
       (event) => eventToTimelineItem(event, getActorAvatar)
@@ -425,6 +490,144 @@ function Timeline({
         placeholder: "Search actions, entities, IDs, actors, sources..."
       }
     ) }),
+    showFilters && /* @__PURE__ */ jsxs("div", { style: { marginBottom: "1rem", padding: "1rem", backgroundColor: "#f9fafb", borderRadius: "0.375rem", display: "flex", flexWrap: "wrap", gap: "0.75rem" }, children: [
+      /* @__PURE__ */ jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "0.25rem" }, children: [
+        /* @__PURE__ */ jsxs("label", { style: { fontSize: "0.75rem", fontWeight: 500, color: "#6b7280" }, children: [
+          "Tenant ID ",
+          lockedFilters.tenantId && /* @__PURE__ */ jsx("span", { style: { color: "#9ca3af" }, children: "(Locked)" })
+        ] }),
+        /* @__PURE__ */ jsx(
+          "input",
+          {
+            type: "text",
+            placeholder: "All tenants",
+            value: lockedFilters.tenantId ? tenantId ?? "" : uiFilters.tenantId ?? "",
+            onChange: (e) => {
+              if (!lockedFilters.tenantId) {
+                setUiFilters((prev) => ({ ...prev, tenantId: e.target.value || void 0 }));
+              }
+            },
+            disabled: lockedFilters.tenantId,
+            style: {
+              padding: "0.375rem 0.5rem",
+              border: "1px solid #d1d5db",
+              borderRadius: "0.375rem",
+              fontSize: "0.875rem",
+              backgroundColor: lockedFilters.tenantId ? "#f3f4f6" : "white",
+              cursor: lockedFilters.tenantId ? "not-allowed" : "text"
+            }
+          }
+        )
+      ] }),
+      /* @__PURE__ */ jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "0.25rem" }, children: [
+        /* @__PURE__ */ jsxs("label", { style: { fontSize: "0.75rem", fontWeight: 500, color: "#6b7280" }, children: [
+          "Action Key ",
+          lockedFilters.actionKey && /* @__PURE__ */ jsx("span", { style: { color: "#9ca3af" }, children: "(Locked)" })
+        ] }),
+        /* @__PURE__ */ jsx(
+          "input",
+          {
+            type: "text",
+            placeholder: "All actions",
+            value: lockedFilters.actionKey ? actionKey ?? "" : uiFilters.actionKey ?? "",
+            onChange: (e) => {
+              if (!lockedFilters.actionKey) {
+                setUiFilters((prev) => ({ ...prev, actionKey: e.target.value || void 0 }));
+              }
+            },
+            disabled: lockedFilters.actionKey,
+            style: {
+              padding: "0.375rem 0.5rem",
+              border: "1px solid #d1d5db",
+              borderRadius: "0.375rem",
+              fontSize: "0.875rem",
+              backgroundColor: lockedFilters.actionKey ? "#f3f4f6" : "white",
+              cursor: lockedFilters.actionKey ? "not-allowed" : "text"
+            }
+          }
+        )
+      ] }),
+      !lockedFilters.entityId && /* @__PURE__ */ jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "0.25rem" }, children: [
+        /* @__PURE__ */ jsx("label", { style: { fontSize: "0.75rem", fontWeight: 500, color: "#6b7280" }, children: "Entity ID" }),
+        /* @__PURE__ */ jsx(
+          "input",
+          {
+            type: "text",
+            placeholder: "All entities",
+            value: uiFilters.entityId ?? "",
+            onChange: (e) => {
+              setUiFilters((prev) => ({ ...prev, entityId: e.target.value || void 0 }));
+            },
+            style: {
+              padding: "0.375rem 0.5rem",
+              border: "1px solid #d1d5db",
+              borderRadius: "0.375rem",
+              fontSize: "0.875rem"
+            }
+          }
+        )
+      ] }),
+      !lockedFilters.entityType && /* @__PURE__ */ jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "0.25rem" }, children: [
+        /* @__PURE__ */ jsx("label", { style: { fontSize: "0.75rem", fontWeight: 500, color: "#6b7280" }, children: "Entity Type" }),
+        /* @__PURE__ */ jsx(
+          "input",
+          {
+            type: "text",
+            placeholder: "All types",
+            value: uiFilters.entityType ?? "",
+            onChange: (e) => {
+              setUiFilters((prev) => ({ ...prev, entityType: e.target.value || void 0 }));
+            },
+            style: {
+              padding: "0.375rem 0.5rem",
+              border: "1px solid #d1d5db",
+              borderRadius: "0.375rem",
+              fontSize: "0.875rem"
+            }
+          }
+        )
+      ] }),
+      !lockedFilters.actorId && /* @__PURE__ */ jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "0.25rem" }, children: [
+        /* @__PURE__ */ jsx("label", { style: { fontSize: "0.75rem", fontWeight: 500, color: "#6b7280" }, children: "Actor ID" }),
+        /* @__PURE__ */ jsx(
+          "input",
+          {
+            type: "text",
+            placeholder: "All actors",
+            value: uiFilters.actorId ?? "",
+            onChange: (e) => {
+              setUiFilters((prev) => ({ ...prev, actorId: e.target.value || void 0 }));
+            },
+            style: {
+              padding: "0.375rem 0.5rem",
+              border: "1px solid #d1d5db",
+              borderRadius: "0.375rem",
+              fontSize: "0.875rem"
+            }
+          }
+        )
+      ] }),
+      (Object.keys(uiFilters).length > 0 || searchQuery) && /* @__PURE__ */ jsx("div", { style: { display: "flex", alignItems: "flex-end" }, children: /* @__PURE__ */ jsx(
+        "button",
+        {
+          type: "button",
+          onClick: () => {
+            setUiFilters({});
+            setSearchQuery("");
+          },
+          style: {
+            padding: "0.375rem 0.75rem",
+            backgroundColor: "#ef4444",
+            color: "white",
+            border: "none",
+            borderRadius: "0.375rem",
+            fontSize: "0.875rem",
+            cursor: "pointer"
+          },
+          children: "Clear"
+        }
+      ) })
+    ] }),
     (searchQuery || filteredEvents.length !== eventsToFilter.length) && /* @__PURE__ */ jsxs("div", { style: { marginBottom: "0.5rem", fontSize: "0.875rem", color: "#6b7280" }, children: [
       "Showing ",
       filteredEvents.length,

package/dist/server/index.d.mts

@@ -1,2 +1,2 @@
-export { f as AuditEventListItem, C as CreateEventInput, e as CreateEventOptions, F as FrontendTokenResponse, G as GET, L as LoadEventsParams, P as PageResult, c as createEvent, a as createEvents, b as createFrontendTokenGET, d as createFrontendTokenRoute, l as loadEvents } from '../index-Bk4DxULy.mjs';
+export { f as AuditEventListItem, C as CreateEventInput, e as CreateEventOptions, F as FrontendTokenResponse, G as GET, L as LoadEventsParams, P as PageResult, c as createEvent, a as createEvents, b as createFrontendTokenGET, d as createFrontendTokenRoute, l as loadEvents } from '../index-DfJ2Gf0Y.mjs';
 import 'next/server';

package/dist/server/index.d.ts

@@ -1,2 +1,2 @@
-export { f as AuditEventListItem, C as CreateEventInput, e as CreateEventOptions, F as FrontendTokenResponse, G as GET, L as LoadEventsParams, P as PageResult, c as createEvent, a as createEvents, b as createFrontendTokenGET, d as createFrontendTokenRoute, l as loadEvents } from '../index-Bk4DxULy.js';
+export { f as AuditEventListItem, C as CreateEventInput, e as CreateEventOptions, F as FrontendTokenResponse, G as GET, L as LoadEventsParams, P as PageResult, c as createEvent, a as createEvents, b as createFrontendTokenGET, d as createFrontendTokenRoute, l as loadEvents } from '../index-DfJ2Gf0Y.js';
 import 'next/server';

package/dist/server/index.js

@@ -178,10 +178,17 @@ var normalizeAuditEventItem = (event) => {
     "actor_id",
     "id"
   ]);
+  const actionKeyValue = coerceString(event.actionKey ?? event.action_key ?? event.action);
+  const actionDescriptionValue = coerceString(event.actionDescription ?? event.action_description);
+  const tenantIdValue = coerceString(event.tenantId ?? event.tenant_id);
   return {
     id: coerceString(event.id) ?? "",
     receivedAt: coerceString(event.receivedAt ?? event.received_at) ?? "",
-    action: coerceString(event.action) ?? "",
+    actionKey: actionKeyValue ?? "",
+    actionDescription: actionDescriptionValue ?? void 0,
+    tenantId: tenantIdValue ?? void 0,
+    // Legacy support: include action for backward compatibility
+    action: actionKeyValue ?? "",
     entityType: coerceString(event.entityType ?? event.entity_type) ?? "",
     entityId: coerceString(event.entityId ?? event.entity_id) ?? "",
     actorId: coerceNullableString(actorIdValue),
@@ -252,7 +259,20 @@ async function loadEvents(apiKey, params, baseUrl = DEFAULT_BASE_URL) {
     url.searchParams.set("entityType", params.entityType);
   }
   if (params.actorType) {
-    url.searchParams.set("actorType", params.actorType);
+    if (Array.isArray(params.actorType)) {
+      url.searchParams.set("actorType", params.actorType.join(","));
+    } else {
+      url.searchParams.set("actorType", params.actorType);
+    }
+  }
+  if (params.tenantId) {
+    url.searchParams.set("tenantId", params.tenantId);
+  }
+  if (params.actionKey) {
+    url.searchParams.set("actionKey", params.actionKey);
+  }
+  if (params.q) {
+    url.searchParams.set("q", params.q);
   }
   if (params.limit) {
     url.searchParams.set("limit", String(params.limit));

package/dist/server/index.mjs

@@ -5,8 +5,8 @@ import {
   createFrontendTokenGET,
   createFrontendTokenRoute,
   loadEvents
-} from "../chunk-A3Q4YKTK.mjs";
-import "../chunk-WA7TMG65.mjs";
+} from "../chunk-5ZJUGBTU.mjs";
+import "../chunk-LOKBGU6S.mjs";
 export {
   GET,
   createEvent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archiva/archiva-nextjs",
-  "version": "0.2.94",
+  "version": "0.3.1",
   "description": "Archiva Next.js SDK - Server Actions and Timeline Component",
   "main": "dist/index.js",
   "module": "dist/index.mjs",