fix(editor): Fix cloud plan data loading on instance (#7841)

n8n-io · Nov 29, 2023 · b0039a3 · b0039a3
1 parent 95854db
commit b0039a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
@@ -148,10 +148,11 @@ export default defineComponent({
 				return;
 			}
 
-			await Promise.all([
+			await Promise.allSettled([
 				this.initializeSourceControl(),
 				this.initializeTemplates(),
 				this.initializeNodeTranslationHeaders(),
+				this.initializeCloudData(),
 			]);
 
 			this.onAfterAuthenticateInitialized = true;
@@ -162,7 +163,6 @@ export default defineComponent({
 
 		await this.settingsStore.initialize();
 		await this.initializeHooks();
-		await this.initializeCloudData();
 
 		void this.checkForNewVersions();
 		void this.onAfterAuthenticate();

diff --git a/packages/editor-ui/src/stores/cloudPlan.store.ts b/packages/editor-ui/src/stores/cloudPlan.store.ts
@@ -54,7 +54,7 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 
 	const hasCloudPlan = computed(() => {
 		const cloudUserId = settingsStore.settings.n8nMetadata?.userId;
-		return usersStore.currentUser?.isOwner && settingsStore.isCloudDeployment && cloudUserId;
+		return usersStore.isInstanceOwner && settingsStore.isCloudDeployment && cloudUserId;
 	});
 
 	const getUserCloudAccount = async () => {
@@ -142,7 +142,9 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 			if (!userIsTrialing.value) return;
 			await getInstanceCurrentUsage();
 			startPollingInstanceUsageData();
-		} catch {}
+		} catch (e) {
+			console.error('Error fetching cloud plan data', e);
+		}
 	};
 
 	const fetchUserCloudAccount = async () => {