mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(editor): Render dates correctly in parameter hint (#9089)

Browse Source
This commit is contained in:
Elias Meire
2024-04-11 12:09:55 +02:00
committed by GitHub
parent d7abc30104
commit 064e8f4a1d
4 changed files with 72 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
View File

@@ -4,14 +4,13 @@ import InputTriple from '@/components/InputTriple/InputTriple.vue';
import ParameterInputFull from '@/components/ParameterInputFull.vue';
import ParameterInputHint from '@/components/ParameterInputHint.vue';
import ParameterIssues from '@/components/ParameterIssues.vue';
import { resolveParameter } from '@/composables/useWorkflowHelpers';
import { isExpression } from '@/utils/expressions';
import { isObject } from '@jsplumb/util';
import type { AssignmentValue, INodeProperties } from 'n8n-workflow';
import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
import { isExpression, stringifyExpressionResult } from '@/utils/expressions';
import type { AssignmentValue, INodeProperties, Result } from 'n8n-workflow';
import { computed, ref } from 'vue';
import TypeSelect from './TypeSelect.vue';
import { useNDVStore } from '@/stores/ndv.store';
import { useI18n } from '@/composables/useI18n';
import { useRouter } from 'vue-router';
interface Props {
path: string;
@@ -32,7 +31,8 @@ const emit = defineEmits<{
}>();
const ndvStore = useNDVStore();
const i18n = useI18n();
const router = useRouter();
const { resolveExpression } = useWorkflowHelpers({ router });
const assignmentTypeToNodeProperty = (
type: string,
@@ -81,29 +81,21 @@ const hint = computed(() => {
return '';
}
let result: Result<unknown, Error>;
try {
const resolvedValue = resolveParameter(value, {
const resolvedValue = resolveExpression(value, undefined, {
targetItem: ndvStore.hoveringItem ?? undefined,
inputNodeName: ndvStore.ndvInputNodeName,
inputRunIndex: ndvStore.ndvInputRunIndex,
inputBranchIndex: ndvStore.ndvInputBranchIndex,
}) as unknown;
if (isObject(resolvedValue)) {
return JSON.stringify(resolvedValue);
}
if (typeof resolvedValue === 'boolean' || typeof resolvedValue === 'number') {
return resolvedValue.toString();
}
if (resolvedValue === '') {
return i18n.baseText('parameterInput.emptyString');
}
return resolvedValue as string;
result = { ok: true, result: resolvedValue };
} catch (error) {
return '';
result = { ok: false, error };
}
return stringifyExpressionResult(result);
});
const highlightHint = computed(() =>