Skip to content
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

add replicate container #659

Merged
merged 2 commits into from
Oct 17, 2024
Merged

add replicate container #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d37798c
add replicate container
zhangshanwen Oct 17, 2024
4a44b6d
style: format code with Gofumpt
deepsource-autofix[bot] Oct 17, 2024
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
12 changes: 9 additions & 3 deletions example/integration/pagebuilder_share_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,12 @@ func TestPageBuilderShareContainer(t *testing.T) {
},
EventResponseMatch: func(t *testing.T, er *TestEventResponse) {
var (
container pagebuilder.Container
m containers.ListContent
container pagebuilder.Container
nextContainer pagebuilder.Container
m containers.ListContent
)
TestDB.Order("id desc").First(&container)
if container.ID <= 11 || container.ModelID == 10 || container.ModelName != "ListContent" || container.Shared {
if container.ID <= 11 || container.ModelID == 10 || container.ModelName != "ListContent" || container.Shared || container.DisplayOrder != 2 {
t.Fatalf("Replicate Container Faield %#+v", container)
return
}
Expand All @@ -89,6 +90,11 @@ func TestPageBuilderShareContainer(t *testing.T) {
t.Fatalf("Replicate Container Model Faield %#+v", m)
return
}
TestDB.First(&nextContainer, 11)
if nextContainer.DisplayOrder != 3 {
t.Fatalf("Replicate Container Faield %#+v", nextContainer)
return
}
return
},
},
Expand Down
12 changes: 9 additions & 3 deletions example/integration/pagebuilder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,11 +1014,12 @@ func TestPageBuilder(t *testing.T) {
},
EventResponseMatch: func(t *testing.T, er *TestEventResponse) {
var (
container pagebuilder.Container
m containers.ListContent
container pagebuilder.Container
nextContainer pagebuilder.Container
m containers.ListContent
)
TestDB.Order("id desc").First(&container)
if container.ID <= 11 || container.ModelID == 10 || container.ModelName != "ListContent" {
if container.ID <= 11 || container.ModelID == 10 || container.ModelName != "ListContent" || container.DisplayOrder != 2 {
t.Fatalf("Replicate Container Faield %#+v", container)
return
}
Expand All @@ -1027,6 +1028,11 @@ func TestPageBuilder(t *testing.T) {
t.Fatalf("Replicate Container Model Faield %#+v", m)
return
}
TestDB.First(&nextContainer, 11)
if nextContainer.DisplayOrder != 3 {
t.Fatalf("Replicate Container Faield %#+v", nextContainer)
return
}
return
},
},
Expand Down
8 changes: 8 additions & 0 deletions pagebuilder/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ type Messages struct {
FilterTabNamedVersions string

Rename string
Hide string
Show string
PageOverView string
Others string
Add string
Expand Down Expand Up @@ -117,6 +119,8 @@ var Messages_en_US = &Messages{
PageBuilder: "Page Builder",
PageTemplate: "Page Template",
Rename: "Rename",
Hide: "Hide",
Show: "Show",
PageOverView: "Page Overview",

Others: "Others",
Expand Down Expand Up @@ -201,6 +205,8 @@ var Messages_zh_CN = &Messages{
FilterTabOnlineVersion: "在线版本",
FilterTabNamedVersions: "已命名版本",
Rename: "重命名",
Hide: "隐藏",
Show: "显示",
PageOverView: "页面概览",

Others: "其他",
Expand Down Expand Up @@ -287,6 +293,8 @@ var Messages_ja_JP = &Messages{
FilterTabOnlineVersion: "オンラインバージョン",
FilterTabNamedVersions: "名前付きバージョン",
Rename: "名前の変更",
Hide: "隠す",
Show: "表示",
PageOverView: "ページの概要",
PageBuilder: "ページビルダー",
PageTemplate: "ページテンプレート",
Expand Down
221 changes: 117 additions & 104 deletions pagebuilder/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

"github.com/qor5/admin/v3/l10n"
"github.com/qor5/admin/v3/presets"
"github.com/qor5/admin/v3/presets/gorm2op"
"github.com/qor5/admin/v3/publish"
"github.com/qor5/admin/v3/utils"
)
Expand Down Expand Up @@ -69,57 +70,60 @@

func (b *ModelBuilder) addSharedContainerToPage(pageID int, containerID, pageVersion, locale, modelName string, modelID uint) (newContainerID string, err error) {
var c Container
err = b.db.First(&c, "model_name = ? AND model_id = ? AND shared = true and page_model_name = ? ", modelName, modelID, b.name).Error
if err != nil {
return
}
var (
maxOrder sql.NullFloat64
displayOrder float64
)
err = b.db.Model(&Container{}).Select("MAX(display_order)").
Where("page_id = ? and page_version = ? and locale_code = ? and page_model_name = ?", pageID, pageVersion, locale, b.name).Scan(&maxOrder).Error
if err != nil {
return
}
err = b.db.Model(&Container{}).Select("MAX(display_order)").
Where("page_id = ? and page_version = ? and locale_code = ? and page_model_name = ? ", pageID, pageVersion, locale, b.name).Scan(&maxOrder).Error
if err != nil {
return
}
if containerID != "" {
var lastContainer Container
cs := lastContainer.PrimaryColumnValuesBySlug(containerID)
if dbErr := b.db.Where("id = ? AND locale_code = ? and page_model_name = ? ", cs["id"], locale, b.name).First(&lastContainer).Error; dbErr == nil {
displayOrder = lastContainer.DisplayOrder
if err = b.db.Model(&Container{}).Where("page_id = ? and page_version = ? and locale_code = ? and page_model_name = ? and display_order > ? ", pageID, pageVersion, locale, b.name, displayOrder).
UpdateColumn("display_order", gorm.Expr("display_order + ? ", 1)).Error; err != nil {
return
}

err = b.db.Transaction(func(tx *gorm.DB) (dbErr error) {
if dbErr = tx.First(&c, "model_name = ? AND model_id = ? AND shared = true and page_model_name = ? ", modelName, modelID, b.name).Error; dbErr != nil {
return

Check warning on line 76 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L74-L76 

Added lines #L74 - L76 were not covered by tests
}

} else {
displayOrder = maxOrder.Float64
}
container := Container{
PageID: uint(pageID),
PageVersion: pageVersion,
ModelName: modelName,
PageModelName: b.name,
DisplayName: c.DisplayName,
ModelID: modelID,
Shared: true,
DisplayOrder: displayOrder + 1,
Locale: l10n.Locale{
LocaleCode: locale,
},
}
err = b.db.Create(&container).Error
if err != nil {
return
}
containerID = container.PrimarySlug()
var (
maxOrder sql.NullFloat64
displayOrder float64
)
dbErr = tx.Model(&Container{}).Select("MAX(display_order)").
Where("page_id = ? and page_version = ? and locale_code = ? and page_model_name = ?", pageID, pageVersion, locale, b.name).Scan(&maxOrder).Error
if dbErr != nil {
return

Check warning on line 86 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L79-L86 

Added lines #L79 - L86 were not covered by tests
}
dbErr = tx.Model(&Container{}).Select("MAX(display_order)").
Where("page_id = ? and page_version = ? and locale_code = ? and page_model_name = ? ", pageID, pageVersion, locale, b.name).Scan(&maxOrder).Error
if dbErr != nil {
return

Check warning on line 91 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L88-L91 

Added lines #L88 - L91 were not covered by tests
}
if containerID != "" {
var lastContainer Container
cs := lastContainer.PrimaryColumnValuesBySlug(containerID)
tx.Where("id = ? AND locale_code = ? and page_model_name = ? ", cs["id"], locale, b.name).First(&lastContainer)
if lastContainer.ID > 0 {
displayOrder = lastContainer.DisplayOrder
if dbErr = tx.Model(&Container{}).Where("page_id = ? and page_version = ? and locale_code = ? and page_model_name = ? and display_order > ? ", pageID, pageVersion, locale, b.name, displayOrder).
UpdateColumn("display_order", gorm.Expr("display_order + ? ", 1)).Error; dbErr != nil {
return

Check warning on line 101 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L93-L101 

Added lines #L93 - L101 were not covered by tests
}
}

} else {
displayOrder = maxOrder.Float64

Check warning on line 106 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L105-L106 

Added lines #L105 - L106 were not covered by tests
}
container := Container{
PageID: uint(pageID),
PageVersion: pageVersion,
ModelName: modelName,
PageModelName: b.name,
DisplayName: c.DisplayName,
ModelID: modelID,
Shared: true,
DisplayOrder: displayOrder + 1,
Locale: l10n.Locale{
LocaleCode: locale,
},

Check warning on line 119 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L108-L119 

Added lines #L108 - L119 were not covered by tests
}
if dbErr = tx.Create(&container).Error; dbErr != nil {
return

Check warning on line 122 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L121-L122 

Added lines #L121 - L122 were not covered by tests
}
newContainerID = container.PrimarySlug()
return

Check warning on line 125 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L124-L125 

Added lines #L124 - L125 were not covered by tests
})
return
}

Expand All @@ -131,68 +135,77 @@
}

func (b *ModelBuilder) addContainerToPage(ctx *web.EventContext, pageID int, containerID, pageVersion, locale, modelName string) (modelID uint, newContainerID string, err error) {
containerMb := b.builder.ContainerByName(modelName)
model := containerMb.NewModel()
var dc DemoContainer
b.db.Where("model_name = ? AND locale_code = ?", modelName, locale).First(&dc)
if dc.ID != 0 && dc.ModelID != 0 {
b.db.Where("id = ?", dc.ModelID).First(model)
reflectutils.Set(model, "ID", uint(0))
}
err = containerMb.Editing().Creating().Saver(model, "", ctx)
if err != nil {
return
}

var (
maxOrder sql.NullFloat64
displayOrder float64
dc DemoContainer
containerMb = b.builder.ContainerByName(modelName)
model = containerMb.NewModel()
)
wh := b.db.Model(&Container{}).Select("MAX(display_order)").
Where("page_id = ? and page_version = ? and page_model_name = ? ", pageID, pageVersion, b.name)

err = withLocale(b.builder, wh, locale).Scan(&maxOrder).Error
if err != nil {
return
}
if containerID != "" {
var lastContainer Container
cs := lastContainer.PrimaryColumnValuesBySlug(containerID)
if dbErr := b.db.Where("id = ? AND locale_code = ? and page_model_name = ?", cs["id"], locale, b.name).First(&lastContainer).Error; dbErr == nil {
displayOrder = lastContainer.DisplayOrder
if err = withLocale(
b.builder,
b.db.Model(&Container{}).
Where("page_id = ? and page_version = ? and page_model_name = ? and display_order > ? ", pageID, pageVersion, b.name, displayOrder),
locale,
).
UpdateColumn("display_order", gorm.Expr("display_order + ? ", 1)).Error; err != nil {
return
err = b.db.Transaction(func(tx *gorm.DB) (dbErr error) {
tx.Where("model_name = ? AND locale_code = ?", modelName, locale).First(&dc)
if dc.ID != 0 && dc.ModelID != 0 {
tx.Where("id = ?", dc.ModelID).First(model)
reflectutils.Set(model, "ID", uint(0))
}
ctx.WithContextValue(gorm2op.CtxKeyDB{}, tx)
defer ctx.WithContextValue(gorm2op.CtxKeyDB{}, nil)
if dbErr = containerMb.Editing().Creating().Saver(model, "", ctx); dbErr != nil {
return

Check warning on line 153 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L153 

Added line #L153 was not covered by tests
}

var (
maxOrder sql.NullFloat64
displayOrder float64
)
wh := tx.Model(&Container{}).Select("MAX(display_order)").
Where("page_id = ? and page_version = ? and page_model_name = ? ", pageID, pageVersion, b.name)

if dbErr = withLocale(b.builder, wh, locale).Scan(&maxOrder).Error; dbErr != nil {
return

Check warning on line 164 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L164 

Added line #L164 was not covered by tests
}
if containerID != "" {
var lastContainer Container
cs := lastContainer.PrimaryColumnValuesBySlug(containerID)
tx.Where("id = ? AND locale_code = ? and page_model_name = ?", cs["id"], locale, b.name).First(&lastContainer)
if lastContainer.ID > 0 {
displayOrder = lastContainer.DisplayOrder
if dbErr = withLocale(
b.builder,
tx.Model(&Container{}).
Where("page_id = ? and page_version = ? and page_model_name = ? and display_order > ? ", pageID, pageVersion, b.name, displayOrder),
locale,
).
UpdateColumn("display_order", gorm.Expr("display_order + ? ", 1)).Error; dbErr != nil {
return

Check warning on line 179 in pagebuilder/model.go

View check run for this annotation

Codecov / codecov/patch

pagebuilder/model.go#L179 

Added line #L179 was not covered by tests
}
}

} else {
displayOrder = maxOrder.Float64
}
modelID = reflectutils.MustGet(model, "ID").(uint)
displayName := modelName
if b.builder.ps.GetI18n() != nil {
displayName = i18n.T(ctx.R, presets.ModelsI18nModuleKey, modelName)
}
container := Container{
PageID: uint(pageID),
PageVersion: pageVersion,
ModelName: modelName,
PageModelName: b.name,
DisplayName: displayName,
ModelID: modelID,
DisplayOrder: displayOrder + 1,
Locale: l10n.Locale{
LocaleCode: locale,
},
}
err = tx.Create(&container).Error
newContainerID = container.PrimarySlug()

return
})

} else {
displayOrder = maxOrder.Float64
}
modelID = reflectutils.MustGet(model, "ID").(uint)
displayName := modelName
if b.builder.ps.GetI18n() != nil {
displayName = i18n.T(ctx.R, presets.ModelsI18nModuleKey, modelName)
}
container := Container{
PageID: uint(pageID),
PageVersion: pageVersion,
ModelName: modelName,
PageModelName: b.name,
DisplayName: displayName,
ModelID: modelID,
DisplayOrder: displayOrder + 1,
Locale: l10n.Locale{
LocaleCode: locale,
},
}
err = b.db.Create(&container).Error
newContainerID = container.PrimarySlug()
return
}

Expand Down
Loading
Loading