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
24 changes: 24 additions & 0 deletions apps/web/app/(app)/[emailAccountId]/assistant/RulesTab.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { Rules } from "@/app/(app)/[emailAccountId]/assistant/Rules";
import { RulesPrompt } from "@/app/(app)/[emailAccountId]/assistant/RulesPrompt";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";

export function RulesTab() {
return (
<Tabs defaultValue="prompt" searchParam="view">
<div className="flex items-center gap-2 pt-2">
<span className="text-sm font-medium">View as:</span>
<TabsList>
<TabsTrigger value="prompt">Prompt</TabsTrigger>
<TabsTrigger value="rules">Rules</TabsTrigger>
</TabsList>
</div>

<TabsContent value="prompt">
<RulesPrompt />
</TabsContent>
<TabsContent value="rules">
<Rules />
</TabsContent>
</Tabs>
);
}
30 changes: 5 additions & 25 deletions apps/web/app/(app)/[emailAccountId]/assistant/SettingsTab.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,13 @@
import { AboutSetting } from "@/app/(app)/[emailAccountId]/assistant/AboutSetting";
import { DigestSetting } from "@/app/(app)/[emailAccountId]/assistant/DigestSetting";
import { DraftReplies } from "@/app/(app)/[emailAccountId]/assistant/DraftReplies";
import { Rules } from "@/app/(app)/[emailAccountId]/assistant/Rules";
import { RulesPrompt } from "@/app/(app)/[emailAccountId]/assistant/RulesPrompt";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";

export function SettingsTab() {
return (
<Tabs defaultValue="prompt" searchParam="settings-tab">
<div className="flex items-center gap-2 pt-2">
<span className="text-sm font-medium">View as:</span>
<TabsList>
<TabsTrigger value="prompt">Prompt</TabsTrigger>
<TabsTrigger value="rules">Rules</TabsTrigger>
</TabsList>
</div>

<TabsContent value="prompt">
<RulesPrompt />
</TabsContent>
<TabsContent value="rules">
<Rules />
</TabsContent>

<div className="mt-8 space-y-2">
<DraftReplies />
<AboutSetting />
<DigestSetting />
</div>
</Tabs>
<div className="space-y-2">
<DraftReplies />
<AboutSetting />
<DigestSetting />
</div>
);
}
15 changes: 12 additions & 3 deletions apps/web/app/(app)/[emailAccountId]/automation/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,16 @@ import { checkUserOwnsEmailAccount } from "@/utils/email-account";
import { SettingsTab } from "@/app/(app)/[emailAccountId]/assistant/SettingsTab";
import { PageHeading } from "@/components/Typography";
import { TabSelect } from "@/components/TabSelect";
import { RulesTab } from "@/app/(app)/[emailAccountId]/assistant/RulesTab";

export const maxDuration = 300; // Applies to the actions

const tabOptions = (emailAccountId: string) => [
{
id: "rules",
label: "Rules",
href: `/${emailAccountId}/automation?tab=rules`,
},
{
id: "settings",
label: "Settings",
Expand Down Expand Up @@ -94,7 +100,7 @@ export default async function AutomationPage({
fallback={
<TabSelect
options={tabOptions(emailAccountId)}
selected={tab ?? "settings"}
selected={tab ?? "rules"}
/>
}
>
Expand All @@ -106,7 +112,10 @@ export default async function AutomationPage({
</Suspense>
</div>

<Tabs defaultValue="settings">
<Tabs defaultValue="rules">
<TabsContent value="rules" className="mb-10">
<RulesTab />
</TabsContent>
Comment thread
coderabbitai[bot] marked this conversation as resolved.
<TabsContent value="settings" className="mb-10">
<SettingsTab />
</TabsContent>
Expand Down Expand Up @@ -151,7 +160,7 @@ async function TabNavigation({
]
: []),
]}
selected={tab ?? "settings"}
selected={tab ?? "rules"}
/>
);
}
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.9.1
v1.9.2
Loading