-
-
Notifications
You must be signed in to change notification settings - Fork 279
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge master into UserCollection #428
Merged
Merged
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
Deleted some previous work
Consider reworking and squashing this commit
This allows us to have the same submisison structure for entity and entity merge components.
The controller for merging pages was almost identical to the entity-editor. Refactored to make entity-editor controller work for regular edits and merges
There's no other way I can come up ith to know whether a revision is a merge or a standard edit
& Use ORM option to keep multiple EntityRevisions with the same ID
Remove whatever I tried with revisionParents
so we can retrieve them from the body of the /edit/handler request, which sends the rootState
on all 5 $entity$_revision, so that we can deduce which entities have been merged by the revision. Otherwise, if for example we're merging two authors, but there are relationships with another author, three author_revision rows will be created, but onyl two of the entities are merged.
Set isMerge property for revision and $entity$_revision entries
In preparation to adding the other entity types sections. Process entity section form state to allow multiple entities state that works with front-end.
And cleaned up extraneous argument in call to debouncedUpdateNameField in the non-merge name section
Use ISO strings everywhere we can and {year month day} objects only for date field and validation. Rename date utility isNullValue to isNullDate.
This got borked during a rebase I think
BB-292 fix(sql): Script to delete duplicate relationships
chore: Update to Postgres 12
After PR #383 mentions of "click to open in a new tab" are wrong and misleading
search: add 'editor' type in the search result
fix: fix mentions of "open in a new tab"
feat: Entity merging tool
Also remove special case for '/create' routes (see previous commit), and added types
BB-481: Fix merged entities path redirect
MonkeyDo
approved these changes
May 26, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
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.
Problem
I will be adding
collection
in the search feature and neededitor
too. So updating UserCollection branchSolution
Merge master into UserCollection