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

Graph view: use initialOptions to save & restore view state on navigation #1717

Merged
merged 3 commits into from
May 2, 2024

Conversation

markgrahamdawson
Copy link
Contributor

@markgrahamdawson markgrahamdawson commented Mar 19, 2024

These changes build on the work undertaken to save & restore workspace layout on navigation #1664

Which is part of a larger issue #662

There was an equivalent pull request for the log view #1688
There is an equivalent pull request for the tree view which this builds on: #1705
There is an equivalent pull request for the table view which this builds on: #1711

Check List

  • I have read CONTRIBUTING.md and added my name as a Code Contributor.
  • Contains logically grouped changes (else tidy your branch by rebase).
  • Does not contain off-topic changes (use other PRs for other changes).
  • Applied any dependency changes to both setup.cfg (and conda-environment.yml if present).
  • Tests are included (or explain why tests are not needed).
  • CHANGES.md entry included if this is a change that can affect users
  • Cylc-Doc pull request opened if required at cylc/cylc-doc/pull/XXXX.
  • If this is a bug fix, PR should be raised against the relevant ?.?.x branch.

@markgrahamdawson markgrahamdawson self-assigned this Mar 19, 2024
@MetRonnie MetRonnie added this to the 2.5.0 milestone Mar 27, 2024
@markgrahamdawson markgrahamdawson force-pushed the lumino-adv-graph branch 2 times, most recently from 13e260f to 4cac41d Compare April 2, 2024 12:52
@markgrahamdawson markgrahamdawson marked this pull request as ready for review April 2, 2024 12:59
CHANGES.md Outdated Show resolved Hide resolved
src/views/Graph.vue Outdated Show resolved Hide resolved
src/views/Graph.vue Outdated Show resolved Hide resolved
src/views/Graph.vue Outdated Show resolved Hide resolved
src/views/Graph.vue Outdated Show resolved Hide resolved
src/views/Graph.vue Outdated Show resolved Hide resolved
src/views/Graph.vue Outdated Show resolved Hide resolved
tests/e2e/specs/graph.cy.js Outdated Show resolved Hide resolved
src/views/Graph.vue Outdated Show resolved Hide resolved
src/views/Graph.vue Outdated Show resolved Hide resolved
CHANGES.md Outdated Show resolved Hide resolved
@markgrahamdawson
Copy link
Contributor Author

markgrahamdawson commented Apr 24, 2024

It would be nice to get this in so I can finish off #1763

Copy link
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

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

I'm having a bit of a poke about with the Graph view to see if the initial refresh can rely more on Vue's reactivity than manual polling, but this will do for the time being

@markgrahamdawson
Copy link
Contributor Author

markgrahamdawson commented Apr 26, 2024

@oliver-sanders If I make a new issue for Ronnies note above.
Can I merge this in? Does it really need a rebase first to tidy up?

pick ee02689 Use initialOptions prop to save view state
pick f07f01b added e2e tests
squash cc5be38 updated change log
squash 0292dc4 fix change log
pick ab5182f Do initial refresh safely when autorefresh is off
squash 816110c added town crier log
squash b0facef reverted CHANGES.md as using towncrier
pick ceecb61 fix empty graph when switching between workflows
pick 3c06b60 added e2e test for 'loads graph when switching between workflows'

added e2e tests

updated change log

fix broken e2e tests

review amends

review amends change log

review amends tests

fix change loggit

Do initial refresh safely when autorefresh is off

added town crier log

reverted CHANGES.md as using towncrier

fix empty graph when switching between workflows

added e2e test for 'loads graph when switching between workflows'
@oliver-sanders
Copy link
Member

We can also squash-merge PRs (note, you don't need separate commits for changelog, tests, etc, they can go in together with the feature).

@oliver-sanders
Copy link
Member

Unfortunately the auto-refresh option appears to be flaky for me. Sometimes the graph comes back, sometimes it does not. I don't think the diff to the refresh method quite did the job.

Copy link
Contributor Author

@markgrahamdawson markgrahamdawson left a comment

Choose a reason for hiding this comment

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

Ready for review...
For testing the autoRefresh setting a console log can be added to the async refresh () function and it should show that - when the component mounts and autorefresh is off - the data polling stops when the nodeDimensions has been calculated.

Copy link
Member

@oliver-sanders oliver-sanders left a comment

Choose a reason for hiding this comment

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

Nice.

@oliver-sanders
Copy link
Member

@MetRonnie, please check you're happy with new changes and whack the merge button.

Copy link
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

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

Looks like it does the job from my testing out

@MetRonnie MetRonnie merged commit 37636d4 into cylc:master May 2, 2024
8 checks passed
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.

3 participants