@archiva/archiva-nextjs 0.2.93 → 0.3.0

package/dist/index.js

@@ -239,6 +239,91 @@ var ArchivaError = class extends Error {
   }
 };
 
+// src/eventNormalizer.ts
+var coerceString = (value) => {
+  if (value === null || value === void 0) {
+    return void 0;
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return void 0;
+};
+var coerceNullableString = (value) => {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return null;
+};
+var coerceActorType = (value) => {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const normalized = value.toLowerCase();
+  if (normalized === "user" || normalized === "service" || normalized === "system") {
+    return normalized;
+  }
+  return void 0;
+};
+var getActorValue = (event, actorRecord, keys) => {
+  for (const key of keys) {
+    if (Object.prototype.hasOwnProperty.call(event, key)) {
+      return event[key];
+    }
+    if (actorRecord && Object.prototype.hasOwnProperty.call(actorRecord, key)) {
+      return actorRecord[key];
+    }
+  }
+  return void 0;
+};
+var normalizeAuditEventItem = (event) => {
+  const actorRecord = typeof event.actor === "object" && event.actor !== null ? event.actor : void 0;
+  const actorDisplayValue = getActorValue(event, actorRecord, [
+    "actorDisplay",
+    "actor_display",
+    "display",
+    "display_name",
+    "name"
+  ]);
+  const actorTypeValue = getActorValue(event, actorRecord, [
+    "actorType",
+    "actor_type",
+    "type"
+  ]);
+  const actorIdValue = getActorValue(event, actorRecord, [
+    "actorId",
+    "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) ?? "",
+    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),
+    actorType: coerceActorType(actorTypeValue),
+    actorDisplay: coerceString(actorDisplayValue) ?? "",
+    source: coerceNullableString(event.source)
+  };
+};
+
 // src/client.ts
 var DEFAULT_BASE_URL = "https://api.archiva.app";
 function buildHeaders(apiKey, overrides) {
@@ -300,7 +385,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));
@@ -332,20 +430,7 @@ async function loadEvents(apiKey, params, baseUrl = DEFAULT_BASE_URL) {
         details: item
       });
     }
