From 4f77edce5e1756622653de28b41523d515fa672a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Jerman?= Date: Tue, 28 Mar 2023 16:47:27 +0200 Subject: [PATCH] Make page layout handles unique per page not ns --- server/compose/envoy/yaml_encode.gen.go | 1 + server/compose/model/models.gen.go | 4 ++++ server/compose/page_layout.cue | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/server/compose/envoy/yaml_encode.gen.go b/server/compose/envoy/yaml_encode.gen.go index 6213bd5ae..7ecfb235e 100644 --- a/server/compose/envoy/yaml_encode.gen.go +++ b/server/compose/envoy/yaml_encode.gen.go @@ -523,6 +523,7 @@ func (e YamlEncoder) encodePage(ctx context.Context, p envoyx.EncodeParams, node "description", res.Description, "handle", res.Handle, "id", res.ID, + "meta", res.Meta, "moduleID", auxModuleID, "namespaceID", auxNamespaceID, "selfID", auxSelfID, diff --git a/server/compose/model/models.gen.go b/server/compose/model/models.gen.go index 4722b1ceb..7b05ad75a 100644 --- a/server/compose/model/models.gen.go +++ b/server/compose/model/models.gen.go @@ -945,6 +945,10 @@ var PageLayout = &dal.Model{ Modifiers: []dal.IndexFieldModifier{"LOWERCASE"}, }, + { + AttributeIdent: "PageID", + }, + { AttributeIdent: "NamespaceID", }, diff --git a/server/compose/page_layout.cue b/server/compose/page_layout.cue index 3f1cd4565..7f818a3f7 100644 --- a/server/compose/page_layout.cue +++ b/server/compose/page_layout.cue @@ -76,7 +76,7 @@ pageLayout: { "page_id": { attribute: "page_id" }, "parent_id": { attribute: "parent_id" }, "unique_handle": { - fields: [{ attribute: "handle", modifiers: ["LOWERCASE"] }, { attribute: "namespace_id" }] + fields: [{ attribute: "handle", modifiers: ["LOWERCASE"] }, { attribute: "page_id" }, { attribute: "namespace_id" }] predicate: "handle != '' AND deleted_at IS NULL" } }