fix: property fields in a property list cannot be removed (#160)

yk-eukarya · web-flow · commit 358237ba21b3 · 2022-07-19T12:19:23.000+03:00
* fix

* fix pr comments
diff --git a/pkg/property/pointer.go b/pkg/property/pointer.go
@@ -216,7 +216,7 @@ func (p *Pointer) Test(sg SchemaGroupID, i ItemID, f FieldID) bool {
 }
 
 func (p *Pointer) TestItem(sg SchemaGroupID, i ItemID) bool {
-	return p.TestSchemaGroup(sg) && (p.item == nil || *p.item == i)
+	return p.TestSchemaGroup(sg) && (p.item == nil || p.item.Equal(i))
 }
 
 func (p *Pointer) TestSchemaGroup(sg SchemaGroupID) bool {
diff --git a/pkg/property/property.go b/pkg/property/property.go
@@ -266,8 +266,11 @@ func (p *Property) RemoveField(ptr *Pointer) {
 		return
 	}
 
-	if group := ToGroup(p.Item(ptr)); group != nil {
+	item := p.Item(ptr)
+	if group := ToGroup(item); group != nil {
 		group.RemoveField(fid)
+	} else if groupList := ToGroupList(item); groupList != nil {
+		groupList.RemoveFields(ptr)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ func (p *Pointer) Test(sg SchemaGroupID, i ItemID, f FieldID) bool {`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`func (p *Pointer) TestItem(sg SchemaGroupID, i ItemID) bool {`
`219`		`- return p.TestSchemaGroup(sg) && (p.item == nil \|\| *p.item == i)`
	`219`	`+ return p.TestSchemaGroup(sg) && (p.item == nil \|\| p.item.Equal(i))`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`func (p *Pointer) TestSchemaGroup(sg SchemaGroupID) bool {`
Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,11 @@ func (p Property) RemoveField(ptr Pointer) {`
`266`	`266`	`return`
`267`	`267`	`}`
`268`	`268`
`269`		`- if group := ToGroup(p.Item(ptr)); group != nil {`
	`269`	`+ item := p.Item(ptr)`
	`270`	`+ if group := ToGroup(item); group != nil {`
`270`	`271`	`group.RemoveField(fid)`
	`272`	`+ } else if groupList := ToGroupList(item); groupList != nil {`
	`273`	`+ groupList.RemoveFields(ptr)`
`271`	`274`	`}`
`272`	`275`	`}`
`273`	`276`