Feat/1246 allow reordering complex form components #1385
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
myieye
force-pushed
the
feat/1246-allow-reordering-complex-form-components
branch
from
a299fa5 to
de7e10e
Compare
hahn-kev
reviewed
Jan 20, 2025
hahn-kev
reviewed
Jan 20, 2025
hahn-kev
reviewed
Jan 20, 2025
| private class SensesDiffApi(IMiniLcmApi api, Guid entryId) : IOrderableCollectionDiffApi<Sense> | ||
| private class ComplexFormComponentsDiffApi(Entry afterEntry, IMiniLcmApi api) : IOrderableCollectionDiffApi<ComplexFormComponent> | ||
| { | ||
| private readonly bool supportsEntityIds = api.GetDataFormat() == ProjectDataFormat.Harmony; |
There was a problem hiding this comment.
I really don't like this (and the code which is conditional on this). What if we used Id everywhere, and the Fw version set the component Id to the right thing based on context? eg: either the ComponentSense??EntryId or ComplexFormEntryId.
hahn-kev
reviewed
Jan 20, 2025
hahn-kev
reviewed
Jan 20, 2025
| { | ||
| if (supportsEntityIds) between = MapBackToEntityIds(between); | ||
| var componentId = supportsEntityIds ? component.Id : component.ComponentSenseId ?? component.ComponentEntryId; | ||
| await api.MoveComplexFormComponent(afterEntry.Id, componentId, between); |
There was a problem hiding this comment.
yeah this won't work. Imagine a client (fw lite, or FLExTools) calling MoveComplexFormComponent directly. What does it pass in to the 2nd arg? component.Id? or component.ComponentEntryId? It depends on GetDataFormat, that really sucks. See my comment above for how we might fix this
…es, even after they are modified
…mplementation for IOrderableCollectionDiffApi.GetId
…d a comment in the file documenting its purpose
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.
Notable changes:
ComplexEntryComponents, so that I didn't need to makeBetweenPositiongeneric. You actually only need 1 Guid. If you're comparing complex-forms then you can use the complex-form ID. If you're comparing components then you usecomponentSenseId ?? componentEntryId, so you get the most specific one. For CRDTs it can be mapped back to theComplexEntryComponent.Idbefore entering the API.GetDataFormat()to the MiniLcmApi in order to distinguish the two cases ☝️CanInsertComplexFormComponentViaSyncproved to be a super valuable test. What cases passed and failed changed constantly as I was fleshing out the Fw implementation.