@xh/hoist 72.0.0-SNAPSHOT.1737748132453 → 72.0.0-SNAPSHOT.1737749290997

package/admin/jsonsearch/JsonSearchPanel.ts

@@ -53,14 +53,14 @@ export const [JsonSearchPanel, jsonSearchPanel] = hoistCmp.withFactory<JsonBlobM
                             }),
                             panel({
                                 mask: impl.nodeLoadTask,
-                                tbar: nodeTbar({model: impl}),
+                                tbar: readerTbar({model: impl}),
                                 bbar: nodeBbar({
                                     omit: !impl.asPathList,
                                     model: impl
                                 }),
                                 item: jsonInput({
                                     model: impl,
-                                    bind: 'matchingNodes',
+                                    bind: 'readerContent',
                                     flex: 1,
                                     width: '100%',
                                     readonly: true,
@@ -161,30 +161,37 @@ const helpButton = hoistCmp.factory({
     }
 });
 
-const nodeTbar = hoistCmp.factory<JsonSearchPanelImplModel>(({model}) => {
-    return toolbar(
-        buttonGroupInput({
-            model,
-            bind: 'pathOrValue',
-            minimal: true,
-            outlined: true,
-            items: [
-                button({
-                    text: 'Path',
-                    value: 'path'
-                }),
-                button({
-                    text: 'Value',
-                    value: 'value'
-                })
-            ]
-        }),
-        filler(),
-        box({
-            omit: !model.matchingNodeCount,
-            item: `${model.matchingNodeCount} ${model.matchingNodeCount === 1 ? 'match' : 'matches'}`
-        })
-    );
+const readerTbar = hoistCmp.factory<JsonSearchPanelImplModel>(({model}) => {
+    return toolbar({
+        items: [
+            buttonGroupInput({
+                model,
+                bind: 'readerContentType',
+                minimal: true,
+                outlined: true,
+                disabled: !model.selectedRecord,
+                items: [
+                    button({
+                        text: 'Document',
+                        value: 'document'
+                    }),
+                    button({
+                        text: 'Matching Paths',
+                        value: 'paths'
+                    }),
+                    button({
+                        text: 'Matching Values',
+                        value: 'values'
+                    })
+                ]
+            }),
+            filler(),
+            box({
+                omit: !model.matchingNodeCount,
+                item: `${model.matchingNodeCount} ${model.matchingNodeCount === 1 ? 'match' : 'matches'}`
+            })
+        ]
+    });
 });
 
 const nodeBbar = hoistCmp.factory<JsonSearchPanelImplModel>(({model}) => {

package/admin/jsonsearch/impl/JsonSearchPanelImplModel.ts

@@ -22,13 +22,13 @@ export class JsonSearchPanelImplModel extends HoistModel {
 
     @bindable.ref error = null;
     @bindable path: string = '';
-    @bindable pathOrValue: 'path' | 'value' = 'value';
+    @bindable readerContentType: 'document' | 'paths' | 'values' = 'values';
     @bindable pathFormat: 'XPath' | 'JSONPath' = 'XPath';
-    @bindable matchingNodes: string = '';
+    @bindable readerContent: string = '';
     @bindable matchingNodeCount: number = 0;
 
     get asPathList(): boolean {
-        return this.pathOrValue === 'path';
+        return this.readerContentType === 'paths';
     }
 
     get queryBuffer(): number {
@@ -43,6 +43,10 @@ export class JsonSearchPanelImplModel extends HoistModel {
         return this.componentProps.matchingNodesUrl;
     }
 
+    get selectedRecord() {
+        return this.gridModel.selectedRecord;
+    }
+
     get gridModelConfig() {
         return this.componentProps.gridModelConfig;
     }
@@ -69,8 +73,8 @@ export class JsonSearchPanelImplModel extends HoistModel {
                 }
             },
             {
-                track: () => [this.gridModel.selectedRecord, this.pathOrValue, this.pathFormat],
-                run: () => this.loadJsonNodesAsync(),
+                track: () => [this.selectedRecord, this.readerContentType, this.pathFormat],
+                run: () => this.loadreaderContentTypeAsync(),
                 debounce: 300
             }
         );
@@ -98,10 +102,17 @@ export class JsonSearchPanelImplModel extends HoistModel {
         }
     }
 
-    private async loadJsonNodesAsync() {
-        if (!this.gridModel.selectedRecord) {
+    private async loadreaderContentTypeAsync() {
+        if (!this.selectedRecord) {
             this.matchingNodeCount = 0;
-            this.matchingNodes = '';
+            this.readerContent = '';
+            return;
+        }
+
+        const {json} = this.selectedRecord.data;
+
+        if (this.readerContentType === 'document') {
+            this.readerContent = JSON.stringify(JSON.parse(json), null, 2);
             return;
         }
 
@@ -109,8 +120,8 @@ export class JsonSearchPanelImplModel extends HoistModel {
             url: this.matchingNodesUrl,
             params: {
                 path: this.path,
-                asPathList: this.pathOrValue === 'path',
-                json: this.gridModel.selectedRecord.data.json
+                asPathList: this.readerContentType === 'paths',
+                json
             }
         }).linkTo(this.nodeLoadTask);
 
@@ -118,7 +129,7 @@ export class JsonSearchPanelImplModel extends HoistModel {
         if (this.asPathList && this.pathFormat === 'XPath') {
             nodes = nodes.map(it => this.convertToPath(it));
         }
-        this.matchingNodes = JSON.stringify(nodes, null, 2);
+        this.readerContent = JSON.stringify(nodes, null, 2);
     }
 
     private convertToPath(JSONPath: string): string {

package/build/types/admin/jsonsearch/impl/JsonSearchPanelImplModel.d.ts

@@ -10,18 +10,19 @@ export declare class JsonSearchPanelImplModel extends HoistModel {
     nodeLoadTask: TaskObserver;
     error: any;
     path: string;
-    pathOrValue: 'path' | 'value';
+    readerContentType: 'document' | 'paths' | 'values';
     pathFormat: 'XPath' | 'JSONPath';
-    matchingNodes: string;
+    readerContent: string;
     matchingNodeCount: number;
     get asPathList(): boolean;
     get queryBuffer(): number;
     get docSearchUrl(): string;
     get matchingNodesUrl(): string;
+    get selectedRecord(): import("../../../data").StoreRecord;
     get gridModelConfig(): any;
     constructor();
     onLinked(): void;
     loadJsonDocsAsync(): Promise<void>;
-    private loadJsonNodesAsync;
+    private loadreaderContentTypeAsync;
     private convertToPath;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "72.0.0-SNAPSHOT.1737748132453",
+  "version": "72.0.0-SNAPSHOT.1737749290997",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",