Compare commits
6 Commits
fix/csrf-d
...
fix/projec
| Author | SHA1 | Date | |
|---|---|---|---|
| d361d00674 | |||
| 78ff8f8e70 | |||
| 2463b7b8ba | |||
| 5b235a668f | |||
| c5ab179071 | |||
| b4f4de6f7a |
@@ -117,12 +117,13 @@ export class ActivityService {
|
||||
/**
|
||||
* Get a single activity log by ID
|
||||
*/
|
||||
async findOne(id: string, workspaceId: string): Promise<ActivityLogResult | null> {
|
||||
async findOne(id: string, workspaceId?: string): Promise<ActivityLogResult | null> {
|
||||
const where: Prisma.ActivityLogWhereUniqueInput = { id };
|
||||
if (workspaceId) {
|
||||
where.workspaceId = workspaceId;
|
||||
}
|
||||
return await this.prisma.activityLog.findUnique({
|
||||
where: {
|
||||
id,
|
||||
workspaceId,
|
||||
},
|
||||
where,
|
||||
include: {
|
||||
user: {
|
||||
select: {
|
||||
|
||||
@@ -4,6 +4,7 @@ import { tap } from "rxjs/operators";
|
||||
import { ActivityService } from "../activity.service";
|
||||
import { ActivityAction, EntityType } from "@prisma/client";
|
||||
import type { Prisma } from "@prisma/client";
|
||||
import type { CreateActivityLogInput } from "../interfaces/activity.interface";
|
||||
import type { AuthenticatedRequest } from "../../common/types/user.types";
|
||||
|
||||
/**
|
||||
@@ -61,10 +62,13 @@ export class ActivityLoggingInterceptor implements NestInterceptor {
|
||||
// Extract entity information
|
||||
const resultObj = result as Record<string, unknown> | undefined;
|
||||
const entityId = params.id ?? (resultObj?.id as string | undefined);
|
||||
|
||||
// workspaceId is now optional - log events even when missing
|
||||
const workspaceId = user.workspaceId ?? (body.workspaceId as string | undefined);
|
||||
|
||||
if (!entityId || !workspaceId) {
|
||||
this.logger.warn("Cannot log activity: missing entityId or workspaceId");
|
||||
// Log with warning if entityId is missing, but still proceed with logging if workspaceId exists
|
||||
if (!entityId) {
|
||||
this.logger.warn("Cannot log activity: missing entityId");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -92,9 +96,8 @@ export class ActivityLoggingInterceptor implements NestInterceptor {
|
||||
const userAgent =
|
||||
typeof userAgentHeader === "string" ? userAgentHeader : userAgentHeader?.[0];
|
||||
|
||||
// Log the activity
|
||||
await this.activityService.logActivity({
|
||||
workspaceId,
|
||||
// Log the activity — workspaceId is optional
|
||||
const activityInput: CreateActivityLogInput = {
|
||||
userId: user.id,
|
||||
action,
|
||||
entityType,
|
||||
@@ -102,7 +105,11 @@ export class ActivityLoggingInterceptor implements NestInterceptor {
|
||||
details,
|
||||
ipAddress: ip ?? undefined,
|
||||
userAgent: userAgent ?? undefined,
|
||||
});
|
||||
};
|
||||
if (workspaceId) {
|
||||
activityInput.workspaceId = workspaceId;
|
||||
}
|
||||
await this.activityService.logActivity(activityInput);
|
||||
} catch (error) {
|
||||
// Don't fail the request if activity logging fails
|
||||
this.logger.error(
|
||||
|
||||
@@ -2,9 +2,10 @@ import type { ActivityAction, EntityType, Prisma } from "@prisma/client";
|
||||
|
||||
/**
|
||||
* Interface for creating a new activity log entry
|
||||
* workspaceId is optional - allows logging events without workspace context
|
||||
*/
|
||||
export interface CreateActivityLogInput {
|
||||
workspaceId: string;
|
||||
workspaceId?: string | null;
|
||||
userId: string;
|
||||
action: ActivityAction;
|
||||
entityType: EntityType;
|
||||
|
||||
@@ -29,6 +29,25 @@ export class WorkspacesController {
|
||||
return this.workspacesService.getUserWorkspaces(user.id);
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /api/workspaces/:workspaceId/stats
|
||||
* Returns member, project, and domain counts for a workspace.
|
||||
*/
|
||||
@Get(":workspaceId/stats")
|
||||
async getStats(@Param("workspaceId") workspaceId: string) {
|
||||
return this.workspacesService.getStats(workspaceId);
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /api/workspaces/:workspaceId/members
|
||||
* Returns the list of members for a workspace.
|
||||
*/
|
||||
@Get(":workspaceId/members")
|
||||
@UseGuards(WorkspaceGuard)
|
||||
async getMembers(@Param("workspaceId") workspaceId: string) {
|
||||
return this.workspacesService.getMembers(workspaceId);
|
||||
}
|
||||
|
||||
/**
|
||||
* POST /api/workspaces/:workspaceId/members
|
||||
* Add a member to a workspace with the specified role.
|
||||
|
||||
@@ -321,6 +321,18 @@ export class WorkspacesService {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Get members of a workspace.
|
||||
*/
|
||||
async getMembers(workspaceId: string) {
|
||||
return this.prisma.workspaceMember.findMany({
|
||||
where: { workspaceId },
|
||||
include: {
|
||||
user: { select: { id: true, name: true, email: true, createdAt: true } },
|
||||
},
|
||||
orderBy: { joinedAt: "asc" },
|
||||
});
|
||||
}
|
||||
private assertCanAssignRole(
|
||||
actorRole: WorkspaceMemberRole,
|
||||
requestedRole: WorkspaceMemberRole
|
||||
@@ -342,4 +354,15 @@ export class WorkspacesService {
|
||||
private isUniqueConstraintError(error: unknown): error is Prisma.PrismaClientKnownRequestError {
|
||||
return error instanceof Prisma.PrismaClientKnownRequestError && error.code === "P2002";
|
||||
}
|
||||
|
||||
async getStats(
|
||||
workspaceId: string
|
||||
): Promise<{ memberCount: number; projectCount: number; domainCount: number }> {
|
||||
const [memberCount, projectCount, domainCount] = await Promise.all([
|
||||
this.prisma.workspaceMember.count({ where: { workspaceId } }),
|
||||
this.prisma.project.count({ where: { workspaceId } }),
|
||||
this.prisma.domain.count({ where: { workspaceId } }),
|
||||
]);
|
||||
return { memberCount, projectCount, domainCount };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
ChevronUp,
|
||||
ChevronDown,
|
||||
} from "lucide-react";
|
||||
import type { KnowledgeEntryWithTags } from "@mosaic/shared";
|
||||
import type { KnowledgeEntryWithTags, KnowledgeTag } from "@mosaic/shared";
|
||||
import { EntryStatus, Visibility } from "@mosaic/shared";
|
||||
|
||||
import { MosaicSpinner } from "@/components/ui/MosaicSpinner";
|
||||
@@ -25,7 +25,7 @@ import {
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
} from "@/components/ui/dialog";
|
||||
import { fetchEntries, createEntry, deleteEntry } from "@/lib/api/knowledge";
|
||||
import { fetchEntries, createEntry, deleteEntry, fetchTags } from "@/lib/api/knowledge";
|
||||
import type { EntriesResponse, CreateEntryData, EntryFilters } from "@/lib/api/knowledge";
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
@@ -421,6 +421,26 @@ function CreateEntryDialog({
|
||||
const [visibility, setVisibility] = useState<Visibility>(Visibility.PRIVATE);
|
||||
const [formError, setFormError] = useState<string | null>(null);
|
||||
|
||||
// Tag state
|
||||
const [selectedTags, setSelectedTags] = useState<string[]>([]);
|
||||
const [tagInput, setTagInput] = useState("");
|
||||
const [availableTags, setAvailableTags] = useState<KnowledgeTag[]>([]);
|
||||
const [showSuggestions, setShowSuggestions] = useState(false);
|
||||
const tagInputRef = useRef<HTMLInputElement>(null);
|
||||
|
||||
// Load available tags when dialog opens
|
||||
useEffect(() => {
|
||||
if (open) {
|
||||
fetchTags()
|
||||
.then((tags) => {
|
||||
setAvailableTags(tags);
|
||||
})
|
||||
.catch((err: unknown) => {
|
||||
console.error("Failed to load tags:", err);
|
||||
});
|
||||
}
|
||||
}, [open]);
|
||||
|
||||
function resetForm(): void {
|
||||
setTitle("");
|
||||
setContent("");
|
||||
@@ -428,6 +448,9 @@ function CreateEntryDialog({
|
||||
setStatus(EntryStatus.DRAFT);
|
||||
setVisibility(Visibility.PRIVATE);
|
||||
setFormError(null);
|
||||
setSelectedTags([]);
|
||||
setTagInput("");
|
||||
setShowSuggestions(false);
|
||||
}
|
||||
|
||||
async function handleSubmit(e: SyntheticEvent): Promise<void> {
|
||||
@@ -452,6 +475,7 @@ function CreateEntryDialog({
|
||||
content: trimmedContent,
|
||||
status,
|
||||
visibility,
|
||||
tags: selectedTags,
|
||||
};
|
||||
const trimmedSummary = summary.trim();
|
||||
if (trimmedSummary) {
|
||||
@@ -610,6 +634,212 @@ function CreateEntryDialog({
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Tags */}
|
||||
<div style={{ marginBottom: 16 }}>
|
||||
<label
|
||||
htmlFor="entry-tags"
|
||||
style={{
|
||||
display: "block",
|
||||
marginBottom: 6,
|
||||
fontSize: "0.85rem",
|
||||
fontWeight: 500,
|
||||
color: "var(--text-2)",
|
||||
}}
|
||||
>
|
||||
Tags
|
||||
</label>
|
||||
<div
|
||||
style={{
|
||||
width: "100%",
|
||||
minHeight: 38,
|
||||
padding: "6px 8px",
|
||||
background: "var(--bg)",
|
||||
border: "1px solid var(--border)",
|
||||
borderRadius: "var(--r)",
|
||||
boxSizing: "border-box",
|
||||
display: "flex",
|
||||
flexWrap: "wrap",
|
||||
gap: 4,
|
||||
alignItems: "center",
|
||||
position: "relative",
|
||||
}}
|
||||
>
|
||||
{/* Selected tag chips */}
|
||||
{selectedTags.map((tag) => (
|
||||
<span
|
||||
key={tag}
|
||||
style={{
|
||||
display: "inline-flex",
|
||||
alignItems: "center",
|
||||
gap: 4,
|
||||
padding: "2px 8px",
|
||||
background: "var(--surface-2)",
|
||||
border: "1px solid var(--border)",
|
||||
borderRadius: "var(--r-sm)",
|
||||
fontSize: "0.75rem",
|
||||
color: "var(--text)",
|
||||
}}
|
||||
>
|
||||
{tag}
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setSelectedTags((prev) => prev.filter((t) => t !== tag));
|
||||
}}
|
||||
style={{
|
||||
background: "transparent",
|
||||
border: "none",
|
||||
padding: 0,
|
||||
cursor: "pointer",
|
||||
color: "var(--muted)",
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
lineHeight: 1,
|
||||
}}
|
||||
>
|
||||
×
|
||||
</button>
|
||||
</span>
|
||||
))}
|
||||
{/* Tag text input */}
|
||||
<input
|
||||
ref={tagInputRef}
|
||||
id="entry-tags"
|
||||
type="text"
|
||||
value={tagInput}
|
||||
onChange={(e) => {
|
||||
setTagInput(e.target.value);
|
||||
setShowSuggestions(e.target.value.length > 0);
|
||||
}}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter" || e.key === ",") {
|
||||
e.preventDefault();
|
||||
const trimmed = tagInput.trim();
|
||||
if (trimmed && !selectedTags.includes(trimmed)) {
|
||||
setSelectedTags((prev) => [...prev, trimmed]);
|
||||
setTagInput("");
|
||||
}
|
||||
}
|
||||
if (e.key === "Backspace" && tagInput === "" && selectedTags.length > 0) {
|
||||
setSelectedTags((prev) => prev.slice(0, -1));
|
||||
}
|
||||
}}
|
||||
onBlur={() => {
|
||||
// Delay to allow click on suggestion
|
||||
setTimeout(() => {
|
||||
setShowSuggestions(false);
|
||||
}, 150);
|
||||
}}
|
||||
onFocus={() => {
|
||||
if (tagInput.length > 0) setShowSuggestions(true);
|
||||
}}
|
||||
placeholder={selectedTags.length === 0 ? "Add tags..." : ""}
|
||||
style={{
|
||||
flex: 1,
|
||||
minWidth: 80,
|
||||
border: "none",
|
||||
background: "transparent",
|
||||
color: "var(--text)",
|
||||
fontSize: "0.85rem",
|
||||
outline: "none",
|
||||
padding: "2px 0",
|
||||
}}
|
||||
/>
|
||||
{/* Autocomplete suggestions */}
|
||||
{showSuggestions && (
|
||||
<div
|
||||
style={{
|
||||
position: "absolute",
|
||||
top: "100%",
|
||||
left: 0,
|
||||
right: 0,
|
||||
marginTop: 4,
|
||||
background: "var(--surface)",
|
||||
border: "1px solid var(--border)",
|
||||
borderRadius: "var(--r)",
|
||||
boxShadow: "0 4px 12px rgba(0,0,0,0.15)",
|
||||
maxHeight: 150,
|
||||
overflowY: "auto",
|
||||
zIndex: 10,
|
||||
}}
|
||||
>
|
||||
{availableTags
|
||||
.filter(
|
||||
(t) =>
|
||||
t.name.toLowerCase().includes(tagInput.toLowerCase()) &&
|
||||
!selectedTags.includes(t.name)
|
||||
)
|
||||
.slice(0, 5)
|
||||
.map((tag) => (
|
||||
<button
|
||||
key={tag.id}
|
||||
type="button"
|
||||
onClick={() => {
|
||||
if (!selectedTags.includes(tag.name)) {
|
||||
setSelectedTags((prev) => [...prev, tag.name]);
|
||||
}
|
||||
setTagInput("");
|
||||
setShowSuggestions(false);
|
||||
tagInputRef.current?.focus();
|
||||
}}
|
||||
style={{
|
||||
width: "100%",
|
||||
padding: "8px 12px",
|
||||
background: "transparent",
|
||||
border: "none",
|
||||
textAlign: "left",
|
||||
cursor: "pointer",
|
||||
color: "var(--text)",
|
||||
fontSize: "0.85rem",
|
||||
}}
|
||||
onMouseEnter={(e) => {
|
||||
e.currentTarget.style.background = "var(--surface-2)";
|
||||
}}
|
||||
onMouseLeave={(e) => {
|
||||
e.currentTarget.style.background = "transparent";
|
||||
}}
|
||||
>
|
||||
{tag.name}
|
||||
</button>
|
||||
))}
|
||||
{availableTags.filter(
|
||||
(t) =>
|
||||
t.name.toLowerCase().includes(tagInput.toLowerCase()) &&
|
||||
!selectedTags.includes(t.name)
|
||||
).length === 0 &&
|
||||
tagInput.trim() &&
|
||||
!selectedTags.includes(tagInput.trim()) && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
const trimmed = tagInput.trim();
|
||||
if (trimmed && !selectedTags.includes(trimmed)) {
|
||||
setSelectedTags((prev) => [...prev, trimmed]);
|
||||
}
|
||||
setTagInput("");
|
||||
setShowSuggestions(false);
|
||||
tagInputRef.current?.focus();
|
||||
}}
|
||||
style={{
|
||||
width: "100%",
|
||||
padding: "8px 12px",
|
||||
background: "transparent",
|
||||
border: "none",
|
||||
textAlign: "left",
|
||||
cursor: "pointer",
|
||||
color: "var(--muted)",
|
||||
fontSize: "0.85rem",
|
||||
fontStyle: "italic",
|
||||
}}
|
||||
>
|
||||
Create "{tagInput.trim()}"
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Status + Visibility row */}
|
||||
<div style={{ display: "flex", gap: 16, marginBottom: 16 }}>
|
||||
<div style={{ flex: 1 }}>
|
||||
|
||||
188
apps/web/src/app/(authenticated)/kanban/page.test.tsx
Normal file
188
apps/web/src/app/(authenticated)/kanban/page.test.tsx
Normal file
@@ -0,0 +1,188 @@
|
||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
||||
import { render, screen, waitFor } from "@testing-library/react";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import type { Task } from "@mosaic/shared";
|
||||
import { TaskPriority, TaskStatus } from "@mosaic/shared";
|
||||
import KanbanPage from "./page";
|
||||
|
||||
const mockReplace = vi.fn();
|
||||
let mockSearchParams = new URLSearchParams();
|
||||
|
||||
vi.mock("next/navigation", () => ({
|
||||
useRouter: (): { replace: typeof mockReplace } => ({ replace: mockReplace }),
|
||||
useSearchParams: (): URLSearchParams => mockSearchParams,
|
||||
}));
|
||||
|
||||
vi.mock("@hello-pangea/dnd", () => ({
|
||||
DragDropContext: ({ children }: { children: React.ReactNode }): React.JSX.Element => (
|
||||
<div data-testid="mock-dnd-context">{children}</div>
|
||||
),
|
||||
Droppable: ({
|
||||
children,
|
||||
droppableId,
|
||||
}: {
|
||||
children: (provided: {
|
||||
innerRef: (el: HTMLElement | null) => void;
|
||||
droppableProps: Record<string, never>;
|
||||
placeholder: React.ReactNode;
|
||||
}) => React.ReactNode;
|
||||
droppableId: string;
|
||||
}): React.JSX.Element => (
|
||||
<div data-testid={`mock-droppable-${droppableId}`}>
|
||||
{children({
|
||||
innerRef: () => {
|
||||
/* noop */
|
||||
},
|
||||
droppableProps: {},
|
||||
placeholder: null,
|
||||
})}
|
||||
</div>
|
||||
),
|
||||
Draggable: ({
|
||||
children,
|
||||
draggableId,
|
||||
}: {
|
||||
children: (
|
||||
provided: {
|
||||
innerRef: (el: HTMLElement | null) => void;
|
||||
draggableProps: { style: Record<string, string> };
|
||||
dragHandleProps: Record<string, string>;
|
||||
},
|
||||
snapshot: { isDragging: boolean }
|
||||
) => React.ReactNode;
|
||||
draggableId: string;
|
||||
index: number;
|
||||
}): React.JSX.Element => (
|
||||
<div data-testid={`mock-draggable-${draggableId}`}>
|
||||
{children(
|
||||
{
|
||||
innerRef: () => {
|
||||
/* noop */
|
||||
},
|
||||
draggableProps: { style: {} },
|
||||
dragHandleProps: {},
|
||||
},
|
||||
{ isDragging: false }
|
||||
)}
|
||||
</div>
|
||||
),
|
||||
}));
|
||||
|
||||
vi.mock("@/components/ui/MosaicSpinner", () => ({
|
||||
MosaicSpinner: ({ label }: { label?: string }): React.JSX.Element => (
|
||||
<div data-testid="mosaic-spinner">{label ?? "Loading..."}</div>
|
||||
),
|
||||
}));
|
||||
|
||||
const mockUseWorkspaceId = vi.fn<() => string | null>();
|
||||
vi.mock("@/lib/hooks", () => ({
|
||||
useWorkspaceId: (): string | null => mockUseWorkspaceId(),
|
||||
}));
|
||||
|
||||
const mockFetchTasks = vi.fn<() => Promise<Task[]>>();
|
||||
const mockUpdateTask = vi.fn<() => Promise<unknown>>();
|
||||
const mockCreateTask = vi.fn<() => Promise<Task>>();
|
||||
vi.mock("@/lib/api/tasks", () => ({
|
||||
fetchTasks: (...args: unknown[]): Promise<Task[]> => mockFetchTasks(...(args as [])),
|
||||
updateTask: (...args: unknown[]): Promise<unknown> => mockUpdateTask(...(args as [])),
|
||||
createTask: (...args: unknown[]): Promise<Task> => mockCreateTask(...(args as [])),
|
||||
}));
|
||||
|
||||
const mockFetchProjects = vi.fn<() => Promise<unknown[]>>();
|
||||
vi.mock("@/lib/api/projects", () => ({
|
||||
fetchProjects: (...args: unknown[]): Promise<unknown[]> => mockFetchProjects(...(args as [])),
|
||||
}));
|
||||
|
||||
const createdTask: Task = {
|
||||
id: "task-new-1",
|
||||
title: "Ship Kanban add task flow",
|
||||
description: null,
|
||||
status: TaskStatus.NOT_STARTED,
|
||||
priority: TaskPriority.MEDIUM,
|
||||
dueDate: null,
|
||||
creatorId: "user-1",
|
||||
assigneeId: null,
|
||||
workspaceId: "ws-1",
|
||||
projectId: "project-42",
|
||||
parentId: null,
|
||||
sortOrder: 0,
|
||||
metadata: {},
|
||||
completedAt: null,
|
||||
createdAt: new Date("2026-03-01"),
|
||||
updatedAt: new Date("2026-03-01"),
|
||||
};
|
||||
|
||||
describe("KanbanPage add task flow", (): void => {
|
||||
beforeEach((): void => {
|
||||
vi.clearAllMocks();
|
||||
mockSearchParams = new URLSearchParams("project=project-42");
|
||||
mockUseWorkspaceId.mockReturnValue("ws-1");
|
||||
mockFetchTasks.mockResolvedValue([]);
|
||||
mockFetchProjects.mockResolvedValue([]);
|
||||
mockCreateTask.mockResolvedValue(createdTask);
|
||||
});
|
||||
|
||||
it("opens add-task form in a column and creates a task via API", async (): Promise<void> => {
|
||||
const user = userEvent.setup();
|
||||
|
||||
render(<KanbanPage />);
|
||||
|
||||
await waitFor((): void => {
|
||||
expect(screen.getByText("Kanban Board")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
// Click the "+ Add task" button in the To Do column
|
||||
const addTaskButtons = screen.getAllByRole("button", { name: /\+ Add task/i });
|
||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||
await user.click(addTaskButtons[0]!); // First column is "To Do"
|
||||
|
||||
// Type in the title input
|
||||
const titleInput = screen.getByPlaceholderText("Task title...");
|
||||
await user.type(titleInput, createdTask.title);
|
||||
|
||||
// Click the Add button
|
||||
await user.click(screen.getByRole("button", { name: /✓ Add/i }));
|
||||
|
||||
await waitFor((): void => {
|
||||
expect(mockCreateTask).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
title: createdTask.title,
|
||||
status: TaskStatus.NOT_STARTED,
|
||||
projectId: "project-42",
|
||||
}),
|
||||
"ws-1"
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it("cancels add-task form when pressing Escape", async (): Promise<void> => {
|
||||
const user = userEvent.setup();
|
||||
|
||||
render(<KanbanPage />);
|
||||
|
||||
await waitFor((): void => {
|
||||
expect(screen.getByText("Kanban Board")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
// Click the "+ Add task" button
|
||||
const addTaskButtons = screen.getAllByRole("button", { name: /\+ Add task/i });
|
||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||
await user.click(addTaskButtons[0]!);
|
||||
|
||||
// Type in the title input
|
||||
const titleInput = screen.getByPlaceholderText("Task title...");
|
||||
await user.type(titleInput, "Test task");
|
||||
|
||||
// Press Escape to cancel
|
||||
await user.keyboard("{Escape}");
|
||||
|
||||
// Form should be closed, back to "+ Add task" button
|
||||
await waitFor((): void => {
|
||||
const buttons = screen.getAllByRole("button", { name: /\+ Add task/i });
|
||||
expect(buttons.length).toBe(5); // One per column
|
||||
});
|
||||
|
||||
// Should not have called createTask
|
||||
expect(mockCreateTask).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -4,21 +4,39 @@ import { useState, useEffect, useCallback, useRef } from "react";
|
||||
import type { ReactElement } from "react";
|
||||
|
||||
import { MosaicSpinner } from "@/components/ui/MosaicSpinner";
|
||||
import { fetchRunnerJobs, fetchJobSteps, RunnerJobStatus } from "@/lib/api/runner-jobs";
|
||||
import type { RunnerJob, JobStep } from "@/lib/api/runner-jobs";
|
||||
import {
|
||||
fetchActivityLogs,
|
||||
ActivityAction,
|
||||
EntityType,
|
||||
type ActivityLog,
|
||||
type ActivityLogFilters,
|
||||
} from "@/lib/api/activity";
|
||||
import { useWorkspaceId } from "@/lib/hooks";
|
||||
|
||||
// ─── Constants ────────────────────────────────────────────────────────
|
||||
|
||||
type StatusFilter = "all" | "running" | "completed" | "failed" | "queued";
|
||||
type ActionFilter = "all" | ActivityAction;
|
||||
type EntityFilter = "all" | EntityType;
|
||||
type DateRange = "24h" | "7d" | "30d" | "all";
|
||||
|
||||
const STATUS_OPTIONS: { value: StatusFilter; label: string }[] = [
|
||||
{ value: "all", label: "All statuses" },
|
||||
{ value: "running", label: "Running" },
|
||||
{ value: "completed", label: "Completed" },
|
||||
{ value: "failed", label: "Failed" },
|
||||
{ value: "queued", label: "Queued" },
|
||||
const ACTION_OPTIONS: { value: ActionFilter; label: string }[] = [
|
||||
{ value: "all", label: "All actions" },
|
||||
{ value: ActivityAction.CREATED, label: "Created" },
|
||||
{ value: ActivityAction.UPDATED, label: "Updated" },
|
||||
{ value: ActivityAction.DELETED, label: "Deleted" },
|
||||
{ value: ActivityAction.COMPLETED, label: "Completed" },
|
||||
{ value: ActivityAction.ASSIGNED, label: "Assigned" },
|
||||
];
|
||||
|
||||
const ENTITY_OPTIONS: { value: EntityFilter; label: string }[] = [
|
||||
{ value: "all", label: "All entities" },
|
||||
{ value: EntityType.TASK, label: "Tasks" },
|
||||
{ value: EntityType.EVENT, label: "Events" },
|
||||
{ value: EntityType.PROJECT, label: "Projects" },
|
||||
{ value: EntityType.WORKSPACE, label: "Workspaces" },
|
||||
{ value: EntityType.USER, label: "Users" },
|
||||
{ value: EntityType.DOMAIN, label: "Domains" },
|
||||
{ value: EntityType.IDEA, label: "Ideas" },
|
||||
];
|
||||
|
||||
const DATE_RANGES: { value: DateRange; label: string }[] = [
|
||||
@@ -28,37 +46,37 @@ const DATE_RANGES: { value: DateRange; label: string }[] = [
|
||||
{ value: "all", label: "All" },
|
||||
];
|
||||
|
||||
const STATUS_FILTER_TO_ENUM: Record<StatusFilter, RunnerJobStatus[] | undefined> = {
|
||||
all: undefined,
|
||||
running: [RunnerJobStatus.RUNNING],
|
||||
completed: [RunnerJobStatus.COMPLETED],
|
||||
failed: [RunnerJobStatus.FAILED],
|
||||
queued: [RunnerJobStatus.QUEUED, RunnerJobStatus.PENDING],
|
||||
};
|
||||
|
||||
const POLL_INTERVAL_MS = 5_000;
|
||||
|
||||
// ─── Helpers ──────────────────────────────────────────────────────────
|
||||
|
||||
function getStatusColor(status: string): string {
|
||||
switch (status) {
|
||||
case "RUNNING":
|
||||
return "var(--ms-amber-400)";
|
||||
case "COMPLETED":
|
||||
return "var(--ms-teal-400)";
|
||||
case "FAILED":
|
||||
case "CANCELLED":
|
||||
return "var(--danger)";
|
||||
case "QUEUED":
|
||||
case "PENDING":
|
||||
return "var(--ms-blue-400)";
|
||||
default:
|
||||
return "var(--muted)";
|
||||
}
|
||||
const ACTION_COLORS: Record<string, string> = {
|
||||
[ActivityAction.CREATED]: "var(--ms-teal-400)",
|
||||
[ActivityAction.UPDATED]: "var(--ms-blue-400)",
|
||||
[ActivityAction.DELETED]: "var(--danger)",
|
||||
[ActivityAction.COMPLETED]: "var(--ms-emerald-400)",
|
||||
[ActivityAction.ASSIGNED]: "var(--ms-amber-400)",
|
||||
};
|
||||
|
||||
function getActionColor(action: string): string {
|
||||
return ACTION_COLORS[action] ?? "var(--muted)";
|
||||
}
|
||||
|
||||
function formatRelativeTime(dateStr: string | null): string {
|
||||
if (!dateStr) return "\u2014";
|
||||
const ENTITY_LABELS: Record<string, string> = {
|
||||
[EntityType.TASK]: "Task",
|
||||
[EntityType.EVENT]: "Event",
|
||||
[EntityType.PROJECT]: "Project",
|
||||
[EntityType.WORKSPACE]: "Workspace",
|
||||
[EntityType.USER]: "User",
|
||||
[EntityType.DOMAIN]: "Domain",
|
||||
[EntityType.IDEA]: "Idea",
|
||||
};
|
||||
|
||||
function getEntityTypeLabel(entityType: string): string {
|
||||
return ENTITY_LABELS[entityType] ?? entityType;
|
||||
}
|
||||
|
||||
function formatRelativeTime(dateStr: string): string {
|
||||
const date = new Date(dateStr);
|
||||
const now = Date.now();
|
||||
const diffMs = now - date.getTime();
|
||||
@@ -74,29 +92,6 @@ function formatRelativeTime(dateStr: string | null): string {
|
||||
return date.toLocaleDateString();
|
||||
}
|
||||
|
||||
function formatDuration(startedAt: string | null, completedAt: string | null): string {
|
||||
if (!startedAt) return "\u2014";
|
||||
const start = new Date(startedAt).getTime();
|
||||
const end = completedAt ? new Date(completedAt).getTime() : Date.now();
|
||||
const ms = end - start;
|
||||
if (ms < 1_000) return `${String(ms)}ms`;
|
||||
const sec = Math.floor(ms / 1_000);
|
||||
if (sec < 60) return `${String(sec)}s`;
|
||||
const min = Math.floor(sec / 60);
|
||||
const remainSec = sec % 60;
|
||||
return `${String(min)}m ${String(remainSec)}s`;
|
||||
}
|
||||
|
||||
function formatStepDuration(durationMs: number | null): string {
|
||||
if (durationMs === null) return "\u2014";
|
||||
if (durationMs < 1_000) return `${String(durationMs)}ms`;
|
||||
const sec = Math.floor(durationMs / 1_000);
|
||||
if (sec < 60) return `${String(sec)}s`;
|
||||
const min = Math.floor(sec / 60);
|
||||
const remainSec = sec % 60;
|
||||
return `${String(min)}m ${String(remainSec)}s`;
|
||||
}
|
||||
|
||||
function isWithinDateRange(dateStr: string, range: DateRange): boolean {
|
||||
if (range === "all") return true;
|
||||
const date = new Date(dateStr);
|
||||
@@ -105,18 +100,16 @@ function isWithinDateRange(dateStr: string, range: DateRange): boolean {
|
||||
return now - date.getTime() < hours * 60 * 60 * 1_000;
|
||||
}
|
||||
|
||||
// ─── Status Badge ─────────────────────────────────────────────────────
|
||||
// ─── Action Badge ─────────────────────────────────────────────────────
|
||||
|
||||
function StatusBadge({ status }: { status: string }): ReactElement {
|
||||
const color = getStatusColor(status);
|
||||
const isRunning = status === "RUNNING";
|
||||
function ActionBadge({ action }: { action: string }): ReactElement {
|
||||
const color = getActionColor(action);
|
||||
|
||||
return (
|
||||
<span
|
||||
style={{
|
||||
display: "inline-flex",
|
||||
alignItems: "center",
|
||||
gap: 6,
|
||||
padding: "2px 10px",
|
||||
borderRadius: 9999,
|
||||
fontSize: "0.75rem",
|
||||
@@ -127,18 +120,7 @@ function StatusBadge({ status }: { status: string }): ReactElement {
|
||||
textTransform: "capitalize",
|
||||
}}
|
||||
>
|
||||
{isRunning && (
|
||||
<span
|
||||
style={{
|
||||
width: 6,
|
||||
height: 6,
|
||||
borderRadius: "50%",
|
||||
background: color,
|
||||
animation: "pulse 1.5s ease-in-out infinite",
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{status.toLowerCase()}
|
||||
{action.toLowerCase()}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
@@ -149,59 +131,55 @@ export default function LogsPage(): ReactElement {
|
||||
const workspaceId = useWorkspaceId();
|
||||
|
||||
// Data state
|
||||
const [jobs, setJobs] = useState<RunnerJob[]>([]);
|
||||
const [activities, setActivities] = useState<ActivityLog[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
// Expanded job and steps
|
||||
const [expandedJobId, setExpandedJobId] = useState<string | null>(null);
|
||||
const [jobStepsMap, setJobStepsMap] = useState<Record<string, JobStep[]>>({});
|
||||
const [stepsLoading, setStepsLoading] = useState<Set<string>>(new Set());
|
||||
|
||||
// Filters
|
||||
const [statusFilter, setStatusFilter] = useState<StatusFilter>("all");
|
||||
const [actionFilter, setActionFilter] = useState<ActionFilter>("all");
|
||||
const [entityFilter, setEntityFilter] = useState<EntityFilter>("all");
|
||||
const [dateRange, setDateRange] = useState<DateRange>("7d");
|
||||
const [searchQuery, setSearchQuery] = useState("");
|
||||
|
||||
// Auto-refresh
|
||||
const [autoRefresh, setAutoRefresh] = useState(false);
|
||||
const [autoRefresh, setAutoRefresh] = useState(true);
|
||||
const intervalRef = useRef<ReturnType<typeof setInterval> | null>(null);
|
||||
|
||||
// Hover state
|
||||
const [hoveredRowId, setHoveredRowId] = useState<string | null>(null);
|
||||
|
||||
// ─── Data Loading ─────────────────────────────────────────────────
|
||||
|
||||
const loadJobs = useCallback(async (): Promise<void> => {
|
||||
const loadActivities = useCallback(async (): Promise<void> => {
|
||||
try {
|
||||
const statusEnums = STATUS_FILTER_TO_ENUM[statusFilter];
|
||||
const filters: Parameters<typeof fetchRunnerJobs>[0] = {};
|
||||
const filters: ActivityLogFilters = {};
|
||||
if (workspaceId) {
|
||||
filters.workspaceId = workspaceId;
|
||||
}
|
||||
if (statusEnums) {
|
||||
filters.status = statusEnums;
|
||||
if (actionFilter !== "all") {
|
||||
filters.action = actionFilter;
|
||||
}
|
||||
if (entityFilter !== "all") {
|
||||
filters.entityType = entityFilter;
|
||||
}
|
||||
|
||||
const data = await fetchRunnerJobs(filters);
|
||||
setJobs(data);
|
||||
const response: Awaited<ReturnType<typeof fetchActivityLogs>> =
|
||||
await fetchActivityLogs(filters);
|
||||
setActivities(response);
|
||||
setError(null);
|
||||
} catch (err: unknown) {
|
||||
console.error("[Logs] Failed to fetch runner jobs:", err);
|
||||
console.error("[Logs] Failed to fetch activity logs:", err);
|
||||
setError(
|
||||
err instanceof Error
|
||||
? err.message
|
||||
: "We had trouble loading jobs. Please try again when you're ready."
|
||||
: "We had trouble loading activity logs. Please try again when you're ready."
|
||||
);
|
||||
}
|
||||
}, [workspaceId, statusFilter]);
|
||||
}, [workspaceId, actionFilter, entityFilter]);
|
||||
|
||||
// Initial load
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
setIsLoading(true);
|
||||
|
||||
loadJobs()
|
||||
loadActivities()
|
||||
.then(() => {
|
||||
if (!cancelled) {
|
||||
setIsLoading(false);
|
||||
@@ -216,13 +194,13 @@ export default function LogsPage(): ReactElement {
|
||||
return (): void => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, [loadJobs]);
|
||||
}, [loadActivities]);
|
||||
|
||||
// Auto-refresh polling
|
||||
useEffect(() => {
|
||||
if (autoRefresh) {
|
||||
intervalRef.current = setInterval(() => {
|
||||
void loadJobs();
|
||||
void loadActivities();
|
||||
}, POLL_INTERVAL_MS);
|
||||
} else if (intervalRef.current) {
|
||||
clearInterval(intervalRef.current);
|
||||
@@ -235,55 +213,22 @@ export default function LogsPage(): ReactElement {
|
||||
intervalRef.current = null;
|
||||
}
|
||||
};
|
||||
}, [autoRefresh, loadJobs]);
|
||||
|
||||
// ─── Steps Loading ────────────────────────────────────────────────
|
||||
|
||||
const toggleExpand = useCallback(
|
||||
(jobId: string) => {
|
||||
if (expandedJobId === jobId) {
|
||||
setExpandedJobId(null);
|
||||
return;
|
||||
}
|
||||
|
||||
setExpandedJobId(jobId);
|
||||
|
||||
// Load steps if not already loaded
|
||||
if (!jobStepsMap[jobId] && !stepsLoading.has(jobId)) {
|
||||
setStepsLoading((prev) => new Set(prev).add(jobId));
|
||||
|
||||
fetchJobSteps(jobId, workspaceId ?? undefined)
|
||||
.then((steps) => {
|
||||
setJobStepsMap((prev) => ({ ...prev, [jobId]: steps }));
|
||||
})
|
||||
.catch((err: unknown) => {
|
||||
console.error("[Logs] Failed to fetch steps for job:", jobId, err);
|
||||
setJobStepsMap((prev) => ({ ...prev, [jobId]: [] }));
|
||||
})
|
||||
.finally(() => {
|
||||
setStepsLoading((prev) => {
|
||||
const next = new Set(prev);
|
||||
next.delete(jobId);
|
||||
return next;
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
[expandedJobId, jobStepsMap, stepsLoading, workspaceId]
|
||||
);
|
||||
}, [autoRefresh, loadActivities]);
|
||||
|
||||
// ─── Filtering ────────────────────────────────────────────────────
|
||||
|
||||
const filteredJobs = jobs.filter((job) => {
|
||||
const filteredActivities = activities.filter((activity) => {
|
||||
// Date range filter
|
||||
if (!isWithinDateRange(job.createdAt, dateRange)) return false;
|
||||
if (!isWithinDateRange(activity.createdAt, dateRange)) return false;
|
||||
|
||||
// Search filter
|
||||
if (searchQuery.trim()) {
|
||||
const q = searchQuery.toLowerCase();
|
||||
const matchesType = job.type.toLowerCase().includes(q);
|
||||
const matchesId = job.id.toLowerCase().includes(q);
|
||||
if (!matchesType && !matchesId) return false;
|
||||
const matchesEntity = getEntityTypeLabel(activity.entityType).toLowerCase().includes(q);
|
||||
const matchesId = activity.entityId.toLowerCase().includes(q);
|
||||
const matchesUser = activity.user?.name?.toLowerCase().includes(q);
|
||||
const matchesEmail = activity.user?.email.toLowerCase().includes(q);
|
||||
if (!matchesEntity && !matchesId && !matchesUser && !matchesEmail) return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -293,7 +238,7 @@ export default function LogsPage(): ReactElement {
|
||||
|
||||
const handleManualRefresh = (): void => {
|
||||
setIsLoading(true);
|
||||
void loadJobs().finally(() => {
|
||||
void loadActivities().finally(() => {
|
||||
setIsLoading(false);
|
||||
});
|
||||
};
|
||||
@@ -307,16 +252,12 @@ export default function LogsPage(): ReactElement {
|
||||
|
||||
return (
|
||||
<main className="container mx-auto px-4 py-8">
|
||||
{/* Pulse animation for running status */}
|
||||
{/* Pulse animation for auto-refresh */}
|
||||
<style>{`
|
||||
@keyframes pulse {
|
||||
0%, 100% { opacity: 1; }
|
||||
50% { opacity: 0.4; }
|
||||
}
|
||||
@keyframes auto-refresh-spin {
|
||||
from { transform: rotate(0deg); }
|
||||
to { transform: rotate(360deg); }
|
||||
}
|
||||
`}</style>
|
||||
|
||||
{/* ─── Header ─────────────────────────────────────────────── */}
|
||||
@@ -332,10 +273,10 @@ export default function LogsPage(): ReactElement {
|
||||
>
|
||||
<div>
|
||||
<h1 className="text-3xl font-bold" style={{ color: "var(--text)" }}>
|
||||
Logs & Telemetry
|
||||
Activity Logs
|
||||
</h1>
|
||||
<p className="mt-1" style={{ color: "var(--text-muted)" }}>
|
||||
Runner job history and step-level detail
|
||||
Audit trail and activity history
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -408,11 +349,11 @@ export default function LogsPage(): ReactElement {
|
||||
marginBottom: 24,
|
||||
}}
|
||||
>
|
||||
{/* Status filter */}
|
||||
{/* Action filter */}
|
||||
<select
|
||||
value={statusFilter}
|
||||
value={actionFilter}
|
||||
onChange={(e) => {
|
||||
setStatusFilter(e.target.value as StatusFilter);
|
||||
setActionFilter(e.target.value as ActionFilter);
|
||||
}}
|
||||
style={{
|
||||
padding: "8px 12px",
|
||||
@@ -425,7 +366,31 @@ export default function LogsPage(): ReactElement {
|
||||
minWidth: 140,
|
||||
}}
|
||||
>
|
||||
{STATUS_OPTIONS.map((opt) => (
|
||||
{ACTION_OPTIONS.map((opt) => (
|
||||
<option key={opt.value} value={opt.value}>
|
||||
{opt.label}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
|
||||
{/* Entity filter */}
|
||||
<select
|
||||
value={entityFilter}
|
||||
onChange={(e) => {
|
||||
setEntityFilter(e.target.value as EntityFilter);
|
||||
}}
|
||||
style={{
|
||||
padding: "8px 12px",
|
||||
borderRadius: 8,
|
||||
fontSize: "0.82rem",
|
||||
border: "1px solid var(--border)",
|
||||
background: "var(--surface)",
|
||||
color: "var(--text)",
|
||||
cursor: "pointer",
|
||||
minWidth: 140,
|
||||
}}
|
||||
>
|
||||
{ENTITY_OPTIONS.map((opt) => (
|
||||
<option key={opt.value} value={opt.value}>
|
||||
{opt.label}
|
||||
</option>
|
||||
@@ -467,7 +432,7 @@ export default function LogsPage(): ReactElement {
|
||||
{/* Search input */}
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Search by job type..."
|
||||
placeholder="Search by entity or user..."
|
||||
value={searchQuery}
|
||||
onChange={(e) => {
|
||||
setSearchQuery(e.target.value);
|
||||
@@ -487,9 +452,9 @@ export default function LogsPage(): ReactElement {
|
||||
</div>
|
||||
|
||||
{/* ─── Content ────────────────────────────────────────────── */}
|
||||
{isLoading && jobs.length === 0 ? (
|
||||
{isLoading && activities.length === 0 ? (
|
||||
<div className="flex justify-center py-16">
|
||||
<MosaicSpinner label="Loading jobs..." />
|
||||
<MosaicSpinner label="Loading activity logs..." />
|
||||
</div>
|
||||
) : error !== null ? (
|
||||
<div
|
||||
@@ -508,7 +473,7 @@ export default function LogsPage(): ReactElement {
|
||||
Try again
|
||||
</button>
|
||||
</div>
|
||||
) : filteredJobs.length === 0 ? (
|
||||
) : filteredActivities.length === 0 ? (
|
||||
<div
|
||||
className="rounded-lg p-8 text-center"
|
||||
style={{
|
||||
@@ -516,10 +481,10 @@ export default function LogsPage(): ReactElement {
|
||||
border: "1px solid var(--border)",
|
||||
}}
|
||||
>
|
||||
<p style={{ color: "var(--text-muted)" }}>No jobs found</p>
|
||||
<p style={{ color: "var(--text-muted)" }}>No activity logs found</p>
|
||||
</div>
|
||||
) : (
|
||||
/* ─── Job Table ──────────────────────────────────────────── */
|
||||
/* ─── Activity Table ──────────────────────────────────────── */
|
||||
<div
|
||||
style={{
|
||||
borderRadius: 12,
|
||||
@@ -535,7 +500,7 @@ export default function LogsPage(): ReactElement {
|
||||
background: "var(--bg-mid)",
|
||||
}}
|
||||
>
|
||||
{["Job Type", "Status", "Started", "Duration", "Steps"].map((header) => (
|
||||
{["Action", "Entity", "User", "Details", "Time"].map((header) => (
|
||||
<th
|
||||
key={header}
|
||||
style={{
|
||||
@@ -556,32 +521,9 @@ export default function LogsPage(): ReactElement {
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{filteredJobs.map((job) => {
|
||||
const isExpanded = expandedJobId === job.id;
|
||||
const isHovered = hoveredRowId === job.id;
|
||||
const steps = jobStepsMap[job.id];
|
||||
const isStepsLoading = stepsLoading.has(job.id);
|
||||
|
||||
return (
|
||||
<JobRow
|
||||
key={job.id}
|
||||
job={job}
|
||||
isExpanded={isExpanded}
|
||||
isHovered={isHovered}
|
||||
steps={steps}
|
||||
isStepsLoading={isStepsLoading}
|
||||
onToggle={() => {
|
||||
toggleExpand(job.id);
|
||||
}}
|
||||
onMouseEnter={() => {
|
||||
setHoveredRowId(job.id);
|
||||
}}
|
||||
onMouseLeave={() => {
|
||||
setHoveredRowId(null);
|
||||
}}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
{filteredActivities.map((activity) => (
|
||||
<ActivityRow key={activity.id} activity={activity} />
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -591,260 +533,91 @@ export default function LogsPage(): ReactElement {
|
||||
);
|
||||
}
|
||||
|
||||
// ─── Job Row Component ────────────────────────────────────────────────
|
||||
|
||||
function JobRow({
|
||||
job,
|
||||
isExpanded,
|
||||
isHovered,
|
||||
steps,
|
||||
isStepsLoading,
|
||||
onToggle,
|
||||
onMouseEnter,
|
||||
onMouseLeave,
|
||||
}: {
|
||||
job: RunnerJob;
|
||||
isExpanded: boolean;
|
||||
isHovered: boolean;
|
||||
steps: JobStep[] | undefined;
|
||||
isStepsLoading: boolean;
|
||||
onToggle: () => void;
|
||||
onMouseEnter: () => void;
|
||||
onMouseLeave: () => void;
|
||||
}): ReactElement {
|
||||
return (
|
||||
<>
|
||||
<tr
|
||||
onClick={onToggle}
|
||||
onMouseEnter={onMouseEnter}
|
||||
onMouseLeave={onMouseLeave}
|
||||
style={{
|
||||
background: isExpanded
|
||||
? "var(--surface-2)"
|
||||
: isHovered
|
||||
? "var(--surface-2)"
|
||||
: "var(--surface)",
|
||||
cursor: "pointer",
|
||||
borderBottom: isExpanded ? "none" : "1px solid var(--border)",
|
||||
transition: "background 100ms ease",
|
||||
}}
|
||||
>
|
||||
<td
|
||||
style={{
|
||||
padding: "12px 16px",
|
||||
fontSize: "0.85rem",
|
||||
fontWeight: 500,
|
||||
color: "var(--text)",
|
||||
whiteSpace: "nowrap",
|
||||
}}
|
||||
>
|
||||
<span style={{ display: "inline-flex", alignItems: "center", gap: 8 }}>
|
||||
<span
|
||||
style={{
|
||||
display: "inline-block",
|
||||
width: 16,
|
||||
textAlign: "center",
|
||||
fontSize: "0.7rem",
|
||||
color: "var(--muted)",
|
||||
transition: "transform 150ms ease",
|
||||
transform: isExpanded ? "rotate(90deg)" : "rotate(0deg)",
|
||||
}}
|
||||
>
|
||||
▶
|
||||
</span>
|
||||
{job.type}
|
||||
</span>
|
||||
</td>
|
||||
<td style={{ padding: "12px 16px" }}>
|
||||
<StatusBadge status={job.status} />
|
||||
</td>
|
||||
<td
|
||||
style={{
|
||||
padding: "12px 16px",
|
||||
fontSize: "0.82rem",
|
||||
fontFamily: "var(--mono)",
|
||||
color: "var(--text-muted)",
|
||||
whiteSpace: "nowrap",
|
||||
}}
|
||||
>
|
||||
{formatRelativeTime(job.startedAt ?? job.createdAt)}
|
||||
</td>
|
||||
<td
|
||||
style={{
|
||||
padding: "12px 16px",
|
||||
fontSize: "0.82rem",
|
||||
fontFamily: "var(--mono)",
|
||||
color: "var(--text-muted)",
|
||||
whiteSpace: "nowrap",
|
||||
}}
|
||||
>
|
||||
{formatDuration(job.startedAt, job.completedAt)}
|
||||
</td>
|
||||
<td
|
||||
style={{
|
||||
padding: "12px 16px",
|
||||
fontSize: "0.82rem",
|
||||
fontFamily: "var(--mono)",
|
||||
color: "var(--text-muted)",
|
||||
}}
|
||||
>
|
||||
{steps ? String(steps.length) : "\u2014"}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
{/* Expanded Steps Section */}
|
||||
{isExpanded && (
|
||||
<tr>
|
||||
<td
|
||||
colSpan={5}
|
||||
style={{
|
||||
padding: 0,
|
||||
borderBottom: "1px solid var(--border)",
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
background: "var(--bg-mid)",
|
||||
padding: "12px 16px 12px 48px",
|
||||
}}
|
||||
>
|
||||
{isStepsLoading ? (
|
||||
<div style={{ display: "flex", justifyContent: "center", padding: 16 }}>
|
||||
<MosaicSpinner size={24} label="Loading steps..." />
|
||||
</div>
|
||||
) : !steps || steps.length === 0 ? (
|
||||
<p
|
||||
style={{
|
||||
fontSize: "0.82rem",
|
||||
color: "var(--text-muted)",
|
||||
padding: "8px 0",
|
||||
}}
|
||||
>
|
||||
No steps recorded for this job
|
||||
</p>
|
||||
) : (
|
||||
<table style={{ width: "100%", borderCollapse: "collapse" }}>
|
||||
<thead>
|
||||
<tr>
|
||||
{["#", "Name", "Phase", "Status", "Duration"].map((header) => (
|
||||
<th
|
||||
key={header}
|
||||
style={{
|
||||
padding: "6px 12px",
|
||||
textAlign: "left",
|
||||
fontSize: "0.7rem",
|
||||
fontWeight: 600,
|
||||
textTransform: "uppercase",
|
||||
letterSpacing: "0.05em",
|
||||
color: "var(--muted)",
|
||||
fontFamily: "var(--mono)",
|
||||
borderBottom: "1px solid var(--border)",
|
||||
whiteSpace: "nowrap",
|
||||
}}
|
||||
>
|
||||
{header}
|
||||
</th>
|
||||
))}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{steps
|
||||
.sort((a, b) => a.ordinal - b.ordinal)
|
||||
.map((step) => (
|
||||
<StepRow key={step.id} step={step} />
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
|
||||
{/* Job error message if failed */}
|
||||
{job.error && (
|
||||
<div
|
||||
style={{
|
||||
marginTop: 12,
|
||||
padding: "8px 12px",
|
||||
borderRadius: 6,
|
||||
fontSize: "0.78rem",
|
||||
fontFamily: "var(--mono)",
|
||||
color: "var(--danger)",
|
||||
background: "color-mix(in srgb, var(--danger) 8%, transparent)",
|
||||
border: "1px solid color-mix(in srgb, var(--danger) 20%, transparent)",
|
||||
wordBreak: "break-all",
|
||||
}}
|
||||
>
|
||||
{job.error}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
// ─── Step Row Component ───────────────────────────────────────────────
|
||||
|
||||
function StepRow({ step }: { step: JobStep }): ReactElement {
|
||||
const [hovered, setHovered] = useState(false);
|
||||
// ─── Activity Row Component ───────────────────────────────────────────
|
||||
|
||||
function ActivityRow({ activity }: { activity: ActivityLog }): ReactElement {
|
||||
return (
|
||||
<tr
|
||||
onMouseEnter={() => {
|
||||
setHovered(true);
|
||||
}}
|
||||
onMouseLeave={() => {
|
||||
setHovered(false);
|
||||
}}
|
||||
style={{
|
||||
background: hovered ? "color-mix(in srgb, var(--surface) 50%, transparent)" : "transparent",
|
||||
borderBottom: "1px solid color-mix(in srgb, var(--border) 50%, transparent)",
|
||||
background: "var(--surface)",
|
||||
borderBottom: "1px solid var(--border)",
|
||||
transition: "background 100ms ease",
|
||||
}}
|
||||
>
|
||||
<td
|
||||
style={{
|
||||
padding: "6px 12px",
|
||||
fontSize: "0.78rem",
|
||||
fontFamily: "var(--mono)",
|
||||
color: "var(--muted)",
|
||||
}}
|
||||
>
|
||||
{String(step.ordinal)}
|
||||
<td style={{ padding: "12px 16px" }}>
|
||||
<ActionBadge action={activity.action} />
|
||||
</td>
|
||||
<td
|
||||
style={{
|
||||
padding: "6px 12px",
|
||||
fontSize: "0.8rem",
|
||||
padding: "12px 16px",
|
||||
fontSize: "0.85rem",
|
||||
fontWeight: 500,
|
||||
color: "var(--text)",
|
||||
}}
|
||||
>
|
||||
{step.name}
|
||||
<div style={{ display: "flex", flexDirection: "column", gap: 2 }}>
|
||||
<span>{getEntityTypeLabel(activity.entityType)}</span>
|
||||
<span
|
||||
style={{
|
||||
fontSize: "0.75rem",
|
||||
color: "var(--muted)",
|
||||
fontFamily: "var(--mono)",
|
||||
}}
|
||||
>
|
||||
{activity.entityId}
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td
|
||||
style={{
|
||||
padding: "6px 12px",
|
||||
fontSize: "0.75rem",
|
||||
fontFamily: "var(--mono)",
|
||||
color: "var(--text-muted)",
|
||||
textTransform: "lowercase",
|
||||
padding: "12px 16px",
|
||||
fontSize: "0.82rem",
|
||||
color: "var(--text)",
|
||||
}}
|
||||
>
|
||||
{step.phase}
|
||||
</td>
|
||||
<td style={{ padding: "6px 12px" }}>
|
||||
<StatusBadge status={step.status} />
|
||||
{activity.user ? (
|
||||
<div style={{ display: "flex", flexDirection: "column", gap: 2 }}>
|
||||
<span>{activity.user.name ?? activity.user.email}</span>
|
||||
{activity.user.name && (
|
||||
<span
|
||||
style={{
|
||||
fontSize: "0.75rem",
|
||||
color: "var(--muted)",
|
||||
}}
|
||||
>
|
||||
{activity.user.email}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<span style={{ color: "var(--muted)" }}>—</span>
|
||||
)}
|
||||
</td>
|
||||
<td
|
||||
style={{
|
||||
padding: "6px 12px",
|
||||
padding: "12px 16px",
|
||||
fontSize: "0.78rem",
|
||||
color: "var(--text-muted)",
|
||||
fontFamily: "var(--mono)",
|
||||
maxWidth: 300,
|
||||
overflow: "hidden",
|
||||
textOverflow: "ellipsis",
|
||||
whiteSpace: "nowrap",
|
||||
}}
|
||||
title={activity.details ? JSON.stringify(activity.details) : undefined}
|
||||
>
|
||||
{activity.details ? JSON.stringify(activity.details) : "—"}
|
||||
</td>
|
||||
<td
|
||||
style={{
|
||||
padding: "12px 16px",
|
||||
fontSize: "0.82rem",
|
||||
fontFamily: "var(--mono)",
|
||||
color: "var(--text-muted)",
|
||||
whiteSpace: "nowrap",
|
||||
}}
|
||||
>
|
||||
{formatStepDuration(step.durationMs)}
|
||||
{formatRelativeTime(activity.createdAt)}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
|
||||
139
apps/web/src/lib/api/activity.ts
Normal file
139
apps/web/src/lib/api/activity.ts
Normal file
@@ -0,0 +1,139 @@
|
||||
/**
|
||||
* Activity API Client
|
||||
* Handles activity-log-related API requests
|
||||
*/
|
||||
|
||||
import { apiGet, type ApiResponse } from "./client";
|
||||
|
||||
/**
|
||||
* Activity action enum (matches backend ActivityAction)
|
||||
*/
|
||||
export enum ActivityAction {
|
||||
CREATED = "CREATED",
|
||||
UPDATED = "UPDATED",
|
||||
DELETED = "DELETED",
|
||||
COMPLETED = "COMPLETED",
|
||||
ASSIGNED = "ASSIGNED",
|
||||
}
|
||||
|
||||
/**
|
||||
* Entity type enum (matches backend EntityType)
|
||||
*/
|
||||
export enum EntityType {
|
||||
TASK = "TASK",
|
||||
EVENT = "EVENT",
|
||||
PROJECT = "PROJECT",
|
||||
WORKSPACE = "WORKSPACE",
|
||||
USER = "USER",
|
||||
DOMAIN = "DOMAIN",
|
||||
IDEA = "IDEA",
|
||||
}
|
||||
|
||||
/**
|
||||
* Activity log response interface (matches Prisma ActivityLog model)
|
||||
*/
|
||||
export interface ActivityLog {
|
||||
id: string;
|
||||
workspaceId: string;
|
||||
userId: string;
|
||||
action: ActivityAction;
|
||||
entityType: EntityType;
|
||||
entityId: string;
|
||||
details: Record<string, unknown> | null;
|
||||
ipAddress: string | null;
|
||||
userAgent: string | null;
|
||||
createdAt: string;
|
||||
user?: {
|
||||
id: string;
|
||||
name: string | null;
|
||||
email: string;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Filters for querying activity logs
|
||||
*/
|
||||
export interface ActivityLogFilters {
|
||||
workspaceId?: string;
|
||||
userId?: string;
|
||||
action?: ActivityAction;
|
||||
entityType?: EntityType;
|
||||
entityId?: string;
|
||||
startDate?: string;
|
||||
endDate?: string;
|
||||
page?: number;
|
||||
limit?: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* Paginated activity logs response
|
||||
*/
|
||||
export interface PaginatedActivityLogs {
|
||||
data: ActivityLog[];
|
||||
meta: {
|
||||
total: number;
|
||||
page: number;
|
||||
limit: number;
|
||||
totalPages: number;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch activity logs with optional filters
|
||||
*/
|
||||
export async function fetchActivityLogs(filters?: ActivityLogFilters): Promise<ActivityLog[]> {
|
||||
const params = new URLSearchParams();
|
||||
|
||||
if (filters?.userId) {
|
||||
params.append("userId", filters.userId);
|
||||
}
|
||||
if (filters?.action) {
|
||||
params.append("action", filters.action);
|
||||
}
|
||||
if (filters?.entityType) {
|
||||
params.append("entityType", filters.entityType);
|
||||
}
|
||||
if (filters?.entityId) {
|
||||
params.append("entityId", filters.entityId);
|
||||
}
|
||||
if (filters?.startDate) {
|
||||
params.append("startDate", filters.startDate);
|
||||
}
|
||||
if (filters?.endDate) {
|
||||
params.append("endDate", filters.endDate);
|
||||
}
|
||||
if (filters?.page !== undefined) {
|
||||
params.append("page", String(filters.page));
|
||||
}
|
||||
if (filters?.limit !== undefined) {
|
||||
params.append("limit", String(filters.limit));
|
||||
}
|
||||
|
||||
const queryString = params.toString();
|
||||
const endpoint = queryString ? `/api/activity?${queryString}` : "/api/activity";
|
||||
|
||||
const response = await apiGet<PaginatedActivityLogs>(endpoint, filters?.workspaceId);
|
||||
return response.data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch a single activity log by ID
|
||||
*/
|
||||
export async function fetchActivityLog(id: string, workspaceId?: string): Promise<ActivityLog> {
|
||||
return apiGet<ActivityLog>(`/api/activity/${id}`, workspaceId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch audit trail for a specific entity
|
||||
*/
|
||||
export async function fetchAuditTrail(
|
||||
entityType: EntityType,
|
||||
entityId: string,
|
||||
workspaceId?: string
|
||||
): Promise<ActivityLog[]> {
|
||||
const response = await apiGet<ApiResponse<ActivityLog[]>>(
|
||||
`/api/activity/audit/${entityType}/${entityId}`,
|
||||
workspaceId
|
||||
);
|
||||
return response.data;
|
||||
}
|
||||
@@ -18,3 +18,4 @@ export * from "./projects";
|
||||
export * from "./workspaces";
|
||||
export * from "./admin";
|
||||
export * from "./fleet-settings";
|
||||
export * from "./activity";
|
||||
|
||||
Reference in New Issue
Block a user