anyproto/anytype-heart
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-09 09:35:00 +09:00
Code Activity

GO-5297 Merge branch 'main' into go-5297-push-service-1st-iteration

Browse source
This commit is contained in:
Anatolii Smolianinov 2025-04-16 14:29:50 +02:00
commit 2d215de63d
No known key found for this signature in database
GPG key ID: 2DFC2826A71FE8A0
55 changed files with 2089 additions and 1725 deletions
Download patch file Download diff file Expand all files Collapse all files

11
space/clientspace/space.go
View file

@ -164,11 +164,10 @@ func (s *space) tryLoadBundledAndInstallIfMissing(disableRemoteLoad bool) {
if errors.Is(err, context.Canceled) {
return // we are closing, skip installation,
}
log.Error("failed to load bundled objects", zap.Error(err))
log.Warn("failed to load bundled objects", zap.Error(err))
}
_, _, err = s.installer.InstallBundledObjects(s.loadMissingBundledObjectsCtx, s, missingSourceIds, true)
if err != nil {
log.Error("failed to install bundled objects", zap.Error(err))
if len(missingSourceIds) > 0 {
log.Warn("missing bundled objects", zap.Strings("ids", missingSourceIds))
}
}
@ -187,9 +186,7 @@ func (s *space) mandatoryObjectsLoad(ctx context.Context, disableRemoteLoad bool
return
}
go s.tryLoadBundledAndInstallIfMissing(disableRemoteLoad)
if s.loadMandatoryObjectsErr != nil {
return
}
err := s.migrationProfileObject(ctx)
if err != nil {
log.Error("failed to migrate profile object", zap.Error(err))

27
space/internal/components/migration/systemobjectreviser/systemobjectreviser.go
View file

@ -119,16 +119,16 @@ func reviseObject(ctx context.Context, log logger.CtxLogger, space dependencies.
}
details := buildDiffDetails(bundleObject, localObject, isSystem)
recRelsDetails, err := checkRecommendedRelations(ctx, space, bundleObject, localObject, uk)
if err != nil {
log.Error("failed to check recommended relations", zap.Error(err))
}
for _, recRelsDetail := range recRelsDetails {
details.Set(recRelsDetail.Key, recRelsDetail.Value)
}
if isSystem {
recRelsDetails, err := checkRecommendedRelations(ctx, space, bundleObject, localObject, uk)
if err != nil {
log.Error("failed to check recommended relations", zap.Error(err))
}
for _, recRelsDetail := range recRelsDetails {
details.Set(recRelsDetail.Key, recRelsDetail.Value)
}
relFormatOTDetail, err := checkRelationFormatObjectTypes(ctx, space, bundleObject, localObject)
if err != nil {
log.Error("failed to check relation format object types", zap.Error(err))
@ -258,17 +258,24 @@ func checkRecommendedRelations(
return nil, err
}
var allNewIds []string
for _, key := range []domain.RelationKey{
bundle.RelationKeyRecommendedRelations,
bundle.RelationKeyRecommendedFeaturedRelations,
bundle.RelationKeyRecommendedFileRelations,
bundle.RelationKeyRecommendedHiddenRelations,
bundle.RelationKeyRecommendedRelations,
} {
localIds := current.GetStringList(key)
newIds := details.GetStringList(key)
allNewIds = append(allNewIds, newIds...)
removed, added := slice.DifferenceRemovedAdded(localIds, newIds)
if len(added) != 0 || len(removed) != 0 {
if key == bundle.RelationKeyRecommendedRelations {
// we should not miss relations that were set to recommended by user
removedFromAll, _ := slice.DifferenceRemovedAdded(removed, allNewIds)
newIds = append(newIds, removedFromAll...)
}
newValues = append(newValues, &domain.Detail{
Key: key,
Value: domain.StringList(newIds),