querysub 0.695.0 → 0.697.0

package/package.json

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

@@ -106,22 +106,59 @@ export function confirmNoOverlapDeploy(actionLabel: string, onConfirm: () => voi
     });
 }
 
+const CONFIRM_LIST_MAX_HEIGHT = 220;
+
+/** Deploying every outdated service restarts all of them at once, which is most of the cluster — worth naming what is about to restart before it happens. */
+class DeployAllConfirmModal extends qreact.Component<{ titles: string[]; latestRef: string; onConfirm: () => void }> {
+    render() {
+        let count = this.props.titles.length;
+        return <div className={css.vbox(14).maxWidth(560)}>
+            <div className={css.fontSize(18).boldStyle}>Deploy {count} service{count === 1 && "" || "s"}?</div>
+            <div>
+                Each one restarts onto {this.props.latestRef.slice(0, 6)}. The old instances keep running for {formatTime(DEFAULT_OVERLAP_TIME)} before shutting down, so there is somewhere for connections to go while clients move across.
+            </div>
+            <div className={css.vbox(2).fillWidth.maxHeight(CONFIRM_LIST_MAX_HEIGHT).overflowAuto}>
+                {this.props.titles.map(title => <div>{title}</div>)}
+            </div>
+            <div className={css.hbox(10)}>
+                <button
+                    className={buttonStyle.hsl(120, 70, 90)}
+                    onClick={() => {
+                        closeAllModals();
+                        this.props.onConfirm();
+                    }}
+                >
+                    Deploy & Restart All ({count})
+                </button>
+                <button className={buttonStyle.hsl(0, 0, 90)} onClick={() => closeAllModals()}>
+                    Cancel
+                </button>
+            </div>
+        </div>;
+    }
+}
+export function confirmDeployAll(config: { titles: string[]; latestRef: string; onConfirm: () => void }) {
+    showFullscreenModal({
+        content: <DeployAllConfirmModal titles={config.titles} latestRef={config.latestRef} onConfirm={config.onConfirm} />,
+    });
+}
+
 export class UpdateButtons extends qreact.Component<{
     services: ServiceConfig[];
 }> {
     state = t.state({
         isDeploying: t.type(false),
     });
-    // Deploys all outdated services to latestRef, always immediately. The overlap is what keeps the service up - the old instances keep running for it, so connections have somewhere to go while clients move across. noOverlap kills them at once instead.
-    private deployAll(outdatedServices: ServiceConfig[], latestRef: string, noOverlap: boolean) {
+    // Deploys all outdated services to latestRef, always immediately. The overlap is what keeps the service up - the old instances keep running for it, so connections have somewhere to go while clients move across.
+    private deployAll(outdatedServices: ServiceConfig[], latestRef: string) {
         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;
             updated.parameters.releaseTime = Date.now();
-            // Always set, never inherited: the overlap belongs to the deploy being made, and leaving the previous deploy's value in place means one no-overlap deploy silently makes every later deploy a no-overlap one. A ternary, as 0 is the value we actually want here and it is falsy.
-            updated.parameters.overlapTime = noOverlap ? 0 : DEFAULT_OVERLAP_TIME;
+            // Always set, never inherited: the overlap belongs to the deploy being made, and leaving the previous deploy's value in place means one no-overlap deploy silently makes every later deploy a no-overlap one.
+            updated.parameters.overlapTime = DEFAULT_OVERLAP_TIME;
             return updated;
         });
         let controller = MachineServiceController(SocketFunction.browserNodeId());
@@ -190,9 +227,13 @@ export class UpdateButtons extends qreact.Component<{
                 <button
                     className={buttonStyle.hsl(120, 70, 90)}
                     disabled={this.state.isDeploying}
-                    title="Deploys now; the old instances keep running for their configured overlap before shutting down"
+                    title="Asks first, then deploys; the old instances keep running for their configured overlap before shutting down"
                     onClick={() => {
-                        this.deployAll(outdatedServices, gitInfo.latestRef, false);
+                        confirmDeployAll({
+                            titles: outdatedServices.map(service => service.info.title),
+                            latestRef: gitInfo.latestRef,
+                            onConfirm: () => this.deployAll(outdatedServices, gitInfo.latestRef),
+                        });
                     }}
                 >
                     <div>
@@ -208,17 +249,15 @@ export class UpdateButtons extends qreact.Component<{
                     </div>)}
                 </button>
                 <button
-                    className={buttonStyle.hsl(0, 85, 70)}
+                    className={buttonStyle.hsl(45, 85, 82)}
                     disabled={this.state.isDeploying}
-                    title="Deploys now AND shuts the old instances down as soon as the new ones are up (overlap of 0)"
+                    title="Deploys every outdated service straight away, without asking. Same overlap as the confirmed deploy — the old instances keep running before shutting down"
                     onClick={() => {
-                        confirmNoOverlapDeploy(`Deploy All (${outdatedServices.length}), No Overlap`, () => {
-                            this.deployAll(outdatedServices, gitInfo.latestRef, true);
-                        });
+                        this.deployAll(outdatedServices, gitInfo.latestRef);
                     }}
                 >
                     <div>
-                        {bigEmoji("⚡")} <span>{this.state.isDeploying && "⏳ Deploying..." || `Deploy All (${outdatedServices.length}), No Overlap`}</span>
+                        {bigEmoji("⚡")} <span>{this.state.isDeploying && "⏳ Deploying..." || `Deploy All Now (${outdatedServices.length})`}</span>
                     </div>
                 </button>
             </>}