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

Merge 1.8.1 into master #4562

Merged
merged 14 commits into from
Dec 13, 2021
Merged

Merge 1.8.1 into master #4562

merged 14 commits into from
Dec 13, 2021

Conversation

shefalijoshi
Copy link
Contributor

@shefalijoshi shefalijoshi commented Dec 10, 2021 •
edited
Loading

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

shefalijoshi and others added 13 commits November 15, 2021 14:27
@shefalijoshi
Transaction fix (#4421) (#4461)
9c52ec7 
* When transaction is active, objects.get should search in dirty object first.
@davetsay @nikhilmandlik @akhenry
Bugfix/create tree node (#4472)
9cb743f 
* Transaction fix (#4421)

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

Co-authored-by: Andrew Henry <[email protected]>

* 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 <[email protected]>
Co-authored-by: Andrew Henry <[email protected]>
@michaelrogers
Changed descending to ascending in sort order method (#4480)
340246a
@jvigliotta
adding RAF to display layout alphanumerics (#4486)
cb55500
@jvigliotta @nikhilmandlik @akhenry
[Tabs] Sizing of offscreen tabs causing issues (#4444)
26aa49d 
Co-authored-by: Nikhil <[email protected]>
Co-authored-by: Andrew Henry <[email protected]>
@jvigliotta
[LAD Tables] Use RAF for updating template (#4500)
ad22661
@akhenry
Fixes LAD rows for string telemetry (#4508)
858de56 
* Fixes LAD rows for string telemetry
* saving the object if it was missing (#4471)
@shefalijoshi
Merge branch 'release/1.8.1' of https://github.com/nasa/openmct into …
b21db2e 
…release/1.8.1
@michaelrogers @jvigliotta
4328 - Maintain reference to a focusedImage if the bounds change (#4545)
44cbd3f 
* 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

Co-authored-by: Jamie Vigliotta <[email protected]>
@nikhilmandlik
imported objects are not persisting (#4477)
a2301e6 
* imported objects are not persisting #4470
* disabled karma spec reporter suppressErrorSummary
@shefalijoshi
Merge branch 'release/1.8.1' of https://github.com/nasa/openmct into …
6bea39c 
…release/1.8.1
@shefalijoshi
update version number
8af947b
@shefalijoshi
Merge branch 'master' of https://github.com/nasa/openmct into master-…
3299556 
…1.8.1
@codecov
Copy link

codecov bot commented Dec 10, 2021 •
edited
Loading

Codecov Report

Merging #4562 (88ec72d) into master (7c4258d) will decrease coverage by 0.02%.
The diff coverage is 37.14%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4562      +/-   ##
==========================================
- Coverage   56.83%   56.81%   -0.03%     
==========================================
  Files         727      727              
  Lines       22819    22872      +53     
  Branches     1628     1646      +18     
==========================================
+ Hits        12970    12994      +24     
- Misses       9445     9466      +21     
- Partials      404      412       +8
Impacted Files Coverage Δ
...plugins/displayLayout/components/TelemetryView.vue 2.52% <0.00%> (-0.16%) ⬇️
src/ui/layout/mct-tree.vue 12.21% <0.00%> (-0.68%) ⬇️
src/plugins/imagery/components/ImageryView.vue 35.71% <18.75%> (-1.06%) ⬇️
src/plugins/LADTable/components/LADRow.vue 52.11% <67.64%> (+6.08%) ⬆️
src/plugins/tabs/components/tabs.vue 36.80% <72.22%> (+7.82%) ⬆️
src/ui/components/ObjectView.vue 43.64% <0.00%> (+0.55%) ⬆️

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 7c4258d...88ec72d. Read the comment docs.

unlikelyzero
unlikelyzero suggested changes Dec 13, 2021
View reviewed changes
Copy link
Contributor

@unlikelyzero unlikelyzero left a comment •
edited
Loading

Choose a reason for hiding this comment

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

are we leaving ImportASJSONAction.js empty?

@unlikelyzero unlikelyzero self-requested a review December 13, 2021 19:18
@unlikelyzero unlikelyzero merged commit bba29b0 into master Dec 13, 2021
@unlikelyzero unlikelyzero deleted the master-1.8.1 branch December 13, 2021 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@unlikelyzero unlikelyzero unlikelyzero approved these changes

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

Successfully merging this pull request may close these issues.
7 participants
@shefalijoshi @unlikelyzero @davetsay @michaelrogers @jvigliotta @akhenry @nikhilmandlik