more fixes to student pay fix 86522f2

Author: williamstein

src/packages/frontend/course/configuration/student-pay.tsx

@@ -22,10 +22,12 @@ import { compute_cost } from "@cocalc/util/licenses/purchase/compute-cost";
 import { DEFAULT_PURCHASE_INFO } from "@cocalc/util/licenses/purchase/student-pay";
 import type { PurchaseInfo } from "@cocalc/util/licenses/purchase/types";
 import { currency } from "@cocalc/util/misc";
+import ShowError from "@cocalc/frontend/components/error";
 
 export default function StudentPay({ actions, settings }) {
   const intl = useIntl();
 
+  const [error, setError] = useState<string>("");
   const [minPayment, setMinPayment] = useState<number | undefined>(undefined);
   const updateMinPayment = () => {
     (async () => {
@@ -37,20 +39,24 @@ export default function StudentPay({ actions, settings }) {
   }, []);
 
   const [info, setInfo] = useState<PurchaseInfo>(() => {
-    const cur = settings.get("payInfo")?.toJS();
+    let cur = settings.get("payInfo")?.toJS();
+    let info: PurchaseInfo;
     if (cur != null) {
-      return cur;
+      info = { ...DEFAULT_PURCHASE_INFO, ...cur };
+    } else {
+      info = {
+        ...DEFAULT_PURCHASE_INFO,
+        // @ts-ignore
+        start: new Date(),
+        end: dayjs().add(3, "month").toDate(),
+      };
     }
-    const info = {
-      ...DEFAULT_PURCHASE_INFO,
-      start: new Date(),
-      end: dayjs().add(3, "month").toDate(),
-    } as PurchaseInfo;
     setTimeout(() => {
       // React requirement: this must happen in different render loop, because
       // it causes an update to the UI.
       actions.configuration.setStudentPay({ info, cost });
     }, 1);
+    console.log(info);
     return info;
   });
 
@@ -74,7 +80,8 @@ export default function StudentPay({ actions, settings }) {
   const cost = useMemo(() => {
     try {
       return compute_cost(info).cost;
-    } catch (_) {
+    } catch (err) {
+      setError(`${err}`);
       return null;
     }
   }, [info]);
@@ -149,6 +156,7 @@ export default function StudentPay({ actions, settings }) {
         </>
       }
     >
+      <ShowError error={error} setError={setError} />
       {cost != null && !showStudentPay && !!settings?.get("student_pay") && (
         <div style={{ float: "right" }}>
           <MoneyStatistic title="Cost Per Student" value={cost} />

src/packages/frontend/course/store.ts

@@ -27,6 +27,7 @@ import type {
   CopyConfigurationOptions,
   CopyConfigurationTargets,
 } from "./configuration/configuration-copying";
+import { DEFAULT_PURCHASE_INFO } from "@cocalc/util/licenses/purchase/student-pay";
 
 export const PARALLEL_DEFAULT = 5;
 export const MAX_COPY_PARALLEL = 25;
@@ -287,7 +288,11 @@ export class CourseStore extends Store<CourseState> {
     if (settings == null || !settings.get("student_pay")) return null;
     const payInfo = settings.get("payInfo")?.toJS();
     if (!payInfo) return null;
-    return payInfo;
+    // merge in defaults for backward compat if e.g., no version set
+    return {
+      ...DEFAULT_PURCHASE_INFO,
+      ...payInfo,
+    };
   }
 
   public get_datastore(): Datastore {

src/packages/frontend/course/student-projects/actions.ts

@@ -833,6 +833,7 @@ export class StudentProjectsActions {
       await this.course_actions.shared_project.configure();
       await this.set_all_student_project_course_info();
     } catch (err) {
+      console.warn(err);
       this.course_actions.set_error(
         `Error configuring student projects - ${err}`,
       );

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

@@ -7,7 +7,6 @@ import { CustomUpgrades, Subscription, User } from "./types";
 
 import costVersions from "./cost-versions";
 
-
 export const CURRENT_VERSION = "3";
 
 // Another gamble implicit in this is that pre's are available.  When they
@@ -83,6 +82,10 @@ interface CostsStructure {
 }
 
 export function getCosts(version: string): CostsStructure {
+  const x = costVersions[version];
+  if (x == null) {
+    throw Error(`Unknown cost version '${version}'`);
+  }
   const {
     SUB_DISCOUNT,
     GCE_COSTS,