8000 fix: handle presets.PageRenderIface panic in preview page by molon · Pull Request #967 · qor5/admin · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: handle presets.PageRenderIface panic in preview page #967

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

Merged
merged 4 commits into from
May 22, 2025
Merged

fix: handle presets.PageRenderIface panic in preview page #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57e6111
fix: handle presets.PageRenderIface panic in preview page
molon May 15, 2025
530fd25
Merge branch 'main' into fix-preview-panic
molon May 15, 2025
18d7b84
test: add case for handling preview not found page in page_seo_test
molon May 15, 2025
162a60f
fix deepsource
molon May 15, 2025
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
17 changes: 13 additions & 4 deletions example/integration/page_seo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,21 @@ func TestPageSeoTemplate(t *testing.T) {
dbr, _ := TestDB.DB()

cases := []TestCase{
{
Name: "Preview Not Found Page",
Debug: true,
ReqFunc: func() *http.Request {
pageSEOData.TruncatePut(dbr)
return httptest.NewRequest("GET", "/page_builder/pages/preview?id=", http.NoBody)
},
ExpectPageBodyContainsInOrder: []string{"404"},
},
{
Name: "Page Use Customize SEO OpenGraphImage",
Debug: true,
ReqFunc: func() *http.Request {
pageSEOData.TruncatePut(dbr)
return httptest.NewRequest("GET", "/page_builder/pages/preview?id=10_2024-05-21-v01_International", nil)
return httptest.NewRequest("GET", "/page_builder/pages/preview?id=10_2024-05-21-v01_International", http.NoBody)
},
ExpectPageBodyContainsInOrder: []string{"/system/media_libraries/16/file.og.jpeg"},
},
Expand All @@ -52,7 +61,7 @@ func TestPageSeoTemplate(t *testing.T) {
Debug: true,
ReqFunc: func() *http.Request {
pageSEOData.TruncatePut(dbr)
return httptest.NewRequest("GET", "/page_builder/pages/preview?id=11_2024-05-21-v01_International", nil)
return httptest.NewRequest("GET", "/page_builder/pages/preview?id=11_2024-05-21-v01_International", http.NoBody)
},
ExpectPageBodyContainsInOrder: []string{"/system/media_libraries/17/file.og.jpeg"},
},
Expand All @@ -61,7 +70,7 @@ func TestPageSeoTemplate(t *testing.T) {
Debug: true,
ReqFunc: func() *http.Request {
pageGlobalSEOData.TruncatePut(dbr)
return httptest.NewRequest("GET", "/page_builder/pages/preview?id=10_2024-05-21-v01_International", nil)
return httptest.NewRequest("GET", "/page_builder/pages/preview?id=10_2024-05-21-v01_International", http.NoBody)
},
ExpectPageBodyContainsInOrder: []string{"/system/media_libraries/18/file.og.jpeg"},
},
Expand All @@ -77,7 +86,7 @@ func TestPageSeoTemplate(t *testing.T) {
BuildEventFuncRequest()
return req
},
EventResponseMatch: func(t *testing.T, er *TestEventResponse) {
EventResponseMatch: func(t *testing.T, _ *TestEventResponse) {
var m seo.QorSEOSetting
TestDB.Where("name='Global SEO' and locale_code='International'").First(&m)
if m.Setting.OpenGraphImageFromMediaLibrary.URL() != "" {
Expand Down
22 changes: 21 additions & 1 deletion pagebuilder/model_events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"cmp"
"encoding/json"
"fmt"
"log"
"path"
"sort"
"strconv"
Expand Down Expand Up @@ -48,7 +49,26 @@
b.editor.RegisterEventFunc(ReplicateContainerEvent, b.eventMiddleware(b.replicateContainer))
b.editor.RegisterEventFunc(EditContainerEvent, b.eventMiddleware(b.editContainer))
b.editor.RegisterEventFunc(UpdateContainerEvent, b.eventMiddleware(b.updateContainer))
b.preview = web.Page(b.previewContent)

preview := web.Page(b.previewContent)
preview.Wrap(func(in web.PageFunc) web.PageFunc {
return func(ctx *web.EventContext) (r web.PageResponse, err error) {
defer func() {
if v := recover(); v != nil {
if render, ok := v.(presets.PageRenderIface); ok {
if rerr, ok := v.(error); ok {
log.Printf("catch previewrender err: %+v", rerr)
}
r, err = render.Render(ctx)
return
}
panic(v)

Check warning on line 65 in pagebuilder/model_events.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model_events.go#L65 

Added line #L65 was not covered by tests
}
}()
return in(ctx)
}
})
b.preview = preview
}

func (b *ModelBuilder) setPageBuilderModel(obj interface{}, ctx *web.EventContext) {
Expand Down
2 changes: 1 addition & 1 deletion presets/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func ErrNotFound(reason string) error {
Reason: reason,
PageRenderFunc: func(ctx *web.EventContext) (r web.PageResponse, err error) {
ctx.W.WriteHeader(http.StatusNotFound)
return
return DefaultNotFoundPageFunc(ctx)
},
}
}
6 changes: 5 additions & 1 deletion presets/presets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@ func (b *Builder) getHomePageFunc() web.PageFunc {
return b.defaultHomePageFunc
}

func (b *Builder) DefaultNotFoundPageFunc(ctx *web.EventContext) (r web.PageResponse, err error) {
var DefaultNotFoundPageFunc = func(ctx *web.EventContext) (r web.PageResponse, err error) {
msgr := MustGetMessages(ctx.R)
r.Body = h.Div(
h.H1("404").Class("mb-2"),
Expand All @@ -1104,6 +1104,10 @@ func (b *Builder) DefaultNotFoundPageFunc(ctx *web.EventContext) (r web.PageResp
return
}

func (*Builder) DefaultNotFoundPageFunc(ctx *web.EventContext) (r web.PageResponse, err error) {
return DefaultNotFoundPageFunc(ctx)
}

func (b *Builder) getNotFoundPageFunc() web.PageFunc {
pf := b.DefaultNotFoundPageFunc
if b.notFoundFunc != nil {
Expand Down
Loading
0