From 4045aee9cb5587a456318934700b59ba422f7422 Mon Sep 17 00:00:00 2001 From: OlegIvaniv Date: Mon, 29 May 2023 13:29:07 +0200 Subject: [PATCH] fix(editor): Fix Luxon date parsing of ExecutionsUsage component (#6333) * fix(editor): Fix luxon date parsing of ExecutionsUsage component * Fix wrong indent --- packages/editor-ui/src/App.vue | 2 +- packages/editor-ui/src/mixins/nodeHelpers.ts | 5 +++++ packages/editor-ui/src/stores/cloudPlan.store.ts | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue index cbd8757126907..fdb084f1fa7ba 100644 --- a/packages/editor-ui/src/App.vue +++ b/packages/editor-ui/src/App.vue @@ -193,7 +193,7 @@ export default defineComponent({ }, async checkForCloudPlanData(): Promise { try { - await this.cloudPlanStore.getOwnerCurrentPLan(); + await this.cloudPlanStore.getOwnerCurrentPlan(); if (!this.cloudPlanStore.userIsTrialing) return; await this.cloudPlanStore.getInstanceCurrentUsage(); this.startPollingInstanceUsageData(); diff --git a/packages/editor-ui/src/mixins/nodeHelpers.ts b/packages/editor-ui/src/mixins/nodeHelpers.ts index 8f7dec8ffda7d..4609b4f653297 100644 --- a/packages/editor-ui/src/mixins/nodeHelpers.ts +++ b/packages/editor-ui/src/mixins/nodeHelpers.ts @@ -36,6 +36,7 @@ import { mapStores } from 'pinia'; import { useSettingsStore } from '@/stores/settings.store'; import { useUsersStore } from '@/stores/users.store'; import { useWorkflowsStore } from '@/stores/workflows.store'; +import { useRootStore } from '@/stores'; import { useNodeTypesStore } from '@/stores/nodeTypes.store'; import { useCredentialsStore } from '@/stores/credentials.store'; import { defineComponent } from 'vue'; @@ -49,6 +50,7 @@ export const nodeHelpers = defineComponent({ useSettingsStore, useWorkflowsStore, useUsersStore, + useRootStore, ), }, methods: { @@ -524,6 +526,9 @@ export const nodeHelpers = defineComponent({ data as INode, nodeType.subtitle, 'internal', + this.rootStore.timezone, + {}, + undefined, PLACEHOLDER_FILLED_AT_EXECUTION_TIME, ) as string | undefined; } diff --git a/packages/editor-ui/src/stores/cloudPlan.store.ts b/packages/editor-ui/src/stores/cloudPlan.store.ts index b034d711b0380..ddd610f6c3a84 100644 --- a/packages/editor-ui/src/stores/cloudPlan.store.ts +++ b/packages/editor-ui/src/stores/cloudPlan.store.ts @@ -45,7 +45,7 @@ export const useCloudPlanStore = defineStore('cloudPlan', () => { return state.usage?.executions >= state.data?.monthlyExecutionsLimit; }); - const getOwnerCurrentPLan = async () => { + const getOwnerCurrentPlan = async () => { const cloudUserId = settingsStore.settings.n8nMetadata?.userId; const hasCloudPlan = usersStore.currentUser?.isOwner && settingsStore.isCloudDeployment && cloudUserId; @@ -72,7 +72,7 @@ export const useCloudPlanStore = defineStore('cloudPlan', () => { return { state, - getOwnerCurrentPLan, + getOwnerCurrentPlan, getInstanceCurrentUsage, userIsTrialing, currentPlanData,