From 361f3c164bd27d23fca79b86a67a2614ac0f893c Mon Sep 17 00:00:00 2001
From: Kiran Ashok <stepinfwd@gmail.com>
Date: Thu, 3 Nov 2022 16:53:09 +0530
Subject: [PATCH] feat :: changed naming from disable -> enabledSort ,
 serverside sort only active when sort enabled (#4477)

---
 frontend/src/Editor/Components/Table/Table.jsx             | 4 ++--
 .../Editor/Components/Table/load-properties-and-styles.js  | 4 ++--
 frontend/src/Editor/Inspector/Components/Table.jsx         | 7 +++++--
 frontend/src/Editor/WidgetManager/widgetConfig.js          | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx
index caccef2532..484e093ffb 100644
--- a/frontend/src/Editor/Components/Table/Table.jsx
+++ b/frontend/src/Editor/Components/Table/Table.jsx
@@ -89,7 +89,7 @@ export function Table({
     enablePrevButton,
     totalRecords,
     rowsPerPage,
-    disabledSort,
+    enabledSort,
   } = loadPropertiesAndStyles(properties, styles, darkMode, component);
 
   const getItemStyle = ({ isDragging, isDropAnimating }, draggableStyle) => ({
@@ -388,7 +388,7 @@ export function Table({
       pageCount: -1,
       manualPagination: false,
       getExportFileBlob,
-      disableSortBy: disabledSort,
+      disableSortBy: !enabledSort,
       manualSortBy: serverSideSort,
     },
     useColumnOrder,
diff --git a/frontend/src/Editor/Components/Table/load-properties-and-styles.js b/frontend/src/Editor/Components/Table/load-properties-and-styles.js
index 7db2b40565..8473c1c244 100644
--- a/frontend/src/Editor/Components/Table/load-properties-and-styles.js
+++ b/frontend/src/Editor/Components/Table/load-properties-and-styles.js
@@ -9,7 +9,7 @@ export default function loadPropertiesAndStyles(properties, styles, darkMode, co
   const enablePrevButton = properties.enablePrevButton ?? true;
 
   const totalRecords = properties.totalRecords ?? '';
-  const disabledSort = properties?.disabledSort ?? false;
+  const enabledSort = properties?.enabledSort ?? true;
 
   const serverSideSort = properties.serverSideSort ?? false;
 
@@ -79,6 +79,6 @@ export default function loadPropertiesAndStyles(properties, styles, darkMode, co
     enablePrevButton,
     totalRecords,
     rowsPerPage,
-    disabledSort,
+    enabledSort,
   };
 }
diff --git a/frontend/src/Editor/Inspector/Components/Table.jsx b/frontend/src/Editor/Inspector/Components/Table.jsx
index 04757e755d..5ca7899a45 100644
--- a/frontend/src/Editor/Inspector/Components/Table.jsx
+++ b/frontend/src/Editor/Inspector/Components/Table.jsx
@@ -789,6 +789,9 @@ class TableComponent extends React.Component {
     const clientSidePagination = component.component.definition.properties.clientSidePagination?.value
       ? resolveReferences(component.component.definition.properties.clientSidePagination?.value, currentState)
       : false;
+    const enabledSort = component.component.definition.properties.enabledSort?.value
+      ? resolveReferences(component.component.definition.properties.enabledSort?.value, currentState)
+      : true;
 
     const renderCustomElement = (param, paramType = 'properties') => {
       return renderElement(component, componentMeta, paramUpdated, dataQueries, param, paramType, currentState);
@@ -928,14 +931,14 @@ class TableComponent extends React.Component {
       ...(serverSidePagination ? ['enableNextButton'] : []),
       ...(serverSidePagination ? ['totalRecords'] : []),
       ...(clientSidePagination && !serverSidePagination ? ['rowsPerPage'] : []),
+      ...(enabledSort ? ['serverSideSort'] : []),
       'serverSideSearch',
       'showDownloadButton',
       'showFilterButton',
       'showBulkUpdateActions',
       'showBulkSelector',
       'highlightSelectedRow',
-      'disabledSort',
-      'serverSideSort',
+      'enabledSort',
       'serverSideFilter',
     ];
 
diff --git a/frontend/src/Editor/WidgetManager/widgetConfig.js b/frontend/src/Editor/WidgetManager/widgetConfig.js
index 1d9c4d77e3..ce1c258c3c 100644
--- a/frontend/src/Editor/WidgetManager/widgetConfig.js
+++ b/frontend/src/Editor/WidgetManager/widgetConfig.js
@@ -155,9 +155,9 @@ export const widgets = [
           schema: { type: 'boolean' },
         },
       },
-      disabledSort: {
+      enabledSort: {
         type: 'toggle',
-        displayName: 'Disable sorting',
+        displayName: 'Enable sorting',
         validation: {
           schema: { type: 'boolean' },
         },
@@ -412,6 +412,7 @@ export const widgets = [
         highlightSelectedRow: { value: '{{false}}' },
         columnSizes: { value: '{{({})}}' },
         actions: { value: [] },
+        enabledSort: { value: '{{true}}' },
       },
       events: [],
       styles: {