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): Fix Luxon date parsing of ExecutionsUsage component (#6333)

Browse source 
* fix(editor): Fix luxon date parsing of ExecutionsUsage component

* Fix wrong indent
This commit is contained in:
OlegIvaniv 2023-05-29 13:29:07 +02:00 committed by GitHub
parent 0e4c615d0d
commit 8f0ff460b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -193,7 +193,7 @@ export default defineComponent({
}, },
async checkForCloudPlanData(): Promise<void> { async checkForCloudPlanData(): Promise<void> {
try { try {
await this.cloudPlanStore.getOwnerCurrentPLan(); await this.cloudPlanStore.getOwnerCurrentPlan();
if (!this.cloudPlanStore.userIsTrialing) return; if (!this.cloudPlanStore.userIsTrialing) return;
await this.cloudPlanStore.getInstanceCurrentUsage(); await this.cloudPlanStore.getInstanceCurrentUsage();
this.startPollingInstanceUsageData(); this.startPollingInstanceUsageData();

5
packages/editor-ui/src/mixins/nodeHelpers.ts
View file

@ -36,6 +36,7 @@ import { mapStores } from 'pinia';
import { useSettingsStore } from '@/stores/settings.store'; import { useSettingsStore } from '@/stores/settings.store';
import { useUsersStore } from '@/stores/users.store'; import { useUsersStore } from '@/stores/users.store';
import { useWorkflowsStore } from '@/stores/workflows.store'; import { useWorkflowsStore } from '@/stores/workflows.store';
import { useRootStore } from '@/stores';
import { useNodeTypesStore } from '@/stores/nodeTypes.store'; import { useNodeTypesStore } from '@/stores/nodeTypes.store';
import { useCredentialsStore } from '@/stores/credentials.store'; import { useCredentialsStore } from '@/stores/credentials.store';
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
@ -49,6 +50,7 @@ export const nodeHelpers = defineComponent({
useSettingsStore, useSettingsStore,
useWorkflowsStore, useWorkflowsStore,
useUsersStore, useUsersStore,
useRootStore,
), ),
}, },
methods: { methods: {
@ -524,6 +526,9 @@ export const nodeHelpers = defineComponent({
data as INode, data as INode,
nodeType.subtitle, nodeType.subtitle,
'internal', 'internal',
this.rootStore.timezone,
{},
undefined,
PLACEHOLDER_FILLED_AT_EXECUTION_TIME, PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
) as string | undefined; ) as string | undefined;
} }

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

@ -45,7 +45,7 @@ export const useCloudPlanStore = defineStore('cloudPlan', () => {
return state.usage?.executions >= state.data?.monthlyExecutionsLimit; return state.usage?.executions >= state.data?.monthlyExecutionsLimit;
}); });
const getOwnerCurrentPLan = async () => { const getOwnerCurrentPlan = async () => {
const cloudUserId = settingsStore.settings.n8nMetadata?.userId; const cloudUserId = settingsStore.settings.n8nMetadata?.userId;
const hasCloudPlan = const hasCloudPlan =
usersStore.currentUser?.isOwner && settingsStore.isCloudDeployment && cloudUserId; usersStore.currentUser?.isOwner && settingsStore.isCloudDeployment && cloudUserId;
@ -72,7 +72,7 @@ export const useCloudPlanStore = defineStore('cloudPlan', () => {
return { return {
state, state,
getOwnerCurrentPLan, getOwnerCurrentPlan,
getInstanceCurrentUsage, getInstanceCurrentUsage,
userIsTrialing, userIsTrialing,
currentPlanData, currentPlanData,