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.

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

Have annotations work with domain objects that have dots #7065

Merged

Conversation

scottbell
Copy link
Contributor

@scottbell scottbell commented Sep 18, 2023

Closes #7063

Describe your changes:

  • Change the targets in the annotation object to an array to allow CouchDB to search it properly when . are in the keyString.
  • Add option for Map/Reduce view to CouchDB to afford 10-800x speedup in annotation searches.
  • Fix (hopefully) flakey plot tagging tests.

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Is this change backwards compatible? For example, developers won't need to change how they are calling the API or how they've extended core plugins such as Tables or Plots.

Author Checklist

  • Changes address original issue?
  • Tests included and/or updated with changes?
  • Command line build passes?
  • Has this been smoke tested?
  • Testing instructions included in associated issue OR is this a dependency/testcase change?

Reviewer Checklist

  • Changes appear to address issue?
  • Reviewer has tested changes by following the provided instructions?
  • Changes appear not to be breaking changes?
  • Appropriate automated tests included?
  • Code style and in-line documentation are appropriate?
  • Has associated issue been labelled unverified? (only applicable if this PR closes the issue)
  • Has associated issue been labelled bug? (only applicable if this PR is for a bug fix)

@scottbell scottbell linked an issue Sep 18, 2023 that may be closed by this pull request
7 tasks
@deploysentinel
Copy link

deploysentinel bot commented Sep 18, 2023

Current Playwright Test Results Summary

✅ 14 Passing

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 09/21/2023 08:59:26am UTC)

Run Details

Running Workflow e2e-couchdb on Github Actions

Commit: 287e019

Started: 09/21/2023 08:57:30am UTC

View Detailed Build Results


Current Playwright Test Results Summary

✅ 139 Passing - ⚠️ 4 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 09/21/2023 08:59:26am UTC)

Run Details

Running Job e2e-stable on CircleCI

Commit: 287e019

Started: 09/21/2023 08:32:04am UTC

⚠️ Flakes

📄   functional/plugins/plot/logPlot.e2e.spec.js • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Log plot tests Log Plot ticks are functionally correct in regular and log mode and after refresh
Retry 1Initial Attempt
6.09% (7) 7 / 115 runs
failed over last 7 days
27.83% (32) 32 / 115 runs
flaked over last 7 days

📄   functional/plugins/notebook/restrictedNotebook.e2e.spec.js • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Restricted Notebook with a page locked and with an embed @addinit Allows embeds to be deleted if page unlocked @addinit
Retry 1Initial Attempt
0% (0) 0 / 115 runs
failed over last 7 days
45.22% (52) 52 / 115 runs
flaked over last 7 days

📄   functional/planning/timelist.e2e.spec.js • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Time List Create a Time List, add a single Plan to it and verify all the activities are displayed with no milliseconds
Retry 1Initial Attempt
1.36% (2) 2 / 147 runs
failed over last 7 days
50.34% (74) 74 / 147 runs
flaked over last 7 days

📄   functional/plugins/notebook/notebookSnapshots.e2e.spec.js • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Snapshot image tests Can drop an image onto a notebook and create a new entry
Retry 1Initial Attempt
1.61% (1) 1 / 62 run
failed over last 7 days
80.65% (50) 50 / 62 runs
flaked over last 7 days

View Detailed Build Results


@codecov
Copy link

codecov bot commented Sep 18, 2023

Codecov Report

Merging #7065 (287e019) into master (05c7a81) will increase coverage by 0.07%.
The diff coverage is 27.27%.

@@            Coverage Diff             @@
##           master    #7065      +/-   ##
==========================================
+ Coverage   55.22%   55.29%   +0.07%     
==========================================
  Files         649      649              
  Lines       26041    26055      +14     
  Branches     2547     2547              
==========================================
+ Hits        14381    14407      +26     
+ Misses      10970    10956      -14     
- Partials      690      692       +2     
Flag Coverage Δ *Carryforward flag
e2e-full 41.92% <ø> (-0.08%) ⬇️ Carriedforward from 21b7bba
e2e-stable 57.35% <24.52%> (-0.05%) ⬇️
unit 48.70% <24.24%> (+0.09%) ⬆️

