querysub 0.271.0 → 0.272.0

package/package.json

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

@@ -22,13 +22,15 @@ export class RenderGitRefInfo extends qreact.Component<{
 }> {
     render() {
         let controller = MachineServiceController(SocketFunction.browserNodeId());
+        let gitRef = this.props.gitRef;
         let gitRefInfo = controller.getGitRefInfo({
-            ref: this.props.gitRef,
+            ref: gitRef,
             useQuerysub: this.props.isQuerysub,
         });
         if (!gitRefInfo) return undefined;
+        let { description, time } = gitRefInfo;
         return <div className={css.fontWeight("normal")}>
-            {formatDateJSX(gitRefInfo.time)} AGO <span className={css.hsl(0, 0, 80).pad2(5, 2).italic}>{gitRefInfo.description}</span> ({this.props.gitRef.slice(0, 6)})
+            {formatDateJSX(time)} AGO <span className={css.hsl(0, 0, 80).pad2(5, 2).italic}>{description}</span> ({gitRef.slice(0, 6)})
         </div>;
     }
 }

package/src/deployManager/machineSchema.ts

@@ -259,6 +259,18 @@ export class MachineServiceControllerBase {
     }
 
     public async commitPushService(commitMessage: string) {
+        if (commitMessage.toLowerCase().includes("querysub")) {
+            let querysubFolder = path.resolve("../querysub");
+            if (fs.existsSync(querysubFolder)) {
+                let querysubLastCommit = await getGitRefInfo({
+                    gitDir: querysubFolder,
+                    ref: "origin/main",
+                });
+                if (querysubLastCommit) {
+                    commitMessage += `\n\n(querysub commit): ${querysubLastCommit.description}`;
+                }
+            }
+        }
         await commitAndPush({
             gitDir: ".",
             message: commitMessage,