Merge pull request #9105 from ToolJet/hotfix/tjdb-ux

Hotfix: TJDB ux fixes
ToolJet · Mar 18, 2024 · b621ef1 · b621ef1
2 parents df70abd + 76cfbdb
commit b621ef1
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 28 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.33.0
+2.33.1
diff --git a/frontend/.version b/frontend/.version
@@ -1 +1 @@
-2.33.0
+2.33.1
diff --git a/frontend/src/TooljetDatabase/Forms/EditRowForm.jsx b/frontend/src/TooljetDatabase/Forms/EditRowForm.jsx
@@ -281,15 +281,16 @@ const EditRowForm = ({ onEdit, onClose, rowIdToBeEdited = null }) => {
               )}
               <span>{headerText}</span>
             </div>
-            <div className="edit-row-dropdown col-auto row-edit-select-container w-100" data-cy="select-row-dropdown">
-              <Select
-                isDisabled={true}
-                useMenuPortal={false}
-                placeholder="Select a row to edit"
-                value={selectedRow}
-                options={options}
-                onChange={handleOnSelect}
-              />
+
+            <div className="edit-row-container mb-3">
+              <div style={{ position: 'relative' }}>
+                <input
+                  value={selectedRow}
+                  type="text"
+                  disabled={true}
+                  className={!darkMode ? 'form-control' : 'form-control dark-form-row'}
+                />
+              </div>
             </div>
           </div>
 

diff --git a/frontend/src/TooljetDatabase/Menu/CellEditMenu/styles.scss b/frontend/src/TooljetDatabase/Menu/CellEditMenu/styles.scss
@@ -2,6 +2,7 @@
     min-width: 300px;
     height: auto;
     margin-top: 2px;
+    inset: 0px auto auto -9px !important;
 
     .tjdb-bool-cell-menu-badge-default {
         padding: 2px 12px;
@@ -15,7 +16,7 @@
     }
 
     .boolean-state-selected {
-        border-color:#3E63DD;
+        border-color: #3E63DD;
         background: var(--indigo3);
         color: #3E63DD;
     }
@@ -37,17 +38,17 @@
     }
 
     .cell-editmenu-keyActions {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      gap: 5px;
-  
-      .leftNav-parent-container,
-      .rightNav-parent-container {
-        border-radius: 6px;
-        border: 1px solid var(--slate7);
-        width: 24px;
-        text-align: center;
-      }
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 5px;
+
+        .leftNav-parent-container,
+        .rightNav-parent-container {
+            border-radius: 6px;
+            border: 1px solid var(--slate7);
+            width: 24px;
+            text-align: center;
+        }
     }
 }
diff --git a/frontend/src/TooljetDatabase/Table/index.jsx b/frontend/src/TooljetDatabase/Table/index.jsx
@@ -471,7 +471,7 @@ const Table = ({ collapseSidebar }) => {
         setSelectedRowIds({});
         const cellValue = rows[selectedCellRef.current.rowIndex].cells[selectedCellRef.current.columnIndex]?.value;
         const isCellValueDefault =
-          headerGroups[0].headers[selectedCellRef.current.columnIndex]?.column_default === cellValue.toString()
+          headerGroups[0].headers[selectedCellRef.current.columnIndex]?.column_default === cellValue?.toString()
             ? true
             : false;
         setCellVal(cellValue);
@@ -491,7 +491,7 @@ const Table = ({ collapseSidebar }) => {
           rows[selectedCellRef.current.rowIndex].cells[selectedCellRef.current.columnIndex]?.column?.dataType;
         if (cellValue === null) {
           const isCellValueDefault =
-            headerGroups[0].headers[selectedCellRef.current.columnIndex]?.column_default === cellValue.toString()
+            headerGroups[0].headers[selectedCellRef.current.columnIndex]?.column_default === cellValue?.toString()
               ? true
               : false;
           setSelectedRowIds({});
@@ -756,7 +756,7 @@ const Table = ({ collapseSidebar }) => {
       ['table-editable-parent-cell', 'tjdb-td-wrapper', 'table-cell', 'cell-text'].includes(e.target.classList.value)
     ) {
       const isCellValueDefault =
-        headerGroups[0].headers[cellIndex]?.column_default === cellVal.toString() ? true : false;
+        headerGroups[0].headers[cellIndex]?.column_default === cellVal?.toString() ? true : false;
       updateCellNavigationRef(rowIndex, cellIndex, true);
       setSelectedRowIds({});
       setCellVal(cellVal);

diff --git a/server/.version b/server/.version
@@ -1 +1 @@
-2.33.0
+2.33.1