👌 Moving cloud hooks to initializeCore

n8n-io · Nov 29, 2023 · 89667e8 · 89667e8
1 parent 50cb2f3
commit 89667e8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/packages/editor-ui/src/__tests__/init.test.ts b/packages/editor-ui/src/__tests__/init.test.ts
@@ -4,7 +4,6 @@ import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { initializeAuthenticatedFeatures } from '@/init';
-import * as registerModule from '@/hooks/register';
 import type { SpyInstance } from 'vitest';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
@@ -24,7 +23,6 @@ describe('Init', () => {
 		let cloudPlanStore: ReturnType<typeof useCloudPlanStore>;
 		let sourceControlStore: ReturnType<typeof useSourceControlStore>;
 		let nodeTypesStore: ReturnType<typeof useNodeTypesStore>;
-		let hooksSpy: SpyInstance<[], Promise<void>>;
 		let cloudStoreSpy: SpyInstance<[], Promise<void>>;
 		let templatesTestSpy: SpyInstance<[], Promise<void>>;
 		let sourceControlSpy: SpyInstance<[], Promise<void>>;
@@ -45,7 +43,6 @@ describe('Init', () => {
 			vi.mock('@/hooks/register', () => ({
 				initializeCloudHooks: vi.fn(),
 			}));
-			hooksSpy = vi.spyOn(registerModule, 'initializeCloudHooks');
 			cloudStoreSpy = vi.spyOn(cloudPlanStore, 'initialize');
 			templatesTestSpy = vi.spyOn(settingsStore, 'testTemplatesEndpoint');
 			sourceControlSpy = vi.spyOn(sourceControlStore, 'getPreferences');
@@ -61,7 +58,6 @@ describe('Init', () => {
 				typeof useUsersStore
 			>);
 			await initializeAuthenticatedFeatures();
-			expect(hooksSpy).not.toHaveBeenCalled();
 			expect(cloudStoreSpy).not.toHaveBeenCalled();
 			expect(templatesTestSpy).not.toHaveBeenCalled();
 			expect(sourceControlSpy).not.toHaveBeenCalled();
@@ -72,7 +68,6 @@ describe('Init', () => {
 				typeof useUsersStore
 			>);
 			await initializeAuthenticatedFeatures();
-			expect(hooksSpy).toHaveBeenCalled();
 			expect(cloudStoreSpy).toHaveBeenCalled();
 			expect(templatesTestSpy).toHaveBeenCalled();
 			expect(sourceControlSpy).toHaveBeenCalled();

diff --git a/packages/editor-ui/src/init.ts b/packages/editor-ui/src/init.ts
@@ -24,6 +24,14 @@ export async function initializeCore() {
 	await settingsStore.initialize();
 	await usersStore.initialize();
 
+	if (settingsStore.isCloudDeployment) {
+		try {
+			await initializeCloudHooks();
+		} catch (e) {
+			console.error('Failed to initialize cloud hooks:', e);
+		}
+	}
+
 	coreInitialized = true;
 }
 
@@ -61,15 +69,11 @@ export async function initializeAuthenticatedFeatures() {
 	}
 
 	if (settingsStore.isCloudDeployment) {
-		const results = await Promise.allSettled([cloudPlanStore.initialize(), initializeCloudHooks()]);
-		results.forEach((result, index) => {
-			if (result.status === 'rejected') {
-				console.error(
-					`Failed to initialize ${index === 0 ? 'cloud plan store' : 'cloud hooks'}:`,
-					result.reason,
-				);
-			}
-		});
+		try {
+			await cloudPlanStore.initialize();
+		} catch (e) {
+			console.error('Failed to initialize cloud plan store:', e);
+		}
 	}
 
 	authenticatedFeaturesInitialized = true;