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

Fix routing and layout issue #923

Merged
merged 4 commits into from
Sep 22, 2024
Merged

Fix routing and layout issue #923

merged 4 commits into from
Sep 22, 2024

Conversation

dmx974
Copy link
Contributor

@dmx974 dmx974 commented Sep 22, 2024

Move some graph-related logic from App.vue to GraphView.vue to prevent execution with other routes.
That basically make layout management and client-side routing work as expected (for instance, you can now go to /test without issues).

src/App.vue Outdated
api.removeEventListener('reconnected', onReconnected)
executionStore.unbindExecutionEvents()
})
onBeforeUnmount(() => {})
Copy link
Member

Choose a reason for hiding this comment

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

nit: Remove the empty callback

@huchenlei
Copy link
Member

huchenlei commented Sep 22, 2024

@dmx974 BTW can you merge this to dev1.3 to avoid further merge conflict on dev1.3?

@huchenlei huchenlei changed the base branch from main to dev1.3 September 22, 2024 09:15
@dmx974
Copy link
Contributor Author

dmx974 commented Sep 22, 2024

playwright-tests-chromium passed on main, but not on dev1.3, I didn't use dev1.3 as base branch, can you merge that PR on main?

@dmx974 dmx974 merged commit 94db2e9 into dev1.3 Sep 22, 2024
7 of 9 checks passed
@dmx974 dmx974 deleted the routing branch September 22, 2024 11:07
huchenlei added a commit that referenced this pull request Sep 23, 2024
huchenlei added a commit that referenced this pull request Sep 23, 2024
huchenlei added a commit that referenced this pull request Sep 23, 2024
huchenlei added a commit that referenced this pull request Sep 23, 2024
* Revert "Revert "Fix routing and layout issue (#923)" (#930)"

This reverts commit 1e2dfea.

* Fix merge conflicts
huchenlei pushed a commit that referenced this pull request Sep 23, 2024
* fix router and move graph related parts to GraphView.vue

* (fix) add back child element in UnloadWindowConfirmDialog

* (cleanup) remove empty callback
huchenlei added a commit that referenced this pull request Sep 23, 2024
huchenlei added a commit that referenced this pull request Sep 23, 2024
* Revert "Revert "Fix routing and layout issue (#923)" (#930)"

This reverts commit 1e2dfea.

* Fix merge conflicts
huchenlei pushed a commit that referenced this pull request Sep 24, 2024
* fix router and move graph related parts to GraphView.vue

* (fix) add back child element in UnloadWindowConfirmDialog

* (cleanup) remove empty callback
huchenlei added a commit that referenced this pull request Sep 24, 2024
huchenlei added a commit that referenced this pull request Sep 24, 2024
* Revert "Revert "Fix routing and layout issue (#923)" (#930)"

This reverts commit 1e2dfea.

* Fix merge conflicts
huchenlei pushed a commit that referenced this pull request Sep 25, 2024
* fix router and move graph related parts to GraphView.vue

* (fix) add back child element in UnloadWindowConfirmDialog

* (cleanup) remove empty callback
huchenlei added a commit that referenced this pull request Sep 25, 2024
huchenlei added a commit that referenced this pull request Sep 25, 2024
* Revert "Revert "Fix routing and layout issue (#923)" (#930)"

This reverts commit 1e2dfea.

* Fix merge conflicts
huchenlei pushed a commit that referenced this pull request Sep 25, 2024
* fix router and move graph related parts to GraphView.vue

* (fix) add back child element in UnloadWindowConfirmDialog

* (cleanup) remove empty callback
huchenlei added a commit that referenced this pull request Sep 25, 2024
huchenlei added a commit that referenced this pull request Sep 25, 2024
* Revert "Revert "Fix routing and layout issue (#923)" (#930)"

This reverts commit 1e2dfea.

* Fix merge conflicts
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.

2 participants