Merge master into UserCollection #428

prabalsingh24 · 2020-05-26T10:11:31Z

Problem

I will be adding collection in the search feature and need editor too. So updating UserCollection branch

Solution

Merge master into UserCollection

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

…ntity

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

coveralls · 2020-05-26T10:15:52Z

Coverage increased (+10.4%) to 60.251% when pulling 77fccbb on master into 3717b8f on UserCollection.

Also remove special case for '/create' routes (see previous commit), and added types

BB-481: Fix merged entities path redirect

MonkeyDo

👍

MonkeyDo added 30 commits April 22, 2020 19:29

fix(sql): Script to delete duplicate relationships

435ce89

feature(mergin): First setting up of merging route

ceb74ad

Continued implementation

03f3a45

Deleted some previous work

Commiting everything

268a0e8

Consider reworking and squashing this commit

feat(merging): Reworked entity merging mechanism

0d2d633

feat(merging): Added canEdit flag to relationshipSections

70b272d

feat(merging): Implement redirected BBID lookup

bb3c939

feat(merging): Pass ISO date strings around instead of objects

ad35f01

This allows us to have the same submisison structure for entity and entity merge components.

feat(merging): Added safety in ISO date transform functions

080d431

feat(merging): Refactor code

d26591c

feat(logging): Update and fix logger throughout the application

0ad43da

feat(title): Use previously unused page title

5aa637a

feat(merging): Refactor code

8720836

The controller for merging pages was almost identical to the entity-editor. Refactored to make entity-editor controller work for regular edits and merges

feat(merge-tool): Schema: Add is_merge column to revision table

dc5a891

There's no other way I can come up ith to know whether a revision is a merge or a standard edit

refactor(merge-tool): Transform revision route logic to async/await

6acf332

& Use ORM option to keep multiple EntityRevisions with the same ID

feat(merge-tool): Use isMerge attribute on revision display page

1d8d50f

Remove whatever I tried with revisionParents

feat(merge-tool): Cosmetic change on merge page

b3f382b

feat(merge-tool): Set combined relationships target/source to merge e…

01727f2

…ntity

feat(merge-tool): Add entities we're merging to state

058492a

so we can retrieve them from the body of the /edit/handler request, which sends the rootState

feat(merge-tool): Fix redirection mechanism

51f29bb

feat(merge-tool): Fix merging mechanism

d893958

Set isMerge property for revision and $entity$_revision entries

feat(merge-tool): Catch revision route errors

3b04927

feat(merge-tool): Improve how merge revisions are displayed

e88cadc

refactor(merge-tool): Refactor entity merge section for form state

b8ba9af

In preparation to adding the other entity types sections. Process entity section form state to allow multiple entities state that works with front-end.

feat(merge-tool): Fix updating name merge field

9e43b4a

And cleaned up extraneous argument in call to debouncedUpdateNameField in the non-merge name section

feat(merge-tool): Don't show aliases equal to main alias

80ad430

feat(merge-tool): Don't abort entity update if merge operation

42ce047

refactor(merge-tool): Refactor helpers

c0637e2

feat(merge-tool): Merge Editions

8a7c2a2

MonkeyDo and others added 24 commits May 5, 2020 16:33

fix(merge-tool): Small UI fixes

2e541b4

fix(merge tool): Fix date processing/validation

4299c45

Use ISO strings everywhere we can and {year month day} objects only for date field and validation. Rename date utility isNullValue to isNullDate.

fix(merge-tool): Only remove mergeQueue after successful merge

5fb3bd3

fix(merge-tool): Fix updated bootstrap version issues

5a0d903

The most minor of changes

2bb0ef8

fix(merge-tool): Use parentAlias for deleted entities

1e4df8a

This got borked during a rebase I think

search: add 'editor' type in the search result

ca0e54b

Merge branch 'master' into entity-merging

1a5fa5f

fix: change allEntity-->allEntities

aa7c7e1

refactor: change collection --> type in the search url param

dd797ea

Merge pull request #421 from bookbrainz/delete-duplicate-relationships

32594b5

BB-292 fix(sql): Script to delete duplicate relationships

change collection-->type in actions.js

004a05d

chore: upgrade to postgres 12

51c1a8f

chore(pg12): Update travisCI to PG 12

676d0ae

Merge pull request #426 from bookbrainz/pg-12-update

ab12a01

chore: Update to Postgres 12

fix: fix mentions of "open in a new tab"

07632ed

After PR #383 mentions of "click to open in a new tab" are wrong and misleading

Merge pull request #423 from prabalsingh24/add-user-in-search

5e976f3

search: add 'editor' type in the search result

Merge pull request #427 from bookbrainz/new-tab

3846eec

fix: fix mentions of "open in a new tab"

Merge branch 'master' into entity-merging

f3c2a70

fix(merge-tool): Show last know alias in merge revisions

83bda6b

chore(merge-tool): Cleanup before merging PR

a010506

chore(merge-tool): Last little cleanup

8e8cdb2

Merge pull request #333 from bookbrainz/entity-merging

cb93d78

feat: Entity merging tool

docs: Updated online user docs link

f340035

MonkeyDo and others added 3 commits May 26, 2020 13:36

fix(routes): Put routes without bbid before defining route parameter

3b010e7

BB-481 fix(routes): Fix bbid redirect path

7dc9642

Also remove special case for '/create' routes (see previous commit), and added types

Merge pull request #429 from bookbrainz/fix-routes-redirect

77fccbb

BB-481: Fix merged entities path redirect

MonkeyDo approved these changes May 26, 2020

View reviewed changes

MonkeyDo merged commit b819fd6 into UserCollection May 26, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge master into UserCollection #428

Merge master into UserCollection #428

prabalsingh24 commented May 26, 2020 •

edited

Loading

coveralls commented May 26, 2020 •

edited

Loading

MonkeyDo left a comment

Merge master into UserCollection #428

Merge master into UserCollection #428

Conversation

prabalsingh24 commented May 26, 2020 • edited Loading

Problem

Solution

coveralls commented May 26, 2020 • edited Loading

MonkeyDo left a comment

Choose a reason for hiding this comment

prabalsingh24 commented May 26, 2020 •

edited

Loading

coveralls commented May 26, 2020 •

edited

Loading