From 8515d226bc2c1ba8d825219e940ad148b0bce72d Mon Sep 17 00:00:00 2001
From: Shaurya Sharma <shaurya064@gmail.com>
Date: Wed, 6 Nov 2024 16:20:00 +0530
Subject: [PATCH] Minor fixes for table autogenerate column

---
 frontend/src/AppBuilder/Widgets/Table/Table.jsx              | 5 +----
 .../AppBuilder/Widgets/Table/columns/autogenerateColumns.js  | 5 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/frontend/src/AppBuilder/Widgets/Table/Table.jsx b/frontend/src/AppBuilder/Widgets/Table/Table.jsx
index 714f2dd640..8bbe06ffd6 100644
--- a/frontend/src/AppBuilder/Widgets/Table/Table.jsx
+++ b/frontend/src/AppBuilder/Widgets/Table/Table.jsx
@@ -139,7 +139,6 @@ export const Table = React.memo(
     const updatedDataReference = useRef([]);
     const preSelectRow = useRef(false);
     const initialPageCountRef = useRef(null);
-    const isInitialRender = useRef(true);
     const allAppEvents = useEvents();
     // const { events: allAppEvents } = useAppInfo();
     const tableEvents = allAppEvents.filter((event) => event.target === 'component' && event.sourceId === id);
@@ -578,10 +577,8 @@ export const Table = React.memo(
           dynamicColumn,
           setComponentProperty,
           properties.autogenerateColumns ?? false,
-          id,
-          isInitialRender.current
+          id
         );
-        isInitialRender.current = false;
         if (useDynamicColumn) {
           const dynamicColumnHasId = dynamicColumn && dynamicColumn.every((column) => 'id' in column);
           if (!dynamicColumnHasId) {
diff --git a/frontend/src/AppBuilder/Widgets/Table/columns/autogenerateColumns.js b/frontend/src/AppBuilder/Widgets/Table/columns/autogenerateColumns.js
index e093bdeac5..334f115d4e 100644
--- a/frontend/src/AppBuilder/Widgets/Table/columns/autogenerateColumns.js
+++ b/frontend/src/AppBuilder/Widgets/Table/columns/autogenerateColumns.js
@@ -9,8 +9,7 @@ export default function autogenerateColumns(
   dynamicColumn = [],
   setProperty,
   generateNestedColumns,
-  id,
-  isInitialRender
+  id
 ) {
   if (useDynamicColumn) {
     if (dynamicColumn.length > 0 && dynamicColumn[0].name) {
@@ -111,7 +110,7 @@ export default function autogenerateColumns(
   setTimeout(
     () =>
       setProperty(id, 'columns', finalColumns, 'properties', undefined, undefined, undefined, {
-        skipUndoRedo: isInitialRender,
+        skipUndoRedo: true,
         saveAfterAction: true,
       }),
     10