From 24e4efc741f4befe72f6fe2734f8067051b92b58 Mon Sep 17 00:00:00 2001 From: BennuFire Date: Tue, 5 Apr 2022 15:50:12 +0200 Subject: [PATCH 1/2] Report updates base on global params Disable refresh when a global parameter is changed that is not used in the report --- src/card/view/CardView.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/card/view/CardView.tsx b/src/card/view/CardView.tsx index 41ffa6986..f89d72c59 100644 --- a/src/card/view/CardView.tsx +++ b/src/card/view/CardView.tsx @@ -48,6 +48,16 @@ const NeoCardView = ({ title, database, query, cypherParameters, globalParameter return globalParameters ? globalParameters[key] : undefined; } + const getLocalParameters = (): any => { + var re = /(?:^|\W)\$(\w+)(?!\w)/g, match, localQueryVariables : string[] = []; + //const localQueryVariables = query.match(/(?:^|\W)\$neodash(\w+)/g); + while (match = re.exec(query)) { + localQueryVariables.push(match[1]); + } + console.log(localQueryVariables); + return Object.fromEntries(Object.entries(globalParameters).filter(([local]) => localQueryVariables.includes(local) )); + } + return (
{reportHeader} @@ -62,7 +72,7 @@ const NeoCardView = ({ title, database, query, cypherParameters, globalParameter Date: Tue, 5 Apr 2022 16:09:49 +0200 Subject: [PATCH 2/2] Update CardView.tsx Removing extra logs --- src/card/view/CardView.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/card/view/CardView.tsx b/src/card/view/CardView.tsx index f89d72c59..80e20fa5d 100644 --- a/src/card/view/CardView.tsx +++ b/src/card/view/CardView.tsx @@ -49,12 +49,10 @@ const NeoCardView = ({ title, database, query, cypherParameters, globalParameter } const getLocalParameters = (): any => { - var re = /(?:^|\W)\$(\w+)(?!\w)/g, match, localQueryVariables : string[] = []; - //const localQueryVariables = query.match(/(?:^|\W)\$neodash(\w+)/g); + let re = /(?:^|\W)\$(\w+)(?!\w)/g, match, localQueryVariables : string[] = []; while (match = re.exec(query)) { localQueryVariables.push(match[1]); } - console.log(localQueryVariables); return Object.fromEntries(Object.entries(globalParameters).filter(([local]) => localQueryVariables.includes(local) )); }