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.

Sign up for GitHub

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(editor): SettingsSidebar should disconnect from push when navigating away #6025

Merged
merged 3 commits into from
Apr 20, 2023
Merged

fix(editor): SettingsSidebar should disconnect from push when navigating away #6025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f1da19
fix(editor): SettingsSidebar should disconnect from push when navigat…
netroy Apr 20, 2023
214d1ad
SettingsSidebar should use push only if the community nodes feature i…
netroy Apr 20, 2023
c581c2b
move push handling to SettingsCommunityNodesView
netroy Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions packages/editor-ui/src/components/SettingsSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import mixins from 'vue-typed-mixins';
import { ABOUT_MODAL_KEY, VERSIONS_MODAL_KEY, VIEWS } from '@/constants';
import { userHelpers } from '@/mixins/userHelpers';
import { pushConnection } from '@/mixins/pushConnection';
import { IFakeDoor } from '@/Interface';
import { IMenuItem } from 'n8n-design-system';
import { BaseTextKey } from '@/plugins/i18n';
Expand All @@ -33,7 +32,7 @@ import { useUIStore } from '@/stores/ui';
import { useSettingsStore } from '@/stores/settings';
import { useRootStore } from '@/stores/n8nRootStore';

export default mixins(userHelpers, pushConnection).extend({
export default mixins(userHelpers).extend({
name: 'SettingsSidebar',
computed: {
...mapStores(useRootStore, useSettingsStore, useUIStore),
Expand Down Expand Up @@ -134,9 +133,6 @@ export default mixins(userHelpers, pushConnection).extend({
return menuItems;
},
},
mounted() {
this.pushConnect();
},
methods: {
canAccessPersonalSettings(): boolean {
return this.canUserAccessRouteByName(VIEWS.PERSONAL_SETTINGS);
Expand Down
9 changes: 8 additions & 1 deletion packages/editor-ui/src/views/SettingsCommunityNodesView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import {
} from '@/constants';
import CommunityPackageCard from '@/components/CommunityPackageCard.vue';
import { showMessage } from '@/mixins/showMessage';
import { pushConnection } from '@/mixins/pushConnection';
import mixins from 'vue-typed-mixins';
import { PublicInstalledPackage } from 'n8n-workflow';

Expand All @@ -70,7 +71,7 @@ import { BaseTextKey } from '@/plugins/i18n';

const PACKAGE_COUNT_THRESHOLD = 31;

export default mixins(showMessage).extend({
export default mixins(showMessage, pushConnection).extend({
name: 'SettingsCommunityNodesView',
components: {
CommunityPackageCard,
Expand All @@ -81,6 +82,9 @@ export default mixins(showMessage).extend({
};
},
async mounted() {
// The push connection is needed here to receive `reloadNodeType` and `removeNodeType` events when community nodes are installed, updated, or removed.
this.pushConnect();

try {
this.$data.loading = true;
await this.communityNodesStore.fetchInstalledPackages();
Expand Down Expand Up @@ -124,6 +128,9 @@ export default mixins(showMessage).extend({
this.$data.loading = false;
}
},
beforeDestroy() {
this.pushDisconnect();
},
computed: {
...mapStores(useCommunityNodesStore, useSettingsStore, useUIStore),
getEmptyStateDescription(): string {
Expand Down