-    const event = item;
-    const actorDisplay = event.actorDisplay !== null && event.actorDisplay !== void 0 ? event.actorDisplay : event.actor_display !== null && event.actor_display !== void 0 ? event.actor_display : void 0;
-    const actorType = event.actorType !== null && event.actorType !== void 0 ? event.actorType : event.actor_type !== null && event.actor_type !== void 0 ? event.actor_type : void 0;
-    return {
-      id: String(event.id ?? ""),
-      receivedAt: String(event.receivedAt ?? event.received_at ?? ""),
-      action: String(event.action ?? ""),
-      entityType: String(event.entityType ?? event.entity_type ?? ""),
-      entityId: String(event.entityId ?? event.entity_id ?? ""),
-      actorId: event.actorId !== null && event.actorId !== void 0 ? String(event.actorId) : event.actor_id !== null && event.actor_id !== void 0 ? String(event.actor_id) : null,
-      actorType: actorType && (actorType === "user" || actorType === "service" || actorType === "system") ? actorType : void 0,
-      actorDisplay: actorDisplay !== null && actorDisplay !== void 0 ? String(actorDisplay) : void 0,
-      source: event.source !== null && event.source !== void 0 ? String(event.source) : null
-    };
+    return normalizeAuditEventItem(item);
   });
   return {
     items,

package/dist/index.mjs

@@ -9,7 +9,8 @@ import {
   createFrontendTokenGET,
   createFrontendTokenRoute,
   loadEvents
-} from "./chunk-2YLLG2IF.mjs";
+} from "./chunk-5ZJUGBTU.mjs";
+import "./chunk-LOKBGU6S.mjs";
 export {
   ArchivaError,
   ArchivaProvider,

package/dist/react/client.js

@@ -56,6 +56,91 @@ function useArchiva() {
   return useArchivaContext();
 }
 
+// src/eventNormalizer.ts
+var coerceString = (value) => {
+  if (value === null || value === void 0) {
+    return void 0;
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return void 0;
+};
+var coerceNullableString = (value) => {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return null;
+};
+var coerceActorType = (value) => {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const normalized = value.toLowerCase();
+  if (normalized === "user" || normalized === "service" || normalized === "system") {
+    return normalized;
+  }
+  return void 0;
+};
+var getActorValue = (event, actorRecord, keys) => {
+  for (const key of keys) {
+    if (Object.prototype.hasOwnProperty.call(event, key)) {
+      return event[key];
+    }
+    if (actorRecord && Object.prototype.hasOwnProperty.call(actorRecord, key)) {
+      return actorRecord[key];
+    }
+  }
+  return void 0;
+};
+var normalizeAuditEventItem = (event) => {
+  const actorRecord = typeof event.actor === "object" && event.actor !== null ? event.actor : void 0;
+  const actorDisplayValue = getActorValue(event, actorRecord, [
+    "actorDisplay",
+    "actor_display",
+    "display",
+    "display_name",
+    "name"
+  ]);
+  const actorTypeValue = getActorValue(event, actorRecord, [
+    "actorType",
+    "actor_type",
+    "type"
+  ]);
+  const actorIdValue = getActorValue(event, actorRecord, [
+    "actorId",
+    "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) ?? "",
+    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),
+    actorType: coerceActorType(actorTypeValue),
+    actorDisplay: coerceString(actorDisplayValue) ?? "",
+    source: coerceNullableString(event.source)
+  };
+};
+
 // src/react/Timeline.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");
 function formatTimestamp(timestamp, format = "default") {
@@ -118,7 +203,8 @@ var CloudCogIcon = ({ className }) => /* @__PURE__ */ (0, import_jsx_runtime2.js
   }
 );
 function eventToTimelineItem(event, getActorAvatar) {
-  const action = event.action.charAt(0).toUpperCase() + event.action.slice(1);
+  const actionValue = event.actionKey || event.action || "";
+  const action = actionValue.charAt(0).toUpperCase() + actionValue.slice(1);
   const description = action;
   const actorId = event.actorId || "unknown";
   const userName = actorId.includes(":") ? actorId.split(":")[1] || actorId : actorId;
@@ -148,7 +234,7 @@ function eventToTimelineItem(event, getActorAvatar) {
     // Required by TimelineItem type, but not used in activity layout - matches ActivityLog.tsx line 352
     userName: userName.charAt(0).toUpperCase() + userName.slice(1),
     // Matches ActivityLog.tsx line 353
-    actorDisplay: event.actorDisplay ?? void 0,
+    actorDisplay: event.actorDisplay,
     // Matches ActivityLog.tsx line 354
     userHandle,
     // Matches ActivityLog.tsx line 355
@@ -181,7 +267,8 @@ async function fetchEventsWithRetry(apiBaseUrl, getToken, forceRefreshToken, par
     url.searchParams.set("entityType", params.entityType);
   }
   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));
@@ -217,20 +304,7 @@ async function fetchEventsWithRetry(apiBaseUrl, getToken, forceRefreshToken, par
     if (typeof item !== "object" || item === null) {
       throw new Error("Invalid item format in response");
     }
-    const event = item;
-    const actorDisplay = event.actorDisplay !== null && event.actorDisplay !== void 0 ? event.actorDisplay : event.actor_display !== null && event.actor_display !== void 0 ? event.actor_display : void 0;
-    const actorType = event.actorType !== null && event.actorType !== void 0 ? event.actorType : event.actor_type !== null && event.actor_type !== void 0 ? event.actor_type : void 0;
-    return {
-      id: String(event.id ?? ""),
-      receivedAt: String(event.receivedAt ?? event.received_at ?? ""),
-      action: String(event.action ?? ""),
-      entityType: String(event.entityType ?? event.entity_type ?? ""),
-      entityId: String(event.entityId ?? event.entity_id ?? ""),
-      actorId: event.actorId !== null && event.actorId !== void 0 ? String(event.actorId) : event.actor_id !== null && event.actor_id !== void 0 ? String(event.actor_id) : null,
-      actorType: actorType && (actorType === "user" || actorType === "service" || actorType === "system") ? actorType : void 0,
-      actorDisplay: actorDisplay !== null && actorDisplay !== void 0 ? String(actorDisplay) : void 0,
-      source: event.source !== null && event.source !== void 0 ? String(event.source) : null
-    };
+    return normalizeAuditEventItem(item);
   });
   return {
     items,
@@ -353,7 +427,8 @@ 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();
+    return actionValue.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({

package/dist/react/client.mjs

@@ -1,4 +1,7 @@
 "use client";
+import {
+  normalizeAuditEventItem
+} from "../chunk-LOKBGU6S.mjs";
 import {
   useArchivaContext
 } from "../chunk-H4TGL57C.mjs";
@@ -73,7 +76,8 @@ var CloudCogIcon = ({ className }) => /* @__PURE__ */ jsxs(
   }
 );
 function eventToTimelineItem(event, getActorAvatar) {
-  const action = event.action.charAt(0).toUpperCase() + event.action.slice(1);
+  const actionValue = event.actionKey || event.action || "";
+  const action = actionValue.charAt(0).toUpperCase() + actionValue.slice(1);
   const description = action;
   const actorId = event.actorId || "unknown";
   const userName = actorId.includes(":") ? actorId.split(":")[1] || actorId : actorId;
@@ -103,7 +107,7 @@ function eventToTimelineItem(event, getActorAvatar) {
     // Required by TimelineItem type, but not used in activity layout - matches ActivityLog.tsx line 352
     userName: userName.charAt(0).toUpperCase() + userName.slice(1),
     // Matches ActivityLog.tsx line 353
-    actorDisplay: event.actorDisplay ?? void 0,
+    actorDisplay: event.actorDisplay,
     // Matches ActivityLog.tsx line 354
     userHandle,
     // Matches ActivityLog.tsx line 355
@@ -136,7 +140,8 @@ async function fetchEventsWithRetry(apiBaseUrl, getToken, forceRefreshToken, par
     url.searchParams.set("entityType", params.entityType);
   }
   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));
@@ -172,20 +177,7 @@ async function fetchEventsWithRetry(apiBaseUrl, getToken, forceRefreshToken, par
     if (typeof item !== "object" || item === null) {
       throw new Error("Invalid item format in response");
     }
-    const event = item;
-    const actorDisplay = event.actorDisplay !== null && event.actorDisplay !== void 0 ? event.actorDisplay : event.actor_display !== null && event.actor_display !== void 0 ? event.actor_display : void 0;
-    const actorType = event.actorType !== null && event.actorType !== void 0 ? event.actorType : event.actor_type !== null && event.actor_type !== void 0 ? event.actor_type : void 0;
-    return {
-      id: String(event.id ?? ""),
-      receivedAt: String(event.receivedAt ?? event.received_at ?? ""),
-      action: String(event.action ?? ""),
-      entityType: String(event.entityType ?? event.entity_type ?? ""),
-      entityId: String(event.entityId ?? event.entity_id ?? ""),
-      actorId: event.actorId !== null && event.actorId !== void 0 ? String(event.actorId) : event.actor_id !== null && event.actor_id !== void 0 ? String(event.actor_id) : null,
-      actorType: actorType && (actorType === "user" || actorType === "service" || actorType === "system") ? actorType : void 0,
-      actorDisplay: actorDisplay !== null && actorDisplay !== void 0 ? String(actorDisplay) : void 0,
-      source: event.source !== null && event.source !== void 0 ? String(event.source) : null
-    };
+    return normalizeAuditEventItem(item);
   });
   return {
     items,
@@ -308,7 +300,8 @@ 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();
+    return actionValue.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({

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-BJ8aJsbs.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-BJ8aJsbs.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

@@ -113,6 +113,91 @@ var ArchivaError = class extends Error {
   }
 };
 
+// src/eventNormalizer.ts
+var coerceString = (value) => {
+  if (value === null || value === void 0) {
+    return void 0;
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return void 0;
+};
+var coerceNullableString = (value) => {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return null;
+};
+var coerceActorType = (value) => {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const normalized = value.toLowerCase();
+  if (normalized === "user" || normalized === "service" || normalized === "system") {
+    return normalized;
+  }
+  return void 0;
+};
+var getActorValue = (event, actorRecord, keys) => {
+  for (const key of keys) {
+    if (Object.prototype.hasOwnProperty.call(event, key)) {
+      return event[key];
+    }
+    if (actorRecord && Object.prototype.hasOwnProperty.call(actorRecord, key)) {
+      return actorRecord[key];
+    }
+  }
+  return void 0;
+};
+var normalizeAuditEventItem = (event) => {
+  const actorRecord = typeof event.actor === "object" && event.actor !== null ? event.actor : void 0;
+  const actorDisplayValue = getActorValue(event, actorRecord, [
+    "actorDisplay",
+    "actor_display",
+    "display",
+    "display_name",
+    "name"
+  ]);
+  const actorTypeValue = getActorValue(event, actorRecord, [
+    "actorType",
+    "actor_type",
+    "type"
+  ]);
+  const actorIdValue = getActorValue(event, actorRecord, [
+    "actorId",
+    "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) ?? "",
+    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),
+    actorType: coerceActorType(actorTypeValue),
+    actorDisplay: coerceString(actorDisplayValue) ?? "",
+    source: coerceNullableString(event.source)
+  };
+};
+
 // src/client.ts
 var DEFAULT_BASE_URL = "https://api.archiva.app";
 function buildHeaders(apiKey, overrides) {
@@ -174,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));
@@ -206,20 +304,7 @@ async function loadEvents(apiKey, params, baseUrl = DEFAULT_BASE_URL) {
         details: item
       });
     }
-    const event = item;
-    const actorDisplay = event.actorDisplay !== null && event.actorDisplay !== void 0 ? event.actorDisplay : event.actor_display !== null && event.actor_display !== void 0 ? event.actor_display : void 0;
-    const actorType = event.actorType !== null && event.actorType !== void 0 ? event.actorType : event.actor_type !== null && event.actor_type !== void 0 ? event.actor_type : void 0;
-    return {
-      id: String(event.id ?? ""),
-      receivedAt: String(event.receivedAt ?? event.received_at ?? ""),
-      action: String(event.action ?? ""),
-      entityType: String(event.entityType ?? event.entity_type ?? ""),
-      entityId: String(event.entityId ?? event.entity_id ?? ""),
-      actorId: event.actorId !== null && event.actorId !== void 0 ? String(event.actorId) : event.actor_id !== null && event.actor_id !== void 0 ? String(event.actor_id) : null,
-      actorType: actorType && (actorType === "user" || actorType === "service" || actorType === "system") ? actorType : void 0,
-      actorDisplay: actorDisplay !== null && actorDisplay !== void 0 ? String(actorDisplay) : void 0,
-      source: event.source !== null && event.source !== void 0 ? String(event.source) : null
-    };
+    return normalizeAuditEventItem(item);
   });
   return {
     items,

package/dist/server/index.mjs

@@ -5,7 +5,8 @@ import {
   createFrontendTokenGET,
   createFrontendTokenRoute,
   loadEvents
-} from "../chunk-2YLLG2IF.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.93",
+  "version": "0.3.0",
   "description": "Archiva Next.js SDK - Server Actions and Timeline Component",
   "main": "dist/index.js",
   "module": "dist/index.mjs",