From 904321443f76380dda2172191467fe8d451f4bbf Mon Sep 17 00:00:00 2001
From: Gustavo Saiani <gustavo@poe.ma>
Date: Fri, 8 Jul 2022 21:12:24 +0200
Subject: [PATCH] Fix 23421 (#23802)

---
 .../query_builder/components/DatasetEditor/DatasetEditor.jsx    | 2 +-
 .../23421-visualization-settins-breaks-ui.cy.spec.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx
index 23a4a48fec4..0f31344cc7d 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx
@@ -261,7 +261,7 @@ function DatasetEditor(props) {
 
   const focusFirstField = useCallback(() => {
     const [firstField] = fields;
-    setFocusedFieldRef(firstField.field_ref);
+    setFocusedFieldRef(firstField?.field_ref);
   }, [fields, setFocusedFieldRef]);
 
   useEffect(() => {
diff --git a/frontend/test/metabase/scenarios/models/reproductions/23421-visualization-settins-breaks-ui.cy.spec.js b/frontend/test/metabase/scenarios/models/reproductions/23421-visualization-settins-breaks-ui.cy.spec.js
index 90ccbaadae2..d6babb05f03 100644
--- a/frontend/test/metabase/scenarios/models/reproductions/23421-visualization-settins-breaks-ui.cy.spec.js
+++ b/frontend/test/metabase/scenarios/models/reproductions/23421-visualization-settins-breaks-ui.cy.spec.js
@@ -15,7 +15,7 @@ const questionDetails = {
   dataset: true,
 };
 
-describe.skip("issue 23421", () => {
+describe("issue 23421", () => {
   beforeEach(() => {
     restore();
     cy.signInAsAdmin();
-- 
GitLab