Fix/campaign publish

docs/docsrc/examples/examples_admin/page_builder_with_campaign.go

@@ -1,10 +1,15 @@
 package examples_admin
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"strings"
 
+	"github.com/qor/oss"
+
+	"github.com/qor/oss/filesystem"
+
 	"github.com/qor5/admin/v3/pagebuilder"
 	"github.com/qor5/admin/v3/presets"
 	"github.com/qor5/admin/v3/presets/gorm2op"
@@ -57,6 +62,14 @@ func (b *Campaign) GetTitle() string {
 	return b.Title
 }
 
+func (b *Campaign) PublishUrl(db *gorm.DB, ctx context.Context, storage oss.StorageInterface) (s string) {
+	return "campaigns/index.html"
+}
+
+func (b *Campaign) LiveUrl(db *gorm.DB, ctx context.Context, storage oss.StorageInterface) (s string) {
+	return "campaigns/index.html"
+}
+
 func (p *Campaign) PrimarySlug() string {
 	return fmt.Sprintf("%v_%v", p.ID, p.Version.Version)
 }
@@ -73,6 +86,14 @@ func (p *Campaign) PrimaryColumnValuesBySlug(slug string) map[string]string {
 	}
 }
 
+func (b *CampaignProduct) PublishUrl(db *gorm.DB, ctx context.Context, storage oss.StorageInterface) (s string) {
+	return "campaign-products/index.html"
+}
+
+func (b *CampaignProduct) LiveUrl(db *gorm.DB, ctx context.Context, storage oss.StorageInterface) (s string) {
+	return "campaign-products/index.html"
+}
+
 func (b *CampaignProduct) GetTitle() string {
 	return b.Name
 }
