From e6cab6093d554e93805d126011ceea135f85761a Mon Sep 17 00:00:00 2001
From: Alexander Polyankin <alexander.polyankin@metabase.com>
Date: Mon, 1 Apr 2024 14:30:55 +0300
Subject: [PATCH] Temp fix for the join issue (#40836)

---
 frontend/src/metabase-lib/queries/StructuredQuery.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/metabase-lib/queries/StructuredQuery.ts b/frontend/src/metabase-lib/queries/StructuredQuery.ts
index c82ee3ac0bb..674bceff508 100644
--- a/frontend/src/metabase-lib/queries/StructuredQuery.ts
+++ b/frontend/src/metabase-lib/queries/StructuredQuery.ts
@@ -264,7 +264,11 @@ class StructuredQuery extends AtomicQuery {
    * @deprecated use metabase-lib v2 to manage joins
    */
   joins = _.once((): JoinWrapper[] => {
-    return Q.getJoins(this.legacyQuery({ useStructuredQuery: true })).map(
+    const legacyQuery = this.legacyQuery({ useStructuredQuery: true });
+    if (!legacyQuery) {
+      return [];
+    }
+    return Q.getJoins(legacyQuery).map(
       (join, index) => new JoinWrapper(join, index, this),
     );
   });
-- 
GitLab