Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
'use client';

import type { Onboarding } from '@db';
import { usePathname } from 'next/navigation';
import { OnboardingTracker } from './OnboardingTracker';

interface Props {
onboarding: Onboarding;
}

export function ConditionalOnboardingTracker({ onboarding }: Props) {
const pathname = usePathname();
const isAutomationRoute = pathname.includes('/automation');

// Don't render the OnboardingTracker if we're on an automation route
if (isAutomationRoute) {
return null;
}

return <OnboardingTracker onboarding={onboarding} />;
}
4 changes: 2 additions & 2 deletions apps/app/src/app/(app)/[orgId]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import dynamic from 'next/dynamic';
import { cookies, headers } from 'next/headers';
import { redirect } from 'next/navigation';
import { Suspense } from 'react';
import { ConditionalOnboardingTracker } from './components/ConditionalOnboardingTracker';
import { DynamicMinHeight } from './components/DynamicMinHeight';
import { OnboardingTracker } from './components/OnboardingTracker';

const HotKeys = dynamic(() => import('@/components/hot-keys').then((mod) => mod.HotKeys), {
ssr: true,
Expand Down Expand Up @@ -90,7 +90,7 @@ export default async function Layout({
>
<SidebarProvider initialIsCollapsed={isCollapsed}>
<AnimatedLayout sidebar={<Sidebar organization={organization} />} isCollapsed={isCollapsed}>
{onboarding?.triggerJobId && <OnboardingTracker onboarding={onboarding} />}
{onboarding?.triggerJobId && <ConditionalOnboardingTracker onboarding={onboarding} />}
<Header organizationId={organization.id} />
<DynamicMinHeight>{children}</DynamicMinHeight>
<AssistantSheet />
Expand Down
7 changes: 6 additions & 1 deletion apps/app/src/app/(app)/[orgId]/tasks/components/TaskCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { usePathname, useRouter } from 'next/navigation';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useDrag, useDrop } from 'react-dnd';
import { TaskStatusSelector } from './TaskStatusSelector';
import { format } from 'date-fns';

// DnD Item Type identifier for tasks.
export const ItemTypes = {
Expand Down Expand Up @@ -196,7 +197,11 @@ export function TaskCard({
>
<span className="min-w-0 flex-grow truncate py-2 text-sm">{task.title}</span>
<div className="ml-auto flex shrink-0 items-center space-x-3 pl-2">
<span className="text-muted-foreground text-xs whitespace-nowrap">Apr 15</span>
<span className="text-muted-foreground text-xs whitespace-nowrap">
{task.createdAt
? format(new Date(task.createdAt), 'MMM d, yyyy')
: ''}
</span>
<div className="bg-muted flex h-5 w-5 items-center justify-center overflow-hidden rounded-full border">
{assignedMember?.user?.image ? (
<Image
Expand Down
1 change: 1 addition & 0 deletions apps/app/src/components/app-onboarding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ export function AppOnboarding({
width={400}
quality={100}
className="relative z-10 rounded-lg drop-shadow-md"
unoptimized
/>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterEnum
ALTER TYPE "RiskCategory" ADD VALUE 'fraud';
1 change: 1 addition & 0 deletions packages/db/prisma/schema/risk.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ enum RiskTreatmentType {

enum RiskCategory {
customer
fraud
governance
operations
other
Expand Down
2 changes: 2 additions & 0 deletions packages/docs/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -6550,6 +6550,7 @@
"description": "Risk category",
"enum": [
"customer",
"fraud",
"governance",
"operations",
"other",
Expand Down Expand Up @@ -6693,6 +6694,7 @@
"description": "Risk category",
"enum": [
"customer",
"fraud",
"governance",
"operations",
"other",
Expand Down
Loading