Skip to content

Fix JSONDecodeError in link filters #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ruzaqiarkan-eng wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix JSONDecodeError in link filters #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flexirule/public/js/flexirule/core/control_registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ ControlRegistry.registerDefault({
filters = JSON.parse(filters);
} catch (e) {
console.warn("FlexiRule: Failed to parse link_filters for", df.fieldname, e);
filters = {};
}
}

Expand Down
7 changes: 4 additions & 3 deletions flexirule/public/js/flexirule/rule_builder/components/rule_config/ActionSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,11 @@ function getDoctypeForLink(df) {
function getLinkFilters(df) {
if (!df.link_filters) return {};
try {
if (typeof df.link_filters === "string") {
return JSON.parse(df.link_filters);
let filters = df.link_filters;
if (typeof filters === "string") {
filters = JSON.parse(filters);
}
return df.link_filters;
return filters && typeof filters === "object" ? filters : {};
} catch (e) {
console.warn("FlexiRule: Failed to parse link_filters for", df.fieldname, e);
return {};
Expand Down
4 changes: 3 additions & 1 deletion flexirule/public/js/flexirule/rule_builder/stores/useMetaStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,14 @@ export const useMetaStore = defineStore("rule-builder-meta", () => {
return link_options_cache[key];
}

const sanitizedFilters = filters && typeof filters === "object" ? filters : {};

const response = await frappe.call({
method: "frappe.desk.search.search_link",
args: {
doctype,
txt,
filters: filters || {},
filters: sanitizedFilters,
start,
page_length,
},
Expand Down
32 changes: 16 additions & 16 deletions flexirule/ruleflow/core/contracts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@
"fieldname": "rule",
"reqd": 1,
"options": "Rule",
"link_filters": "[['Rule','trigger_type','=','Callable Event'],['Rule','exposed_as_subrule','=',1],['Rule','is_active','=',1]]",
"link_filters": '[["Rule","trigger_type","=","Callable Event"],["Rule","exposed_as_subrule","=",1],["Rule","is_active","=",1]]',
},
{
"fieldname": "skip_conditions",
Expand Down Expand Up @@ -618,7 +618,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{
"fieldname": "config",
Expand Down Expand Up @@ -662,7 +662,7 @@
{
"fieldname": "reference_doctype",
"reqd": 0,
"link_filters": "[['DocType','istable','=',0]]",
"link_filters": '[["DocType","istable","=",0]]',
},
{"fieldname": "config", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{
Expand All @@ -686,7 +686,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "config", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{"fieldname": "return_type", "default": "Yes / No", "read_only": 1},
Expand All @@ -706,7 +706,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "config", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{"fieldname": "return_type", "default": "List of Records", "read_only": 1},
Expand All @@ -728,7 +728,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "config", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{"fieldname": "return_type", "default": "List of Values", "read_only": 1},
Expand All @@ -747,7 +747,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "config", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{"fieldname": "return_type", "default": "List of Values", "read_only": 1},
Expand All @@ -766,7 +766,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "config", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{"fieldname": "return_type", "default": "List of Values", "read_only": 1},
Expand All @@ -785,7 +785,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "config", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{"fieldname": "return_type", "default": "List of Values", "read_only": 1},
Expand All @@ -804,7 +804,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "config", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{"fieldname": "return_type", "default": "List of Values", "read_only": 1},
Expand All @@ -823,7 +823,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "config", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{"fieldname": "return_type", "default": "List of Records", "read_only": 1},
Expand All @@ -848,7 +848,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{
"fieldname": "config",
Expand Down Expand Up @@ -884,7 +884,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "reference_docname", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{
Expand All @@ -911,7 +911,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "reference_docname", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{"fieldname": "return_type", "default": "Yes / No", "read_only": 1},
Expand All @@ -930,7 +930,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{
"fieldname": "config",
Expand Down Expand Up @@ -959,7 +959,7 @@
{
"fieldname": "reference_doctype",
"reqd": 1,
"link_filters": "[['DocType','issingle','=',0],['DocType','istable','=',0]]",
"link_filters": '[["DocType","issingle","=",0],["DocType","istable","=",0]]',
},
{"fieldname": "reference_docname", "depends_on": "eval:doc.reference_doctype", "reqd": 1},
{
Expand Down
Loading