From 8a2b8b90a46b2fa497a4e41c9223e5339191b1d1 Mon Sep 17 00:00:00 2001
From: arpitnath <arpitnath42@gmail.com>
Date: Tue, 10 May 2022 20:55:14 +0530
Subject: [PATCH] followup to: 2789

---
 frontend/src/_styles/theme.scss                    | 1 +
 frontend/src/_ui/JSONTreeViewer/JSONNode.jsx       | 4 ++--
 frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx  | 7 ++++++-
 frontend/src/_ui/JSONTreeViewer/JSONTreeViewer.jsx | 5 ++++-
 package-lock.json                                  | 2 +-
 plugins/package-lock.json                          | 1 +
 server/package-lock.json                           | 4 ++++
 7 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss
index 88d19298f9..2b8cfb6386 100644
--- a/frontend/src/_styles/theme.scss
+++ b/frontend/src/_styles/theme.scss
@@ -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;
diff --git a/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx b/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
index 97f348e6cd..973ee9b7a3 100644
--- a/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
+++ b/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
@@ -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',
diff --git a/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx b/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx
index 1596a50d83..3a44331725 100644
--- a/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx
+++ b/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx
@@ -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
diff --git a/frontend/src/_ui/JSONTreeViewer/JSONTreeViewer.jsx b/frontend/src/_ui/JSONTreeViewer/JSONTreeViewer.jsx
index 82186dadc4..05aa920c1f 100644
--- a/frontend/src/_ui/JSONTreeViewer/JSONTreeViewer.jsx
+++ b/frontend/src/_ui/JSONTreeViewer/JSONTreeViewer.jsx
@@ -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 {
diff --git a/package-lock.json b/package-lock.json
index 3267bbc1b8..0c604b402d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "tooljet",
+  "name": "ToolJet",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/plugins/package-lock.json b/plugins/package-lock.json
index 1571570ce3..c55a7d310a 100644
--- a/plugins/package-lock.json
+++ b/plugins/package-lock.json
@@ -16818,6 +16818,7 @@
       }
     },
     "packages/notion": {
+      "name": "@tooljet-plugins/notion",
       "version": "1.0.0",
       "dependencies": {
         "@notionhq/client": "^1.0.4",
diff --git a/server/package-lock.json b/server/package-lock.json
index 096e9f9380..1aeac64a69 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -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",