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
Expand Up @@ -37,16 +37,19 @@ describe("getOneaiComparisonRows", () => {
expect(rows[0]?.feature).toBe("20 users");
expect(rows[0]?.advantage).toBeNull();
expect(rows[0]?.chatgpt).toContain("annual");
expect(rows[0]?.copilot).toContain("M365");
expect(rows[1]?.advantage).toBeNull();
expect(rows[1]?.chatgpt).toContain("Rp12,800,000");
expect(rows[2]?.chatgpt).toContain("included");
expect(rows[2]?.chatgpt).not.toMatch(/bought separately/i);
expect(rows[2]?.copilot).toContain("add-on");
expect(rows[3]?.feature).toContain("across providers");
expect(rows[9]?.chatgpt).toContain("Yes");
expect(rows[9]?.oneai).toContain("Yes");
expect(rows[9]?.advantage).toBeNull();
expect(rows[10]?.feature).toContain("On-prem");
expect(rows[10]?.oneai).toBe("Yes");
expect(rows[10]?.copilot).toContain("cloud-only");
expect(rows[10]?.advantage).toBe("capability");
});

Expand All @@ -57,9 +60,11 @@ describe("getOneaiComparisonRows", () => {
expect(rows[0]?.feature).toBe("20 pengguna");
expect(rows[1]?.oneai).toContain("harga tetap");
expect(rows[1]?.chatgpt).toContain("tahunan");
expect(rows[1]?.copilot).toContain("M365");
expect(rows[2]?.chatgpt).not.toMatch(/dibeli terpisah/i);
expect(rows[3]?.advantage).toBe("capability");
expect(rows[10]?.feature).toContain("On-premise");
expect(rows[10]?.copilot).toContain("cloud saja");
});

