querysub 0.253.0 → 0.255.0

package/package.json

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

@@ -7,6 +7,8 @@ import { css } from "../../4-dom/css";
 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;
 
@@ -25,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>;
     }
 }
 
@@ -42,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
@@ -52,13 +56,15 @@ export class UpdateButtons extends qreact.Component<{
                     showFullscreenModal({
                         content: <div>
                             <InputLabel
-                                label="Commit message (enter to commit, escape to cancel)"
+                                label="Commit message (shift+enter to commit, escape to cancel)"
                                 value={""}
                                 textarea
                                 fillWidth
-                                onChangeValue={value => {
+                                focusOnMount
+                                onChangeValue={async value => {
                                     if (!value) return;
-                                    void controller.commitPushAndPublishQuerysub.promise(value);
+                                    await controller.commitPushAndPublishQuerysub.promise(value);
+                                    closeAllModals();
                                 }}
                             />
                             <div className={css.vbox(5)}>
@@ -76,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)}
@@ -85,13 +94,15 @@ export class UpdateButtons extends qreact.Component<{
                     showFullscreenModal({
                         content: <div>
                             <InputLabel
-                                label="Commit message (enter to commit, escape to cancel)"
+                                label="Commit message (shift+enter to commit, escape to cancel)"
                                 value={""}
                                 textarea
                                 fillWidth
-                                onChangeValue={value => {
+                                focusOnMount
+                                onChangeValue={async value => {
                                     if (!value) return;
-                                    void controller.commitPushService.promise(value);
+                                    await controller.commitPushService.promise(value);
+                                    closeAllModals();
                                 }}
                             />
                             <div className={css.vbox(5)}>

package/src/deployManager/machineController.ts

@@ -93,12 +93,12 @@ class MachineControllerBase {
         machineNodeId: string;
         gitRef: string;
     }) {
-        await MachineController(config.machineNodeId).deployService.promise({
+        await MachineController(config.machineNodeId).deployMachine.promise({
             gitRef: config.gitRef,
         });
     }
 
-    public async deployService(config: {
+    public async deployMachine(config: {
         gitRef: string;
     }) {
         let gitFolder = os.homedir() + "/machine-alwaysup";
@@ -120,12 +120,17 @@ export const MachineController = getSyncedController(SocketFunction.register(
         streamScreenOutput: {},
         watchOtherScreenOutput: {},
         deployMachineFromBrowser: {},
-        deployService: {},
+        deployMachine: {},
     }),
     () => ({
         hooks: [assertIsManagementUser],
     }),
-));
+), {
+    writes: {
+        deployMachineFromBrowser: ["MachineInfo"],
+        deployMachine: ["MachineInfo"],
+    }
+});
 
 let callbacks = new Map<string, (data: string) => Promise<void>>();
 export async function watchScreenOutput(config: {

package/src/deployManager/machineSchema.ts

@@ -305,8 +305,8 @@ export const MachineServiceController = getSyncedController(
             addServiceConfig: ["ServiceConfig", "ServiceConfigList"],
             setServiceConfigs: ["ServiceConfig"],
             deleteServiceConfig: ["ServiceConfig", "ServiceConfigList"],
-            commitPushService: ["gitInfo"],
-            commitPushAndPublishQuerysub: ["gitInfo"],
+            commitPushService: ["gitInfo", "ServiceConfig"],
+            commitPushAndPublishQuerysub: ["gitInfo", "ServiceConfig"],
         },
         reads: {
             getMachineList: ["MachineInfoList"],

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));
 }