Project

General

Profile

« Previous | Next » 

Revision ea9df6c7

Added by koszko over 1 year ago

update error reporting in popup

View differences:

html/popup.js
79 79

  
80 80
	by_id("scripts_blocked").innerText = page_info.allow ? "no" : "yes";
81 81

  
82
	by_id("injected_payload").innerText = page_info.payload ?
83
	    page_info.payload.identifier : "None";
82
	let payload_text = "None";
83

  
84
	if (page_info.payload) {
85
	    if ("error" in page_info) {
86
		if (page_info.error.haketilo_error_type === "missing")
87
		    payload_text = `None (error: resource with id '${page_info.error.id}' missing from the database)`;
88
		else if (page_info.error.haketilo_error_type === "circular")
89
		    payload_text = `None (error: circular dependency of resource with id '${page_info.error.id}' on itself)`;
90
		else if (page_info.error.haketilo_error_type === "db")
91
		    payload_text = `None (error: failure reading Haketilo internal database)`;
92
		else if (page_info.error.haketilo_error_type === "other")
93
		    payload_text = `None (error: unknown failure occured)`;
94
	    } else {
95
		payload_text = page_info.payload.identifier;
96
	    }
97
	}
98

  
99
	by_id("injected_payload").innerText = payload_text;
84 100

  
85 101
	const scripts_fate = page_info.allow ? "allowed" : "blocked";
86 102

  
103
	let mapping_text;
104

  
87 105
	if (page_info.mapping === "~allow")
88
	    var mapping = `None (scripts ${scripts_fate} by a rule)`;
106
	    mapping_text = `None (scripts ${scripts_fate} by a rule)`;
107
	else if ("error" in page_info
108
		 && page_info.error.haketilo_error_type ==="deciding_policy")
109
	    mapping_text = `None (error occured when determining policy)`;
89 110
	else if (page_info.mapping)
90
	    var mapping = page_info.mapping;
91
	else if (page_info.error)
92
	    var mapping = `None (error occured when determining policy)`;
93
	by_id("mapping_used").innerText = mapping;
111
	    mapping_text = page_info.mapping;
112
	else
113
	    mapping_text = `None (scripts ${scripts_fate} by default policy)`;
114

  
115
	by_id("mapping_used").innerText = mapping_text;
94 116
    }
95 117
}
96 118

  

Also available in: Unified diff