onprem/frontend/gpu licenses: show info in text description and bugfixing

Author: haraldschilly

src/packages/frontend/project/settings/quota-editor/admin-quotas.tsx

@@ -5,6 +5,8 @@
 
 import { useEffect, useState } from "react";
 import { Button, Card, Popconfirm, Popover } from "antd";
+import { isEqual } from "lodash";
+
 import { alert_message } from "@cocalc/frontend/alerts";
 import { Icon, Loading } from "@cocalc/frontend/components";
 import { webapp_client } from "@cocalc/frontend/webapp-client";
@@ -13,16 +15,16 @@ import { PROJECT_UPGRADES } from "@cocalc/util/schema";
 import type { ProjectSettings } from "../types";
 import QuotaRow from "./quota-row";
 import type { QuotaParams } from "./types";
-import { isEqual } from "lodash";
-import { useRedux } from "@cocalc/frontend/app-framework";
+import { CSS, useRedux } from "@cocalc/frontend/app-framework";
 
 const QUOTA_PARAMS = PROJECT_UPGRADES.params;
 
 interface Props {
   project_id: string;
+  style?: CSS;
 }
 
-export default function AdminQuotas({ project_id }: Props) {
+export default function AdminQuotas({ project_id, style }: Props) {
   const projectSettings: ProjectSettings | undefined = useRedux([
     "projects",
     "project_map",
@@ -114,6 +116,7 @@ export default function AdminQuotas({ project_id }: Props) {
 
   return (
     <Card
+      style={style}
       title={
         <>
           <Icon name="user-plus" /> Admin Quota Editor

src/packages/frontend/project/settings/run-quota/hooks.tsx

@@ -8,6 +8,7 @@ import { fromPairs, isEqual } from "lodash";
 
 import { ProjectStatus } from "@cocalc/comm/project-status/types";
 import {
+  TypedMap,
   useEffect,
   useMemo,
   useState,
@@ -20,6 +21,7 @@ import {
 } from "@cocalc/util/db-schema/site-defaults";
 import { round1, seconds2hms, server_time } from "@cocalc/util/misc";
 import { PROJECT_UPGRADES } from "@cocalc/util/schema";
+import { GPU } from "@cocalc/util/types/site-licenses";
 import {
   Upgrades,
   quota2upgrade_key,
@@ -54,7 +56,12 @@ export function useRunQuota(
       return rq
         .map((val, key) => {
           if (key === "gpu") {
-            return val?.get("num", 0);
+            const v = val as boolean | TypedMap<GPU>;
+            if (typeof v === "boolean") {
+              return v ? 1 : null;
+            } else {
+              return v?.get("num", 0);
+            }
           } else if (typeof val !== "number") {
             return val;
           } else if (key == "idle_timeout") {

src/packages/frontend/project/settings/run-quota/run-quota.tsx

@@ -246,8 +246,6 @@ export const RunQuota: React.FC<Props> = React.memo(
         );
       }
 
-      console.log(record.key, val);
-
       if (typeof val === "boolean") {
         return renderBoolean(val, projectIsRunning);
       } else if (record.key === "idle_timeout") {

src/packages/frontend/project/settings/upgrade-usage.tsx

@@ -211,7 +211,10 @@ export const UpgradeUsage: React.FC<Props> = React.memo(
       return (
         <>
           {account_groups.includes("admin") && (
-            <AdminQuotas project_id={project_id} />
+            <AdminQuotas
+              project_id={project_id}
+              style={{ marginTop: "15px" }}
+            />
           )}
           {is_commercial && (
             <PayAsYouGoQuotaEditor

src/packages/util/licenses/describe-quota.ts

@@ -3,7 +3,6 @@
  *  License: AGPLv3 s.t. "Commons Clause" – see LICENSE.md for details
  */
 
-
 /*
 To avoid inconsistency, we are going to follow the style guide/table from
 the "Microsoft Writing Style Guide" for things like "3 GB":
@@ -139,6 +138,11 @@ export function describe_quota(
       `${quota.dedicated_cpu} dedicated ${plural(quota.dedicated_cpu, "vCPU")}`,
     );
   }
+  if (quota.gpu) {
+    const { gpu } = quota;
+    const num = gpu === true ? 1 : gpu.num ?? 1;
+    v.push(`${num} GPU(s)`);
+  }
 
   if (
     typeof quota.dedicated_vm !== "boolean" &&

src/packages/util/types/site-licenses.ts

@@ -33,7 +33,7 @@ export interface SiteLicenseQuota {
   // JSON array of Array of JSON Patch Operations, e.g. "[{op: \"add\", path: \"/foo\", value: \"bar\"}]"
   // It's not an array of objects, because somewhere the array is converted to weird map of "0, 1, 2,..." indexed objects.
   patch?: string;
-  gpu?: GPU;
+  gpu?: GPU | boolean;
 }
 
 // For typescript use of these from user side, we make this available:

src/packages/util/upgrades/quota.ts

@@ -111,7 +111,7 @@ interface QuotaBase {
 interface QuotaOnPrem {
   ext_rw?: boolean;
   patch?: { [key: string]: string | object }[];
-  gpu?: GPU | false;
+  gpu?: GPU | boolean;
 }
 
 // the resulting quota is a combination of the base quota and the onprem specific one