mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-09 22:24:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(editor): show null value in table view (#4346)

Browse source 
* fix(editor): remove code that never runs from table view

* fix(editor): show null in table view

* fix(editor): handle nil values properly

* fix(editor): add double quotes around strings

* fix(editor): remove unused function

* Revert "fix(editor): remove code that never runs from table view"

This reverts commit 167312d059.

* fix(editor): applying Max's review
This commit is contained in:
Csaba Tuncsik 2022-10-18 15:22:33 +02:00 committed by GitHub
parent dae01f3abe
commit bb4e08c076
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
packages/editor-ui/src/components/RunDataTable.vue
View file

@ -103,9 +103,7 @@
@mouseleave="onMouseLeaveCell"
:class="hasJsonInColumn(index2) ? $style.minColWidth : $style.limitColWidth"
>
<span v-if="isSimple(data)" :class="$style.value">{{
[null, undefined].includes(data) ? '&nbsp;' : data
}}</span>
<span v-if="isSimple(data)" :class="{[$style.value]: true, [$style.empty]: isEmpty(data)}">{{ getValueToRender(data) }}</span>
<n8n-tree :nodeClass="$style.nodeClass" v-else :value="data">
<template v-slot:label="{ label, path }">
<span
@ -315,11 +313,12 @@ export default mixins(externalHooks).extend({
return `{{ $node["${this.node.name}"].json["${column}"]${expr} }}`;
},
isEmpty(value: unknown) {
isEmpty(value: unknown): boolean {
return (
value === '' ||
(Array.isArray(value) && value.length === 0) ||
(typeof value === 'object' && value !== null && Object.keys(value).length === 0)
(typeof value === 'object' && value !== null && Object.keys(value).length === 0) ||
(value === null || value === undefined)
);
},
getValueToRender(value: unknown) {
@ -338,6 +337,10 @@ export default mixins(externalHooks).extend({
return this.$locale.baseText('runData.emptyObject');
}
if (value === null || value === undefined) {
return `[${value}]`;
}
return value;
},
onDragStart() {
@ -386,7 +389,9 @@ export default mixins(externalHooks).extend({
}, 1000); // ensure dest data gets set if drop
},
isSimple(data: unknown): boolean {
return typeof data !== 'object';
return (typeof data !== 'object' || data === null) ||
(Array.isArray(data) && data.length === 0) ||
(typeof data === 'object' && Object.keys(data).length === 0);
},
hasJsonInColumn(colIndex: number): boolean {
return this.tableData.hasJson[this.tableData.columns[colIndex]];