querysub 0.513.0 → 0.514.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.513.0",
+  "version": "0.514.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/deployButtons.tsx

@@ -195,6 +195,9 @@ export class UpdateServiceButtons extends qreact.Component<{
 export class DeployMachineButtons extends qreact.Component<{
     machines: MachineInfo[];
 }> {
+    state = t.state({
+        isDeploying: t.type(false),
+    });
     render() {
         let controller = MachineServiceController(SocketFunction.browserNodeId());
         const gitInfo = controller.getGitInfo();
@@ -208,25 +211,38 @@ export class DeployMachineButtons extends qreact.Component<{
         return <>
             {outdatedMachines.length > 0 && <div
                 className={buttonStyle.alignSelf("stretch").hsl(120, 70, 50)}
-                onClick={async () => {
-                    let machineController = MachineController(SocketFunction.browserNodeId());
-                    try {
-                        await Promise.allSettled(outdatedMachines.map(machine => {
-                            return machineController.deployMachineFromBrowser.promise({
-                                machineNodeId: machine.applyNodeId,
-                                gitRef: gitInfo.latestRef,
+                onClick={() => {
+                    if (this.state.isDeploying) return;
+                    this.state.isDeploying = true;
+                    // Props are synchronized state, so everything the async work needs is captured HERE, in the synced part
+                    let machineNodeIds = outdatedMachines.map(machine => machine.applyNodeId);
+                    let gitRef = gitInfo.latestRef;
+                    Querysub.onCommitFinished(async () => {
+                        try {
+                            let machineController = MachineController(SocketFunction.browserNodeId());
+                            try {
+                                await Promise.allSettled(machineNodeIds.map(machineNodeId => {
+                                    return machineController.deployMachineFromBrowser.promise({
+                                        machineNodeId,
+                                        gitRef,
+                                    });
+                                }));
+                            } 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;
+                                }
+                            }
+                        } finally {
+                            Querysub.commit(() => {
+                                this.state.isDeploying = false;
                             });
-                        }));
-                    } 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>
-                    {bigEmoji("🎯", -4)} <span>Deploy {outdatedMachines.length} Machines</span>
+                    {bigEmoji("🎯", -4)} <span>{this.state.isDeploying && "⏳ Deploying..." || `Deploy ${outdatedMachines.length} Machines`}</span>
                 </div>
                 <div className={css.hbox(5)}>
                     <b>New</b>