*This pull request uses carry forward flags. Click here to find out more.

Files Changed Coverage Δ
...c/plugins/imagery/components/AnnotationsCanvas.vue 2.66% <0.00%> (+0.03%) ⬆️
...ctorViews/annotations/AnnotationsInspectorView.vue 0.00% <0.00%> (ø)
...gins/inspectorViews/annotations/tags/TagEditor.vue 0.00% <ø> (ø)
...ins/notebook/actions/ExportNotebookAsTextAction.js 50.00% <0.00%> (-0.65%) ⬇️
src/plugins/notebook/components/Notebook.vue 18.42% <ø> (ø)
...ugins/notebook/monkeyPatchObjectAPIForNotebooks.js 17.18% <0.00%> (-0.85%) ⬇️
src/ui/layout/search/AnnotationSearchResult.vue 39.13% <ø> (+5.16%) ⬆️
...c/plugins/persistence/couch/CouchObjectProvider.js 88.20% <6.25%> (-4.06%) ⬇️
...c/plugins/persistence/couch/CouchSearchProvider.js 74.00% <8.33%> (-21.75%) ⬇️
src/plugins/plot/MctPlot.vue 36.46% <20.00%> (+0.09%) ⬆️
... and 3 more

... and 7 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 05c7a81...287e019. Read the comment docs.

@scottbell scottbell changed the title Have annotations work with domain objects that have dots 1 Have annotations work with domain objects that have dots Sep 18, 2023
@scottbell scottbell added the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 18, 2023
@scottbell scottbell marked this pull request as ready for review September 18, 2023 21:00
@scottbell scottbell requested a review from ozyx September 18, 2023 21:01
@scottbell
Copy link
Contributor Author

@ozyx I think we'll need to change map annotations too - both the way they do selections and the way we create annotations as target related stuff are now arrays of objects with a keyString attribute.

@github-actions github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 18, 2023
@scottbell scottbell requested a review from akhenry September 19, 2023 13:33
@scottbell scottbell added the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 19, 2023
@github-actions github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 19, 2023
@scottbell scottbell added the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 19, 2023
@github-actions github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 19, 2023
@scottbell scottbell added the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 19, 2023
@github-actions github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 19, 2023
@scottbell scottbell added the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 19, 2023
@github-actions github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 19, 2023
@scottbell scottbell added the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 20, 2023
@github-actions github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 20, 2023
@scottbell scottbell added the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 21, 2023
@github-actions github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 21, 2023
@scottbell scottbell added the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 21, 2023
@github-actions github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Sep 21, 2023
Copy link
Contributor

@akhenry akhenry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks!

@akhenry akhenry merged commit 482f1f6 into master Sep 21, 2023
10 checks passed
@akhenry akhenry deleted the 7063-have-annotations-work-with-domain-objects-that-have-dots-1 branch September 21, 2023 20:50
@akhenry akhenry added this to the Target:3.0.2 milestone Sep 21, 2023
ozyx pushed a commit that referenced this pull request Sep 21, 2023
…ve dots

* migrating to new structure - wip

* notebooks work, now to plots and images

* resolve conflicts

* fix search

* add to readme

* spelling

* fix unit test

* add search by view for big search speedup

* spelling

* fix out of order search

* improve reliability of plot tagging tests
ozyx added a commit that referenced this pull request Sep 21, 2023
…ve dots

* migrating to new structure - wip

* notebooks work, now to plots and images

* resolve conflicts

* fix search

* add to readme

* spelling

* fix unit test

* add search by view for big search speedup

* spelling

* fix out of order search

* improve reliability of plot tagging tests
shefalijoshi pushed a commit that referenced this pull request Sep 21, 2023
#7078)

cherry-pick(#7065): Have annotations work with domain objects that have dots

* migrating to new structure - wip

* notebooks work, now to plots and images

* resolve conflicts

* fix search

* add to readme

* spelling

* fix unit test

* add search by view for big search speedup

* spelling

* fix out of order search

* improve reliability of plot tagging tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Have annotations work with domain objects that have dots
2 participants