Commitab93533

committed

Send RPC error details through to github issue. Don't show error modal for error in feedback

1 parentedff802 commitab93533Copy full SHA for ab93533

File tree

+14

-10

lines changed

+14

-10

lines changed

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,16 @@ import Popup from "reactjs-popup";`
`7`	`7`
`8`	`8`
`9`	`9`	`exportconstFeedbackModal=({close, error})=>{`
`10`		`-letinitialTitle,instructions;`
	`10`	`+letinitialTitle,instructions,descriptionExtra;`
`11`	`11`	`if(error){`
`12`	`12`	initialTitle=`Error in RPC method${error.method}`;
	`13`	+constdetails=`
	`14`	`+Method:${error.method}`
	`15`	`+Request data:${JSON.stringify(error.data,null,4)}`
	`16`	`+`
	`17`	`+${error.traceback}`
	`18`	+`;
	`19`	+descriptionExtra="\n\n```"+details+"```";
`13`	`20`	`instructions=<>`
`14`	`21`	`<h3>Report error</h3>`
`15`	`22`	`<p>`
`@@ -19,18 +26,13 @@ export const FeedbackModal = ({close, error}) => {`
`19`	`26`	`</p>`
`20`	`27`	`<details>`
`21`	`28`	`<summary>Click for error details</summary>`
`22`		-<pre>{`
`23`		`-Method:${error.method}`
`24`		`-`
`25`		`-Request data:${JSON.stringify(error.data,null,4)}`
`26`		`-`
`27`		`-${error.traceback}`
`28`		- `}</pre>
	`29`	`+<pre>{details}</pre>`
`29`	`30`	`</details>`
`30`	`31`
`31`	`32`	`</>`
`32`	`33`	`}else{`
`33`	`34`	`initialTitle="";`
	`35`	`+descriptionExtra="";`
`34`	`36`	`instructions=<>`
`35`	`37`	`<h3>Give feedback</h3>`
`36`	`38`	`<p>Tell us what you like or don't like! If you're reporting a bug, give a detailed description of the problem:</p>`
`@@ -73,7 +75,7 @@ ${error.traceback}`
`73`	`75`	`rpc("submit_feedback",`
`74`	`76`	`{`
`75`	`77`	`title:title.value,`
`76`		`-description:description.value,`
	`78`	`+description:description.value+descriptionExtra,`
`77`	`79`	`state:redact.store.getState(),`
`78`	`80`	`});`
`79`	`81`	`close();`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@ export const rpc = (method, data, onSuccess, onError) => {`
`15`	`15`	`).then((response)=>{`
`16`	`16`	`console.log('Finished RPC method',method);`
`17`	`17`	`if(response.data.error){`
`18`		`-stateSet("error",{...response.data.error, method, data});`
	`18`	`+if(method!=="submit_feedback"){`
	`19`	`+stateSet("error",{...response.data.error, method, data});`
	`20`	`+}`
`19`	`21`	`}elseif(onSuccess){`
`20`	`22`	`onSuccess(response.data);`
`21`	`23`	`}`

Comments

(0)