fix: prefer sysinfo over cpuplot name in vars

wavetermdev · Oct 17, 2024 · eb64c34 · eb64c34
1 parent ee292ac
commit eb64c34
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 26 deletions.
diff --git a/frontend/app/block/block.tsx b/frontend/app/block/block.tsx
@@ -16,7 +16,7 @@ import {
 import { getWaveObjectAtom, makeORef, useWaveObjectValue } from "@/store/wos";
 import { focusedBlockId, getElemAsStr } from "@/util/focusutil";
 import { isBlank } from "@/util/util";
-import { CpuPlotView, CpuPlotViewModel, makeCpuPlotViewModel } from "@/view/cpuplot/cpuplot";
+import { SysinfoView, SysinfoViewModel, makeSysinfoViewModel } from "@/view/cpuplot/cpuplot";
 import { HelpView, HelpViewModel, makeHelpViewModel } from "@/view/helpview/helpview";
 import { QuickTipsView, QuickTipsViewModel } from "@/view/quicktipsview/quicktipsview";
 import { TermViewModel, TerminalView, makeTerminalModel } from "@/view/term/term";
@@ -47,8 +47,9 @@ function makeViewModel(blockId: string, blockView: string, nodeModel: NodeModel)
     if (blockView === "waveai") {
         return makeWaveAiViewModel(blockId);
     }
-    if (blockView === "cpuplot") {
-        return makeCpuPlotViewModel(blockId);
+    if (blockView === "cpuplot" || blockView == "sysinfo") {
+        // "cpuplot" is for backwards compatibility with already-opened widgets
+        return makeSysinfoViewModel(blockId, blockView);
     }
     if (blockView === "help") {
         return makeHelpViewModel(blockId, nodeModel);
@@ -89,8 +90,9 @@ function getViewElem(
     if (blockView === "waveai") {
         return <WaveAi key={blockId} blockId={blockId} model={viewModel as WaveAiModel} />;
     }
-    if (blockView === "cpuplot") {
-        return <CpuPlotView key={blockId} blockId={blockId} model={viewModel as CpuPlotViewModel} />;
+    if (blockView === "cpuplot" || blockView === "sysinfo") {
+        // "cpuplot" is for backwards compatibility with already opened widgets
+        return <SysinfoView key={blockId} blockId={blockId} model={viewModel as SysinfoViewModel} />;
     }
     if (blockView == "help") {
         return <HelpView key={blockId} model={viewModel as HelpViewModel} />;

diff --git a/frontend/app/view/cpuplot/cpuplot.tsx b/frontend/app/view/cpuplot/cpuplot.tsx
@@ -19,7 +19,6 @@ import { OverlayScrollbarsComponent, OverlayScrollbarsComponentRef } from "overl
 import "./cpuplot.less";
 
 const DefaultNumPoints = 120;
-type LineType = "default" | "title" | "sparkline";
 
 type DataItem = {
     ts: number;
@@ -87,7 +86,7 @@ function convertWaveEventToDataItem(event: WaveEvent): DataItem {
     return dataItem;
 }
 
-class CpuPlotViewModel {
+class SysinfoViewModel {
     viewType: string;
     blockAtom: jotai.Atom<Block>;
     termMode: jotai.Atom<string>;
@@ -109,8 +108,8 @@ class CpuPlotViewModel {
     endIconButtons: jotai.Atom<IconButtonDecl[]>;
     plotTypeSelectedAtom: jotai.Atom<string>;
 
-    constructor(blockId: string) {
-        this.viewType = "cpuplot";
+    constructor(blockId: string, viewType: string) {
+        this.viewType = viewType;
         this.blockId = blockId;
         this.blockAtom = WOS.getWaveObjectAtom<Block>(`block:${blockId}`);
         this.addDataAtom = jotai.atom(null, (get, set, points) => {
@@ -127,7 +126,7 @@ class CpuPlotViewModel {
                 const newData = [...data.slice(points.length), ...points];
                 set(this.dataAtom, newData);
             } catch (e) {
-                console.log("Error adding data to cpuplot", e);
+                console.log("Error adding data to sysinfo", e);
             }
         });
         this.plotMetaAtom = jotai.atom(new Map(Object.entries(DefaultPlotMeta)));
@@ -213,7 +212,7 @@ class CpuPlotViewModel {
             newData.splice(newData.length - initialDataItems.length, initialDataItems.length, ...initialDataItems);
             globalStore.set(this.addDataAtom, newData);
         } catch (e) {
-            console.log("Error loading initial data for cpuplot", e);
+            console.log("Error loading initial data for sysinfo", e);
         } finally {
             globalStore.set(this.loadingAtom, false);
         }
@@ -271,16 +270,16 @@ class CpuPlotViewModel {
     }
 }
 
-function makeCpuPlotViewModel(blockId: string): CpuPlotViewModel {
-    const cpuPlotViewModel = new CpuPlotViewModel(blockId);
-    return cpuPlotViewModel;
+function makeSysinfoViewModel(blockId: string, viewType: string): SysinfoViewModel {
+    const sysinfoViewModel = new SysinfoViewModel(blockId, viewType);
+    return sysinfoViewModel;
 }
 
 const plotColors = ["#58C142", "#FFC107", "#FF5722", "#2196F3", "#9C27B0", "#00BCD4", "#FFEB3B", "#795548"];
 
-type CpuPlotViewProps = {
+type SysinfoViewProps = {
     blockId: string;
-    model: CpuPlotViewModel;
+    model: SysinfoViewModel;
 };
 
 function resolveDomainBound(value: number | string, dataItem: DataItem): number | undefined {
@@ -293,7 +292,7 @@ function resolveDomainBound(value: number | string, dataItem: DataItem): number
     }
 }
 
-function CpuPlotView({ model, blockId }: CpuPlotViewProps) {
+function SysinfoView({ model, blockId }: SysinfoViewProps) {
     const connName = jotai.useAtomValue(model.connection);
     const lastConnName = React.useRef(connName);
     const connStatus = jotai.useAtomValue(model.connStatus);
@@ -333,7 +332,7 @@ function CpuPlotView({ model, blockId }: CpuPlotViewProps) {
     if (loading) {
         return null;
     }
-    return <CpuPlotViewInner key={connStatus?.connection ?? "local"} blockId={blockId} model={model} />;
+    return <SysinfoViewInner key={connStatus?.connection ?? "local"} blockId={blockId} model={model} />;
 }
 
 type SingleLinePlotProps = {
@@ -458,7 +457,7 @@ function SingleLinePlot({
     return <div ref={containerRef} className="sysinfo-plot-content" />;
 }
 
-const CpuPlotViewInner = React.memo(({ model }: CpuPlotViewProps) => {
+const SysinfoViewInner = React.memo(({ model }: SysinfoViewProps) => {
     const plotData = jotai.useAtomValue(model.dataAtom);
     const yvals = jotai.useAtomValue(model.metrics);
     const plotMeta = jotai.useAtomValue(model.plotMetaAtom);
@@ -493,4 +492,4 @@ const CpuPlotViewInner = React.memo(({ model }: CpuPlotViewProps) => {
     );
 });
 
-export { CpuPlotView, CpuPlotViewModel, makeCpuPlotViewModel };
+export { makeSysinfoViewModel, SysinfoView, SysinfoViewModel };
diff --git a/pkg/wconfig/defaultconfig/defaultwidgets.json b/pkg/wconfig/defaultconfig/defaultwidgets.json
@@ -41,13 +41,13 @@
             }
         }
     },
-    "defwidget@cpuplot": {
+    "defwidget@sysinfo": {
         "display:order": 5,
         "icon": "chart-line",
-        "label": "cpu",
+        "label": "sysinfo",
         "blockdef": {
             "meta": {
-                "view": "cpuplot"
+                "view": "sysinfo"
             }
         }
     }

diff --git a/pkg/wlayout/wlayout.go b/pkg/wlayout/wlayout.go
@@ -38,7 +38,7 @@ func GetStarterLayout() PortableLayout {
 		}, Focused: true},
 		{IndexArr: []int{1}, BlockDef: &waveobj.BlockDef{
 			Meta: waveobj.MetaMapType{
-				waveobj.MetaKey_View: "cpuplot",
+				waveobj.MetaKey_View: "sysinfo",
 			},
 		}},
 		{IndexArr: []int{1, 1}, BlockDef: &waveobj.BlockDef{

diff --git a/pkg/wshrpc/wshserver/wshserver.go b/pkg/wshrpc/wshserver/wshserver.go
@@ -83,7 +83,7 @@ func MakePlotData(ctx context.Context, blockId string) error {
 		return err
 	}
 	viewName := block.Meta.GetString(waveobj.MetaKey_View, "")
-	if viewName != "cpuplot" {
+	if viewName != "cpuplot" && viewName != "sysinfo" {
 		return fmt.Errorf("invalid view type: %s", viewName)
 	}
 	return filestore.WFS.MakeFile(ctx, blockId, "cpuplotdata", nil, filestore.FileOptsType{})
@@ -95,7 +95,7 @@ func SavePlotData(ctx context.Context, blockId string, history string) error {
 		return err
 	}
 	viewName := block.Meta.GetString(waveobj.MetaKey_View, "")
-	if viewName != "cpuplot" {
+	if viewName != "cpuplot" && viewName != "sysinfo" {
 		return fmt.Errorf("invalid view type: %s", viewName)
 	}
 	// todo: interpret the data being passed