add savings plans to frontend

Author: IAmJSD

next/app/AWSClient.tsx

@@ -7,7 +7,10 @@ import Filters from "@/components/Filters";
 import { useMemo } from "react";
 import dynamicallyDecompress from "@/utils/dynamicallyDecompress";
 import { AtomKeyWhereInstanceIs } from "@/components/InstanceTable";
-import { reservedTermOptions } from "@/utils/dataMappings";
+import {
+    reservedTermOptions,
+    SupportedSavingsPlanOptions,
+} from "@/utils/dataMappings";
 import { MarketingSchema } from "@/schemas/marketing";
 import Advert from "@/components/Advert";
 import type { CurrencyItem } from "@/utils/loadCurrencies";
@@ -17,6 +20,7 @@ type RootProps<Instance extends { instance_type: string }> = {
     regions: Region;
     marketingData: MarketingSchema;
     currencies: CurrencyItem[];
+    savingsPlanSupported?: SupportedSavingsPlanOptions[];
 };
 
 type AWSClientProps<
@@ -103,8 +107,15 @@ export default function AWSClient<
                 <Filters
                     columnAtomKey={props.columnAtomKey}
                     regions={props.regions}
-                    reservedTermOptions={reservedTermOptions}
+                    reservedTermOptions={reservedTermOptions(
+                        props.savingsPlanSupported,
+                    )}
                     currencies={props.currencies}
+                    reservedLabel={
+                        props.savingsPlanSupported
+                            ? "Reserved/Savings Plan"
+                            : undefined
+                    }
                 />
                 <div className="flex-1 min-h-0">
                     <InstanceTable

next/app/aws/ec2/[slug]/page.tsx

@@ -107,6 +107,9 @@ export async function generateMetadata({
 }
 
 const reservedTermOptions: [string, string][] = [
+    ["Savings.noUpfront", "No Upfront (Savings Plan)"],
+    ["Savings.partialUpfront", "Partial Upfront (Savings Plan)"],
+    ["Savings.allUpfront", "All Upfront (Savings Plan)"],
     ["Standard.noUpfront", "No Upfront"],
     ["Standard.partialUpfront", "Partial Upfront"],
     ["Standard.allUpfront", "All Upfront"],

next/app/aws/rds/[slug]/page.tsx

@@ -89,6 +89,7 @@ export async function generateMetadata({
 }
 
 const reservedTermOptions: [string, string][] = [
+    ["Savings.noUpfront", "No Upfront (Savings Plan)"],
     ["Standard.noUpfront", "No Upfront"],
     ["Standard.partialUpfront", "Partial Upfront"],
     ["Standard.allUpfront", "All Upfront"],

next/app/page.tsx

@@ -51,6 +51,14 @@ export default async function Home() {
                 compressedInstances={compressedInstances}
                 compressedDataPathTemplate={`/remaining-instances-p{}.msgpack.xz?cache=${instancesHash}`}
                 columnAtomKey="ec2"
+                savingsPlanSupported={[
+                    "yrTerm1Savings.noUpfront",
+                    "yrTerm1Savings.partialUpfront",
+                    "yrTerm1Savings.allUpfront",
+                    "yrTerm3Savings.noUpfront",
+                    "yrTerm3Savings.partialUpfront",
+                    "yrTerm3Savings.allUpfront",
+                ]}
             />
         </>
     );

next/app/rds/page.tsx

@@ -49,6 +49,7 @@ export default async function RDS() {
                 compressedDataPathTemplate={`/remaining-rds-instances.msgpack.xz?cache=${instancesHash}`}
                 columnAtomKey="rds"
                 marketingData={marketingData}
+                savingsPlanSupported={["yrTerm1Savings.noUpfront"]}
             />
         </>
     );

next/llms/generateAwsInstances.ts

@@ -9,6 +9,12 @@ const tableColumns = [
     ["spot_min", "Spot Min"],
     ["spot_avg", "Spot Avg"],
     ["spot_max", "Spot Max"],
+    ["yrTerm1Savings.noUpfront", "1yr No Upfront (Savings Plan)"],
+    ["yrTerm1Savings.partialUpfront", "1yr Partial Upfront (Savings Plan)"],
+    ["yrTerm1Savings.allUpfront", "1yr All Upfront (Savings Plan)"],
+    ["yrTerm3Savings.noUpfront", "3yr No Upfront (Savings Plan)"],
+    ["yrTerm3Savings.partialUpfront", "3yr Partial Upfront (Savings Plan)"],
+    ["yrTerm3Savings.allUpfront", "3yr All Upfront (Savings Plan)"],
     ["yrTerm1Standard.noUpfront", "1yr No Upfront"],
     ["yrTerm1Standard.partialUpfront", "1yr Partial Upfront"],
     ["yrTerm1Standard.allUpfront", "1yr All Upfront"],
@@ -118,6 +124,12 @@ function generateInstanceMarkdown(
                     region,
                     instance.pricing[region]?.[platform]?.[column],
                 );
+            case "yrTerm1Savings.noUpfront":
+            case "yrTerm1Savings.partialUpfront":
+            case "yrTerm1Savings.allUpfront":
+            case "yrTerm3Savings.noUpfront":
+            case "yrTerm3Savings.partialUpfront":
+            case "yrTerm3Savings.allUpfront":
             case "yrTerm1Standard.noUpfront":
             case "yrTerm1Standard.partialUpfront":
             case "yrTerm1Standard.allUpfront":

next/utils/dataMappings.ts

@@ -17,7 +17,7 @@ export const durationOptions: { value: CostDuration; label: string }[] = [
     { value: "annually", label: "Annually" },
 ] as const;
 
-export const reservedTermOptions = [
+const sharedReservedTermOptions = [
     { value: "yrTerm1Standard.noUpfront", label: "1-year - No Upfront" },
     {
         value: "yrTerm1Standard.partialUpfront",
@@ -55,3 +55,36 @@ export const reservedTermOptions = [
         label: "3-year convertible - Full Upfront",
     },
 ];
+
+const savingsPlanExtras = {
+    "yrTerm1Savings.noUpfront": "1-year Savings Plan - No Upfront",
+    "yrTerm1Savings.partialUpfront": "1-year Savings Plan - Partial Upfront",
+    "yrTerm1Savings.allUpfront": "1-year Savings Plan - Full Upfront",
+    "yrTerm3Savings.noUpfront": "3-year Savings Plan - No Upfront",
+    "yrTerm3Savings.partialUpfront": "3-year Savings Plan - Partial Upfront",
+    "yrTerm3Savings.allUpfront": "3-year Savings Plan - Full Upfront",
+};
+
+const savingsPlanCache = new Map<string, { value: string; label: string }[]>();
+
+export type SupportedSavingsPlanOptions = keyof typeof savingsPlanExtras;
+
+export const reservedTermOptions = (
+    savingsPlanSupported: SupportedSavingsPlanOptions[] | undefined,
+) => {
+    if (!savingsPlanSupported) return sharedReservedTermOptions;
+    const key = savingsPlanSupported.join(",");
+    const cached = savingsPlanCache.get(key);
+    if (cached) return cached;
+
+    const extras: { value: string; label: string }[] = [];
+    for (const sp of savingsPlanSupported) {
+        const label = savingsPlanExtras[sp];
+        if (label) {
+            extras.push({ value: sp, label });
+        }
+    }
+    const options = [...extras, ...sharedReservedTermOptions];
+    savingsPlanCache.set(key, options);
+    return options;
+};