querysub 0.253.0 → 0.254.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.253.0",
+  "version": "0.254.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,7 @@ 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";
 
 module.hotreload = true;
 
@@ -52,13 +53,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)}>
@@ -85,13 +88,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"],