From b9a84074bb531e664e120873125cde971d4cb01f Mon Sep 17 00:00:00 2001
From: arpitnath <arpitnath42@gmail.com>
Date: Sat, 16 Sep 2023 02:47:24 +0530
Subject: [PATCH] add event index for creating app versions

---
 frontend/src/Editor/ReleaseVersionButton.jsx |  2 +-
 server/src/services/apps.service.ts          | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/frontend/src/Editor/ReleaseVersionButton.jsx b/frontend/src/Editor/ReleaseVersionButton.jsx
index 9f79f08046..cd6a68bd64 100644
--- a/frontend/src/Editor/ReleaseVersionButton.jsx
+++ b/frontend/src/Editor/ReleaseVersionButton.jsx
@@ -29,7 +29,7 @@ export const ReleaseVersionButton = function DeployVersionButton({
   const releaseVersion = (editingVersion) => {
     setShowPageDeletionConfirmation(false);
     setIsReleasing(true);
-    saveEditingVersion();
+
     appService
       .saveApp(appId, {
         name: appName,
diff --git a/server/src/services/apps.service.ts b/server/src/services/apps.service.ts
index 7a6965a5c0..d98a960397 100644
--- a/server/src/services/apps.service.ts
+++ b/server/src/services/apps.service.ts
@@ -427,7 +427,7 @@ export class AppsService {
 
       const pageEvents = allEvents.filter((event) => event.sourceId === page.id);
 
-      pageEvents.forEach(async (event) => {
+      pageEvents.forEach(async (event, index) => {
         const newEvent = new EventHandler();
 
         newEvent.id = uuid.v4();
@@ -435,6 +435,7 @@ export class AppsService {
         newEvent.sourceId = savedPage.id;
         newEvent.target = event.target;
         newEvent.event = event.event;
+        newEvent.index = event.index ?? index;
         newEvent.appVersionId = appVersion.id;
 
         await manager.save(newEvent);
@@ -470,7 +471,7 @@ export class AppsService {
           newComponentLayouts.push(newLayout);
         });
 
-        componentEvents.forEach(async (event) => {
+        componentEvents.forEach(async (event, index) => {
           const newEvent = new EventHandler();
 
           newEvent.id = uuid.v4();
@@ -478,6 +479,7 @@ export class AppsService {
           newEvent.sourceId = newComponent.id;
           newEvent.target = event.target;
           newEvent.event = event.event;
+          newEvent.index = event.index ?? index;
           newEvent.appVersionId = appVersion.id;
 
           await manager.save(newEvent);
@@ -567,16 +569,20 @@ export class AppsService {
             const newQuery = await manager.save(manager.create(DataQuery, dataQueryParams));
 
             const dataQueryEvents = allEvents.filter((event) => event.sourceId === dataQuery.id);
-            for (const event of dataQueryEvents) {
+
+            dataQueryEvents.forEach(async (event, index) => {
               const newEvent = new EventHandler();
+
               newEvent.id = uuid.v4();
               newEvent.name = event.name;
               newEvent.sourceId = newQuery.id;
               newEvent.target = event.target;
               newEvent.event = event.event;
+              newEvent.index = event.index ?? index;
               newEvent.appVersionId = appVersion.id;
+
               await manager.save(newEvent);
-            }
+            });
 
             oldDataQueryToNewMapping[dataQuery.id] = newQuery.id;
             newDataQueries.push(newQuery);
@@ -594,7 +600,8 @@ export class AppsService {
 
             const newQuery = await manager.save(manager.create(DataQuery, dataQueryParams));
             const dataQueryEvents = allEvents.filter((event) => event.sourceId === globalQuery.id);
-            for (const event of dataQueryEvents) {
+
+            dataQueryEvents.forEach(async (event, index) => {
               const newEvent = new EventHandler();
 
               newEvent.id = uuid.v4();
@@ -602,10 +609,11 @@ export class AppsService {
               newEvent.sourceId = newQuery.id;
               newEvent.target = event.target;
               newEvent.event = event.event;
+              newEvent.index = event.index ?? index;
               newEvent.appVersionId = appVersion.id;
 
               await manager.save(newEvent);
-            }
+            });
             oldDataQueryToNewMapping[globalQuery.id] = newQuery.id;
             newDataQueries.push(newQuery);
           }