@@ -156,8 +155,8 @@ export const OnboardingTracker = ({ onboarding }: { onboarding: Onboarding }) =>
case 'FAILED':
case 'CANCELED':
case 'CRASHED':
- case 'INTERRUPTED':
case 'SYSTEM_FAILURE':
+ case 'DEQUEUED':
case 'EXPIRED':
case 'TIMED_OUT': {
const errorMessage = run.error?.message || 'An unexpected issue occurred.';
diff --git a/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx
index 546836e31..080275097 100644
--- a/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx
@@ -25,6 +25,15 @@ export default async function DashboardPage() {
redirect('/');
}
+ // If onboarding for this org is not completed yet, redirect to onboarding first
+ const org = await db.organization.findUnique({
+ where: { id: organizationId },
+ select: { onboardingCompleted: true },
+ });
+ if (org && org.onboardingCompleted === false) {
+ redirect(`/onboarding/${organizationId}`);
+ }
+
const tasks = await getControlTasks();
const frameworksWithControls = await getAllFrameworkInstancesWithControls({
organizationId,
diff --git a/apps/app/src/app/(app)/[orgId]/layout.tsx b/apps/app/src/app/(app)/[orgId]/layout.tsx
index 8ba4f54a3..2f4879ced 100644
--- a/apps/app/src/app/(app)/[orgId]/layout.tsx
+++ b/apps/app/src/app/(app)/[orgId]/layout.tsx
@@ -36,14 +36,13 @@ export default async function Layout({
});
if (!session) {
- return redirect('/auth/login');
+ console.log('no session');
+ return redirect('/auth');
}
- // First check if the organization exists
+ // First check if the organization exists and load access flags
const organization = await db.organization.findUnique({
- where: {
- id: requestedOrgId,
- },
+ where: { id: requestedOrgId },
});
if (!organization) {
@@ -58,11 +57,23 @@ export default async function Layout({
},
});
+ console.log('member', member);
+
if (!member) {
// User doesn't have access to this organization
return redirect('/auth/unauthorized');
}
+ // If this org is not accessible on current plan, redirect to upgrade
+ if (!organization.hasAccess) {
+ return redirect(`/upgrade/${organization.id}`);
+ }
+
+ // If onboarding is required and user isn't already on onboarding, redirect
+ if (!organization.onboardingCompleted) {
+ return redirect(`/onboarding/${organization.id}`);
+ }
+
const onboarding = await db.onboarding.findFirst({
where: {
organizationId: requestedOrgId,
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx
index 56eef4e14..76bcce063 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx
@@ -1,7 +1,8 @@
'use client';
import { Card } from '@comp/ui/card';
-import type { Member, Task, User } from '@db';
+import type { Control, Member, Task, User } from '@db';
+import { useParams } from 'next/navigation';
import { useMemo, useState } from 'react';
import { updateTask } from '../../actions/updateTask';
import { TaskDeleteDialog } from './TaskDeleteDialog';
@@ -9,12 +10,14 @@ import { TaskMainContent } from './TaskMainContent';
import { TaskPropertiesSidebar } from './TaskPropertiesSidebar';
interface SingleTaskProps {
- task: Task & { fileUrls?: string[] };
+ task: Task & { fileUrls?: string[]; controls?: Control[] };
members?: (Member & { user: User })[];
}
export function SingleTask({ task, members }: SingleTaskProps) {
const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
+ const params = useParams<{ orgId: string }>();
+ const orgIdFromParams = params.orgId;
const assignedMember = useMemo(() => {
if (!task.assigneeId || !members) return null;
@@ -54,6 +57,7 @@ export function SingleTask({ task, members }: SingleTaskProps) {
assignedMember={assignedMember}
handleUpdateTask={handleUpdateTask}
onDeleteClick={() => setDeleteDialogOpen(true)}
+ orgId={orgIdFromParams}
/>
{/* Delete Dialog */}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx
index 93bbb6f47..a46e38181 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx
@@ -7,21 +7,23 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from '@comp/ui/dropdown-menu';
-import type { Departments, Member, Task, TaskFrequency, TaskStatus, User } from '@db';
+import type { Control, Departments, Member, Task, TaskFrequency, TaskStatus, User } from '@db';
import { MoreVertical, Trash2 } from 'lucide-react';
+import Link from 'next/link';
import { useState } from 'react';
import { TaskStatusIndicator } from '../../components/TaskStatusIndicator';
import { PropertySelector } from './PropertySelector';
import { DEPARTMENT_COLORS, taskDepartments, taskFrequencies, taskStatuses } from './constants';
interface TaskPropertiesSidebarProps {
- task: Task;
+ task: Task & { controls?: Control[] };
members?: (Member & { user: User })[];
assignedMember: (Member & { user: User }) | null | undefined; // Allow undefined
handleUpdateTask: (
data: Partial
>,
) => void;
onDeleteClick?: () => void;
+ orgId: string;
}
export function TaskPropertiesSidebar({
@@ -30,6 +32,7 @@ export function TaskPropertiesSidebar({
assignedMember,
handleUpdateTask,
onDeleteClick,
+ orgId,
}: TaskPropertiesSidebarProps) {
const [dropdownOpen, setDropdownOpen] = useState(false);
return (
@@ -247,6 +250,26 @@ export function TaskPropertiesSidebar({
contentWidth="w-48"
/>