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

Bugfix/create tree node #4472

Merged
merged 10 commits into from
Nov 18, 2021
Merged

Bugfix/create tree node #4472

merged 10 commits into from
Nov 18, 2021

Conversation

davetsay
Copy link
Contributor

@davetsay davetsay commented Nov 17, 2021 •
edited
Loading

Fixes #4464

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?
  • [NA] Unit tests included and/or updated with changes?
  • Command line build passes?
  • Has this been smoke tested?
  • Testing instructions included in associated issue?

nikhilmandlik and others added 6 commits November 15, 2021 14:20
@nikhilmandlik @akhenry
Transaction fix (#4421)
c8723da 
* When transaction is active, objects.get should search in dirty object first.

Co-authored-by: Andrew Henry <akhenry@gmail.com>
@davetsay
find insert location prior to adding item to tree
7fb9080
@davetsay
no need to resort
718f200 
add item should only add to direct descendants
@davetsay
remove unused function
57479d6
@davetsay
copy composition before sorting
6549236
@davetsay
remove unused var
30615c3
@codecov
Copy link

codecov bot commented Nov 17, 2021 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release/1.8.1@9c52ec7). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff                @@
##             release/1.8.1    #4472   +/-   ##
================================================
  Coverage                 ?   69.78%           
================================================
  Files                    ?     1029           
  Lines                    ?    36820           
  Branches                 ?     1584           
================================================
  Hits                     ?    25693           
  Misses                   ?    10732           
  Partials                 ?      395

Continue to review full report at Codecov.

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

@davetsay davetsay changed the base branch from master to release/1.8.1 November 18, 2021 04:37
michaelrogers
michaelrogers previously approved these changes Nov 18, 2021
View reviewed changes
Copy link
Contributor

@michaelrogers michaelrogers 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 good to me. I like the externalization of the isSortable method. I think that improves the readability of the code execution.

jvigliotta
jvigliotta requested changes Nov 18, 2021
View reviewed changes
Copy link
Contributor

@jvigliotta jvigliotta left a comment

Choose a reason for hiding this comment

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

Looks awesome! I think we just need to account for open child folders like we talked about.

jvigliotta
jvigliotta approved these changes Nov 18, 2021
View reviewed changes
Copy link
Contributor

@jvigliotta jvigliotta left a comment

Choose a reason for hiding this comment

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

LGTM!

@jvigliotta jvigliotta merged commit 9cb743f into release/1.8.1 Nov 18, 2021
@davetsay davetsay deleted the bugfix/create-tree-node branch November 18, 2021 20:50
nikhilmandlik added a commit that referenced this pull request Nov 24, 2021
@davetsay @nikhilmandlik @akhenry
Bugfix/create tree node (#4472)
396b84d 
* Transaction fix (#4421)

* When transaction is active, objects.get should search in dirty object first.

Co-authored-by: Andrew Henry <akhenry@gmail.com>

* find insert location prior to adding item to tree

* no need to resort

add item should only add to direct descendants

* remove unused function

* copy composition before sorting

* remove unused var

* remove master pollution

* Revert "remove master pollution"

This reverts commit 93bee13.

* add item to correct location

Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
Co-authored-by: Andrew Henry <akhenry@gmail.com>
unlikelyzero pushed a commit that referenced this pull request Dec 13, 2021
@shefalijoshi
Merge 1.8.1 into master (#4562)
bba29b0 
* Transaction fix (#4421) (#4461)
* When transaction is active, objects.get should search in dirty object first.
* Bugfix/create tree node (#4472)
* Transaction fix (#4421)
* When transaction is active, objects.get should search in dirty object first.
* find insert location prior to adding item to tree
* no need to resort
* add item should only add to direct descendants
* remove unused function
* copy composition before sorting
* remove unused var
* remove master pollution
* Revert "remove master pollution"
* add item to correct location
* Changed descending to ascending in sort order method (#4480)
* adding RAF to display layout alphanumerics (#4486)
* [Tabs] Sizing of offscreen tabs causing issues (#4444)
* [LAD Tables] Use RAF for updating template (#4500)
* Fixes LAD rows for string telemetry (#4508)
* Fixes LAD rows for string telemetry
* saving the object if it was missing (#4471)
* 4328 - Maintain reference to a focusedImage if the bounds change (#4545)
* WIP: adding assertions to catch negative index state
* just testing the flow
* SUpdate the image history index to previous selected image
* Cleaning up spacing and log statements
* Converted focusedImageIndex assignment to ternary and general cleanup
* imported objects are not persisting  (#4477)
* imported objects are not persisting #4470
* disabled karma spec reporter suppressErrorSummary
* update version number
* Delete importFromJsonAction directory since it was empty
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jvigliotta jvigliotta jvigliotta approved these changes

@michaelrogers michaelrogers michaelrogers left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

New objects sporadically overlap in treeview
4 participants
@davetsay @michaelrogers @jvigliotta @nikhilmandlik