fix: hide parent infobox fields when child infobox is not nil (#37)

reearth · Aug 6, 2021 · d8c8cda · d8c8cda
1 parent 0b8c007
commit d8c8cda
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 44 deletions.
diff --git a/pkg/layer/merged.go b/pkg/layer/merged.go
@@ -60,7 +60,7 @@ func MergeInfobox(o *Infobox, p *Infobox, linked *id.DatasetID) *MergedInfobox {
 	}
 
 	var ibf []*InfoboxField
-	if o != nil && o.Count() > 0 {
+	if o != nil {
 		ibf = o.Fields()
 	} else if p != nil {
 		ibf = p.Fields()

diff --git a/pkg/layer/merged_test.go b/pkg/layer/merged_test.go
@@ -292,28 +292,7 @@ func TestMerge(t *testing.T) {
 				Parent:        &ib2pr,
 				LinkedDataset: &dataset1,
 			},
-			Fields: []*MergedInfoboxField{
-				{
-					ID:        f2.ID(),
-					Plugin:    p,
-					Extension: e,
-					Property: &property.MergedMetadata{
-						Original:      &f2pr,
-						Parent:        nil,
-						LinkedDataset: &dataset1,
-					},
-				},
-				{
-					ID:        f3.ID(),
-					Plugin:    p,
-					Extension: e,
-					Property: &property.MergedMetadata{
-						Original:      &f3pr,
-						Parent:        nil,
-						LinkedDataset: &dataset1,
-					},
-				},
-			},
+			Fields: []*MergedInfoboxField{},
 		},
 	}
 

diff --git a/pkg/layer/merging/merger_test.go b/pkg/layer/merging/merger_test.go
@@ -55,23 +55,13 @@ func TestMergeLayer(t *testing.T) {
 			MustBuild(),
 	})
 
-	// assert
-	expectedInfoboxField := layer.MergedInfoboxField{
-		ID:        l1if1,
-		Plugin:    p,
-		Extension: e,
-		Property: &property.MergedMetadata{
-			Original:      &fpr,
-			LinkedDataset: &dataset1,
-		},
-	}
 	expectedInfobox := layer.MergedInfobox{
 		Property: &property.MergedMetadata{
 			Original:      &ib1pr,
 			Parent:        &ib2pr,
 			LinkedDataset: &dataset1,
 		},
-		Fields: []*layer.MergedInfoboxField{&expectedInfoboxField},
+		Fields: []*layer.MergedInfoboxField{},
 	}
 	expectedInfoboxField2 := layer.MergedInfoboxField{
 		ID:        l1if1,
@@ -141,16 +131,7 @@ func TestMergeLayer(t *testing.T) {
 							Schema:        ps,
 							LinkedDataset: &dataset1,
 						},
-						Fields: []*MergedInfoboxField{
-							{
-								MergedInfoboxField: expectedInfoboxField,
-								Property: &property.Merged{
-									Original:      &fpr,
-									Schema:        ps,
-									LinkedDataset: &dataset1,
-								},
-							},
-						},
+						Fields: []*MergedInfoboxField{},
 					},
 					Property: &property.Merged{
 						Original:      &itemProperty,