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

2.1.0 backmerge into master #5784

Merged
merged 6 commits into from
Sep 19, 2022
Merged

2.1.0 backmerge into master #5784

merged 6 commits into from
Sep 19, 2022

Conversation

shefalijoshi
Copy link
Contributor

@shefalijoshi shefalijoshi commented Sep 19, 2022

Describe your changes:

Merging 2.1.0 back into master

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?
  • Changes appear not to be breaking changes?
  • Appropriate unit tests included?
  • Code style and in-line documentation are appropriate?
  • Commit messages meet standards?
  • 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)

shefalijoshi and others added 5 commits September 12, 2022 09:12
…se mode (#5750)

* Modify flexible layout pages to make them not draggable in browse mode and add e2e test
* Check if the domain object is set (mounted is done) before trying to destroy the mutable

* Use optional chaining. Add mutable promise check to prevent memory leaks
* Set priority of couch requests to high
* Set priority of image requests to low
* Add e2e test for low-priority images
* Initialize full view for fixed time

* Clean up

* Add back in ticker after merge

* Check for undefined clock instead of timestamp

* Cleanup

* Initialize full view for fixed time

* Clean up

* Add back in ticker after merge

* Check for undefined clock instead of timestamp

* Cleanup

* Update timestamp method and remove from beforeDestroy

* Shorten ternary to optional chaining

* Cleanup unused var

* Moved duplicated logic to method

* Reorder methods

* Update Timelist.vue

Set timestamp to clock start when in fixed time

* Added blank line

* Lint fix

* Update pluginSpec.js

* Invoke currentValue method properly
@shefalijoshi shefalijoshi requested review from unlikelyzero and ozyx and removed request for unlikelyzero September 19, 2022 17:10
@codecov
Copy link

codecov bot commented Sep 19, 2022

Codecov Report

Merging #5784 (0e7ce84) into master (07bf85a) will decrease coverage by 0.53%.
The diff coverage is 31.25%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5784      +/-   ##
==========================================
- Coverage   54.52%   53.99%   -0.54%     
==========================================
  Files         597      597              
  Lines       22529    22604      +75     
  Branches     2065     2071       +6     
==========================================
- Hits        12285    12206      -79     
- Misses       9668     9817     +149     
- Partials      576      581       +5     
Flag Coverage Δ *Carryforward flag
e2e-ci 39.49% <ø> (ø) Carriedforward from 07bf85a
e2e-full 51.23% <ø> (ø) Carriedforward from 07bf85a
e2e-stable 48.75% <ø> (+<0.01%) ⬆️
unit 50.47% <31.25%> (-0.70%) ⬇️

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

Impacted Files Coverage Δ
...plugins/displayLayout/components/SubobjectView.vue 9.30% <0.00%> (ø)
...plugins/displayLayout/components/TelemetryView.vue 2.77% <0.00%> (ø)
...ugins/flexibleLayout/components/flexibleLayout.vue 7.69% <0.00%> (-0.13%) ⬇️
src/plugins/flexibleLayout/components/frame.vue 0.00% <0.00%> (ø)
src/plugins/imagery/components/ImageryView.vue 39.95% <ø> (ø)
...c/plugins/persistence/couch/CouchObjectProvider.js 51.29% <ø> (-6.48%) ⬇️
src/plugins/timeline/TimelineObjectView.vue 38.70% <0.00%> (ø)
src/plugins/timelist/Timelist.vue 58.49% <55.55%> (+1.34%) ⬆️
.../telemetryTable/components/table-configuration.vue 0.00% <0.00%> (-43.25%) ⬇️
src/ui/inspector/InspectorViews.vue 64.28% <0.00%> (-28.58%) ⬇️
... and 17 more

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 07bf85a...0e7ce84. Read the comment docs.

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 merged commit f39419b into master Sep 19, 2022
@ozyx ozyx deleted the 2.1.0-master branch September 19, 2022 17:18
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.

None yet

5 participants