Plan rendering inside a timestrip #6852

shefalijoshi · 2023-07-28T06:00:49Z

Describe your changes:

Use the width and height of the container of the plan to set the activity widths and now markers
TimeSystemAxis always uses the value of global clock now()

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)

…vity widths and now markers

deploysentinel · 2023-07-28T06:04:59Z

Current Playwright Test Results Summary

✅ 14 Passing - ⚠️ 2 Flaky

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

(Last updated on 07/28/2023 04:50:21pm UTC)

Run Details

Running Workflow e2e-couchdb on Github Actions

Commit: b68f179

Started: 07/28/2023 04:46:37pm UTC

⚠️ Flakes

📄 functional/plugins/displayLayout/displayLayout.e2e.spec.js • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Display Layout When multiple plots are contained in a layout, we only ask for annotations once @couchdb Retry 1 • Initial Attempt	5.41% (2) 2 / 37 runs failed over last 7 days	13.51% (5) 5 / 37 runs flaked over last 7 days

📄 functional/couchdb.e2e.spec.js • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
CouchDB Status Indicator with mocked responses @couchdb Shows red if not connected Retry 1 • Initial Attempt	0% (0) 0 / 37 runs failed over last 7 days	8.11% (3) 3 / 37 runs flaked over last 7 days

View Detailed Build Results

Current Playwright Test Results Summary

✅ 131 Passing - ⚠️ 4 Flaky

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

(Last updated on 07/28/2023 04:50:21pm UTC)

Run Details

Running Job e2e-stable on CircleCI

Commit: b68f179

Started: 07/28/2023 04:44:05pm UTC

⚠️ Flakes

📄 functional/plugins/imagery/exampleImagery.e2e.spec.js • 3 Flakes

Top 1 Common Error Messages

`null`	3 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Example Imagery Object Can use independent time conductor to change time Retry 1 • Initial Attempt	14.55% (8) 8 / 55 runs failed over last 7 days	16.36% (9) 9 / 55 runs flaked over last 7 days
Example Imagery in Display Layout View Large action pauses imagery when in realtime and returns to realtime Retry 1 • Initial Attempt	2.13% (1) 1 / 47 run failed over last 7 days	10.64% (5) 5 / 47 runs flaked over last 7 days
Example Imagery in Display Layout Toggle layer visibility by clicking on label Retry 1 • Initial Attempt	0% (0) 0 / 45 runs failed over last 7 days	6.67% (3) 3 / 45 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 1 • Initial Attempt	5.13% (4) 4 / 78 runs failed over last 7 days	2.56% (2) 2 / 78 runs flaked over last 7 days

View Detailed Build Results

codecov · 2023-07-28T06:09:40Z

Codecov Report

Merging #6852 (b68f179) into master (d4e51cb) will increase coverage by 0.01%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #6852      +/-   ##
==========================================
+ Coverage   48.20%   48.22%   +0.01%     
==========================================
  Files         643      643              
  Lines       25615    25618       +3     
  Branches     2509     2507       -2     
==========================================
+ Hits        12347    12353       +6     
+ Misses      12791    12790       -1     
+ Partials      477      475       -2

Flag	Coverage Δ		*Carryforward flag
e2e-full	`41.97% <ø> (ø)`		Carriedforward from 7c58b19
e2e-stable	`56.32% <ø> (+0.03%)`	⬆️
unit	`38.73% <0.00%> (+<0.01%)`	⬆️

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

Files Changed	Coverage Δ
src/plugins/plan/components/Plan.vue	`56.57% <0.00%> (+0.63%)`	⬆️
src/plugins/timeline/TimelineViewLayout.vue	`1.51% <0.00%> (-0.13%)`	⬇️
src/ui/components/TimeSystemAxis.vue	`6.66% <0.00%> (+0.31%)`	⬆️

... and 2 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 d4e51cb...b68f179. Read the comment docs.

scottbell · 2023-07-28T14:02:19Z

