Skip to content

Commit 1835627

Browse files
committed
feat(notebook): add exec cell support for filter
Filter from query or report can now be executed directly.
1 parent 19b9cc0 commit 1835627

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

src/extension/fbaNBRQRenderer.ts

+18-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ export class FBANBRestQueryRenderer {
423423
console.log(`FBANBRestQueryRenderer.executeCell()... cell.metadata=${JSON.stringify(cell.metadata)}`)
424424
if (
425425
cell.kind === vscode.NotebookCellKind.Code &&
426-
(cell.document.languageId === 'javascript' || cell.document.languageId === 'fbJsonPath') &&
426+
['jsonc', 'json', 'javascript', 'fbJsonPath'].includes(cell.document.languageId) &&
427427
cell.metadata &&
428428
cell.metadata.fbUidMembers &&
429429
Array.isArray(cell.metadata.fbUidMembers)
@@ -625,6 +625,22 @@ export class FBANBRestQueryRenderer {
625625
)
626626
exec.end(true)
627627
}
628+
} else if (
629+
fbUidMembers[fbUidMembers.length - 1].endsWith(':query') ||
630+
fbUidMembers[fbUidMembers.length - 1].endsWith(':report')
631+
) {
632+
const filter = JSON5.parse(cell.document.getText())
633+
appendMarkdown(exec, [{ summary: 'querying filter:', texts: [...codeBlock(JSON.stringify(filter, undefined, 2), 'json')] }])
634+
const filterRq: RQ = {
635+
path: 'ext:mbehr1.dlt-logs/get/docs/0/filters?', // todo get from cell data!
636+
commands: [
637+
{
638+
cmd: 'query',
639+
param: JSON.stringify(filter),
640+
},
641+
],
642+
}
643+
FBANBRestQueryRenderer.execRestQuery(editorProvider, exec, docData, filterRq, '', '')
628644
} else {
629645
exec.end(false)
630646
}
@@ -659,6 +675,7 @@ export class FBANBRestQueryRenderer {
659675

660676
appendMarkdown(exec, [
661677
{
678+
open: jsonPath.length === 0 && convFunction.length === 0,
662679
summary: `received ${resJson.data.length} messages${
663680
resJson.data.length > msgs.length ? `. Unfold to see first ${msgs.length}` : resJson.data.length > 0 ? ':' : ''
664681
}`,

0 commit comments

Comments
 (0)