From fb823cfd798c277e0d7c924c81ab23767e0500f2 Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Sun, 30 Jul 2023 18:26:25 -0700
Subject: [PATCH] remove more cmdid references

---
 src/main.tsx           | 1 -
 src/model.ts           | 2 +-
 src/webshare-elems.tsx | 4 ++--
 src/webshare-model.ts  | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main.tsx b/src/main.tsx
index 3a2839ce5..89637fe09 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -41,7 +41,6 @@ type VisType = "visible" | "";
 type InterObsValue = {
     sessionid : string,
     lineid : string,
-    cmdid : string,
     visible : mobx.IObservableValue<boolean>,
     timeoutid? : any,
 };
diff --git a/src/model.ts b/src/model.ts
index c386ad4dc..6cc5631bf 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -2810,7 +2810,7 @@ class Model {
         let wasRunning = cmdStatusIsRunning(origStatus);
         let isRunning = cmdStatusIsRunning(newStatus);
         if (wasRunning && !isRunning) {
-            // console.log("cmd status", screenId, cmdId, origStatus, "=>", newStatus);
+            // console.log("cmd status", screenId, lineId, origStatus, "=>", newStatus);
             let ptr = this.getActiveLine(screenId, lineId);
             if (ptr != null) {
                 let screen = ptr.screen;
diff --git a/src/webshare-elems.tsx b/src/webshare-elems.tsx
index 389790d6d..9c160aa37 100644
--- a/src/webshare-elems.tsx
+++ b/src/webshare-elems.tsx
@@ -405,7 +405,7 @@ class WebLineCmdView extends React.Component<{line : T.WebLine, cmd : T.WebCmd,
                     <TerminalRenderer line={line} cmd={cmd} width={width} staticRender={staticRender} visible={visible} onHeightChange={this.handleHeightChange}/>
                 </If>
                 <If condition={rendererPlugin != null}>
-                    <SimpleBlobRenderer rendererContainer={WebShareModel} cmdId={line.lineid} plugin={rendererPlugin} onHeightChange={this.handleHeightChange} initParams={this.makeRendererModelInitializeParams()}/>
+                    <SimpleBlobRenderer rendererContainer={WebShareModel} lineId={line.lineid} plugin={rendererPlugin} onHeightChange={this.handleHeightChange} initParams={this.makeRendererModelInitializeParams()}/>
                 </If>
                 <If condition={cmd && cmd.rtnstate}>
                     <div key="rtnstate" className="cmd-rtnstate" style={{visibility: ((cmd.status == "done") ? "visible" : "hidden")}}>
@@ -559,7 +559,7 @@ class TerminalRenderer extends React.Component<{line : T.WebLine, cmd : T.WebCmd
                 <If condition={!isFocused}>
                     <div key="term-block" className="term-block" onClick={this.clickTermBlock}></div>
                 </If>
-                <div key="term-connectelem" className="terminal-connectelem" ref={this.termRef} data-cmdid={line.lineid} style={{height: termHeight}}></div>
+                <div key="term-connectelem" className="terminal-connectelem" ref={this.termRef} data-lineid={line.lineid} style={{height: termHeight}}></div>
                 <If condition={!termLoaded}><div key="term-loading" className="terminal-loading-message">...</div></If>
 
             </div>
diff --git a/src/webshare-model.ts b/src/webshare-model.ts
index 69df4901c..5b58de956 100644
--- a/src/webshare-model.ts
+++ b/src/webshare-model.ts
@@ -475,7 +475,7 @@ class WebShareModelClass {
     }
 
     setContentHeight(context : T.RendererContext, height : number) : void {
-        let key = context.cmdId;
+        let key = context.lineId;
         this.contentHeightCache[key] = height;
     }