From e80e461ebaa5a6453866f780b0ad4d3e9f2f2237 Mon Sep 17 00:00:00 2001
From: SamTolmay <samtolmay@gmail.com>
Date: Thu, 11 Mar 2021 10:18:34 +0200
Subject: [PATCH] fix(engine): Use context specific pageId in engine.

---
 packages/engine/src/Blocks.js     | 2 +-
 packages/engine/src/Requests.js   | 2 +-
 packages/engine/src/getContext.js | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/engine/src/Blocks.js b/packages/engine/src/Blocks.js
index 74269cea0..12eaee89b 100644
--- a/packages/engine/src/Blocks.js
+++ b/packages/engine/src/Blocks.js
@@ -596,7 +596,7 @@ class Blocks {
   }
 
   generateBlockId(blockIdPattern) {
-    return `${this.context.lowdefy.pageId}:${blockIdPattern}:${Math.random()
+    return `${this.context.pageId}:${blockIdPattern}:${Math.random()
       .toString(36)
       .replace(/[^a-z]+/g, '')
       .substr(0, 5)}`;
diff --git a/packages/engine/src/Requests.js b/packages/engine/src/Requests.js
index a763d4f80..01dd45d92 100644
--- a/packages/engine/src/Requests.js
+++ b/packages/engine/src/Requests.js
@@ -92,7 +92,7 @@ class Requests {
             event: serializer.serialize(event) || {},
             input: serializer.serialize(this.context.lowdefy.inputs[this.context.id]),
             lowdefyGlobal: serializer.serialize(this.context.lowdefy.lowdefyGlobal),
-            pageId: this.context.lowdefy.pageId,
+            pageId: this.context.pageId,
             state: serializer.serialize(this.context.state),
             urlQuery: serializer.serialize(this.context.lowdefy.urlQuery),
           },
diff --git a/packages/engine/src/getContext.js b/packages/engine/src/getContext.js
index 5dfbf2d91..54954fb30 100644
--- a/packages/engine/src/getContext.js
+++ b/packages/engine/src/getContext.js
@@ -75,6 +75,7 @@ const getContext = async ({ block, contextId, lowdefy }) => {
     eventLog: [],
     requests: {},
     lowdefy,
+    pageId: lowdefy.pageId,
     rootBlock: blockData(block), // filter block to prevent circular structure
     showValidationErrors: false,
     state: {},