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

[Timelist] Fixed Time use Now as start time - 5772 #6497

Merged
merged 39 commits into from
Jul 14, 2023
Merged

Conversation

michaelrogers
Copy link
Contributor

@michaelrogers michaelrogers commented Mar 23, 2023

Closes #5772

Describe your changes:

Updated the fixed time timelist to show current / future events based on the current time. Edit mode view all flag is still maintained. Start / end time formatter updated to use the Time API formatter instead of moment directly.

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)

@codecov
Copy link

codecov bot commented Mar 23, 2023

Codecov Report

Merging #6497 (d7c8591) into master (32529ff) will increase coverage by 0.09%.
The diff coverage is 59.09%.

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

@@            Coverage Diff             @@
##           master    #6497      +/-   ##
==========================================
+ Coverage   53.72%   53.81%   +0.09%     
==========================================
  Files         631      628       -3     
  Lines       25116    25025      -91     
  Branches     2516     2512       -4     
==========================================
- Hits        13493    13468      -25     
+ Misses      10951    10883      -68     
- Partials      672      674       +2     
Flag Coverage Δ *Carryforward flag
e2e-full 42.14% <ø> (-0.09%) ⬇️ Carriedforward from 92329b3
e2e-stable 55.47% <ø> (+0.05%) ⬆️
unit 48.33% <59.09%> (+0.08%) ⬆️

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

Impacted Files Coverage Δ
src/plugins/timelist/Timelist.vue 56.70% <59.09%> (+4.34%) ⬆️

... and 18 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 32529ff...62a163d. Read the comment docs.

@michaelrogers michaelrogers marked this pull request as ready for review March 29, 2023 21:05
@shefalijoshi
Copy link
Contributor

@michaelrogers This doesn't appear to be working if I change the fixed timespan bounds. Can you test this?

Copy link
Contributor

@shefalijoshi shefalijoshi left a comment

Choose a reason for hiding this comment

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

One more small change please.

@michaelrogers
Copy link
Contributor Author

One more small change please.

@shefalijoshi - both requested changes have been made!

@shefalijoshi
Copy link
Contributor

  1. Load a timelist with timespans starting from March, 2023 through December 2024 or later.
  2. Display a list with Remote Clock (year 2024) - note that past (2023), present (2024) and future activities are correctly displayed.
  3. Now switch to Local Clock OR Fixed Timespan with start time of March, 2023 - note that no past events are displayed even when the time list is configured to display ALL activities.
    Expected: The start bounds should only be used to set the timestamp which is then used to calculate which activities are tagged as past, present or future. We should still show past events.
IncorrectListWithLocalClock.mov

Copy link
Contributor

@shefalijoshi shefalijoshi left a comment

Choose a reason for hiding this comment

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

Thanks for making the changes!
Still testing, but added some small comments.

@deploysentinel
Copy link

deploysentinel bot commented Apr 24, 2023

Current Playwright Test Results Summary

✅ 14 Passing - ⚠️ 1 Flaky

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

(Last updated on 07/14/2023 08:19:18pm UTC)

Run Details

Running Workflow e2e-couchdb on Github Actions

Commit: 62a163d

Started: 07/14/2023 08:14:04pm UTC

⚠️ Flakes

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Notebook Tests with CouchDB @couchdb Inspect Notebook Entry Network Requests
Retry 1Initial Attempt
10.64% (5) 5 / 47 runs
failed over last 7 days
68.09% (32) 32 / 47 runs
flaked over last 7 days

View Detailed Build Results


Current Playwright Test Results Summary

✅ 133 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/14/2023 08:19:18pm UTC)

Run Details

Running Job e2e-stable on CircleCI

Commit: 62a163d

Started: 07/14/2023 08:13:08pm UTC

⚠️ Flakes

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Flexible Layout items in a flexible layout can be removed with object tree context menu when viewing another item
Retry 1Initial Attempt
0% (0) 0 / 183 runs
failed over last 7 days
1.64% (3) 3 / 183 runs
flaked over last 7 days

📄   functional/plugins/imagery/exampleImagery.e2e.spec.js • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Example Imagery Object Can use Mouse Wheel to zoom in and out of latest image
Retry 2Retry 1Initial Attempt
0.58% (1) 1 / 171 run
failed over last 7 days
78.95% (135) 135 / 171 runs
flaked over last 7 days

View Detailed Build Results


@shefalijoshi
Copy link
Contributor

I tested this again. It looks like currently active activities are not showing up in the local clock mode.
Actual:
image

Expected:
image

Copy link
Contributor

@shefalijoshi shefalijoshi left a comment

Choose a reason for hiding this comment

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

Found a bug during testing.

@michaelrogers
Copy link
Contributor Author

After conferring with @shefalijoshi - the ticket will be updated to hide activities outside the time bounds.

@michaelrogers
Copy link
Contributor Author

michaelrogers commented Jun 23, 2023

@shefalijoshi - I've updated the filter function to only include activities that fall within the bounds. Note: this affects both fixed and realtime modes of the clock.

This change causes a few tests to fail, but I wanted to confirm that the bounds based filtering is what we are after before proceeding to update the tests.

Copy link
Contributor

@akhenry akhenry left a comment

Choose a reason for hiding this comment

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

Changes are looking good. I do think that we should make sure we include current activities (see comment).

I've also created a followup issue to replace the time controls in the inspector with the independent time conductor. Let's implement that immediately after this is merged.

@michaelrogers michaelrogers requested a review from akhenry July 3, 2023 20:43
@akhenry
Copy link
Contributor

akhenry commented Jul 10, 2023

@shefalijoshi To take a look at failing tests

@akhenry
Copy link
Contributor

akhenry commented Jul 13, 2023

Changes look good to me. I've filed a followup issue to use the new global clock in fixed mode.

Copy link
Contributor

@shefalijoshi shefalijoshi left a comment

Choose a reason for hiding this comment

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

Looks good. I've fixed the broken tests.

@khalidadil khalidadil added the pr:e2e:couchdb npm run test:e2e:couchdb label Jul 14, 2023
@github-actions github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Jul 14, 2023
@michaelrogers michaelrogers merged commit 6e79e5e into master Jul 14, 2023
@michaelrogers michaelrogers deleted the mct5772-v2 branch July 14, 2023 20:19
@ozyx ozyx added this to the Target:3.0.0 milestone Jul 19, 2023
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.

[Timelist] Follow up from 5629
5 participants