Allow specification of swimlanes via configuration #7200

shefalijoshi · 2023-11-03T17:20:48Z

Also see: viper-openmct PR 202

Describe your changes:

Read the groupIds (swimlanes) configuration and use it to order the plan view swimlanes. If there is no grouIds configuration, use the activities to get the groups like before.

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)

…instead.

deploysentinel · 2023-11-03T17:25:05Z

Current Playwright Test Results Summary

✅ 165 Passing - ⚠️ 2 Flaky

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

(Last updated on 12/14/2023 02:19:22pm UTC)

Run Details

Running Job e2e-stable on CircleCI

Commit: e1ad784

Started: 12/14/2023 02:11:32pm UTC

⚠️ Flakes

📄 functional/plugins/plot/logPlot.e2e.spec.js • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Log plot tests Log Plot ticks are functionally correct in regular and log mode and after refresh Retry 1 • Initial Attempt	0% (0) 0 / 34 runs failed over last 7 days	29.41% (10) 10 / 34 runs flaked over last 7 days

📄 functional/plugins/notebook/notebookSnapshots.e2e.spec.js • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Snapshot image tests Can drop an image onto a notebook and create a new entry Retry 1 • Initial Attempt	0% (0) 0 / 33 runs failed over last 7 days	57.58% (19) 19 / 33 runs flaked over last 7 days

View Detailed Build Results

Current Playwright Test Results Summary

✅ 15 Passing

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

(Last updated on 12/14/2023 02:19:22pm UTC)

Run Details

Running Workflow e2e-couchdb on Github Actions

Commit: e1ad784

Started: 12/14/2023 02:12:20pm UTC

View Detailed Build Results

codecov · 2023-11-06T19:09:09Z

Codecov Report

Merging #7200 (1925420) into master (3520a92) will increase coverage by 0.92%.
The diff coverage is 80.76%.

❗ Current head 1925420 differs from pull request most recent head e1ad784. Consider uploading reports for the commit e1ad784 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7200      +/-   ##
==========================================
+ Coverage   54.99%   55.92%   +0.92%     
==========================================
  Files         655      655              
  Lines       26297    26316      +19     
  Branches     2541     2543       +2     
==========================================
+ Hits        14462    14717     +255     
+ Misses      11125    10888     -237     
- Partials      710      711       +1

Flag	Coverage Δ		*Carryforward flag
e2e-full	`41.86% <ø> (+0.02%)`	⬆️	Carriedforward from 800b03a
e2e-stable	`58.41% <86.36%> (+3.45%)`	⬆️
unit	`49.20% <61.53%> (+<0.01%)`	⬆️

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

Files	Coverage Δ
src/plugins/plan/components/PlanView.vue	`55.65% <100.00%> (-0.49%)`	⬇️
src/plugins/timeline/TimelineViewLayout.vue	`50.74% <0.00%> (-0.77%)`	⬇️
src/plugins/timelist/TimelistComponent.vue	`58.67% <50.00%> (-0.61%)`	⬇️
src/plugins/plan/util.js	`45.83% <86.36%> (+19.36%)`	⬆️

... and 49 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 3520a92...e1ad784. Read the comment docs.

jvigliotta

Found one small optional formatting change, otherwise good to go from my end. Up to you if you want to change it. Nice work!

jvigliotta · 2023-11-21T23:59:01Z

src/plugins/plan/util.js

