From 66ea4c8202bdd79e37a8025f7eb39734cf8f01aa Mon Sep 17 00:00:00 2001 From: Dan Janosik Date: Mon, 4 Mar 2019 12:45:40 -0500 Subject: [PATCH] handle "string or numeric" args; rpc browser frontend tweaks --- routes/baseActionsRouter.js | 4 ++-- views/browser.pug | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/routes/baseActionsRouter.js b/routes/baseActionsRouter.js index 35e083d..29d81fe 100644 --- a/routes/baseActionsRouter.js +++ b/routes/baseActionsRouter.js @@ -914,7 +914,7 @@ router.get("/rpc-browser", function(req, res, next) { break; - } else if (argProperties[j] === "string" || argProperties[j] === "numeric or string") { + } else if (argProperties[j] === "string" || argProperties[j] === "numeric or string" || argProperties[j] === "string or numeric") { if (req.query.args[i]) { argValues.push(req.query.args[i]); } @@ -922,7 +922,7 @@ router.get("/rpc-browser", function(req, res, next) { break; } else { - console.log(`Unknown argument property: ${argProperties[j]}`); + console.log(`Unknown argument property: ${argProperties[j]}`); } } } diff --git a/views/browser.pug b/views/browser.pug index db0af40..9084124 100644 --- a/views/browser.pug +++ b/views/browser.pug @@ -33,6 +33,8 @@ block content a(data-toggle="tab", href="#tab-execute", class="nav-link active", role="tab") Execute li(class="nav-item") a(data-toggle="tab", href="#tab-help-content", class="nav-link", role="tab") Help Content + li(class="nav-item") + a(data-toggle="tab", href="#tab-parsed-args", class="nav-link", role="tab") Arguments Details div(class="tab-content") div(id="tab-execute", class="tab-pane active pb-3", role="tabpanel") @@ -41,7 +43,7 @@ block content h5(class="mt-3") Result pre(style="border: solid 1px #ccc;") - code(class="json") #{JSON.stringify(methodResult, null, 4)} + code(class="json", data-lang="json") #{JSON.stringify(methodResult, null, 4)} hr @@ -83,7 +85,12 @@ block content input(type="submit", name="execute", value="Execute", class="btn btn-primary btn-block") div(id="tab-help-content", class="tab-pane", role="tabpanel") - pre #{methodhelp.string} + pre + code(data-lang="txt", class="json") #{methodhelp.string} + + div(id="tab-parsed-args", class="tab-pane", role="tabpanel") + pre + code(data-lang="json", class="json") #{JSON.stringify(methodhelp.args, null, 4)}