Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Update persist and refreshModelCache mutation onQueryStarted (#74631)

Nick Fitzpatrickb68fcb7263b4
diff --git a/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts b/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts
index d341794e29c..7688d25d448 100644
--- a/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts
+++ b/e2e/test/scenarios/admin/databases/database-writable-connection.cy.spec.ts
@@ -150,6 +150,16 @@ describe("scenarios > admin > databases > writable connection", () => {
createWritableConnection(DEFAULT_USER);
refreshModelPersistenceAndAwaitSuccess(model.id);
+
+ // Regression for metabase#74449: the Persist model data toggle must
+ // reflect the mutation result without a page reload (persistModel
+ // returns HTTP 204, and the UI relies on RTK cache invalidation to
+ // refetch the persisted state).
+ cy.visit(`/model/${model.id}`);
+ H.openQuestionActions("Edit settings");
+ cy.findByLabelText("Persist model data").should("be.checked").click();
+ cy.findByLabelText("Persist model data").should("not.be.checked").click();
+ cy.findByLabelText("Persist model data").should("be.checked");
});
});
diff --git a/frontend/src/metabase/api/card.ts b/frontend/src/metabase/api/card.ts
index 0f862ff1ac2..611e1773e5f 100644
--- a/frontend/src/metabase/api/card.ts
+++ b/frontend/src/metabase/api/card.ts
@@ -35,7 +35,6 @@ import {
provideParameterValuesTags,
} from "./tags";
import { hydrateLegacyEntities } from "./utils/hydrate-legacy-entities";
-import { handleQueryFulfilled } from "./utils/lifecycle";
const PERSISTED_MODEL_REFRESH_DELAY = 200;
@@ -241,8 +240,9 @@ export const cardApi = Api.injectEndpoints({
method: "POST",
url: `/api/persist/card/${id}/persist`,
}),
- onQueryStarted: (id, { dispatch, queryFulfilled }) =>
- handleQueryFulfilled(queryFulfilled, () => {
+ onQueryStarted: async (id, { dispatch, queryFulfilled }) => {
+ try {
+ await queryFulfilled;
// we wait to invalidate this tag so the cache refresh has time to start before we refetch
setTimeout(() => {
dispatch(
@@ -253,7 +253,10 @@ export const cardApi = Api.injectEndpoints({
]),
);
}, PERSISTED_MODEL_REFRESH_DELAY);
- }),
+ } catch {
+ // mutation failed — nothing to invalidate
+ }
+ },
}),
unpersistModel: builder.mutation<void, CardId>({
query: (id) => ({
@@ -272,8 +275,9 @@ export const cardApi = Api.injectEndpoints({
method: "POST",
url: `/api/persist/card/${id}/refresh`,
}),
- onQueryStarted: (id, { dispatch, queryFulfilled }) =>
- handleQueryFulfilled(queryFulfilled, () => {
+ onQueryStarted: async (id, { dispatch, queryFulfilled }) => {
+ try {
+ await queryFulfilled;
// we wait to invalidate this tag so the cache refresh has time to start before we refetch
setTimeout(() => {
dispatch(
@@ -284,7 +288,10 @@ export const cardApi = Api.injectEndpoints({
]),
);
}, PERSISTED_MODEL_REFRESH_DELAY);
- }),
+ } catch {
+ // mutation failed — nothing to invalidate
+ }
+ },
}),
listEmbeddableCards: builder.query<GetEmbeddableCard[], void>({
query: (params) => ({