Skip to content

[dev] [carhartlewis] lewis/comp-tp-ui-fixes #654

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
claudfuen merged 2 commits into from
May 16, 2025
Merged

[dev] [carhartlewis] lewis/comp-tp-ui-fixes #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e390f5
refactor(wizard-implementation): streamline onboarding update logic a…
carhartlewis May 16, 2025
9d7bb4e
Merge branch 'main' into lewis/comp-tp-ui-fixes
carhartlewis May 16, 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
41 changes: 18 additions & 23 deletions ...ocale]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/actions/updateWizard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,31 +53,26 @@ export const updateWizard = async ({
where: { organizationId: orgId },
});

if (!onboarding) {
await db.onboarding.create({
data: {
organizationId: orgId,
[dbColumn]: {
version: parsed.version || companyDetailsLatestVersion,
isCompleted: parsed.isCompleted,
data: parsed.data,
},
await db.onboarding.upsert({
where: {
organizationId: orgId,
},
create: {
organizationId: orgId,
[dbColumn]: {
version: parsed.version || companyDetailsLatestVersion,
isCompleted: parsed.isCompleted,
data: parsed.data,
},
});
} else {
await db.onboarding.update({
where: {
organizationId: orgId,
},
update: {
[dbColumn]: {
version: parsed.version || companyDetailsLatestVersion,
isCompleted: parsed.isCompleted,
data: parsed.data,
},
data: {
[dbColumn]: {
version: parsed.version || companyDetailsLatestVersion,
isCompleted: parsed.isCompleted,
data: parsed.data,
},
},
});
}
},
});

revalidatePath(`/${orgId}/implementation/wizard/${wizardId}`);

Expand Down
47 changes: 24 additions & 23 deletions ...shboard)/[orgId]/implementation/wizard/[wizardId]/components/CompanyDetailsWizardForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,7 @@ import {
SelectValue,
} from "@comp/ui/select";
import { useParams, useRouter } from "next/navigation";
import {
Breadcrumb,
BreadcrumbItem,
BreadcrumbLink,
BreadcrumbPage,
BreadcrumbSeparator,
} from "@comp/ui/breadcrumb";
import PageWithBreadcrumb from "@/components/pages/PageWithBreadcrumb";
import { Card, CardContent, CardHeader, CardTitle } from "@comp/ui/card";

const steps = [
"Company identity",
Expand Down Expand Up @@ -220,14 +213,14 @@ export const CompanyDetailsWizardForm = ({
return (
<div className="flex flex-col gap-2">
<Label htmlFor="companyWebsite">
Public website URL
Website
</Label>
<Input
id="companyWebsite"
type="url"
value={displayValue}
onChange={handleChange}
placeholder="acme.com"
prefix="https://"
/>
{errors.companyWebsite && (
<span className="text-destructive text-sm">
Expand Down Expand Up @@ -274,9 +267,9 @@ export const CompanyDetailsWizardForm = ({
);
return found
? {
value: found.value,
label: found.label,
}
value: found.value,
label: found.label,
}
: { value: v, label: v };
})}
placeholder="Select or add one..."
Expand Down Expand Up @@ -592,16 +585,24 @@ export const CompanyDetailsWizardForm = ({
}
}}
>
<WizardStepper steps={steps} currentStep={step} />
<WizardQuestion
step={step}
totalSteps={steps.length}
question={questionNodes[step]}
onNext={handleNext}
onBack={handleBack}
nextDisabled={false}
showBack={step > 0}
/>
<Card>
<CardHeader>
<CardTitle>
<WizardStepper steps={steps} currentStep={step} />
</CardTitle>
</CardHeader>
<CardContent>
<WizardQuestion
step={step}
totalSteps={steps.length}
question={questionNodes[step]}
onNext={handleNext}
onBack={handleBack}
nextDisabled={false}
showBack={step > 0}
/>
</CardContent>
</Card>
</form>
</FormProvider>
);
Expand Down
4 changes: 2 additions & 2 deletions .../(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/WizardQuestion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ export function WizardQuestion({
</Button>
)}
</div>
<div className="flex-1 flex justify-center">
<span className="text-muted-foreground text-sm select-none">
<div className="flex items-center justify-center">
<span className="text-muted-foreground text-xs select-none">
Step {step + 1} / {totalSteps}
</span>
</div>
Expand Down
6 changes: 3 additions & 3 deletions ...]/(app)/(dashboard)/[orgId]/implementation/wizard/[wizardId]/components/WizardStepper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ interface WizardStepperProps {

export function WizardStepper({ steps, currentStep }: WizardStepperProps) {
return (
<div className="mb-8">
<div className="text-3xl font-semibold">{steps[currentStep]}</div>
</div>
<div>
<div>{steps[currentStep]}</div>
</div >
);
}
Loading