querysub 0.361.0 → 0.363.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.361.0",
+  "version": "0.363.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/ServiceDetailPage.tsx

@@ -119,7 +119,8 @@ export class ServiceDetailPage extends qreact.Component {
                     if (!machineInfo) continue;
 
                     let applyNodeId = machineInfo.applyNodeId;
-                    await MachineController(applyNodeId).killRollingServices.promise({
+                    await MachineController(SocketFunction.browserNodeId()).killRollingServicesFromBrowser.promise({
+                        machineNodeId: applyNodeId,
                         serviceKey: config.parameters.key,
                     });
                 }
@@ -192,7 +193,8 @@ export class ServiceDetailPage extends qreact.Component {
                     if (!machineInfo) continue;
 
                     let applyNodeId = machineInfo.applyNodeId;
-                    let rollingInfo = MachineController(applyNodeId).getRollingServiceInfo({
+                    let rollingInfo = MachineController(SocketFunction.browserNodeId()).getRollingServiceInfoFromBrowser({
+                        machineNodeId: applyNodeId,
                         serviceKey: config.parameters.key,
                     });
                     if (rollingInfo) {

package/src/deployManager/machineController.ts

@@ -146,12 +146,30 @@ class MachineControllerBase {
         return await getRollingServiceInfo(config);
     }
 
+    public async getRollingServiceInfoFromBrowser(config: {
+        machineNodeId: string;
+        serviceKey: string;
+    }): Promise<{ rollingScreenName: string; originalScreenName: string; expiresAt: number }[]> {
+        return await MachineController(config.machineNodeId).getRollingServiceInfo.promise({
+            serviceKey: config.serviceKey,
+        });
+    }
+
     public async killRollingServices(config: {
         serviceKey: string;
     }): Promise<void> {
         await killRollingServicesForService(config);
     }
 
+    public async killRollingServicesFromBrowser(config: {
+        machineNodeId: string;
+        serviceKey: string;
+    }): Promise<void> {
+        await MachineController(config.machineNodeId).killRollingServices.promise({
+            serviceKey: config.serviceKey,
+        });
+    }
+
 }
 
 let forwardedCallbacks = new Map<string, string>();
@@ -165,7 +183,9 @@ export const MachineController = getSyncedController(SocketFunction.register(
         deployMachineFromBrowser: {},
         deployMachine: {},
         getRollingServiceInfo: {},
+        getRollingServiceInfoFromBrowser: {},
         killRollingServices: {},
+        killRollingServicesFromBrowser: {},
     }),
     () => ({
         hooks: [assertIsManagementUser],

package/src/diagnostics/logs/IndexedLogs/LogViewer3.tsx

@@ -795,6 +795,10 @@ export class LogViewer3 extends qreact.Component {
                     <TimeRangeSelector />
                 </div>
 
+                <h1>
+                    Test
+                </h1>
+
                 <div className={css.hbox(10).fillWidth}>
                     <InputLabelURL
                         flavor="large"

package/src/diagnostics/logs/lifeCycleAnalysis/lifeCycles.tsx

@@ -19,9 +19,13 @@ IMPORTANT! Now I am properly calling shutdown, so none of the streamed logs shou
 
 
 
-BUG: Fix it so we properly kill rolling screens when we disable a service
+BUG: We aren't able to connect directly to the apply service? Hmm...
 
-TODO: Show rolling services somewhere
+0) Make a minor UI change, so we can see rolling nodes appear
+1) Disable, to ensure rolling nodes go away
+2) Re-enable
+3) Another minor UI change
+4) Use the new "kill rolling" so we can see a forced update
 
 
 BUG: Why are CYOA deploys not working!