it("uses injected row loaders when provided", () => {
Expand All @@ -70,6 +75,7 @@ describe("getOneaiComparisonRows", () => {
feature: () => "Feature A",
stipend: () => "Stipend A",
chatgpt: () => "ChatGPT A",
copilot: () => "Copilot A",
oneai: () => "OneAI A",
advantage: "price"
}
Expand All @@ -81,6 +87,7 @@ describe("getOneaiComparisonRows", () => {
feature: "Feature A",
stipend: "Stipend A",
chatgpt: "ChatGPT A",
copilot: "Copilot A",
oneai: "OneAI A",
advantage: "price"
}
Expand Down
41 changes: 34 additions & 7 deletions app/[lang]/(hyperjump)/oneai/get-oneai-comparison-rows.ts
Original file line number Diff line number Diff line change
@@ -1,46 +1,57 @@
import type { SupportedLanguage } from "@/locales/.generated/types";
import {
oneaiComparisonRows0Chatgpt,
oneaiComparisonRows0Copilot,
oneaiComparisonRows0Feature,
oneaiComparisonRows0Oneai,
oneaiComparisonRows0Stipend,
oneaiComparisonRows1Chatgpt,
oneaiComparisonRows1Copilot,
oneaiComparisonRows1Feature,
oneaiComparisonRows1Oneai,
oneaiComparisonRows1Stipend,
oneaiComparisonRows2Chatgpt,
oneaiComparisonRows2Copilot,
oneaiComparisonRows2Feature,
oneaiComparisonRows2Oneai,
oneaiComparisonRows2Stipend,
oneaiComparisonRows3Chatgpt,
oneaiComparisonRows3Copilot,
oneaiComparisonRows3Feature,
oneaiComparisonRows3Oneai,
oneaiComparisonRows3Stipend,
oneaiComparisonRows4Chatgpt,
oneaiComparisonRows4Copilot,
oneaiComparisonRows4Feature,
oneaiComparisonRows4Oneai,
oneaiComparisonRows4Stipend,
oneaiComparisonRows5Chatgpt,
oneaiComparisonRows5Copilot,
oneaiComparisonRows5Feature,
oneaiComparisonRows5Oneai,
oneaiComparisonRows5Stipend,
oneaiComparisonRows6Chatgpt,
oneaiComparisonRows6Copilot,
oneaiComparisonRows6Feature,
oneaiComparisonRows6Oneai,
oneaiComparisonRows6Stipend,
oneaiComparisonRows7Chatgpt,
oneaiComparisonRows7Copilot,
oneaiComparisonRows7Feature,
oneaiComparisonRows7Oneai,
oneaiComparisonRows7Stipend,
oneaiComparisonRows8Chatgpt,
oneaiComparisonRows8Copilot,
oneaiComparisonRows8Feature,
oneaiComparisonRows8Oneai,
oneaiComparisonRows8Stipend,
oneaiComparisonRows9Chatgpt,
oneaiComparisonRows9Copilot,
oneaiComparisonRows9Feature,
oneaiComparisonRows9Oneai,
oneaiComparisonRows9Stipend,
oneaiComparisonRows10Chatgpt,
oneaiComparisonRows10Copilot,
oneaiComparisonRows10Feature,
oneaiComparisonRows10Oneai,
oneaiComparisonRows10Stipend,
Expand All @@ -59,6 +70,7 @@ export type OneaiComparisonRow = {
feature: string;
stipend: string;
chatgpt: string;
copilot: string;
oneai: string;
advantage: OneaiComparisonRowAdvantage;
};
Expand All @@ -72,6 +84,7 @@ type RowLoader = {
feature: (lang: SupportedLanguage) => string;
stipend: (lang: SupportedLanguage) => string;
chatgpt: (lang: SupportedLanguage) => string;
copilot: (lang: SupportedLanguage) => string;
oneai: (lang: SupportedLanguage) => string;
advantage: OneaiComparisonRowAdvantage;
};
Expand All @@ -95,76 +108,87 @@ const DEFAULT_ROW_LOADERS: RowLoader[] = [
feature: oneaiComparisonRows0Feature,
stipend: oneaiComparisonRows0Stipend,
chatgpt: oneaiComparisonRows0Chatgpt,
copilot: oneaiComparisonRows0Copilot,
oneai: oneaiComparisonRows0Oneai,
advantage: null
},
{
feature: oneaiComparisonRows1Feature,
stipend: oneaiComparisonRows1Stipend,
chatgpt: oneaiComparisonRows1Chatgpt,
copilot: oneaiComparisonRows1Copilot,
oneai: oneaiComparisonRows1Oneai,
advantage: null
},
{
feature: oneaiComparisonRows2Feature,
stipend: oneaiComparisonRows2Stipend,
chatgpt: oneaiComparisonRows2Chatgpt,
copilot: oneaiComparisonRows2Copilot,
oneai: oneaiComparisonRows2Oneai,
advantage: "capability"
},
{
feature: oneaiComparisonRows3Feature,
stipend: oneaiComparisonRows3Stipend,
chatgpt: oneaiComparisonRows3Chatgpt,
copilot: oneaiComparisonRows3Copilot,
oneai: oneaiComparisonRows3Oneai,
advantage: "capability"
},
{
feature: oneaiComparisonRows4Feature,
stipend: oneaiComparisonRows4Stipend,
chatgpt: oneaiComparisonRows4Chatgpt,
copilot: oneaiComparisonRows4Copilot,
oneai: oneaiComparisonRows4Oneai,
advantage: "capability"
},
{
feature: oneaiComparisonRows5Feature,
stipend: oneaiComparisonRows5Stipend,
chatgpt: oneaiComparisonRows5Chatgpt,
copilot: oneaiComparisonRows5Copilot,
oneai: oneaiComparisonRows5Oneai,
advantage: null
},
{
feature: oneaiComparisonRows6Feature,
stipend: oneaiComparisonRows6Stipend,
chatgpt: oneaiComparisonRows6Chatgpt,
copilot: oneaiComparisonRows6Copilot,
oneai: oneaiComparisonRows6Oneai,
advantage: "capability"
},
{
feature: oneaiComparisonRows7Feature,
stipend: oneaiComparisonRows7Stipend,
chatgpt: oneaiComparisonRows7Chatgpt,
copilot: oneaiComparisonRows7Copilot,
oneai: oneaiComparisonRows7Oneai,
advantage: "capability"
},
{
feature: oneaiComparisonRows8Feature,
stipend: oneaiComparisonRows8Stipend,
chatgpt: oneaiComparisonRows8Chatgpt,
copilot: oneaiComparisonRows8Copilot,
oneai: oneaiComparisonRows8Oneai,
advantage: "capability"
},
{
feature: oneaiComparisonRows9Feature,
stipend: oneaiComparisonRows9Stipend,
chatgpt: oneaiComparisonRows9Chatgpt,
copilot: oneaiComparisonRows9Copilot,
oneai: oneaiComparisonRows9Oneai,
advantage: null
},
{
feature: oneaiComparisonRows10Feature,
stipend: oneaiComparisonRows10Stipend,
chatgpt: oneaiComparisonRows10Chatgpt,
copilot: oneaiComparisonRows10Copilot,
oneai: oneaiComparisonRows10Oneai,
advantage: "capability"
}
Expand Down Expand Up @@ -196,13 +220,16 @@ export function getOneaiComparisonRows({
lang,
rowLoaders = DEFAULT_ROW_LOADERS
}: GetOneaiComparisonRowsOptions): OneaiComparisonRow[] {
return rowLoaders.map(({ advantage, chatgpt, feature, oneai, stipend }) => ({
feature: feature(lang),
stipend: stipend(lang),
chatgpt: chatgpt(lang),
oneai: oneai(lang),
advantage
}));
return rowLoaders.map(
({ advantage, chatgpt, copilot, feature, oneai, stipend }) => ({
feature: feature(lang),
stipend: stipend(lang),
chatgpt: chatgpt(lang),
copilot: copilot(lang),
oneai: oneai(lang),
advantage
})
);
}

/**
Expand Down
10 changes: 10 additions & 0 deletions app/[lang]/(hyperjump)/oneai/oneai-comparison-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
oneaiComparisonAdvantagePriceBadge,
oneaiComparisonAssumptions,
oneaiComparisonColumnsChatgpt,
oneaiComparisonColumnsCopilot,
oneaiComparisonColumnsFeature,
oneaiComparisonColumnsOneai,
oneaiComparisonColumnsStipend,
Expand Down Expand Up @@ -156,6 +157,11 @@ export function OneaiComparisonTable({ lang }: OneaiComparisonTableProps) {
className="text-hyperjump-gray px-3 py-3 font-semibold">
{oneaiComparisonColumnsChatgpt(lang)}
</th>
<th
scope="col"
className="text-hyperjump-gray px-3 py-3 font-semibold">
{oneaiComparisonColumnsCopilot(lang)}
</th>
<th
scope="col"
className="bg-hyperjump-blue/10 text-hyperjump-black border-hyperjump-blue/20 border-b-2 px-3 py-3 font-bold">
Expand Down Expand Up @@ -192,6 +198,10 @@ export function OneaiComparisonTable({ lang }: OneaiComparisonTableProps) {
muted={mutedCompetitors}
value={row.chatgpt}
/>
<CompetitorCell
muted={mutedCompetitors}
value={row.copilot}
/>
<OneaiCell lang={lang} row={row} />
</tr>
);
Expand Down
1 change: 1 addition & 0 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading