querysub 0.523.0 → 0.524.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.523.0",
+  "version": "0.524.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

@@ -46,6 +46,32 @@ export class UpdateButtons extends qreact.Component<{
     state = t.state({
         isDeploying: t.type(false),
     });
+    // Deploys all outdated services to latestRef. Scheduled releases use the configured overlap so the new instances are running before the old ones shut down; immediate skips the release entirely (old instances restart right away, no overlap).
+    private deployAll(outdatedServices: ServiceConfig[], latestRef: string, immediate: boolean) {
+        this.state.isDeploying = true;
+        // Props are synchronized state, so everything the async work needs is cloned into plain locals HERE, in the synced part
+        let toDeploy = outdatedServices.map(service => {
+            let updated = deepCloneJSON(service);
+            updated.parameters.gitRef = latestRef;
+            if (immediate) {
+                updated.parameters.releaseTime = undefined;
+            } else {
+                let overlap = updated.parameters.overlapTime || DEFAULT_OVERLAP_TIME;
+                updated.parameters.releaseTime = Date.now() + overlap;
+            }
+            return updated;
+        });
+        let controller = MachineServiceController(SocketFunction.browserNodeId());
+        Querysub.onCommitFinished(async () => {
+            try {
+                await controller.setServiceConfigs.promise(toDeploy);
+            } finally {
+                Querysub.commit(() => {
+                    this.state.isDeploying = false;
+                });
+            }
+        });
+    }
     render() {
         let controller = MachineServiceController(SocketFunction.browserNodeId());
         const gitInfo = controller.getGitInfo();
@@ -98,30 +124,12 @@ export class UpdateButtons extends qreact.Component<{
                 {bigEmoji("⬆️")} <span>Commit & Push ({gitInfo?.uncommitted.length} Files Changed)</span>
             </button>}
 
-            {outdatedServices.length > 0 && gitInfo &&
+            {outdatedServices.length > 0 && gitInfo && <>
                 <button
                     className={buttonStyle.hsl(120, 70, 90)}
                     disabled={this.state.isDeploying}
                     onClick={() => {
-                        this.state.isDeploying = true;
-                        // Props are synchronized state, so everything the async work needs is cloned into plain locals HERE, in the synced part
-                        let toDeploy = outdatedServices.map(service => {
-                            let updated = deepCloneJSON(service);
-                            updated.parameters.gitRef = gitInfo.latestRef;
-                            // Release with the configured overlap, so the new instances are running before the old ones shut down
-                            let overlap = updated.parameters.overlapTime || DEFAULT_OVERLAP_TIME;
-                            updated.parameters.releaseTime = Date.now() + overlap;
-                            return updated;
-                        });
-                        Querysub.onCommitFinished(async () => {
-                            try {
-                                await controller.setServiceConfigs.promise(toDeploy);
-                            } finally {
-                                Querysub.commit(() => {
-                                    this.state.isDeploying = false;
-                                });
-                            }
-                        });
+                        this.deployAll(outdatedServices, gitInfo.latestRef, false);
                     }}
                 >
                     <div>
@@ -136,7 +144,19 @@ export class UpdateButtons extends qreact.Component<{
                         <RenderGitRefInfo gitRef={ref} />
                     </div>)}
                 </button>
-            }
+                <button
+                    className={buttonStyle.hsl(0, 70, 90)}
+                    disabled={this.state.isDeploying}
+                    title="Deploys immediately, with no overlap: the old instances are shut down right away"
+                    onClick={() => {
+                        this.deployAll(outdatedServices, gitInfo.latestRef, true);
+                    }}
+                >
+                    <div>
+                        {bigEmoji("⚡")} <span>{this.state.isDeploying && "⏳ Deploying..." || `Deploy All (${outdatedServices.length}) Now (no delay)`}</span>
+                    </div>
+                </button>
+            </>}
         </>;
     }
 }