From fa601d770a7c584c7878b16276323a289b7d5248 Mon Sep 17 00:00:00 2001
From: arpitnath <arpitnath42@gmail.com>
Date: Mon, 6 Nov 2023 19:21:31 +0530
Subject: [PATCH] fixes: event should map with show/hide modal component id

---
 ...697473340856-MigrateAppsDefinitionSchemaTransition.ts | 4 ++++
 server/src/services/app_import_export.service.ts         | 4 ++++
 server/src/services/apps.service.ts                      | 4 ++++
 server/src/services/page.service.ts                      | 9 +++++++++
 4 files changed, 21 insertions(+)

diff --git a/server/data-migrations/1697473340856-MigrateAppsDefinitionSchemaTransition.ts b/server/data-migrations/1697473340856-MigrateAppsDefinitionSchemaTransition.ts
index aac2a271b3..1804e79137 100644
--- a/server/data-migrations/1697473340856-MigrateAppsDefinitionSchemaTransition.ts
+++ b/server/data-migrations/1697473340856-MigrateAppsDefinitionSchemaTransition.ts
@@ -261,6 +261,10 @@ export class MigrateAppsDefinitionSchemaTransition1697473340856 implements Migra
         eventDefinition.componentId = oldComponentToNewComponentMapping[eventDefinition.componentId];
       }
 
+      if (eventDefinition?.actionId == 'show-modal' || eventDefinition?.actionId === 'hide-modal') {
+        eventDefinition.modal = oldComponentToNewComponentMapping[eventDefinition.modal];
+      }
+
       event.event = eventDefinition;
 
       await manager.save(event);
diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts
index a208bb06ea..7ad588de4f 100644
--- a/server/src/services/app_import_export.service.ts
+++ b/server/src/services/app_import_export.service.ts
@@ -1529,6 +1529,10 @@ export class AppImportExportService {
         eventDefinition.pageId = oldPageToNewPageMapping[eventDefinition.pageId];
       }
 
+      if (eventDefinition?.actionId == 'show-modal' || eventDefinition?.actionId === 'hide-modal') {
+        eventDefinition.modal = oldComponentToNewComponentMapping[eventDefinition.modal];
+      }
+
       event.event = eventDefinition;
 
       await manager.save(event);
diff --git a/server/src/services/apps.service.ts b/server/src/services/apps.service.ts
index 9de25416e7..1825f6d4fa 100644
--- a/server/src/services/apps.service.ts
+++ b/server/src/services/apps.service.ts
@@ -429,6 +429,10 @@ export class AppsService {
         eventDefinition.pageId = oldPageToNewPageMapping[eventDefinition.pageId];
       }
 
+      if (eventDefinition?.actionId == 'show-modal' || eventDefinition?.actionId === 'hide-modal') {
+        eventDefinition.modal = oldComponentToNewComponentMapping[eventDefinition.modal];
+      }
+
       event.event = eventDefinition;
 
       await manager.save(event);
diff --git a/server/src/services/page.service.ts b/server/src/services/page.service.ts
index ebf00ed05a..805e7ea1c9 100644
--- a/server/src/services/page.service.ts
+++ b/server/src/services/page.service.ts
@@ -108,6 +108,10 @@ export class PageService {
             eventDefinition.componentId = componentsIdMap[eventDefinition.componentId];
           }
 
+          if (eventDefinition?.actionId == 'show-modal' || eventDefinition?.actionId === 'hide-modal') {
+            eventDefinition.modal = componentsIdMap[eventDefinition.modal];
+          }
+
           event.event = eventDefinition;
 
           const clonedEvent = new EventHandler();
@@ -144,6 +148,11 @@ export class PageService {
             if (eventDefinition?.actionId === 'control-component') {
               eventDefinition.componentId = componentsIdMap[eventDefinition.componentId];
             }
+
+            if (eventDefinition?.actionId == 'show-modal' || eventDefinition?.actionId === 'hide-modal') {
+              eventDefinition.modal = componentsIdMap[eventDefinition.modal];
+            }
+
             event.event = eventDefinition;
 
             const clonedEvent = new EventHandler();