querysub 0.597.0 → 0.598.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.597.0",
+  "version": "0.598.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/CommitModal.tsx

@@ -8,7 +8,8 @@ import { InputLabel } from "../../library-components/InputLabel";
 import { DropdownSelector } from "../../library-components/DropdownSelector";
 import { closeAllModals } from "../../5-diagnostics/Modal";
 import { callOpenRouterModel, OpenRouterEffort } from "../../diagnostics/logs/errorNotifications2/openRouterHelper";
-import { formatNumber } from "socket-function/src/formatting/format";
+import { formatNumber, formatTime } from "socket-function/src/formatting/format";
+import { timeInSecond } from "socket-function/src/misc";
 import { t } from "../../2-proxy/schema2";
 
 module.hotreload = true;
@@ -96,6 +97,7 @@ export class CommitModal extends qreact.Component<{
         diffLoading: t.boolean(true),
         summarizing: t.boolean(false),
         committing: t.boolean(false),
+        committingStartTime: t.number,
         error: t.string,
         lastCost: t.number,
     });
@@ -172,6 +174,7 @@ export class CommitModal extends qreact.Component<{
         }
         Querysub.localCommit(() => {
             this.state.committing = true;
+            this.state.committingStartTime = Date.now();
             this.state.error = "";
         });
         try {
@@ -187,6 +190,7 @@ export class CommitModal extends qreact.Component<{
 
     render() {
         let { diff, diffLoading, summarizing, committing } = this.state;
+        let commitLabel = this.props.isQuerysub ? "Publish & Commit & Push" : "Commit & Push";
 
         let summarizeLabel: string;
         if (diffLoading) {
@@ -220,7 +224,7 @@ export class CommitModal extends qreact.Component<{
             <div className={css.hbox(10).flexWrap("wrap").alignItems("flex-end")}>
                 <button
                     className={rowButtonStyle.hsl(45, 80, 85)}
-                    disabled={diffLoading || summarizing}
+                    disabled={diffLoading || summarizing || committing}
                     title={diff ? extractChangedLines(diff) : ""}
                     onClick={() => void this.doSummarize()}
                 >
@@ -267,13 +271,17 @@ export class CommitModal extends qreact.Component<{
                 ⚠️ {this.state.error}
             </div>}
 
+            {committing && <div className={css.pad2(10).bord2(0, 0, 20).hsl(120, 50, 92).boldStyle}>
+                ⏳ Running {commitLabel} for {formatTime(Math.max(0, Querysub.nowDelayed(timeInSecond) - this.state.committingStartTime))}…
+            </div>}
+
             <div className={css.hbox(10)}>
                 <button
                     className={rowButtonStyle.hsl(120, 70, 85)}
                     disabled={committing}
                     onClick={() => void this.doCommit()}
                 >
-                    {committing ? "Committing…" : "⬆️ Commit & Push"}
+                    {committing ? `⏳ Running ${commitLabel}…` : `⬆️ ${commitLabel}`}
                 </button>
             </div>