Integrate new features from maint-v11.x branch#578
Draft
palkerecsenyi wants to merge 8 commits intoinveniosoftware:masterfrom
Draft
Integrate new features from maint-v11.x branch#578palkerecsenyi wants to merge 8 commits intoinveniosoftware:masterfrom
palkerecsenyi wants to merge 8 commits intoinveniosoftware:masterfrom
Conversation
a9b5ed8 to
8e7163a
Compare
eee5ffd to
da061aa
Compare
* Added deep link support for replies * Changed TimelineFeed to be a generic component that works for rendering both the parent and reply timelines with as little code duplication as possible. TimelineFeedParent and TimelineFeedReplies are specific instances of TimelineFeed, with specific state/dispatch. * Parent and replies have separate actions and reducers due to the differences in their behaviour and the different API endpoints they use. * The new pagination system introduced in refactored to use a more flexible "bucket" based system instead of fixed slots for the different pages. This was necessary to make the same system work for both parent and reply events. * Created a new `replies_focused` API endpoint, mirroring the functionality of `timeline_focused`. Co-authored-by: Wesley Middelbos <wesleymiddelbos@quicknet.nl> Co-authored-by: Oliver Geneser <hello@geneser.xyz>
feat: add collapsible enable flag fix: make collapsedHeight and collapsible overwritable
* This avoids causing a runtime error when components from this repo are imported on pages other than the request page. Currently, the dataset extraction happens on startup, so if any component includes the data.js file in its import chain then an error will occur. * This fixes an issue on the RDM record details page.
* feat(comment-file): file upload delete read * feat(comment-file): file read UI URL * feat(comment-file): comment-file association * feat(comment-file): allow inline images in comments * feat(comment-file): file details expansion Co-authored-by: Pablo Tamarit <pablo.tamarit@cern.ch> * feat(comment-file): user interface * feat(comment-file): lazy files initialization * fix: timeline event body forward ref (displayName) --------- Co-authored-by: zzacharo <zacharias.zacharodimos@cern.ch>
da061aa to
76c685d
Compare
* Before, if the size of the body changed after initial load, we wouldn't reevaluate whether it was overflowing and therefore whether a "show more" button needed to be shown. * Added a ResizeObserver to detect the size changes. If the button is clicked, the ResizeObserver is deactivated to avoid an infinite loop.
76c685d to
c36cd69
Compare
This file contains hidden or 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
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.
I am taking all the new features from the v11.x branch and merging them into master. I have rebased from master and resolved all of the conflicts, hopefully correctly!