Add namespace blocks on the BE

Author: KinyaElGrande

server/compose/envoy/yaml_decode.gen.go

@@ -103,6 +103,40 @@ func (d *auxYamlDoc) unmarshalPageBlocksNode(r *types.Page, n *yaml.Node) (refs
 	return
 }
 
+func (d *auxYamlDoc) unmarshalNamespaceBlocksNode(r *types.Namespace, n *yaml.Node) (refs map[string]envoyx.Ref, idents envoyx.Identifiers, err error) {
+	refs = map[string]envoyx.Ref{}
+
+	for index, b := range r.Blocks {
+		switch b.Kind {
+		case "RecordList":
+			refs = envoyx.MergeRefs(refs, getPageBlockRecordListRefs(b, index))
+
+		case "Automation":
+			refs = envoyx.MergeRefs(refs, getPageBlockAutomationRefs(b, index))
+
+		case "RecordOrganizer":
+			refs = envoyx.MergeRefs(refs, getPageBlockRecordOrganizerRefs(b, index))
+
+		case "Chart":
+			refs = envoyx.MergeRefs(refs, getPageBlockChartRefs(b, index))
+
+		case "Calendar":
+			refs = envoyx.MergeRefs(refs, getPageBlockCalendarRefs(b, index))
+
+		case "Metric":
+			refs = envoyx.MergeRefs(refs, getPageBlockMetricRefs(b, index))
+
+		case "Comment":
+			refs = envoyx.MergeRefs(refs, getPageBlockCommentRefs(b, index))
+
+		case "Progress":
+			refs = envoyx.MergeRefs(refs, getPageBlockProgressRefs(b, index))
+		}
+	}
+
+	return
+}
+
 func getPageBlockRecordListRefs(b types.PageBlock, index int) (refs map[string]envoyx.Ref) {
 	refs = make(map[string]envoyx.Ref)
 

server/compose/envoy/yaml_decode.go

@@ -93,7 +93,7 @@ func (e YamlEncoder) encodePageBlocksC(ctx context.Context, p envoyx.EncodeParam
 
 	var aux any
 	for i, b := range pg.Blocks {
-		aux, err = e.encodePageBlockC(ctx, p, tt, n, pg, i, b)
+		aux, err = e.encodePageBlockC(ctx, p, tt, n, i, b)
 		if err != nil {
 			return
 		}
@@ -107,7 +107,26 @@ func (e YamlEncoder) encodePageBlocksC(ctx context.Context, p envoyx.EncodeParam
 	return out, nil
 }
 
-func (e YamlEncoder) encodePageBlockC(ctx context.Context, p envoyx.EncodeParams, tt envoyx.Traverser, n *envoyx.Node, pg *types.Page, index int, b types.PageBlock) (_ any, err error) {
+func (e YamlEncoder) encodeNamespaceBlocksC(ctx context.Context, p envoyx.EncodeParams, tt envoyx.Traverser, n *envoyx.Node, pg *types.Namespace, bb types.PageBlocks) (_ any, err error) {
+	out, _ := y7s.MakeSeq()
+
+	var aux any
+	for i, b := range pg.Blocks {
+		aux, err = e.encodePageBlockC(ctx, p, tt, n, i, b)
+		if err != nil {
+			return
+		}
+
+		out, err = y7s.AddSeq(out, aux)
+		if err != nil {
+			return
+		}
+	}
+
+	return out, nil
+}
+
+func (e YamlEncoder) encodePageBlockC(ctx context.Context, p envoyx.EncodeParams, tt envoyx.Traverser, n *envoyx.Node, index int, b types.PageBlock) (_ any, err error) {
 
 	switch b.Kind {
 	case "RecordList":

server/compose/envoy/yaml_encode.gen.go

@@ -27,6 +27,18 @@ namespace: {
 				omitSetter: true
 				omitGetter: true
 			}
+			blocks: {
+				goType: "types.PageBlocks"
+				dal: { type: "JSON", defaultEmptyObject: true }
+				omitSetter: true
+				omitGetter: true
+				envoy: {
+					yaml: {
+						customDecoder: true
+						customEncoder: true
+					}
+				}
+			}
 			name: {
 				sortable: true
 				dal: {}

server/compose/envoy/yaml_encode.go

@@ -109,6 +109,10 @@ endpoints:
         name: meta
         required: true
         title: Meta data
+      - type: sqlxTypes.JSONText
+        name: blocks
+        required: false
+        title: Blocks
       - type: map[string]string
         name: labels
         title: Labels

server/compose/model/models.gen.go

@@ -168,6 +168,14 @@ func (ctrl Namespace) Update(ctx context.Context, r *request.NamespaceUpdate) (i
 		return nil, err
 	}
 
+	if len(r.Blocks) > 2 {
+		// Process blocks if they were included in the request
+		// if not, do not assume that blocks were removed!
+		if err = r.Blocks.Unmarshal(&ns.Blocks); err != nil {
+			return nil, err
+		}
+	}
+
 	ns, err = ctrl.namespace.Update(ctx, ns)
 	return ctrl.makePayload(ctx, ns, err)
 }

server/compose/namespace.cue

@@ -134,6 +134,11 @@ type (
 		// Meta data
 		Meta sqlxTypes.JSONText
 
+		// Blocks POST parameter
+		//
+		// Blocks
+		Blocks sqlxTypes.JSONText
+
 		// Labels POST parameter
 		//
 		// Labels
@@ -569,6 +574,7 @@ func (r NamespaceUpdate) Auditable() map[string]interface{} {
 		"slug":        r.Slug,
 		"enabled":     r.Enabled,
 		"meta":        r.Meta,
+		"blocks":      r.Blocks,
 		"labels":      r.Labels,
 		"updatedAt":   r.UpdatedAt,
 	}
@@ -599,6 +605,11 @@ func (r NamespaceUpdate) GetMeta() sqlxTypes.JSONText {
 	return r.Meta
 }
 
+// Auditable returns all auditable/loggable parameters
+func (r NamespaceUpdate) GetBlocks() sqlxTypes.JSONText {
+	return r.Blocks
+}
+
 // Auditable returns all auditable/loggable parameters
 func (r NamespaceUpdate) GetLabels() map[string]string {
 	return r.Labels
@@ -658,6 +669,13 @@ func (r *NamespaceUpdate) Fill(req *http.Request) (err error) {
 				}
 			}
 
+			if val, ok := req.MultipartForm.Value["blocks"]; ok && len(val) > 0 {
+				r.Blocks, err = payload.ParseJSONTextWithErr(val[0])
+				if err != nil {
+					return err
+				}
+			}
+
 			if val, ok := req.MultipartForm.Value["labels[]"]; ok {
 				r.Labels, err = label.ParseStrings(val)
 				if err != nil {
@@ -714,6 +732,13 @@ func (r *NamespaceUpdate) Fill(req *http.Request) (err error) {
 			}
 		}
 
+		if val, ok := req.Form["blocks"]; ok && len(val) > 0 {
+			r.Blocks, err = payload.ParseJSONTextWithErr(val[0])
+			if err != nil {
+				return err
+			}
+		}
+
 		if val, ok := req.Form["labels[]"]; ok {
 			r.Labels, err = label.ParseStrings(val)
 			if err != nil {

server/compose/rest.yaml

@@ -647,6 +647,30 @@ func (svc namespace) handleUpdate(ctx context.Context, upd *types.Namespace) nam
 			res.Meta = upd.Meta
 		}
 
+		// Get max blockID for later use
+		blockID := uint64(0)
+		for _, b := range res.Blocks {
+			if b.BlockID > blockID {
+				blockID = b.BlockID
+			}
+		}
+
+		if !reflect.DeepEqual(res.Blocks, upd.Blocks) {
+			res.Blocks = upd.Blocks
+			changes |= namespaceChanged
+		}
+
+		// Assure blockIDs
+		for i, b := range res.Blocks {
+			if b.BlockID == 0 {
+				blockID++
+				b.BlockID = blockID
+				res.Blocks[i] = b
+
+				changes |= namespaceChanged
+			}
+		}
+
 		if upd.Labels != nil {
 			if label.Changed(res.Labels, upd.Labels) {
 				changes |= namespaceLabelsChanged