Merge pull request #721 from anyproto/go-2300-clean-import-to-existin…

…g-space GO-2300: make widget collection not favorite for gallery
anyproto · Dec 15, 2023 · f5a3f82 · f5a3f82
2 parents 291c913 + 51163a1
commit f5a3f82
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/core/block/import/common/collection.go b/core/block/import/common/collection.go
@@ -31,13 +31,13 @@ func (r *RootCollection) MakeRootCollection(collectionName string,
 	targetObjects []string,
 	icon string,
 	fileKeys []*pb.ChangeFileKeys,
-	needToAddDate bool,
+	needToAddDate, shouldBeFavorite bool,
 ) (*Snapshot, error) {
 	if needToAddDate {
 		importDate := time.Now().Format(time.RFC3339)
 		collectionName = fmt.Sprintf("%s %s", collectionName, importDate)
 	}
-	detailsStruct := r.getCreateCollectionRequest(collectionName, icon)
+	detailsStruct := r.getCreateCollectionRequest(collectionName, icon, shouldBeFavorite)
 	_, _, st, err := r.service.CreateCollection(detailsStruct, []*model.InternalFlag{{
 		Value: model.InternalFlag_collectionDontIndexLinks,
 	}})
@@ -102,11 +102,11 @@ func (r *RootCollection) addRelations(st *state.State) error {
 	return nil
 }
 
-func (r *RootCollection) getCreateCollectionRequest(collectionName string, icon string) *types.Struct {
+func (r *RootCollection) getCreateCollectionRequest(collectionName string, icon string, shouldBeFavorite bool) *types.Struct {
 	details := make(map[string]*types.Value, 0)
 	details[bundle.RelationKeySourceFilePath.String()] = pbtypes.String(collectionName)
 	details[bundle.RelationKeyName.String()] = pbtypes.String(collectionName)
-	details[bundle.RelationKeyIsFavorite.String()] = pbtypes.Bool(true)
+	details[bundle.RelationKeyIsFavorite.String()] = pbtypes.Bool(shouldBeFavorite)
 	details[bundle.RelationKeyLayout.String()] = pbtypes.Float64(float64(model.ObjectType_collection))
 	details[bundle.RelationKeyIconImage.String()] = pbtypes.String(icon)
 

diff --git a/core/block/import/csv/converter.go b/core/block/import/csv/converter.go
@@ -67,7 +67,7 @@ func (c *CSV) GetSnapshots(ctx context.Context, req *pb.RpcObjectImportRequest,
 		return nil, allErrors
 	}
 	rootCollection := common.NewRootCollection(c.collectionService)
-	rootCol, err := rootCollection.MakeRootCollection(rootCollectionName, result.objectIDs, "", nil, true)
+	rootCol, err := rootCollection.MakeRootCollection(rootCollectionName, result.objectIDs, "", nil, true, true)
 	if err != nil {
 		allErrors.Add(err)
 		if req.Mode == pb.RpcObjectImportRequest_ALL_OR_NOTHING {

diff --git a/core/block/import/html/converter.go b/core/block/import/html/converter.go
@@ -65,7 +65,7 @@ func (h *HTML) GetSnapshots(ctx context.Context, req *pb.RpcObjectImportRequest,
 		return nil, allErrors
 	}
 	rootCollection := common.NewRootCollection(h.collectionService)
-	rootCollectionSnapshot, err := rootCollection.MakeRootCollection(rootCollectionName, targetObjects, "", nil, true)
+	rootCollectionSnapshot, err := rootCollection.MakeRootCollection(rootCollectionName, targetObjects, "", nil, true, true)
 	if err != nil {
 		allErrors.Add(err)
 		if allErrors.ShouldAbortImport(len(path), req.Type) {

diff --git a/core/block/import/markdown/import.go b/core/block/import/markdown/import.go
@@ -100,7 +100,7 @@ func (m *Markdown) processFiles(req *pb.RpcObjectImportRequest, progress process
 func (m *Markdown) createRootCollection(allSnapshots []*common.Snapshot) ([]*common.Snapshot, string, error) {
 	targetObjects := m.getObjectIDs(allSnapshots)
 	rootCollection := common.NewRootCollection(m.service)
-	rootCol, err := rootCollection.MakeRootCollection(rootCollectionName, targetObjects, "", nil, true)
+	rootCol, err := rootCollection.MakeRootCollection(rootCollectionName, targetObjects, "", nil, true, true)
 	if err != nil {
 		return nil, "", err
 	}

diff --git a/core/block/import/notion/api/database/database.go b/core/block/import/notion/api/database/database.go
@@ -338,7 +338,7 @@ func (ds *Service) AddObjectsToNotionCollection(notionContext *api.NotionImportC
 	allObjects := ds.filterObjects(notionContext, notionDB, notionPages)
 
 	rootCollection := common.NewRootCollection(ds.collectionService)
-	rootCol, err := rootCollection.MakeRootCollection(rootCollectionName, allObjects, "", nil, true)
+	rootCol, err := rootCollection.MakeRootCollection(rootCollectionName, allObjects, "", nil, true, true)
 	if err != nil {
 		return nil, err
 	}

diff --git a/core/block/import/pb/gallery.go b/core/block/import/pb/gallery.go
@@ -60,7 +60,7 @@ func (g *GalleryImport) ProvideCollection(snapshots []*common.Snapshot,
 		}
 	}
 	objectsIDs := g.getObjectsIDs(snapshots)
-	objectsCollection, err := rootCollection.MakeRootCollection(collectionName, objectsIDs, icon, fileKeys, false)
+	objectsCollection, err := rootCollection.MakeRootCollection(collectionName, objectsIDs, icon, fileKeys, false, true)
 	if err != nil {
 		return nil, err
 	}
@@ -77,7 +77,7 @@ func (g *GalleryImport) getWidgetsCollection(collectionName string,
 	collectionsSnapshots []*common.Snapshot,
 ) ([]*common.Snapshot, error) {
 	widgetCollectionName := collectionName + widgetCollectionPattern
-	widgetsCollectionSnapshot, err := rootCollection.MakeRootCollection(widgetCollectionName, widgetObjects, icon, fileKeys, false)
+	widgetsCollectionSnapshot, err := rootCollection.MakeRootCollection(widgetCollectionName, widgetObjects, icon, fileKeys, false, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/core/block/import/pb/gallery_test.go b/core/block/import/pb/gallery_test.go
@@ -207,6 +207,7 @@ func TestGalleryImport_ProvideCollection(t *testing.T) {
 		objectsInCollection := rootCollectionState.GetStoreSlice(template.CollectionStoreKey)
 		assert.Len(t, objectsInCollection, 1)
 		assert.Equal(t, objectsInCollection[0], "oldObjectInWidget")
+		assert.False(t, pbtypes.GetBool(rootCollectionState.Details(), bundle.RelationKeyIsFavorite.String()))
 
 		rootCollectionState = state.NewDocFromSnapshot("", collection[1].Snapshot).(*state.State)
 		objectsInCollection = rootCollectionState.GetStoreSlice(template.CollectionStoreKey)

diff --git a/core/block/import/pb/space.go b/core/block/import/pb/space.go
@@ -57,7 +57,7 @@ func (s *SpaceImport) ProvideCollection(snapshots []*common.Snapshot,
 		})
 	}
 	rootCollection := common.NewRootCollection(s.service)
-	rootCollectionSnapshot, err := rootCollection.MakeRootCollection(rootCollectionName, rootObjects, "", nil, true)
+	rootCollectionSnapshot, err := rootCollection.MakeRootCollection(rootCollectionName, rootObjects, "", nil, true, true)
 	if err != nil {
 		return nil, err
 	}

diff --git a/core/block/import/txt/converter.go b/core/block/import/txt/converter.go
@@ -56,7 +56,7 @@ func (t *TXT) GetSnapshots(ctx context.Context, req *pb.RpcObjectImportRequest,
 		return nil, allErrors
 	}
 	rootCollection := common.NewRootCollection(t.service)
-	rootCol, err := rootCollection.MakeRootCollection(rootCollectionName, targetObjects, "", nil, true)
+	rootCol, err := rootCollection.MakeRootCollection(rootCollectionName, targetObjects, "", nil, true, true)
 	if err != nil {
 		allErrors.Add(err)
 		if allErrors.ShouldAbortImport(len(paths), req.Type) {