followup to: 2789

This commit is contained in:
arpitnath 2022-05-10 20:55:14 +05:30
parent 7c30a830db
commit 8a2b8b90a4
7 changed files with 19 additions and 5 deletions

View file

@ -4964,6 +4964,7 @@ div#driver-page-overlay {
.json-tree-valuetype {
font-size: 10px;
padding-top: 2px;
width: fit-content !important;
}
.node-length-color {
color: #3650AF;

View file

@ -325,12 +325,12 @@ export const JSONNode = ({ data, ...restProps }) => {
</div>
<div
onMouseEnter={() => updateHoveredNode(currentNode, currentNodePath)}
onMouseLeave={() => updateHoveredNode(null)}
style={{ width: 'inherit' }}
className={`${shouldDisplayIntendedBlock && 'group-border'} ${applySelectedNodeStyles && 'selected-node'}`}
>
<div
onMouseEnter={() => updateHoveredNode(currentNode, currentNodePath)}
onMouseLeave={() => updateHoveredNode(null)}
className={cx('d-flex', {
'group-object-container': shouldDisplayIntendedBlock,
'mx-2': typeofCurrentNode !== 'Object' && typeofCurrentNode !== 'Array',

View file

@ -15,7 +15,12 @@ const JSONTreeValueNode = ({ data, type }) => {
);
}
const value = type === 'String' ? `"${data}"` : String(data);
let value = type === 'String' ? `"${data}"` : String(data);
if (value.length > 60) {
value = `${value.substring(0, 60)} ... "`;
}
const clsForUndefinedOrNull = (type === 'Undefined' || type === 'Null') && 'badge badge-secondary';
return (
<span

View file

@ -157,8 +157,11 @@ export class JSONTreeViewer extends React.Component {
newPath = `${path}.${key}`;
}
if (_.isObject(value) || _.isArray(value)) {
if (_.isObject(value)) {
map.set(newPath, { type: _type });
buildMap(value, newPath);
} else if (_.isArray(value)) {
map.set(newPath, { type: _type });
} else if (_.isFunction(value)) {
map.set(newPath, { type: _type });
} else {

2
package-lock.json generated
View file

@ -1,5 +1,5 @@
{
"name": "tooljet",
"name": "ToolJet",
"lockfileVersion": 2,
"requires": true,
"packages": {

View file

@ -16818,6 +16818,7 @@
}
},
"packages/notion": {
"name": "@tooljet-plugins/notion",
"version": "1.0.0",
"dependencies": {
"@notionhq/client": "^1.0.4",

View file

@ -114,6 +114,8 @@
"@tooljet-plugins/mssql": "file:packages/mssql",
"@tooljet-plugins/mysql": "file:packages/mysql",
"@tooljet-plugins/n8n": "file:packages/n8n",
"@tooljet-plugins/notion": "file:packages/notion",
"@tooljet-plugins/openapi": "file:packages/openapi",
"@tooljet-plugins/oracledb": "file:packages/oracledb",
"@tooljet-plugins/postgresql": "file:packages/postgresql",
"@tooljet-plugins/redis": "file:packages/redis",
@ -15046,6 +15048,8 @@
"@tooljet-plugins/mssql": "file:packages/mssql",
"@tooljet-plugins/mysql": "file:packages/mysql",
"@tooljet-plugins/n8n": "file:packages/n8n",
"@tooljet-plugins/notion": "file:packages/notion",
"@tooljet-plugins/openapi": "file:packages/openapi",
"@tooljet-plugins/oracledb": "file:packages/oracledb",
"@tooljet-plugins/postgresql": "file:packages/postgresql",
"@tooljet-plugins/redis": "file:packages/redis",