src/plugins/timeline/TimelineViewLayout.vue


      if (!clientHeight) {
        //this is a hack - need a better way to find the parent of this component
-        let parent = this.openmct.layout.$refs.browseObject.$el;
+        let parent = this.$el.closest('.c-object-view');


can we use $parent here?

No we can't.

What’s the issue here?

scottbell · 2023-07-28T15:35:02Z

I'd tried adding a plan into a timestrip into the first column of a Flexible Display Layout with three columns, and then the plan object into the last two columns and got this:

Is this expected?

jvigliotta · 2023-07-28T16:49:07Z

src/plugins/timeline/TimelineViewLayout.vue

@@ -92,6 +94,10 @@ export default {
      this.composition.on('reorder', this.reorder);
      this.composition.load();
    }
+
+    this.handleContentResize = _.debounce(this.handleContentResize, 500);


We can use this guy now instead of importing lodash: https://github.com/nasa/openmct/blob/master/src/utils/debounce.js

shefalijoshi · 2023-07-28T17:24:28Z

Yes, this looks fine. The horizontal width will determine the size of the activity rectangles.

shefalijoshi added 2 commits July 27, 2023 22:41

Use the width and height of the container of the plan to set the acti…

803ac7d

…vity widths and now markers

Use the right parent to determine height and width

394cd5c

shefalijoshi requested a review from ozyx July 28, 2023 06:02

Merge branch 'master' into fix-plan-in-timestrip

e1380c6

khalidadil approved these changes Jul 28, 2023

View reviewed changes

scottbell reviewed Jul 28, 2023

View reviewed changes

ozyx added the pr:e2e:couchdb npm run test:e2e:couchdb label Jul 28, 2023

ozyx added this to the Target:3.0.0 milestone Jul 28, 2023

Merge branch 'master' into fix-plan-in-timestrip

b68f179

ozyx added pr:e2e:couchdb npm run test:e2e:couchdb and removed pr:e2e:couchdb npm run test:e2e:couchdb labels Jul 28, 2023

ozyx enabled auto-merge (squash) July 28, 2023 16:42

ozyx disabled auto-merge July 28, 2023 16:46

github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Jul 28, 2023

jvigliotta reviewed Jul 28, 2023

View reviewed changes

shefalijoshi merged commit 3c2b032 into master Jul 28, 2023

shefalijoshi deleted the fix-plan-in-timestrip branch July 28, 2023 17:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Plan rendering inside a timestrip #6852

Plan rendering inside a timestrip #6852

shefalijoshi commented Jul 28, 2023 •

edited

Loading

deploysentinel bot commented Jul 28, 2023 •

edited

Loading

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

codecov bot commented Jul 28, 2023 •

edited

Loading

scottbell Jul 28, 2023

shefalijoshi Jul 28, 2023

scottbell Jul 28, 2023

scottbell commented Jul 28, 2023

jvigliotta Jul 28, 2023

shefalijoshi commented Jul 28, 2023

Plan rendering inside a timestrip #6852

Plan rendering inside a timestrip #6852

Conversation

shefalijoshi commented Jul 28, 2023 • edited Loading

Describe your changes:

All Submissions:

Author Checklist

Reviewer Checklist

deploysentinel bot commented Jul 28, 2023 • edited Loading

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Test Case Results

Current Playwright Test Results Summary

⚠️ Flakes

Top 1 Common Error Messages

Test Case Results

Test Case Results

codecov bot commented Jul 28, 2023 • edited Loading

Codecov Report

scottbell Jul 28, 2023

Choose a reason for hiding this comment

shefalijoshi Jul 28, 2023

Choose a reason for hiding this comment

scottbell Jul 28, 2023

Choose a reason for hiding this comment

scottbell commented Jul 28, 2023

jvigliotta Jul 28, 2023

Choose a reason for hiding this comment

shefalijoshi commented Jul 28, 2023

shefalijoshi commented Jul 28, 2023 •

edited

Loading

deploysentinel bot commented Jul 28, 2023 •

edited

Loading

codecov bot commented Jul 28, 2023 •

edited

Loading