+  let groupIds;
+  const sourceMap = domainObject.sourceMap;
+  const json = getObjectJson(domainObject);
+  if (sourceMap !== undefined && sourceMap.groupIds !== undefined) {


I think you can simplify this as if (sourceMap?.groupIds) {

ozyx · 2023-11-06T23:26:00Z

e2e/appActions.js

@@ -644,6 +644,26 @@ async function renameObjectFromContextMenu(page, url, newName) {
  await page.click('[aria-label="Save"]');
 }

+async function addPlanGetInterceptor(page) {


Let's move this to planningUtils since it is specific to the Plan / Gantt Chart testing suites

…a/openmct into timelist-swimlane-order-7196

ozyx

I'm wary of this solution because it further couples Open MCT (open source) Plans with VIPER Plans. There should be a way we can handle this completely on the VIPER side, maybe with some kind of interceptor?

shefalijoshi · 2023-12-11T18:56:08Z

I'm wary of this solution because it further couples Open MCT (open source) Plans with VIPER Plans. There should be a way we can handle this completely on the VIPER side, maybe with some kind of interceptor?

There is an interceptor on the VIPER side here: viper-openmct PR 202
But we need that VIPER interceptor configuration to still be parsed on the Open MCT side.

ozyx · 2023-12-11T21:20:32Z

I'm wary of this solution because it further couples Open MCT (open source) Plans with VIPER Plans. There should be a way we can handle this completely on the VIPER side, maybe with some kind of interceptor?

There is an interceptor on the VIPER side here: viper-openmct PR 202 But we need that VIPER interceptor configuration to still be parsed on the Open MCT side.

I think a good way to decouple these would be to have something like a PlanProvider so we could allow users to define their own schemas. I'll create an enhancement ticket if it seems like a reasonable idea. Will re-review

shefalijoshi added 8 commits November 2, 2023 10:18

Use specified group order for plans

c980e8e

Allow groupIds to be a function

e0b0388

Fix typo in if statement

541a910

Check that activities are present for a given group

f74408c

Change refresh to emit the new model

49fa8a8

Update domainobject on change

f629616

Revert changes for domainObject

1f06a3b

Revert groupIds as functions. Check if groups are objects with names …

a53f557

…instead.

shefalijoshi requested a review from ozyx November 3, 2023 17:24

Add e2e test for plan swim lane order

ebbacb3

Merge branch 'master' into timelist-swimlane-order-7196

285ac08

unlikelyzero added this to the Target:3.2.0 milestone Nov 7, 2023

Merge branch 'master' into timelist-swimlane-order-7196

378bf61

unlikelyzero removed this from the Target:3.2.0 milestone Nov 13, 2023

shefalijoshi requested review from jvigliotta and removed request for ozyx November 20, 2023 22:47

jvigliotta approved these changes Nov 22, 2023

View reviewed changes

ozyx suggested changes Nov 22, 2023

View reviewed changes

shefalijoshi added 4 commits November 30, 2023 06:26

Address review comments - improve if statement

b7bbc5d

Merge branch 'timelist-swimlane-order-7196' of https://github.com/nas…

5dd2122

…a/openmct into timelist-swimlane-order-7196

Move function to right util helper

2bee84f

Merge branch 'master' into timelist-swimlane-order-7196

33112f4

shefalijoshi requested a review from ozyx November 30, 2023 14:32

shefalijoshi added 5 commits December 5, 2023 09:11

Merge branch 'master' into timelist-swimlane-order-7196

2e0f0dc

Fix path for imported code

83d17e0

Merge branch 'master' into timelist-swimlane-order-7196

c10676c

Remove focused test

c97e16a

Merge branch 'timelist-swimlane-order-7196' of https://github.com/nas…

178fae0

…a/openmct into timelist-swimlane-order-7196

shefalijoshi added the pr:e2e Automatically triggers e2e tests to run label Dec 6, 2023

github-actions bot removed the pr:e2e Automatically triggers e2e tests to run label Dec 6, 2023

ozyx suggested changes Dec 11, 2023

View reviewed changes

Merge branch 'master' into timelist-swimlane-order-7196

33ebb72

shefalijoshi requested a review from ozyx December 11, 2023 18:56

Change the name of the ordered group configuration

f75e9ea

ozyx approved these changes Dec 12, 2023

View reviewed changes

Merge branch 'master' into timelist-swimlane-order-7196

95f352c

shefalijoshi added the pr:e2e:couchdb npm run test:e2e:couchdb label Dec 14, 2023

Merge branch 'master' into timelist-swimlane-order-7196

1925420

shefalijoshi enabled auto-merge (squash) December 14, 2023 13:59

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

Merge branch 'master' into timelist-swimlane-order-7196

e1ad784

shefalijoshi added the pr:e2e:couchdb npm run test:e2e:couchdb label Dec 14, 2023

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

shefalijoshi merged commit 250db8d into master Dec 14, 2023

shefalijoshi deleted the timelist-swimlane-order-7196 branch December 14, 2023 14:19

unlikelyzero added this to the Target:3.3.0 milestone Jan 25, 2024

unlikelyzero added the type:feature Feature. Required intentional design label Jan 25, 2024

unlikelyzero modified the milestones: Target:3.3.0, Target:4.0.0 Feb 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow specification of swimlanes via configuration #7200

Allow specification of swimlanes via configuration #7200

shefalijoshi commented Nov 3, 2023 •

edited by jvigliotta

Loading

deploysentinel bot commented Nov 3, 2023 •

edited

Loading

Test Case Results

Test Case Results

codecov bot commented Nov 6, 2023 •

edited

Loading

jvigliotta left a comment

jvigliotta Nov 21, 2023

ozyx Nov 6, 2023

ozyx left a comment

shefalijoshi commented Dec 11, 2023

ozyx commented Dec 11, 2023 •

edited

Loading

Allow specification of swimlanes via configuration #7200

Allow specification of swimlanes via configuration #7200

Conversation

shefalijoshi commented Nov 3, 2023 • edited by jvigliotta Loading

Describe your changes:

All Submissions:

Author Checklist

Reviewer Checklist

deploysentinel bot commented Nov 3, 2023 • edited Loading

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Test Case Results

Current Playwright Test Results Summary

codecov bot commented Nov 6, 2023 • edited Loading

Codecov Report

jvigliotta left a comment

Choose a reason for hiding this comment

jvigliotta Nov 21, 2023

Choose a reason for hiding this comment

ozyx Nov 6, 2023

Choose a reason for hiding this comment

ozyx left a comment

Choose a reason for hiding this comment

shefalijoshi commented Dec 11, 2023

ozyx commented Dec 11, 2023 • edited Loading

shefalijoshi commented Nov 3, 2023 •

edited by jvigliotta

Loading

deploysentinel bot commented Nov 3, 2023 •

edited

Loading

codecov bot commented Nov 6, 2023 •

edited

Loading

ozyx commented Dec 11, 2023 •

edited

Loading