querysub 0.399.0 → 0.400.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.399.0",
+  "version": "0.400.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

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

@@ -0,0 +1,61 @@
+import { qreact } from "../../../4-dom/qreact";
+import { Table } from "../../../5-diagnostics/Table";
+import { formatValue } from "../../../5-diagnostics/GenericFormat";
+import { LifeCycle, getVariables } from "./lifeCycles";
+import { LifecycleInstance } from "./lifeCycleSearch";
+
+export class LifeCycleInstanceTableView extends qreact.Component<{
+    lifeCycle: LifeCycle;
+    instance: LifecycleInstance;
+}> {
+    render() {
+        let { lifeCycle, instance } = this.props;
+
+        let columnKeyToTitle = new Map<string, string>();
+        let allColumnKeys = new Set<string>();
+
+        for (let entryData of instance.entries) {
+            let entry = lifeCycle.entries.find(e => e.matchPattern === entryData.matchPattern);
+            if (!entry) continue;
+
+            let variables = getVariables(entry);
+            for (let variable of variables) {
+                allColumnKeys.add(variable.key);
+                if (variable.title && !columnKeyToTitle.has(variable.key)) {
+                    columnKeyToTitle.set(variable.key, variable.title);
+                }
+            }
+        }
+
+        let rows = instance.entries.map((entryData) => {
+            let entry = lifeCycle.entries.find(e => e.matchPattern === entryData.matchPattern);
+            let entryTitle = entry && (entry.description || entry.matchPattern) || entryData.matchPattern;
+
+            let row: { entryTitle: string;[key: string]: unknown } = {
+                entryTitle: entryTitle,
+            };
+
+            if (entry) {
+                let variables = getVariables(entry);
+                for (let variable of variables) {
+                    row[variable.key] = entryData.datum[variable.key];
+                }
+            }
+
+            return row;
+        });
+
+        let columns: any = {
+            entryTitle: { title: "Entry" },
+        };
+
+        for (let columnKey of allColumnKeys) {
+            columns[columnKey] = {
+                title: columnKeyToTitle.get(columnKey) || columnKey,
+                formatter: (value: unknown) => formatValue(value),
+            };
+        }
+
+        return <Table rows={rows} columns={columns} />;
+    }
+}

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

@@ -1,7 +1,7 @@
 import { qreact } from "../../../4-dom/qreact";
 import { t } from "../../../2-proxy/schema2";
 import { css } from "typesafecss";
-import { deepCloneJSON, nextId } from "socket-function/src/misc";
+import { deepCloneJSON, nextId, sort } from "socket-function/src/misc";
 import { Querysub } from "../../../4-querysub/QuerysubController";
 import { InputLabel } from "../../../library-components/InputLabel";
 import { Button } from "../../../library-components/Button";
@@ -32,6 +32,7 @@ import { isPublic } from "../../../config";
 export let lifecycleIdURL = new URLParam("lifecycleid", "");
 export let limitURL = new URLParam("lifecyclelimit", 16);
 export let additionalSearchURL = new URLParam("lifecyclesearch", "");
