mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(editor): Separate cloud endpoint calls (#7312)

Browse source 
This PR untangles calls to cloud endpoints so failure in one of them
doesn't stop others to go through.
This commit is contained in:
Milorad FIlipović 2023-10-02 14:25:03 +02:00 committed by GitHub
parent 1691223789
commit 04dfcd73be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/editor-ui/src/App.vue
View file

@ -144,8 +144,9 @@ export default defineComponent({
console.log(HIRING_BANNER); console.log(HIRING_BANNER);
} }
}, },
async checkForCloudPlanData() { async checkForCloudData() {
return this.cloudPlanStore.checkForCloudPlanData(); await this.cloudPlanStore.checkForCloudPlanData();
await this.cloudPlanStore.fetchUserCloudAccount();
}, },
async initialize(): Promise<void> { async initialize(): Promise<void> {
await this.initSettings(); await this.initSettings();
@ -237,7 +238,7 @@ export default defineComponent({
await this.authenticate(); await this.authenticate();
await this.redirectIfNecessary(); await this.redirectIfNecessary();
void this.checkForNewVersions(); void this.checkForNewVersions();
await this.checkForCloudPlanData(); await this.checkForCloudData();
void this.postAuthenticate(); void this.postAuthenticate();
this.loading = false; this.loading = false;

9
packages/editor-ui/src/stores/__tests__/ui.test.ts
View file

@ -123,7 +123,8 @@ describe('UI store', () => {
.spyOn(cloudPlanApi, 'getCloudUserInfo') .spyOn(cloudPlanApi, 'getCloudUserInfo')
.mockResolvedValue(getUserCloudInfo(true)); .mockResolvedValue(getUserCloudInfo(true));
setupOwnerAndCloudDeployment(); setupOwnerAndCloudDeployment();
await cloudPlanStore.getOwnerCurrentPlan(); await cloudPlanStore.checkForCloudPlanData();
await cloudPlanStore.fetchUserCloudAccount();
expect(fetchCloudSpy).toHaveBeenCalled(); expect(fetchCloudSpy).toHaveBeenCalled();
expect(fetchUserCloudAccountSpy).toHaveBeenCalled(); expect(fetchUserCloudAccountSpy).toHaveBeenCalled();
expect(uiStore.bannerStack).toContain('TRIAL'); expect(uiStore.bannerStack).toContain('TRIAL');
@ -137,7 +138,8 @@ describe('UI store', () => {
.spyOn(cloudPlanApi, 'getCloudUserInfo') .spyOn(cloudPlanApi, 'getCloudUserInfo')
.mockResolvedValue(getUserCloudInfo(true)); .mockResolvedValue(getUserCloudInfo(true));
setupOwnerAndCloudDeployment(); setupOwnerAndCloudDeployment();
await cloudPlanStore.getOwnerCurrentPlan(); await cloudPlanStore.checkForCloudPlanData();
await cloudPlanStore.fetchUserCloudAccount();
expect(fetchCloudSpy).toHaveBeenCalled(); expect(fetchCloudSpy).toHaveBeenCalled();
expect(fetchUserCloudAccountSpy).toHaveBeenCalled(); expect(fetchUserCloudAccountSpy).toHaveBeenCalled();
expect(uiStore.bannerStack).toContain('TRIAL_OVER'); expect(uiStore.bannerStack).toContain('TRIAL_OVER');
@ -151,7 +153,8 @@ describe('UI store', () => {
.spyOn(cloudPlanApi, 'getCloudUserInfo') .spyOn(cloudPlanApi, 'getCloudUserInfo')
.mockResolvedValue(getUserCloudInfo(false)); .mockResolvedValue(getUserCloudInfo(false));
setupOwnerAndCloudDeployment(); setupOwnerAndCloudDeployment();
await cloudPlanStore.getOwnerCurrentPlan(); await cloudPlanStore.checkForCloudPlanData();
await cloudPlanStore.fetchUserCloudAccount();
expect(fetchCloudSpy).toHaveBeenCalled(); expect(fetchCloudSpy).toHaveBeenCalled();
expect(fetchUserCloudAccountSpy).toHaveBeenCalled(); expect(fetchUserCloudAccountSpy).toHaveBeenCalled();
expect(uiStore.bannerStack).toContain('TRIAL_OVER'); expect(uiStore.bannerStack).toContain('TRIAL_OVER');

38
packages/editor-ui/src/stores/cloudPlan.store.ts
View file

@ -52,11 +52,27 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
return state.usage?.executions >= state.data?.monthlyExecutionsLimit; return state.usage?.executions >= state.data?.monthlyExecutionsLimit;
}); });
const getOwnerCurrentPlan = async () => { const hasCloudPlan = computed(() => {
const cloudUserId = settingsStore.settings.n8nMetadata?.userId; const cloudUserId = settingsStore.settings.n8nMetadata?.userId;
const hasCloudPlan = return usersStore.currentUser?.isOwner && settingsStore.isCloudDeployment && cloudUserId;
usersStore.currentUser?.isOwner && settingsStore.isCloudDeployment && cloudUserId; });
if (!hasCloudPlan) throw new Error('User does not have a cloud plan');
const getUserCloudAccount = async () => {
if (!hasCloudPlan.value) throw new Error('User does not have a cloud plan');
try {
if (useUsersStore().isInstanceOwner) {
await usersStore.fetchUserCloudAccount();
if (!usersStore.currentUserCloudInfo?.confirmed) {
useUIStore().pushBannerToStack('EMAIL_CONFIRMATION');
}
}
} catch (error) {
throw new Error(error);
}
};
const getOwnerCurrentPlan = async () => {
if (!hasCloudPlan.value) throw new Error('User does not have a cloud plan');
state.loadingPlan = true; state.loadingPlan = true;
let plan; let plan;
try { try {
@ -71,13 +87,6 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
useUIStore().pushBannerToStack('TRIAL'); useUIStore().pushBannerToStack('TRIAL');
} }
} }
if (useUsersStore().isInstanceOwner) {
await usersStore.fetchUserCloudAccount();
if (!usersStore.currentUserCloudInfo?.confirmed) {
useUIStore().pushBannerToStack('EMAIL_CONFIRMATION');
}
}
} catch (error) { } catch (error) {
state.loadingPlan = false; state.loadingPlan = false;
throw new Error(error); throw new Error(error);
@ -132,6 +141,12 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
} catch {} } catch {}
}; };
const fetchUserCloudAccount = async () => {
try {
await getUserCloudAccount();
} catch {}
};
return { return {
state, state,
getOwnerCurrentPlan, getOwnerCurrentPlan,
@ -145,5 +160,6 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
allExecutionsUsed, allExecutionsUsed,
reset, reset,
checkForCloudPlanData, checkForCloudPlanData,
fetchUserCloudAccount,
}; };
}); });