Skip to content

chore: unify updating steps #1204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 15, 2025
Merged

chore: unify updating steps #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21cde77
move updating download page to invite
ameer2468 Oct 15, 2025
f2af60e
unify updating steps
ameer2468 Oct 15, 2025
7feba4c
remove import
ameer2468 Oct 15, 2025
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
40 changes: 1 addition & 39 deletions apps/web/app/(org)/onboarding/components/DownloadPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ import { Button, LogoBadge } from "@cap/ui";
import { useDetectPlatform } from "hooks/useDetectPlatform";
import { Clapperboard, Zap } from "lucide-react";
import { useRouter } from "next/navigation";
import { startTransition, useEffect, useState } from "react";
import { toast } from "sonner";
import { useEffectMutation } from "@/lib/EffectRuntime";
import { withRpc } from "@/lib/Rpcs";
import {
getDownloadButtonText,
getDownloadUrl,
Expand Down Expand Up @@ -39,35 +35,6 @@ export function DownloadPage() {
const { platform, isIntel } = useDetectPlatform();
const loading = platform === null;
const router = useRouter();
const [clickedContinue, setClickedContinue] = useState(false);

useEffect(() => {
startTransition(() => {
onboardingRequest.mutate();
router.refresh();
});
}, []);

const onboardingRequest = useEffectMutation({
mutationFn: () =>
withRpc((r) => {
return r.UserCompleteOnboardingStep({
step: "download",
data: undefined,
});
}),
onSuccess: () => {
if (clickedContinue) {
startTransition(() => {
router.push("/dashboard/caps");
router.refresh();
});
}
},
onError: () => {
toast.error("An error occurred, please try again");
},
});

return (
<div className="flex flex-col gap-12 justify-center items-center min-h-fit lg:gap-20">
Expand Down Expand Up @@ -109,12 +76,7 @@ export function DownloadPage() {
{getDownloadButtonText(platform, loading, isIntel)}
</Button>
<Button
onClick={() => {
setClickedContinue(true);
onboardingRequest.mutate();
}}
spinner={onboardingRequest.isPending && clickedContinue}
disabled={onboardingRequest.isPending && clickedContinue}
onClick={() => router.push("/dashboard/caps")}
className="min-w-[120px]"
variant="dark"
size="lg"
Expand Down
23 changes: 1 addition & 22 deletions packages/web-backend/src/Users/UsersOnboarding.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,33 +172,12 @@ export class UsersOnboarding extends Effect.Service<UsersOnboarding>()(
onboardingSteps: {
...user.onboardingSteps,
inviteTeam: true,
download: true,
},
})
.where(Dz.eq(Db.users.id, currentUser.id)),
);
}),

download: Effect.fn("Onboarding.download")(function* () {
const currentUser = yield* CurrentUser;

const [user] = yield* db.use((db) =>
db
.select()
.from(Db.users)
.where(Dz.eq(Db.users.id, currentUser.id)),
);

yield* db.use((db) =>
db
.update(Db.users)
.set({
onboardingSteps: { ...user.onboardingSteps, download: true },
onboarding_completed_at: new Date(),
})
.where(Dz.eq(Db.users.id, currentUser.id)),
);
}),

skipToDashboard: Effect.fn("Onboarding.skipToDashboard")(function* () {
const currentUser = yield* CurrentUser;

Expand Down
4 changes: 0 additions & 4 deletions packages/web-backend/src/Users/UsersRpcs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ export const UsersRpcsLive = User.UserRpcs.toLayer(
case "inviteTeam":
yield* onboarding.inviteTeam();
return { step: "inviteTeam" as const, data: undefined };

case "download":
yield* onboarding.download();
return { step: "download" as const, data: undefined };
case "skipToDashboard":
yield* onboarding.skipToDashboard();
return { step: "skipToDashboard" as const, data: undefined };
Expand Down
8 changes: 0 additions & 8 deletions packages/web-domain/src/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ export const OnboardingStepPayload = Schema.Union(
step: Schema.Literal("inviteTeam"),
data: Schema.Void,
}),
Schema.Struct({
step: Schema.Literal("download"),
data: Schema.Void,
}),
Schema.Struct({
step: Schema.Literal("skipToDashboard"),
data: Schema.Void,
Expand All @@ -66,10 +62,6 @@ export const OnboardingStepResult = Schema.Union(
step: Schema.Literal("inviteTeam"),
data: Schema.Void,
}),
Schema.Struct({
step: Schema.Literal("download"),
data: Schema.Void,
}),
Schema.Struct({
step: Schema.Literal("skipToDashboard"),
data: Schema.Void,
Expand Down