Merge pull request #3248 from quadratichq/fix-getRenderCells-core-error

Fix core error after getRenderCells

Author: AyushAgrawal-A2

quadratic-client/src/app/web-workers/quadraticCore/worker/core.ts

@@ -147,20 +147,16 @@ class Core {
     y: number;
     width: number;
     height: number;
-  }): Promise<Uint8Array | undefined> {
-    return new Promise((resolve) => {
-      if (!this.gridController) throw new Error('Expected gridController to be defined in Core.getRenderCells');
-      try {
-        const renderCells = this.gridController.getRenderCells(
-          data.sheetId,
-          numbersToRectStringified(data.x, data.y, data.width, data.height)
-        );
-        resolve(renderCells);
-      } catch (e) {
-        this.handleCoreError('getRenderCells', e);
-        resolve(undefined);
-      }
-    });
+  }): Uint8Array | undefined {
+    if (!this.gridController) throw new Error('Expected gridController to be defined in Core.getRenderCells');
+    try {
+      return this.gridController.getRenderCells(
+        data.sheetId,
+        numbersToRectStringified(data.x, data.y, data.width, data.height)
+      );
+    } catch (e) {
+      this.handleCoreError('getRenderCells', e);
+    }
   }
 
   // Gets the SheetIds for the Grid.

quadratic-client/src/app/web-workers/quadraticCore/worker/coreRender.ts

@@ -70,7 +70,7 @@ class CoreRender {
   }
 
   private async getRenderCells(request: RenderCoreRequestRenderCells) {
-    const data = await core.getRenderCells(request);
+    const data = core.getRenderCells(request);
     this.send({ type: 'coreRenderRenderCells', id: request.id, data }, data?.buffer);
   }
 

quadratic-client/src/app/web-workers/renderWebWorker/worker/renderCore.ts

