Update bookmark icon when switching from question to model and back (#24376)

frontend/src/metabase/entities/bookmarks.js

@@ -47,12 +47,12 @@ const Bookmarks = createEntity({
   },
   reducer: (state = {}, { type, payload, error }) => {
     if (type === Questions.actionTypes.UPDATE && payload?.object) {
-      const { archived, id, name } = payload.object;
+      const { archived, dataset, id, name } = payload.object;
       const key = `card-${id}`;
       if (archived) {
         return dissoc(state, key);
       } else {
-        return updateIn(state, [key], item => ({ ...item, name }));
+        return updateIn(state, [key], item => ({ ...item, dataset, name }));
       }
     }
 

frontend/test/metabase/scenarios/organization/bookmarks-question.cy.spec.js

 import {
   restore,
   navigationSidebar,
+  openQuestionActions,
   openNavigationSidebar,
   visitQuestion,
 } from "__support__/e2e/helpers";
@@ -30,6 +31,23 @@ describe("scenarios > question > bookmarks", () => {
       cy.findByText("Orders 2");
     });
 
+    // Convert to model
+    openQuestionActions();
+    cy.findByText("Turn into a model").click();
+    cy.findByText("Turn this into a model").click();
+
+    navigationSidebar().within(() => {
+      cy.icon("model");
+    });
+
+    // Convert back to question
+    openQuestionActions();
+    cy.findByText("Turn back to saved question").click();
+
+    navigationSidebar().within(() => {
+      cy.icon("model").should("not.exist");
+    });
+
     // Remove bookmark
     toggleBookmark();