From a034cb43384e4c9ac7239206b32efed6bab46b0a Mon Sep 17 00:00:00 2001
From: Kiran Ashok <stepinfwd@gmail.com>
Date: Thu, 31 Mar 2022 15:09:04 +0530
Subject: [PATCH] Bugfix: when "make editable" toggle is false , edit option
 for column types (multiselect,select,datepicker) should be disabled (#2329)

* edit check included in datepicker , select and multiselect

* cleanup
---
 frontend/src/Editor/Components/Table/Datepicker.jsx | 1 +
 frontend/src/Editor/Components/Table/Table.jsx      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/frontend/src/Editor/Components/Table/Datepicker.jsx b/frontend/src/Editor/Components/Table/Datepicker.jsx
index 0c6eed954c..ba47c56478 100644
--- a/frontend/src/Editor/Components/Table/Datepicker.jsx
+++ b/frontend/src/Editor/Components/Table/Datepicker.jsx
@@ -55,6 +55,7 @@ export const Datepicker = function Datepicker({
         onChange={dateChange}
         closeOnSelect={true}
         onClose={onDatepickerClose}
+        disabled={readOnly}
       />
     </>
   );
diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx
index 7aeb94ba75..f7b936b73d 100644
--- a/frontend/src/Editor/Components/Table/Table.jsx
+++ b/frontend/src/Editor/Components/Table/Table.jsx
@@ -482,6 +482,7 @@ export function Table({
                   }}
                   filterOptions={fuzzySearch}
                   placeholder="Select.."
+                  disabled={!column.isEditable}
                 />
                 <div className={`invalid-feedback ${isValid ? '' : 'd-flex'}`}>{validationError}</div>
               </div>
@@ -500,6 +501,7 @@ export function Table({
                   onChange={(value) => {
                     handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original);
                   }}
+                  disabled={!column.isEditable}
                 />
               </div>
             );