From b65bfd8096da51fa5751de6a2f861b4ae0ed5959 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Thu, 27 Jun 2024 11:52:15 -0700
Subject: [PATCH 1/2] ACAS-784: Simplify lookup of maestro to use ?

---
 .../maestrosketcherlauncher.js                | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/modules/CmpdReg/src/client/schrodinger/maestrosketcher/maestrosketcherlauncher.js b/modules/CmpdReg/src/client/schrodinger/maestrosketcher/maestrosketcherlauncher.js
index 614b60d6a..3fdfa168b 100644
--- a/modules/CmpdReg/src/client/schrodinger/maestrosketcher/maestrosketcherlauncher.js
+++ b/modules/CmpdReg/src/client/schrodinger/maestrosketcher/maestrosketcherlauncher.js
@@ -1,23 +1,16 @@
 $(function() {
-
-	window.MaestroJSUtil = {
-        // See implementation of "setRepresentation" in src/components/Sketcher/index.tsx of the rc-maestro-sketcher repository as a reference
-		"getSketcher": function getSketcher (el) {
-            function waitForReady (resolve, reject) {
-                var _a;
-                maestro = $(el)[0].contentWindow.Module;
-                const sketcherImportText = (_a = this.maestro) === null || _a === void 0 ? void 0 : (_a.sketcher_import_text || _a.sketcherImportText);
-                // Wait until sketcher is initialized
+    window.MaestroJSUtil = {
+        "getSketcher": function getSketcher(el) {
+            function waitForReady(resolve, reject) {
+                var maestro = $(el)?.[0]?.contentWindow?.Module;
+                const sketcherImportText = maestro?.sketcher_import_text || maestro?.sketcherImportText;
                 if (!sketcherImportText) {
-                    self = this;
-                    setTimeout(function() {waitForReady(resolve, reject)}, 1000);
-                }
-                else {
-                    resolve(maestro)
+                    setTimeout(() => waitForReady(resolve, reject), 1000);
+                } else {
+                    resolve(maestro);
                 }
             }
-			
-			return new Promise(waitForReady);				
-		}
-	};
+            return new Promise(waitForReady);
+        }
+    };
 });
\ No newline at end of file

From 8840bc3368d7b41866166d1448482120d0c8feec Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Thu, 27 Jun 2024 11:53:25 -0700
Subject: [PATCH 2/2] ACAS-784: Lookup qtLoader.module

---
 .../schrodinger/maestrosketcher/maestrosketcherlauncher.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/CmpdReg/src/client/schrodinger/maestrosketcher/maestrosketcherlauncher.js b/modules/CmpdReg/src/client/schrodinger/maestrosketcher/maestrosketcherlauncher.js
index 3fdfa168b..1333d32dc 100644
--- a/modules/CmpdReg/src/client/schrodinger/maestrosketcher/maestrosketcherlauncher.js
+++ b/modules/CmpdReg/src/client/schrodinger/maestrosketcher/maestrosketcherlauncher.js
@@ -2,7 +2,7 @@ $(function() {
     window.MaestroJSUtil = {
         "getSketcher": function getSketcher(el) {
             function waitForReady(resolve, reject) {
-                var maestro = $(el)?.[0]?.contentWindow?.Module;
+                var maestro = $(el)?.[0]?.contentWindow?.qtLoader?.module;
                 const sketcherImportText = maestro?.sketcher_import_text || maestro?.sketcherImportText;
                 if (!sketcherImportText) {
                     setTimeout(() => waitForReady(resolve, reject), 1000);