GO-4719: After import I can no longer add an object to a collection #1989
+513
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: AnastasiaShemyakinskaya <[email protected]>
Coverage provided by https://github.com/seriousben/go-patch-cover-action |
Signed-off-by: AnastasiaShemyakinskaya <[email protected]>
KirillSto
requested changes
Jan 7, 2025
core/block/export/export.go
Outdated
| ) | ||
| for id, details := range e.docs { | ||
| layout := details.GetInt64(bundle.RelationKeyLayout) | ||
| if layout == int64(model.ObjectType_collection) { |
There was a problem hiding this comment.
These settings could be set for views of sets by relations as well, so check on set layout should be added
There was a problem hiding this comment.
Default object type is only applicable for collection, doesn't it? 🧐
There was a problem hiding this comment.
If set is aggregated by relation, then we can choose default object type for views
core/block/export/export.go
Outdated
| err := cache.Do(e.picker, id, func(sb sb.SmartBlock) error { | ||
| st := sb.NewState() | ||
| return st.Iterate(func(b simple.Block) (isContinue bool) { | ||
| if dv := b.Model().GetDataview(); dv != nil { |
There was a problem hiding this comment.
This code could be simplified:
dv := b.Model().GetDataview()
if dv == nil {
return true
}
for ...
return false
core/block/export/export.go
Outdated
| @@ -413,6 +420,55 @@ func (e *exportContext) processProtobuf() error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (e *exportContext) addDependentObjectsFromDataview() error { | |||
| var ( | |||
| viewDependantObjectsIds []string | |||
There was a problem hiding this comment.
Thanks, I always make an error in this word 😅
core/block/export/export.go
Outdated
| } | ||
| } | ||
| } | ||
| viewDependantObjects, err := e.queryAndFilterObjectsByRelation(e.spaceId, viewDependantObjectsIds, bundle.RelationKeyId) |
Signed-off-by: AnastasiaShemyakinskaya <[email protected]>
Signed-off-by: AnastasiaShemyakinskaya <[email protected]>
Signed-off-by: AnastasiaShemyakinskaya <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add mapping of default object type id to the new one in import, so we get new id of default type in result collection object