+export let lifecycleTableViewURL = new URLParam("lifecycletable", false);
 
 export class LifeCyclePage extends qreact.Component {
     controller = LifeCyclesController(SocketFunction.browserNodeId());
@@ -69,9 +70,10 @@ export class LifeCyclePage extends qreact.Component {
                 <div>Loading...</div>
             </div>;
         }
-        let sortedLifeCycles = deepCloneJSON(lifeCycles);
+        lifeCycles = deepCloneJSON(lifeCycles);
+        sort(lifeCycles, x => -x.id.split("_")[0]);
 
-        let filteredLifeCycles = sortedLifeCycles.filter(x =>
+        let filteredLifeCycles = lifeCycles.filter(x =>
             matchFilter({ value: this.state.filterText }, JSON.stringify(x))
         );
 
@@ -83,6 +85,7 @@ export class LifeCyclePage extends qreact.Component {
             filteredLifeCycles = filteredLifeCycles.filter(lc => lc.id === this.state.searchingLifeCycleId);
         }
 
+
         return <div className={css.vbox(16).pad2(16).fillWidth}>
             <style>{`
                 .LifeCycleInstanceRenderer:has(.LifeCycleEntryEditor:hover) {
@@ -112,6 +115,7 @@ export class LifeCyclePage extends qreact.Component {
                     fillWidth
                     onKeyDown={(e) => {
                         if (e.key === "Enter" && lifecycleIdURL.value) {
+                            additionalSearchURL.value = e.currentTarget.value;
                             void this.searchLifeCycle(lifecycleIdURL.value);
                         }
                     }}
@@ -149,7 +153,7 @@ export class LifeCyclePage extends qreact.Component {
                         }}
                         className={css.width(500)}
                     />
-                    <span>({filteredLifeCycles.length} / {sortedLifeCycles.length})</span>
+                    <span>({filteredLifeCycles.length} / {lifeCycles.length})</span>
                     {this.state.searchingLifeCycleId && (
                         <Button
                             hue={120}
@@ -264,7 +268,7 @@ export class LifeCyclePage extends qreact.Component {
             )}
 
             {this.state.lifecycleInstances.length > 0 && (() => {
-                let searchedLifeCycle = sortedLifeCycles.find(lc => lc.id === this.state.searchingLifeCycleId);
+                let searchedLifeCycle = lifeCycles.find(lc => lc.id === this.state.searchingLifeCycleId);
                 if (!searchedLifeCycle) return <div>Cannot find life cycle instance {this.state.searchingLifeCycleId}</div>;
 
                 let lc = searchedLifeCycle;

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

@@ -13,9 +13,10 @@ import { niceStringify } from "../../../niceStringify";
 import { getPathStr } from "../../../path";
 import { MachineThreadInfo } from "../../MachineThreadInfo";
 import { LifeCycleEntryEditor } from "./LifeCycleEntryEditor";
-import { lifecycleIdURL } from "./LifeCyclePage";
+import { lifecycleIdURL, lifecycleTableViewURL } from "./LifeCyclePage";
 import { LifecycleInstance } from "./lifeCycleSearch";
 import { LifeCycle, LifeCyclesController, LifeCycleEntry } from "./lifeCycles";
+import { LifeCycleInstanceTableView } from "./LifeCycleInstanceTableView";
 
 export class LifeCycleRenderer extends qreact.Component<{
     lifeCycle: LifeCycle;
@@ -200,7 +201,7 @@ export class LifeCycleInstanceRenderer extends qreact.Component<{
             }
             title={statusTitle}
             onClick={(e) => {
-                if ((e.target as HTMLElement).closest(".LifeCycleEntryEditor")) {
+                if ((e.target as HTMLElement).closest(".LifeCycleRenderer-contents")) {
                     return;
                 }
                 this.state.expanded = !this.state.expanded;
@@ -270,19 +271,37 @@ export class LifeCycleInstanceRenderer extends qreact.Component<{
             </div>
 
             {this.state.expanded && (
-                <div className={css.vbox(8)}>
-                    {instance.entries.map((entryData, idx) => {
-                        let entryIndex = lifeCycle.entries.findIndex(e => e.matchPattern === entryData.matchPattern);
-                        let entry = lifeCycle.entries[entryIndex];
-                        return <LifeCycleEntryEditor
-                            key={idx}
+                <div className={css.vbox(8) + "LifeCycleRenderer-contents"}>
+                    <Button
+                        hue={200}
+                        onClick={() => {
+                            lifecycleTableViewURL.value = !lifecycleTableViewURL.value;
+                        }}
+                    >
+                        {lifecycleTableViewURL.value && "List View" || "Table View"}
+                    </Button>
+
+                    {lifecycleTableViewURL.value && (
+                        <LifeCycleInstanceTableView
                             lifeCycle={lifeCycle}
-                            entry={entry}
-                            entryIndex={entryIndex}
-                            defaultEditMode={false}
-                            datum={entryData.datum}
-                        />;
-                    })}
+                            instance={instance}
+                        />
+                    ) || (
+                            <div className={css.vbox(8)}>
+                                {instance.entries.map((entryData, idx) => {
+                                    let entryIndex = lifeCycle.entries.findIndex(e => e.matchPattern === entryData.matchPattern);
+                                    let entry = lifeCycle.entries[entryIndex];
+                                    return <LifeCycleEntryEditor
+                                        key={idx}
+                                        lifeCycle={lifeCycle}
+                                        entry={entry}
+                                        entryIndex={entryIndex}
+                                        defaultEditMode={false}
+                                        datum={entryData.datum}
+                                    />;
+                                })}
+                            </div>
+                        )}
                 </div>
             )}
         </div>;

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

@@ -564,7 +564,7 @@ export function createLifeCycleSearch(
             }
         }
 
-        sort(allInstances, x => x.startTime);
+        sort(allInstances, x => -x.startTime);
 
         return allInstances;
     };