mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests 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
3 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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