The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Fix #66446 - Disambiguate errors when moving content to remote synced collections (#68874)
Brad Anderson091f66fc32a5
diff --git a/e2e/test/scenarios/admin/remote-sync.cy.spec.ts b/e2e/test/scenarios/admin/remote-sync.cy.spec.tsindex a5c92adde11..d2717eb65dc 100644--- a/e2e/test/scenarios/admin/remote-sync.cy.spec.ts+++ b/e2e/test/scenarios/admin/remote-sync.cy.spec.ts@@ -104,6 +104,9 @@ describe("Remote Sync", () => {H.getSyncStatusIndicators().should("have.length", 0);+ const expectedError = "Uses content that is not remote synced.";++ cy.log("Test moving via 'Move' modal");H.openCollectionItemMenu("Orders in a dashboard");H.popover().findByText("Move").click();@@ -115,12 +118,20 @@ describe("Remote Sync", () => {cy.wait("@updateDashboard").then((req) => {expect(req.response?.statusCode).to.eq(400);- expect(req.response?.body.message).to.contain(- "content that is not remote synced",- );+ expect(req.response?.body.message).to.contain(expectedError);+ H.entityPickerModal().findByText(expectedError).should("exist");+ H.entityPickerModal().button("Cancel").click();});- H.entityPickerModal().button("Cancel").click();+ cy.log("Test moving via drag-and-drop");+ H.collectionTable().findByText("Orders in a dashboard").as("dragSubject");+ H.navigationSidebar()+ .findByText("Test Synced Collection")+ .as("dropTarget");+ H.dragAndDrop("dragSubject", "dropTarget");+ H.undoToast().should("contain.text", expectedError);++ cy.log("Test positive case");H.openCollectionItemMenu("Orders, Count");H.popover().findByText("Move").click();diff --git a/frontend/src/metabase/common/components/dnd/ItemDragSource.jsx b/frontend/src/metabase/common/components/dnd/ItemDragSource.jsxindex 0196ca218c7..17f1476bb70 100644--- a/frontend/src/metabase/common/components/dnd/ItemDragSource.jsx+++ b/frontend/src/metabase/common/components/dnd/ItemDragSource.jsx@@ -3,7 +3,9 @@ import { Component } from "react";import { DragSource } from "react-dnd";import { getEmptyImage } from "react-dnd-html5-backend";+import { getErrorMessage } from "metabase/api/utils";import { isRootTrashCollection } from "metabase/collections/utils";+import { useToast } from "metabase/common/hooks";import { dragTypeForItem } from ".";@@ -30,7 +32,7 @@ class ItemDragSourceInner extends Component {}}-export const ItemDragSource = DragSource(+const DragSourceComponent = DragSource((props) => dragTypeForItem(props.item),{canDrag({ isSelected, selected, collection, item }, monitor) {@@ -50,7 +52,7 @@ export const ItemDragSource = DragSource(beginDrag(props, monitor, component) {return { item: props.item };},- async endDrag({ selected, onDrop }, monitor, component) {+ async endDrag({ selected, onDrop, onMoveError }, monitor, component) {if (!monitor.didDrop()) {return;}@@ -71,7 +73,7 @@ export const ItemDragSource = DragSource(onDrop && onDrop();} catch (e) {- console.error("There was a problem moving these items: ", e);+ onMoveError?.(e);}}},@@ -82,3 +84,14 @@ export const ItemDragSource = DragSource(isDragging: monitor.isDragging(),}),)(ItemDragSourceInner);++export function ItemDragSource(props) {+ const [sendToast] = useToast();+ const onMoveError = (error) =>+ sendToast({+ message: getErrorMessage(error),+ icon: "warning_triangle_filled",+ iconColor: "warning",+ });+ return <DragSourceComponent {...props} onMoveError={onMoveError} />;+}diff --git a/frontend/src/metabase/dashboard/actions/tabs.ts b/frontend/src/metabase/dashboard/actions/tabs.tsindex 8f98eacfda8..d448bdc7b83 100644--- a/frontend/src/metabase/dashboard/actions/tabs.ts+++ b/frontend/src/metabase/dashboard/actions/tabs.ts@@ -546,6 +546,9 @@ export const tabsReducer = createReducer<DashboardState>();builder.addCase(Dashboards.actionTypes.UPDATE, (state, { payload }) => {+ if (!payload.dashboard) {+ return;+ }const { dashcards: newDashcards, tabs: newTabs } = payload.dashboard;const { prevDash, prevTabs } = getPrevDashAndTabs({diff --git a/frontend/src/metabase/dashboard/reducers-typed.ts b/frontend/src/metabase/dashboard/reducers-typed.tsindex ebcbdcf010b..e654c3e5f3d 100644--- a/frontend/src/metabase/dashboard/reducers-typed.ts+++ b/frontend/src/metabase/dashboard/reducers-typed.ts@@ -327,7 +327,7 @@ export const dashboards = createReducer(};}).addCase(Dashboards.actionTypes.UPDATE, (state, { payload }) => {- const draftDashboard = state[payload.dashboard.id];+ const draftDashboard = state[payload.dashboard?.id];if (draftDashboard) {draftDashboard.collection_id = payload.dashboard.collection_id;draftDashboard.collection = payload.dashboard.collection;diff --git a/frontend/src/metabase/redux/user.ts b/frontend/src/metabase/redux/user.tsindex f843ff3b5fe..6b843afdb81 100644--- a/frontend/src/metabase/redux/user.ts+++ b/frontend/src/metabase/redux/user.ts@@ -52,6 +52,7 @@ export const currentUser = createReducer<User | null>(null, (builder) => {.addCase(Dashboards.actionTypes.UPDATE, (state, { payload }) => {const { dashboard } = payload;if (+ dashboard &&state != null &&state.custom_homepage?.dashboard_id === dashboard.id &&dashboard.archived