@@ -19,7 +19,7 @@ import { renderText } from '@/app/web-workers/renderWebWorker/worker/renderText'
 
 class RenderCore {
   private renderCorePort?: MessagePort;
-  private waitingForResponse: Map<number, Function> = new Map();
+  private waitingForResponse: Record<number, Function> = {};
   private id = 0;
 
   async clientInit(renderPort: MessagePort) {
@@ -129,7 +129,12 @@ class RenderCore {
         resolve([]);
         return;
       }
-      const id = this.id;
+
+      const id = this.id++;
+      this.waitingForResponse[id] = (cells: JsRenderCell[]) => {
+        resolve(cells);
+      };
+
       const message: RenderCoreRequestRenderCells = {
         type: 'renderCoreRequestRenderCells',
         id,
@@ -140,13 +145,9 @@ class RenderCore {
         height,
       };
       this.renderCorePort.postMessage(message);
-      this.waitingForResponse.set(id, (cells: JsRenderCell[]) => {
-        resolve(cells);
-      });
-      this.id++;
 
       abortSignal?.addEventListener('abort', () => {
-        this.waitingForResponse.set(id, () => {});
+        delete this.waitingForResponse[id];
         reject('Render cells request aborted');
       });
     });
@@ -158,17 +159,19 @@ class RenderCore {
 
   private renderCells(message: CoreRenderCells) {
     const { id, data } = message;
-    const response = this.waitingForResponse.get(id);
+
+    const response = this.waitingForResponse[id];
+    delete this.waitingForResponse[id];
     if (!response) {
       console.warn('No callback for requestRenderCells');
       return;
     }
+
     let cells = [] as JsRenderCell[];
     if (data) {
       cells = fromUint8Array<JsRenderCell[]>(data);
     }
     response(cells);
-    this.waitingForResponse.delete(id);
   }
 }
 

quadratic-core/src/wasm_bindings/controller/render.rs

@@ -10,7 +10,7 @@ impl GridController {
     pub fn get_render_cells(&self, sheet_id: String, rect: String) -> Result<Vec<u8>, JsValue> {
         let rect = serde_json::from_str::<Rect>(&rect).map_err(|e| e.to_string())?;
         let Some(sheet) = self.try_sheet_from_string_id(&sheet_id) else {
-            return Result::Err("Sheet not found".into());
+            return Ok(vec![]);
         };
         sheet.send_validation_warnings_rect(rect, true);
         let output = sheet.get_render_cells(rect, self.a1_context());

quadratic-rust-shared/Cargo.toml

@@ -10,8 +10,13 @@ aes = { version = "0.8.4", optional = true }
 arrow = { version = "=54.2.1", optional = true }
 arrow-array = { version = "=54.2.1", optional = true }
 async-trait = "0.1.80"
-aws-config = { version = "1.1.1", features = ["behavior-version-latest"], optional = true }
-aws-sdk-s3 = { version = "1.12.0", features = ["behavior-version-latest", "rt-tokio"], optional = true }
+aws-config = { version = "1.1.1", features = [
+  "behavior-version-latest",
+], optional = true }
+aws-sdk-s3 = { version = "1.12.0", features = [
+  "behavior-version-latest",
+  "rt-tokio",
+], optional = true }
 bigdecimal = "0.4.5" # need this fixed to the sqlx dependency
 bytes = "1.6.0"
 cbc = { version = "0.1.2", features = ["alloc"] }
@@ -27,12 +32,20 @@ httpmock = { git = "https://github.com/quadratichq/httpmock", version = "0.8.0-a
   "record",
 ], optional = true }
 jsonwebtoken = { version = "9.2.0", optional = true }
-parquet = { version = "=54.2.1", default-features = false, features = ["arrow", "arrow-array", "flate2", "snap"], optional = true }
+parquet = { version = "=54.2.1", default-features = false, features = [
+  "arrow",
+  "arrow-array",
+  "flate2",
+  "snap",
+], optional = true }
 prost = { version = "0.13.5", optional = true, default-features = false }
 prost-reflect = { version = "0.15.1", optional = true, features = ["derive"] }
 redis = { version = "0.29.1", features = ["tokio-comp"], optional = true }
-reqwest = { version = "0.11.22", features = ["json", "serde_json"], optional = true }
-russh = { version = "0.51.1", optional = true }
+reqwest = { version = "0.11.22", features = [
+  "json",
+  "serde_json",
+], optional = true }
+russh = { version = "0.53.0", optional = true }
 russh-config = { version = "0.50.0", optional = true }
 rust_decimal = "1.30.0"
 serde = { version = "1.0.193", features = ["derive"] }
@@ -51,7 +64,14 @@ strum = "0.27.1"
 strum_macros = "0.27.1"
 tabled = { version = "0.14.0", features = ["color"], optional = true }
 thiserror = "2.0.12"
-tiberius = { version = "0.12.3", default-features = false, features = ["vendored-openssl", "bigdecimal", "chrono", "time", "tds73", "rust_decimal"], optional = true }
+tiberius = { version = "0.12.3", default-features = false, features = [
+  "vendored-openssl",
+  "bigdecimal",
+  "chrono",
+  "time",
+  "tds73",
+  "rust_decimal",
+], optional = true }
 tokio = { version = "1.44.2", features = ["full"], optional = true }
 tokio-util = { version = "0.7.11", features = ["compat"], optional = true }
 tracing = { version = "0.1.40", optional = true }
@@ -81,7 +101,7 @@ sql = [
   "tiberius",
   "tokio",
   "tokio-util",
-  "tracing"
+  "tracing",
 ]
 storage = ["aws", "crypto", "tokio"]
 benchmark = ["criterion", "tabled"]
@@ -90,7 +110,7 @@ test = ["httpmock", "criterion", "tabled"]
 [dev-dependencies]
 arrow = { version = "=54.2.1", features = ["prettyprint"] }
 aws-smithy-async = { version = "1.2.1", features = ["test-util"] }
-aws-smithy-runtime = {version = "1.6.2", features = ["test-util"] }
+aws-smithy-runtime = { version = "1.6.2", features = ["test-util"] }
 aws-smithy-runtime-api = "1.7.1"
 criterion = { version = "0.5" }
 http = "1.1.0"