querysub 0.254.0 → 0.256.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.254.0",
+  "version": "0.256.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/deployManager/components/MachinesListPage.tsx

@@ -35,8 +35,16 @@ export class MachinesListPage extends qreact.Component {
         return <div className={css.vbox(16)}>
             <div className={css.hbox(12)}>
                 <h2 className={css.flexGrow(1)}>Machines</h2>
-                <div className={css.pad2(12, 8).bord2(200, 30, 70).hsl(200, 20, 95).colorhsl(200, 30, 30)}>
-                    💡 Setup new machines with <code className={css.pad2(4, 2).bord2(200, 20, 80).hsl(200, 15, 85)}>yarn setup-machine 153.34.64.2</code>
+                <div
+                    className={css.pad2(12, 8).bord2(200, 30, 70).hsl(200, 20, 95).colorhsl(200, 30, 30).button}
+                    onClick={() => {
+                        void navigator.clipboard.writeText("yarn setup-machine 153.34.64.2");
+                    }}
+                >
+                    💡 Setup new machines with <code
+                        className={css.pad2(4, 2).bord2(200, 20, 80).hsl(200, 15, 85)}
+                        title="Click to copy command"
+                    >yarn setup-machine 153.34.64.2</code>
                 </div>
 
                 {!this.state.isDeleteMode && likelyDeadMachines.length > 0 && (

package/src/deployManager/components/deployButtons.tsx

@@ -8,6 +8,7 @@ import { formatTime } from "socket-function/src/formatting/format";
 import { formatTimeJSX } from "../../misc/formatJSX";
 import { MachineController } from "../machineController";
 import { closeAllModals } from "../../5-diagnostics/Modal";
+import { unique } from "../../misc";
 
 module.hotreload = true;
 
@@ -26,7 +27,9 @@ export class RenderGitRefInfo extends qreact.Component<{
             useQuerysub: this.props.isQuerysub,
         });
         if (!gitRefInfo) return undefined;
-        return <div className={css.fontWeight("normal")}>{formatTimeJSX(gitRefInfo.time)} AGO {gitRefInfo.description}</div>;
+        return <div className={css.fontWeight("normal")}>
+            {formatTimeJSX(gitRefInfo.time)} AGO <span className={css.hsl(0, 0, 80).pad2(5, 2).italic}>{gitRefInfo.description}</span>
+        </div>;
     }
 }
 
@@ -43,7 +46,7 @@ export class UpdateButtons extends qreact.Component<{
             let { gitRef, repoUrl } = service.parameters;
             return repoUrl === gitInfo?.repoUrl && gitRef !== gitInfo?.latestRef;
         });
-        let outdatedRefs = outdatedServices.map(service => service.parameters.gitRef);
+        let outdatedRefs = unique(outdatedServices.map(service => service.parameters.gitRef));
 
         return <>
             {!!gitInfo?.querysubUncommitted.length && <button
@@ -79,7 +82,10 @@ export class UpdateButtons extends qreact.Component<{
                     {bigEmoji("📚", -5)}
                     Publish & Commit & Push Querysub & Update Package.json ({gitInfo?.querysubUncommitted.length} Files Changed)
                 </div>
-                <RenderGitRefInfo gitRef={gitInfo.querysubRef} isQuerysub />
+                <div className={css.hbox(5)}>
+                    <b>Current</b>
+                    <RenderGitRefInfo gitRef={gitInfo.querysubRef} isQuerysub />
+                </div>
             </button>}
             {!!gitInfo?.uncommitted.length && <button
                 className={buttonStyle.hsl(210, 40, 50)}
@@ -192,12 +198,19 @@ export class DeployMachineButtons extends qreact.Component<{
                 className={buttonStyle.alignSelf("stretch").hsl(120, 70, 50)}
                 onClick={async () => {
                     let machineController = MachineController(SocketFunction.browserNodeId());
-                    await Promise.all(outdatedMachines.map(machine => {
-                        return machineController.deployMachineFromBrowser.promise({
-                            machineNodeId: machine.applyNodeId,
-                            gitRef: gitInfo.latestRef,
-                        });
-                    }));
+                    try {
+                        await Promise.allSettled(outdatedMachines.map(machine => {
+                            return machineController.deployMachineFromBrowser.promise({
+                                machineNodeId: machine.applyNodeId,
+                                gitRef: gitInfo.latestRef,
+                            });
+                        }));
+                    } catch (error) {
+                        // They should always end with a disconnect (which means the machine updated, so obviously it disconnected from us)
+                        if (!String(error).includes("disconnected")) {
+                            throw error;
+                        }
+                    }
                 }}
             >
                 <div>

package/src/misc/formatJSX.tsx

@@ -2,5 +2,5 @@ import { qreact } from "../4-dom/qreact";
 import { formatTime, formatVeryNiceDateTime } from "socket-function/src/formatting/format";
 
 export function formatTimeJSX(time: number) {
-    return <span title={formatVeryNiceDateTime(time)}>({formatTime(Date.now() - time)})</span>;
+    return <span title={formatVeryNiceDateTime(time)}>{formatTime(Date.now() - time)}</span>;
 }

package/src/misc.ts

@@ -49,4 +49,8 @@ export function joinVNodes(vNodes: preact.ComponentChild[], delimitter: preact.C
 
 export function clamp(value: number, min: number, max: number) {
     return Math.max(min, Math.min(max, value));
+}
+
+export function unique<T>(array: T[]): T[] {
+    return Array.from(new Set(array));
 }