Commitbad9428

committed

refactor(editor): adjust parent schema cast logic

1 parent23085c8 commitbad9428Copy full SHA for bad9428

File tree

+34

-6

lines changed

+34

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ defmodule Helper.Converter.EditorToHTML.Validator.EditorSchema do`
`30`	`30`
`31`	`31`	`defget("list")do`
`32`	`32`	`[`
`33`		`-parent:%{"mode"=>[enum:@valid_list_mode]},`
	`33`	`+parent:%{"mode"=>[enum:@valid_list_mode],"items"=>[:list]},`
`34`	`34`	`item:%{`
`35`	`35`	`"checked"=>[:boolean],`
`36`	`36`	`"hideLabel"=>[:boolean],`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ defmodule Helper.Converter.EditorToHTML.Validator do`
`50`	`50`	`end`
`51`	`51`
`52`	`52`	`# validate block which has mode and items`
`53`		`-defpvalidate_block(%{"type"=>type,"data"=>%{"mode"=>_,"items"=>_}=data})`
	`53`	`+defpvalidate_block(%{"type"=>type,"data"=>data})`
`54`	`54`	`whentypein@complex_blocksdo`
`55`	`55`	`[parent:parent_schema,item:item_schema]=EditorSchema.get(type)`
`56`	`56`	`validate_with(type,parent_schema,item_schema,data)`
`@@ -85,7 +85,8 @@ defmodule Helper.Converter.EditorToHTML.Validator do`
`85`	`85`	`defpvalidate_with(block,parent_schema,item_schema,data)do`
`86`	`86`	`caseSchema.cast(parent_schema,data)do`
`87`	`87`	`{:error,errors}->`
`88`		`-format_parse_error(block,errors)`
	`88`	`+{:error,message}=format_parse_error(block,errors)`
	`89`	`+raise%MatchError{term:{:error,message}}`
`89`	`90`
`90`	`91`	`_->`
`91`	`92`	`{:ok,:pass}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.Header do`
`124`	`124`	`}\">footer title content</div>\n</div>\n<div>"`
`125`	`125`	`end`
`126`	`126`
`127`		`-@tag:wip2`
	`127`	`+@tag:wip`
`128`	`128`	`test"wrong header format data should have invalid hint"do`
`129`	`129`	`json=`
`130`	`130`	`Map.merge(@editor_json,%{`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML do`
`41`	`41`	`assert{:ok,_}=Parser.to_html(editor_string)`
`42`	`42`	`end`
`43`	`43`
`44`		`-@tag:wip2`
	`44`	`+@tag:wip`
`45`	`45`	`test"invalid editorjs json fmt should raise error"do`
`46`	`46`	`editor_json=%{`
`47`	`47`	`"invalid_time"=>1_567_250_876_713,`

Lines changed: 28 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,33 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do`
`39`	`39`	`IO.inspect(converted,label:"list converted")`
`40`	`40`	`end`
`41`	`41`
	`42`	`+@editor_json%{`
	`43`	`+"time"=>1_567_250_876_713,`
	`44`	`+"blocks"=>[`
	`45`	`+%{`
	`46`	`+"type"=>"list",`
	`47`	`+"data"=>%{`
	`48`	`+"invalid-mode"=>"",`
	`49`	`+"items"=>[]`
	`50`	`+}`
	`51`	`+}`
	`52`	`+],`
	`53`	`+"version"=>"2.15.0"`
	`54`	`+}`
	`55`	`+@tag:wip2`
	`56`	`+test"invalid list mode parse should raise error message"do`
	`57`	`+{:ok,editor_string}=Jason.encode(@editor_json)`
	`58`	`+{:error,err_msg}=Parser.to_html(editor_string)`
	`59`	`+`
	`60`	`+asserterr_msg==[`
	`61`	`+%{`
	`62`	`+block:"list",`
	`63`	`+field:"mode",`
	`64`	`+message:"should be: checklist \| order_list \| unorder_list"`
	`65`	`+}`
	`66`	`+]`
	`67`	`+end`
	`68`	`+`
`42`	`69`	`@editor_json%{`
`43`	`70`	`"time"=>1_567_250_876_713,`
`44`	`71`	`"blocks"=>[`
`@@ -61,7 +88,7 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do`
`61`	`88`	`],`
`62`	`89`	`"version"=>"2.15.0"`
`63`	`90`	`}`
`64`		`-@tag:wip2`
	`91`	`+@tag:wip`
`65`	`92`	`test"invalid list data parse should raise error message"do`
`66`	`93`	`{:ok,editor_string}=Jason.encode(@editor_json)`
`67`	`94`	`{:error,err_msg}=Parser.to_html(editor_string)`

Comments

(0)