From 71a3820fbc397d0eb8c86864db34573342833ba7 Mon Sep 17 00:00:00 2001
From: Manish Kushare <37823141+manishkushare@users.noreply.github.com>
Date: Wed, 25 Oct 2023 16:23:55 +0530
Subject: [PATCH 1/2] Avoided infinite loop in server side sorting in the table
 component (#8015)

* avoided infinite loop in server side sorting

* bump version
---
 .version                                       | 2 +-
 frontend/.version                              | 2 +-
 frontend/src/Editor/Components/Table/Table.jsx | 2 +-
 server/.version                                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.version b/.version
index f48f82fa2c..d93847fab5 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.22.0
+2.22.1
diff --git a/frontend/.version b/frontend/.version
index f48f82fa2c..d93847fab5 100644
--- a/frontend/.version
+++ b/frontend/.version
@@ -1 +1 @@
-2.22.0
+2.22.1
diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx
index 48854b1492..2d278840f9 100644
--- a/frontend/src/Editor/Components/Table/Table.jsx
+++ b/frontend/src/Editor/Components/Table/Table.jsx
@@ -642,7 +642,7 @@ export function Table({
     }
     if (mounted) setExposedVariable('sortApplied', sortOptions);
     fireEvent('onSort');
-  }, [sortOptions]);
+  }, [JSON.stringify(sortOptions)]);
 
   useEffect(() => {
     setExposedVariable('setPage', async function (targetPageIndex) {
diff --git a/server/.version b/server/.version
index f48f82fa2c..d93847fab5 100644
--- a/server/.version
+++ b/server/.version
@@ -1 +1 @@
-2.22.0
+2.22.1

From 96aeb4b892d2713af08bd8f78ea29e50c24b1464 Mon Sep 17 00:00:00 2001
From: Adish M <adish.madhu@gmail.com>
Date: Fri, 27 Oct 2023 11:26:20 +0530
Subject: [PATCH 2/2] Adding release label to Trigger all the cypress worflow
 to main branch

---
 .github/workflows/cypress-appbuilder.yml  | 2 +-
 .github/workflows/cypress-marketplace.yml | 2 +-
 .github/workflows/cypress-platform.yml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cypress-appbuilder.yml b/.github/workflows/cypress-appbuilder.yml
index 2cbff90ea9..f1a5bd6a00 100644
--- a/.github/workflows/cypress-appbuilder.yml
+++ b/.github/workflows/cypress-appbuilder.yml
@@ -14,7 +14,7 @@ jobs:
   Cypress-App-Builder:
     runs-on: ubuntu-22.04
 
-    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'run-cypress-app-builder' }}
+    if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'run-cypress-app-builder' || github.event.label.name == 'run-cypress') }}
 
     steps:
       - name: Setup Node.js
diff --git a/.github/workflows/cypress-marketplace.yml b/.github/workflows/cypress-marketplace.yml
index b2c138ff6c..edf9c6e7bb 100644
--- a/.github/workflows/cypress-marketplace.yml
+++ b/.github/workflows/cypress-marketplace.yml
@@ -14,7 +14,7 @@ jobs:
   Cypress-Marketplace:
     runs-on: ubuntu-22.04
 
-    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'run-cypress-marketplace' }}
+    if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'run-cypress-marketplace' || github.event.label.name == 'run-cypress') }}
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/cypress-platform.yml b/.github/workflows/cypress-platform.yml
index 6eda6f4962..5b7551430c 100644
--- a/.github/workflows/cypress-platform.yml
+++ b/.github/workflows/cypress-platform.yml
@@ -14,7 +14,7 @@ jobs:
   Cypress-Platform:
     runs-on: ubuntu-22.04
 
-    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'run-cypress-workspace' }}
+    if: ${{ github.event.action == 'labeled' && (github.event.label.name == 'run-cypress-workspace' || github.event.label.name == 'run-cypress') }}
 
     steps:
       - name: Setup Node.js