From 1a02bb53d0235eb01a297414b59330d65889073b Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Wed, 14 Sep 2022 17:14:27 -0700
Subject: [PATCH] refactor infomsg

---
 src/main.tsx | 125 ++++++++++++++++++++++++++++-----------------------
 src/types.ts |   1 +
 2 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/src/main.tsx b/src/main.tsx
index b21bb29a..3d2f44b9 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -664,6 +664,73 @@ class TextAreaInput extends React.Component<{}, {}> {
     }
 }
 
+@mobxReact.observer
+class InfoMsg extends React.Component<{}, {}> {
+    getAfterSlash(s : string) : string {
+        if (s.startsWith("^/")) {
+            return s.substr(1);
+        }
+        let slashIdx = s.lastIndexOf("/");
+        if (slashIdx == s.length-1) {
+            slashIdx = s.lastIndexOf("/", slashIdx-1);
+        }
+        if (slashIdx == -1) {
+            return s;
+        }
+        return s.substr(slashIdx+1);
+    }
+    
+    render() {
+        let model = GlobalModel;
+        let inputModel = model.inputModel;
+        let infoMsg = inputModel.infoMsg.get();
+        let infoShow = inputModel.infoShow.get();
+        let line : string = null;
+        let istr : string = null;
+        let idx : number = 0;
+        return (
+            <div className="cmd-input-info" style={{display: (infoShow ? "block" : "none")}}>
+                <If condition={infoMsg && infoMsg.infotitle != null}>
+                    <div className="info-title">
+                        {infoMsg.infotitle}
+                    </div>
+                </If>
+                <If condition={infoMsg && infoMsg.infomsg != null}>
+                    <div className="info-msg">
+                        {infoMsg.infomsg}
+                    </div>
+                </If>
+                <If condition={infoMsg && infoMsg.infolines != null}>
+                    <div className="info-lines">
+                        <For index="idx" each="line" of={infoMsg.infolines}>
+                            <div key={idx}>{line == "" ? " " : line}</div>
+                        </For>
+                    </div>
+                </If>
+                <If condition={infoMsg && infoMsg.infocomps != null && infoMsg.infocomps.length > 0}>
+                    <div className="info-comps">
+                        <For each="istr" index="idx" of={infoMsg.infocomps}>
+                            <div key={idx} className={cn("info-comp", {"metacmd-comp": istr.startsWith("^")})}>
+                                {this.getAfterSlash(istr)}
+                            </div>
+                        </For>
+                        <If condition={infoMsg.infocompsmore}>
+                            <div key="more" className="info-comp">
+                                ...
+                            </div>
+                        </If>
+                    </div>
+                </If>
+                <If condition={infoMsg && infoMsg.infoerror != null}>
+                    <div className="info-error">
+                        [error] {infoMsg.infoerror}
+                    </div>
+                </If>
+            </div>
+        );
+    }
+}
+
 @mobxReact.observer
 class HistoryInfo extends React.Component<{}, {}> {
     lastClickHNum : string = null;
@@ -798,20 +865,6 @@ class HistoryInfo extends React.Component<{}, {}> {
 
 @mobxReact.observer
 class CmdInput extends React.Component<{}, {}> {
-    getAfterSlash(s : string) : string {
-        if (s.startsWith("^/")) {
-            return s.substr(1);
-        }
-        let slashIdx = s.lastIndexOf("/");
-        if (slashIdx == s.length-1) {
-            slashIdx = s.lastIndexOf("/", slashIdx-1);
-        }
-        if (slashIdx == -1) {
-            return s;
-        }
-        return s.substr(slashIdx+1);
-    }
-    
     render() {
         let model = GlobalModel;
         let inputModel = model.inputModel;
@@ -830,57 +883,15 @@ class CmdInput extends React.Component<{}, {}> {
         }
         let remoteStr = getRemoteStr(rptr);
         let cwdStr = getCwdStr(remote, remoteState);
-        let infoMsg = inputModel.infoMsg.get();
         let infoShow = inputModel.infoShow.get();
         let historyShow = !infoShow && inputModel.historyShow.get();
-        let istr : string = null;
-        let istrIdx : number = 0;
-        let line : string = null;
-        let idx : number = 0;
         return (
             <div className={cn("box cmd-input has-background-black", {"has-info": infoShow}, {"has-history": historyShow})}>
                 <If condition={historyShow}>
                     <div className="cmd-input-grow-spacer"></div>
                     <HistoryInfo/>
                 </If>
-                <div className="cmd-input-info" style={{display: (infoShow ? "block" : "none")}}>
-                    <If condition={infoMsg && infoMsg.infotitle != null}>
-                        <div className="info-title">
-                            {infoMsg.infotitle}
-                        </div>
-                    </If>
-                    <If condition={infoMsg && infoMsg.infomsg != null}>
-                        <div className="info-msg">
-                            {infoMsg.infomsg}
-                        </div>
-                    </If>
-                    <If condition={infoMsg && infoMsg.infolines != null}>
-                        <div className="info-lines">
-                            <For index="idx" each="line" of={infoMsg.infolines}>
-                                <div key={idx}>{line == "" ? " " : line}</div>
-                            </For>
-                        </div>
-                    </If>
-                    <If condition={infoMsg && infoMsg.infocomps != null && infoMsg.infocomps.length > 0}>
-                        <div className="info-comps">
-                            <For each="istr" index="istrIdx" of={infoMsg.infocomps}>
-                                <div key={istrIdx} className={cn("info-comp", {"metacmd-comp": istr.startsWith("^")})}>
-                                    {this.getAfterSlash(istr)}
-                                </div>
-                            </For>
-                            <If condition={infoMsg.infocompsmore}>
-                                <div key="more" className="info-comp">
-                                    ...
-                                </div>
-                            </If>
-                        </div>
-                    </If>
-                    <If condition={infoMsg && infoMsg.infoerror != null}>
-                        <div className="info-error">
-                            [error] {infoMsg.infoerror}
-                        </div>
-                    </If>
-                </div>
+                <InfoMsg/>
                 <div className="cmd-input-context">
                     <div className="has-text-white">
                         <Prompt rptr={rptr} rstate={remoteState}/>
diff --git a/src/types.ts b/src/types.ts
index 524e6c38..7c9b9d9a 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -80,6 +80,7 @@ type RemoteType = {
     defaultstate : RemoteStateType,
     connectmode : string,
     remoteidx : number,
+    archived : boolean,
     remove? : boolean,
 };