@@ -115,7 +136,10 @@ func PageBuilderExample(b *presets.Builder, db *gorm.DB) http.Handler {
 	if err != nil {
 		panic(err)
 	}
-	puBuilder := publish.New(db, nil)
+	stroge := filesystem.New("/tmp/publish")
+	stroge.Delete("/tmp/publish/campaigns/index.html")
+	stroge.Delete("/tmp/publish/campaign-products/index.html")
+	puBuilder := publish.New(db, stroge)
 	if b.GetPermission() == nil {
 		b.Permission(
 			perm.New().Policies(
@@ -132,7 +156,7 @@ func PageBuilderExample(b *presets.Builder, db *gorm.DB) http.Handler {
 		RenderFunc(func(obj interface{}, input *pagebuilder.RenderInput, ctx *web.EventContext) HTMLComponent {
 			c := obj.(*MyContent)
 			return Div().Text(c.Text).Style("height:200px")
-		})
+		}).Cover("https://qor5.com/img/qor-logo.png")
 
 	ed := header.Model(&MyContent{}).Editing("Text", "Color")
 	ed.Field("Color").ComponentFunc(func(obj interface{}, field *presets.FieldContext, ctx *web.EventContext) HTMLComponent {

docs/docsrc/examples/examples_admin/page_builder_with_campaign_test.go

@@ -3,6 +3,8 @@ package examples_admin
 import (
 	"net/http"
 	"net/http/httptest"
+	"os"
+	"strings"
 	"testing"
 
 	"github.com/qor5/admin/v3/pagebuilder"
@@ -187,6 +189,52 @@ func TestPageBuilderCampaign(t *testing.T) {
 				}
 			},
 		},
+		{
+			Name:  "Page Builder Campaign Detail Publish",
+			Debug: true,
+			ReqFunc: func() *http.Request {
+				pageBuilderData.TruncatePut(dbr)
+				req := NewMultipartBuilder().
+					PageURL("/campaigns/1_2024-05-20-v01?__execute_event__=publish_EventPublish&id=1_2024-05-20-v01").
+					BuildEventFuncRequest()
+
+				return req
+			},
+			EventResponseMatch: func(t *testing.T, er *TestEventResponse) {
+				body, err := os.ReadFile("/tmp/publish/campaigns/index.html")
+				if err != nil {
+					t.Error("publish failed!")
+					return
+				}
+				if !strings.Contains(string(body), "Hello Campaign") {
+					t.Errorf("publish failed! %s", string(body))
+					return
+				}
+			},
+		},
+		{
+			Name:  "Page Builder Campaign Products Editor Publish",
+			Debug: true,
+			ReqFunc: func() *http.Request {
+				pageBuilderData.TruncatePut(dbr)
+				req := NewMultipartBuilder().
+					PageURL("/page_builder/campaign-products-editors/1_2024-05-20-v01?__execute_event__=publish_EventPublish&id=1_2024-05-20-v01").
+					BuildEventFuncRequest()
+
+				return req
+			},
+			EventResponseMatch: func(t *testing.T, er *TestEventResponse) {
+				body, err := os.ReadFile("/tmp/publish/campaign-products/index.html")
+				if err != nil {
+					t.Error("publish failed!")
+					return
+				}
+				if !strings.Contains(string(body), "Hello Product") {
+					t.Errorf("publish failed! %s", string(body))
+					return
+				}
+			},
+		},
 	}
 	for _, c := range cases {
 		t.Run(c.Name, func(t *testing.T) {

pagebuilder/model.go

@@ -1,14 +1,15 @@
 package pagebuilder
 
 import (
+	"context"
 	"database/sql"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
+	"net/http/httptest"
 	"net/url"
 	"path"
-	"reflect"
 	"sort"
 	"strconv"
 	"strings"
@@ -582,14 +583,7 @@
 }
 
 func (b *ModelBuilder) setName() {
-	b.name = b.getModelName(b.mb)
-}
-
-func (b *ModelBuilder) getModelName(mb *presets.ModelBuilder) string {
-	modelType := reflect.TypeOf(mb.NewModel())
-	modelstr := modelType.String()
-	modelName := modelstr[strings.LastIndex(modelstr, ".")+1:]
-	return inflection.Plural(strcase.ToKebab(modelName))
+	b.name = utils.GetObjName(b.mb.NewModel())
 }
 
 func (b *ModelBuilder) addSharedContainerToPage(pageID int, containerID, pageVersion, locale, modelName string, modelID uint) (newContainerID string, err error) {
@@ -1243,3 +1237,19 @@
 		return err
 	})
 }
+
+func (b *ModelBuilder) HtmlRaw(obj interface{}) (r string) {
+	p, ok := obj.(PrimarySlugInterface)
+	if !ok {
+		return
+	}
+	w := httptest.NewRecorder()
+	req := httptest.NewRequest("GET", fmt.Sprintf("/?id=%s", p.PrimarySlug()), nil)
+	b.preview.ServeHTTP(w, req)
+	r = w.Body.String()
+	return
+}
+
+func (b *ModelBuilder) ContextValueProvider(in context.Context) context.Context {
+	return context.WithValue(in, b.name, b)
+}

pagebuilder/publish.go

@@ -7,80 +7,55 @@
 	"path"
 	"path/filepath"
 
-	"github.com/qor/oss"
+	"github.com/qor5/admin/v3/utils"
+
 	"github.com/qor5/admin/v3/l10n"
+
+	"github.com/qor/oss"
 	"github.com/qor5/admin/v3/publish"
 	"gorm.io/gorm"
 )
 
-type contextKeyType int
-
-const contextKey contextKeyType = iota
-
-func (b *ModelBuilder) ContextValueProvider(in context.Context) context.Context {
-	return context.WithValue(in, contextKey, b)
-}
-
-func builderFromContext(c context.Context) (b *ModelBuilder, ok bool) {
-	b, ok = c.Value(contextKey).(*ModelBuilder)
-	return
-}
+func (p *Page) PublishUrl(db *gorm.DB, ctx context.Context, storage oss.StorageInterface) (s string) {
+	var (
+		err        error
+		localePath string
+	)
+	builder := ctx.Value(utils.GetObjName(p))
 
-func (p *Page) GetPublishActions(db *gorm.DB, ctx context.Context, storage oss.StorageInterface) (objs []*publish.PublishAction, err error) {
-	var b *ModelBuilder
-	var ok bool
-	if b, ok = builderFromContext(ctx); !ok || b == nil {
-		return
-	}
-	content, err := p.getPublishContent(b, ctx)
-	if err != nil {
+	b, ok := builder.(*ModelBuilder)
+	if !ok {
 		return
 	}
-
-	var localePath string
 	if b.builder.l10n != nil {
 		localePath = l10n.LocalePathFromContext(p, ctx)
 	}
 
 	var category Category
-	category, err = p.GetCategory(db)
-	if err != nil {
+	if category, err = p.GetCategory(db); err != nil {
 		return
 	}
-	objs = append(objs, &publish.PublishAction{
-		Url:      p.getPublishUrl(localePath, category.Path),
-		Content:  content,
-		IsDelete: false,
-	})
-	p.OnlineUrl = p.getPublishUrl(localePath, category.Path)
+	return p.getPublishUrl(localePath, category.Path)
+}
 
+func (p *Page) LiveUrl(db *gorm.DB, ctx context.Context, storage oss.StorageInterface) (s string) {
 	var liveRecord Page
+
+	builder := ctx.Value(utils.GetObjName(p))
+	mb, ok := builder.(ModelBuilder)
+	if !ok {
+		return
+	}
 	{
 		lrdb := db.Where("id = ? AND status = ?", p.ID, publish.StatusOnline)
-		if b.builder.l10n != nil {
+		if mb.builder.l10n != nil {
 			lrdb = lrdb.Where("locale_code = ?", p.LocaleCode)
 		}
 		lrdb.First(&liveRecord)
 	}
 	if liveRecord.ID == 0 {
 		return
 	}
-
-	if liveRecord.OnlineUrl != p.OnlineUrl {
-		objs = append(objs, &publish.PublishAction{
-			Url:      liveRecord.OnlineUrl,
-			IsDelete: true,
-		})
-	}
-
-	return
-}
-
-func (p *Page) GetUnPublishActions(db *gorm.DB, ctx context.Context, storage oss.StorageInterface) (objs []*publish.PublishAction, err error) {
-	objs = append(objs, &publish.PublishAction{
-		Url:      p.OnlineUrl,
-		IsDelete: true,
-	})
 	return
 }