Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Auto-merge on open document in curation mode #4739

Closed
1 task done
UWinch opened this issue Apr 17, 2024 · 0 comments
Closed
1 task done

Auto-merge on open document in curation mode #4739

UWinch opened this issue Apr 17, 2024 · 0 comments
Assignees
@reckart
Labels
🐛Bug Something isn't working Module: Curation
Projects
Kanban
Milestone
32.1

Comments

@UWinch
Copy link
Contributor

UWinch commented Apr 17, 2024 •
edited by reckart

Describe the bug
Starting with INCEpTION 32.0, there is a new open document dialog on the annotation page when the page has previously been set to curation mode via sidebar. If I open a document this way, the annotation should be auto-merged (when opening the document for the first time in curation mode). However, this does not happen currently.

To Reproduce
Steps to reproduce the behavior:

  1. Have a project with some documents that have been annotated by two annotators and finished.
  2. Go to the annotation page and start the curation via sidebar.
  3. Leave for e.g. the dashboard.
  4. Then click on annotation again and open a document that has not been opened before.
  5. Check that annotations which both annotators agree on have falsely not been merged into the document.

Expected behavior
If I open a document in curation mode for the first time, I would expect that annotations that annotators agree on to be merged into the curation document automatically.

Please complete the following information:

  • Version and build ID: 32.0
  • OS: Linux
  • Browser: Chrome

To do

  • When resetting a curation document e.g. via the monitoring page, the state of the source document is reset, but the curation CAS is not deleted. Since, auto-merge does not check the state but rather if a curation CAS exists, auto-merge will not trigger in such a case. The proper solution here is to delete the curation CAS as part of the reset.
@reckart reckart added this to the 32.1 milestone Apr 17, 2024
@reckart reckart added 🐛Bug Something isn't working Module: Curation labels Apr 17, 2024
reckart added a commit that referenced this issue Apr 29, 2024
@reckart
#4739 - Auto-merge on open document in curation mode
6d54725 
- Trigger merge based on source document state and not based on whether the curation CAS exists
- Delete curation CAS as part of bulk reset
reckart added a commit that referenced this issue Apr 30, 2024
@reckart
Merge pull request #4776 from inception-project/bugfix/4739-Auto-merg…
f4e3687 
…e-on-open-document-in-curation-mode

#4739 - Auto-merge on open document in curation mode
@reckart reckart added this to 🔖 To do in Kanban via automation Apr 30, 2024
@reckart reckart self-assigned this Apr 30, 2024
@reckart reckart closed this as completed Apr 30, 2024
Kanban automation moved this from 🔖 To do to 🍹 Done Apr 30, 2024
reckart added a commit that referenced this issue Apr 30, 2024
@reckart
Merge branch 'release/32.x'
ac7910a 
* release/32.x:
  #4739 - Auto-merge on open document in curation mode
  #4774 - Ability to not reset curation when performing a manual merge (sidebar curation)
  #4772 - Repair to trim whitespace off annotations
  #4769 - Cannot export CAS RDF

% Conflicts:
%	inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMerge.java
%	inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationMergeServiceImpl.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java
reckart added a commit that referenced this issue May 2, 2024
@reckart
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
e5bdb45 
* main: (110 commits)
  #4787 - When re-merging a document CASMetadata is not retained
  #4785 - Upgrade dependencies
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  #4768 - Bulk curation
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-32.1
  #4782 - Avoid duplicate key error when importing documents very rapidly
  #4780 - Optionally include example documents in project templates
  #4778 - Links and other active elements in PDFs interfere with annotation and should be disabled
  #4739 - Auto-merge on open document in curation mode
  #4774 - Ability to not reset curation when performing a manual merge (sidebar curation)
  #4772 - Repair to trim whitespace off annotations
  #4769 - Cannot export CAS RDF
  #4768 - Bulk curation
  #4766 - Add ID column to documents table in dev mode
  #4764 - No longer force-enable server-side timings when dev mode is disabled
  #4762 - Re-merging via the curation sidebar always uses the project settings instead of the dialog settings
  ...

% Conflicts:
%	inception/inception-dependencies/pom.xml
%	inception/inception-diam-editor/pom.xml
%	inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamAnnotationBrowser.java
%	inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java
%	inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java
%	inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java
%	inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/config/InviteServiceAutoConfiguration.java
%	inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java
%	inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/config/CurationUIAutoConfiguration.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java
%	inception/inception-ui-dashboard-activity/pom.xml
%	inception/inception-ui-kb/pom.xml
%	inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java
%	pom.xml
reckart added a commit that referenced this issue May 3, 2024
@reckart
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
d96c29f 
* main: (110 commits)
  #4787 - When re-merging a document CASMetadata is not retained
  #4785 - Upgrade dependencies
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  #4768 - Bulk curation
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-32.1
  #4782 - Avoid duplicate key error when importing documents very rapidly
  #4780 - Optionally include example documents in project templates
  #4778 - Links and other active elements in PDFs interfere with annotation and should be disabled
  #4739 - Auto-merge on open document in curation mode
  #4774 - Ability to not reset curation when performing a manual merge (sidebar curation)
  #4772 - Repair to trim whitespace off annotations
  #4769 - Cannot export CAS RDF
  #4768 - Bulk curation
  #4766 - Add ID column to documents table in dev mode
  #4764 - No longer force-enable server-side timings when dev mode is disabled
  #4762 - Re-merging via the curation sidebar always uses the project settings instead of the dialog settings
  ...

% Conflicts:
%	inception/inception-dependencies/pom.xml
%	inception/inception-diam-editor/pom.xml
%	inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamAnnotationBrowser.java
%	inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java
%	inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java
%	inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java
%	inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/config/InviteServiceAutoConfiguration.java
%	inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java
%	inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/config/CurationUIAutoConfiguration.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java
%	inception/inception-ui-dashboard-activity/pom.xml
%	inception/inception-ui-kb/pom.xml
%	inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java
%	pom.xml
reckart added a commit that referenced this issue May 3, 2024
@reckart
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
c85d4e4 
* main: (110 commits)
  #4787 - When re-merging a document CASMetadata is not retained
  #4785 - Upgrade dependencies
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  #4768 - Bulk curation
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-32.1
  #4782 - Avoid duplicate key error when importing documents very rapidly
  #4780 - Optionally include example documents in project templates
  #4778 - Links and other active elements in PDFs interfere with annotation and should be disabled
  #4739 - Auto-merge on open document in curation mode
  #4774 - Ability to not reset curation when performing a manual merge (sidebar curation)
  #4772 - Repair to trim whitespace off annotations
  #4769 - Cannot export CAS RDF
  #4768 - Bulk curation
  #4766 - Add ID column to documents table in dev mode
  #4764 - No longer force-enable server-side timings when dev mode is disabled
  #4762 - Re-merging via the curation sidebar always uses the project settings instead of the dialog settings
  ...

% Conflicts:
%	inception/inception-dependencies/pom.xml
%	inception/inception-diam-editor/pom.xml
%	inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamAnnotationBrowser.java
%	inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java
%	inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java
%	inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java
%	inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/config/InviteServiceAutoConfiguration.java
%	inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java
%	inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/config/CurationUIAutoConfiguration.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java
%	inception/inception-ui-dashboard-activity/pom.xml
%	inception/inception-ui-kb/pom.xml
%	inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java
%	pom.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@reckart reckart

Labels
🐛Bug Something isn't working Module: Curation
Projects
Kanban
  
🍹 Done
Milestone
32.1
Development

No branches or pull requests
2 participants
@reckart @UWinch