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

Ensure annotations on empty entries in notebook are not lost #6525

Merged
merged 21 commits into from
Apr 4, 2023

Conversation

scottbell
Copy link
Contributor

@scottbell scottbell commented Mar 30, 2023

Closes #6156 #6411

Describe your changes:

Don't (sometimes) delete entries if text is empty. Select and focus entries when created.

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 Mar 30, 2023 that may be closed by this pull request
2 tasks
@scottbell scottbell linked an issue Mar 30, 2023 that may be closed by this pull request
7 tasks
@codecov
Copy link

codecov bot commented Mar 30, 2023

Codecov Report

Merging #6525 (78b993e) into master (bc3a540) will increase coverage by 0.01%.
The diff coverage is 40.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6525      +/-   ##
==========================================
+ Coverage   54.74%   54.76%   +0.01%     
==========================================
  Files         628      628              
  Lines       26802    26805       +3     
  Branches     2421     2422       +1     
==========================================
+ Hits        14673    14680       +7     
+ Misses      11465    11459       -6     
- Partials      664      666       +2     
Flag Coverage Δ *Carryforward flag
e2e-ci 39.34% <ø> (ø) Carriedforward from ae8250d
e2e-full 51.06% <ø> (ø) Carriedforward from ae8250d
e2e-stable 55.57% <100.00%> (+0.08%) ⬆️
unit 48.93% <0.00%> (-0.05%) ⬇️

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

Impacted Files Coverage Δ
src/plugins/notebook/components/Notebook.vue 20.39% <0.00%> (-0.24%) ⬇️
src/plugins/notebook/components/NotebookEntry.vue 17.74% <0.00%> (+0.94%) ⬆️
src/plugins/notebook/utils/notebook-entries.js 81.44% <100.00%> (+1.22%) ⬆️

... and 5 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 bc3a540...78b993e. Read the comment docs.

Copy link
Collaborator

@unlikelyzero unlikelyzero left a comment

Choose a reason for hiding this comment

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

This looks great, but there are several references in this script to remove

// TODO can be removed with fix for https://github.com/nasa/openmct/issues/6411
await page.locator('[aria-label="Notebook Entry"].is-selected div.c-ne__text').click();

@unlikelyzero unlikelyzero added the pr:e2e:couchdb npm run test:e2e:couchdb label Mar 31, 2023
Copy link
Member

@ozyx ozyx left a comment

Choose a reason for hiding this comment

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

LGTM

@ozyx ozyx added this to the Target: 2.2.2 milestone Apr 4, 2023
@ozyx ozyx merged commit 2e60da0 into master Apr 4, 2023
@ozyx ozyx deleted the 6156-annotations-on-empty-entries-in-notebook-are-lost branch April 4, 2023 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr:e2e:couchdb npm run test:e2e:couchdb
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot add annotations on newly create notebook entry Annotations on empty entries in notebook are lost
3 participants