store/course: record "source"

Author: haraldschilly

src/packages/next/components/store/index.tsx

@@ -123,7 +123,7 @@ export default function StoreLayout({ page }: Props) {
 
     switch (main) {
       case "site-license":
-        return <SiteLicense noAccount={noAccount} source="license" />;
+        return <SiteLicense noAccount={noAccount} source="site-license" />;
       case "course":
         return <SiteLicense noAccount={noAccount} source="course" />;
       case "cart":

src/packages/next/components/store/quota-config.tsx

@@ -115,7 +115,7 @@ export const QuotaConfig: React.FC<Props> = (props: Props) => {
       return "Booster";
     } else {
       switch (source) {
-        case "license":
+        case "site-license":
           return "Quota Upgrades";
         case "course":
           return "Project Upgrades";
@@ -651,7 +651,7 @@ export const QuotaConfig: React.FC<Props> = (props: Props) => {
       );
     } else {
       switch (source) {
-        case "license":
+        case "site-license":
           return (
             <Tabs
               activeKey={configMode}

src/packages/next/components/store/run-limit.tsx

@@ -34,7 +34,7 @@ export function RunLimit({
     if (!showExplanations) return;
 
     switch (source) {
-      case "license":
+      case "site-license":
         return (
           <div style={{ marginTop: "5px" }}>
             {boost ? (
@@ -76,7 +76,7 @@ export function RunLimit({
   }
 
   switch (source) {
-    case "license":
+    case "site-license":
       return (
         <>
           <Divider plain>Simultaneous Project Upgrades</Divider>
@@ -87,7 +87,7 @@ export function RunLimit({
             extra={extra()}
           >
             <EditRunLimit
-              type={source}
+              source={source}
               disabled={disabled}
               onChange={(run_limit) => {
                 form.setFieldsValue({ run_limit });
@@ -109,7 +109,7 @@ export function RunLimit({
             extra={extra()}
           >
             <EditRunLimit
-              type={source}
+              source={source}
               disabled={disabled}
               onChange={(run_limit) => {
                 form.setFieldsValue({ run_limit });
@@ -129,12 +129,12 @@ function EditRunLimit({
   value,
   onChange,
   disabled,
-  type,
+  source,
 }: {
   value?: number;
   onChange: (run_limit: number) => void;
   disabled?: boolean;
-  type: LicenseSource;
+  source: LicenseSource;
 }) {
   return (
     <IntegerSlider
@@ -144,9 +144,9 @@ function EditRunLimit({
       max={300}
       maxText={MAX_ALLOWED_RUN_LIMIT}
       onChange={onChange}
-      units={type === "course" ? "students" : "projects"}
+      units={source === "course" ? "students" : "projects"}
       presets={
-        type === "course"
+        source === "course"
           ? [10, 25, 50, 75, 100, 125, 150, 200]
           : [1, 2, 10, 50, 100, 250, 500]
       }

src/packages/next/components/store/site-license.tsx

@@ -83,7 +83,7 @@ export default function SiteLicense({ noAccount, source }: Props) {
       </Title>
       {router.query.id == null && (
         <>
-          {source === "license" && (
+          {source === "site-license" && (
             <div>
               <Paragraph style={{ fontSize: "12pt" }}>
                 <A href="https://doc.cocalc.com/licenses.html">

src/packages/next/components/store/usage-and-duration.tsx

@@ -64,7 +64,7 @@ export function UsageAndDuration(props: Props) {
       <>Academic users receive a 40% discount off the standard price.</>
     );
     switch (source) {
-      case "license":
+      case "site-license":
         return (
           <>
             Will this license be used for academic or commercial purposes?
@@ -80,7 +80,7 @@ export function UsageAndDuration(props: Props) {
 
   function renderUsageItem() {
     switch (source) {
-      case "license":
+      case "site-license":
         return (
           <Radio.Group disabled={disabled}>
             <Space direction="vertical" style={{ margin: "5px 0" }}>
@@ -118,7 +118,7 @@ export function UsageAndDuration(props: Props) {
             Academic
           </Form.Item>
         );
-      case "license":
+      case "site-license":
         return (
           <Form.Item
             name="user"
@@ -256,7 +256,7 @@ export function UsageAndDuration(props: Props) {
       case "course":
         return <>{tz}</>;
 
-      case "license":
+      case "site-license":
         return (
           <>
             You can buy a license either via a subscription or a single purchase
@@ -290,7 +290,7 @@ export function UsageAndDuration(props: Props) {
           </Form.Item>
         );
 
-      case "license":
+      case "site-license":
         return (
           <Form.Item
             name="period"

src/packages/next/lib/api/schema/licenses/common.ts

@@ -69,7 +69,7 @@ export const SiteLicenseQuotaSchema = z.object({
     ),
   user: z.enum(["academic", "business"]).describe("User type."),
   source: z
-    .enum(["license", "course"])
+    .enum(["site-license", "course"])
     .optional()
     .describe(
       "Indicates which page (license or course) was used to create this license.",

src/packages/next/tsconfig.json

@@ -33,7 +33,16 @@
     "locales/*/*.json",
     "locales/en/common.ts"
   ],
-  "exclude": ["node_modules", "public", "styles", "dist"],
+  "exclude": [
+    "node_modules",
+    "public",
+    "styles",
+    "dist",
+    ".next",
+    "target",
+    "locales",
+    "software-inventory"
+  ],
   "references": [
     { "path": "../backend" },
     { "path": "../database" },

src/packages/util/licenses/purchase/purchase-info.ts

@@ -27,6 +27,7 @@ export default function getPurchaseInfo(
         disk,
         member,
         uptime,
+        source,
         boost = false,
       } = conf;
       return {
@@ -47,6 +48,7 @@ export default function getPurchaseInfo(
         boost,
         title,
         description,
+        source,
       };
 
     case "vm":

src/packages/util/licenses/purchase/types.ts

@@ -1,3 +1,16 @@
+/*
+ *  This file is part of CoCalc: Copyright © 2020 Sagemath, Inc.
+ *  License: MS-RSL – see LICENSE.md for details
+ */
+
+import type { Uptime } from "@cocalc/util/consts/site-license";
+import type { DedicatedDisk, DedicatedVM } from "@cocalc/util/types/dedicated";
+import type {
+  CustomDescription,
+  LicenseSource,
+  Period,
+} from "@cocalc/util/upgrades/shopping";
+
 export type User = "academic" | "business";
 export type Upgrade = "basic" | "standard" | "max" | "custom";
 export type Subscription = "no" | "monthly" | "yearly";
@@ -45,15 +58,6 @@ export interface StartEndDatesWithStrings {
   end: Date | string;
 }
 
-/*
- *  This file is part of CoCalc: Copyright © 2020 Sagemath, Inc.
- *  License: MS-RSL – see LICENSE.md for details
- */
-
-import type { Uptime } from "@cocalc/util/consts/site-license";
-import type { DedicatedDisk, DedicatedVM } from "@cocalc/util/types/dedicated";
-import type { CustomDescription, Period } from "../../upgrades/shopping";
-
 interface Version {
   version: string; // it's just a string with no special interpretation.
 }
@@ -81,9 +85,12 @@ interface PurchaseInfoQuota0 {
   run_limit?: number;
 }
 
+type PurchseInfoSource = { source?: LicenseSource };
+
 export type PurchaseInfoQuota = PurchaseInfoQuota0 &
   CustomDescription &
-  StartEndDates;
+  StartEndDates &
+  PurchseInfoSource;
 
 export type PurchaseInfoVoucher = {
   type: "vouchers";

src/packages/util/upgrades/shopping.ts

@@ -27,7 +27,7 @@ export type VMCostProps = {
 };
 
 // the store's source page from where a site-license has been created
-export type LicenseSource = "license" | "course";
+export type LicenseSource = "site-license" | "course";
 
 export type QuotaCostProps = {
   type: "quota";