Merge pull request #1765 from anyproto/release-7-fix

Release 7 fix

Author: requilence

core/syncstatus/detailsupdater/updater.go

@@ -206,20 +206,8 @@ func (u *syncStatusUpdater) updateObjectDetails(syncStatusDetails *syncStatusDet
 			if details == nil || details.Fields == nil {
 				details = &types.Struct{Fields: map[string]*types.Value{}}
 			}
-			if !u.isLayoutSuitableForSyncRelations(details) || pbtypes.GetString(details, bundle.RelationKeySpaceId.String()) == "" {
-				var syncRelations = []string{
-					bundle.RelationKeySyncStatus.String(),
-					bundle.RelationKeySyncError.String(),
-					bundle.RelationKeySyncDate.String(),
-				}
-				modified := false
-				for _, relation := range syncRelations {
-					if _, ok := details.GetFields()[relation]; ok {
-						delete(details.Fields, relation)
-						modified = true
-					}
-				}
-				return details, modified, nil
+			if !u.isLayoutSuitableForSyncRelations(details) {
+				return details, false, nil
 			}
 			if fileStatus, ok := details.GetFields()[bundle.RelationKeyFileBackupStatus.String()]; ok {
 				status, syncError = getSyncStatusForFile(status, syncError, filesyncstatus.Status(int(fileStatus.GetNumberValue())))
@@ -242,28 +230,11 @@ func (u *syncStatusUpdater) updateObjectDetails(syncStatusDetails *syncStatusDet
 }
 
 func (u *syncStatusUpdater) setSyncDetails(sb smartblock.SmartBlock, status domain.ObjectSyncStatus, syncError domain.SyncError) error {
-	var (
-		st      = sb.NewState()
-		details = sb.CombinedDetails()
-	)
-	if !slices.Contains(helper.SyncRelationsSmartblockTypes(), sb.Type()) ||
-		!u.isLayoutSuitableForSyncRelations(details) ||
-		pbtypes.GetString(details, bundle.RelationKeySpaceId.String()) == "" { // this was the case with incorrectly indexed objects
-		var syncRelations = []string{
-			bundle.RelationKeySyncStatus.String(),
-			bundle.RelationKeySyncError.String(),
-			bundle.RelationKeySyncDate.String(),
-		}
-		removedOnce := false
-		for _, relation := range syncRelations {
-			if st.HasRelation(relation) {
-				removedOnce = true
-				st.RemoveRelation(relation)
-			}
-		}
-		if removedOnce {
-			return sb.Apply(st, smartblock.KeepInternalFlags /* do not erase flags */)
-		}
+	if !slices.Contains(helper.SyncRelationsSmartblockTypes(), sb.Type()) {
+		return nil
+	}
+	st := sb.NewState()
+	if !u.isLayoutSuitableForSyncRelations(sb.Details()) {
 		return nil
 	}
 	if fileStatus, ok := st.Details().GetFields()[bundle.RelationKeyFileBackupStatus.String()]; ok {

core/syncstatus/detailsupdater/updater_test.go

@@ -100,7 +100,6 @@ func TestSyncStatusUpdater_UpdateDetails(t *testing.T) {
 			sb := smarttest.New(objectId)
 			st := sb.Doc.(*state.State)
 			st.SetDetailAndBundledRelation(bundle.RelationKeyLayout, pbtypes.Int64(int64(model.ObjectType_basic)))
-			st.SetDetailAndBundledRelation(bundle.RelationKeySpaceId, pbtypes.String("spaceId"))
 			err := apply(sb)
 			require.NoError(t, err)
 
@@ -167,7 +166,6 @@ func TestSyncStatusUpdater_UpdateDetails(t *testing.T) {
 			space.EXPECT().DoCtx(mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, objectId string, apply func(smartblock.SmartBlock) error) {
 				sb := smarttest.New(objectId)
 				st := sb.Doc.(*state.State)
-				st.SetDetailAndBundledRelation(bundle.RelationKeySpaceId, pbtypes.String("spaceId"))
 				st.SetDetailAndBundledRelation(bundle.RelationKeyLayout, pbtypes.Int64(int64(model.ObjectType_file)))
 				st.SetDetailAndBundledRelation(bundle.RelationKeyFileBackupStatus, pbtypes.Int64(int64(filesyncstatus.Limited)))
 				err := apply(sb)
@@ -197,7 +195,6 @@ func TestSyncStatusUpdater_UpdateDetails(t *testing.T) {
 			space.EXPECT().DoCtx(mock.Anything, mock.Anything, mock.Anything).Run(func(ctx context.Context, objectId string, apply func(smartblock.SmartBlock) error) {
 				sb := smarttest.New(objectId)
 				st := sb.Doc.(*state.State)
-				st.SetDetailAndBundledRelation(bundle.RelationKeySpaceId, pbtypes.String("spaceId"))
 				st.SetDetailAndBundledRelation(bundle.RelationKeyLayout, pbtypes.Int64(int64(model.ObjectType_file)))
 				st.SetDetailAndBundledRelation(bundle.RelationKeyFileBackupStatus, pbtypes.Int64(int64(filesyncstatus.Synced)))
 				err := apply(sb)
@@ -249,7 +246,6 @@ func TestSyncStatusUpdater_UpdateSpaceDetails(t *testing.T) {
 		space.EXPECT().DoCtx(mock.Anything, objectId, mock.Anything).Run(func(ctx context.Context, objectId string, apply func(smartblock.SmartBlock) error) {
 			sb := smarttest.New(objectId)
 			st := sb.Doc.(*state.State)
-			st.SetDetailAndBundledRelation(bundle.RelationKeySpaceId, pbtypes.String("spaceId"))
 			st.SetDetailAndBundledRelation(bundle.RelationKeyLayout, pbtypes.Int64(int64(model.ObjectType_basic)))
 			err := apply(sb)
 			require.NoError(t, err)
@@ -283,8 +279,7 @@ func TestSyncStatusUpdater_setSyncDetails(t *testing.T) {
 		// given
 		fx := newFixture(t)
 		sb := smarttest.New("id")
-		st := sb.Doc.(*state.State)
-		st.SetDetailAndBundledRelation(bundle.RelationKeySpaceId, pbtypes.String("spaceId"))
+
 		// when
 		err := fx.setSyncDetails(sb, domain.ObjectSyncStatusError, domain.SyncErrorNetworkError)
 		assert.Nil(t, err)

core/syncstatus/syncsubscriptions/syncingobjects.go

@@ -38,6 +38,11 @@ func (s *syncingObjects) Run() error {
 				Condition:   model.BlockContentDataviewFilter_In,
 				Value:       pbtypes.IntList(int(domain.SpaceSyncStatusSyncing), int(domain.ObjectSyncStatusQueued), int(domain.ObjectSyncStatusError)),
 			},
+			{
+				RelationKey: bundle.RelationKeySpaceId.String(),
+				Condition:   model.BlockContentDataviewFilter_Equal,
+				Value:       pbtypes.String(s.spaceId),
+			},
 		},
 	}
 	s.objectSubscription = objectsubscription.NewIdSubscription(s.service, objectReq)