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
Ignore BE exception when checking dependencies (#64716)
Alexander Polyankin9e401daa2ef3
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.tsindex 27dadd7ba9c..c68aa5d9ef8 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.ts@@ -14,7 +14,6 @@ import { useCheckDependencies } from "../use-check-dependencies";export function useCheckCardDependencies({onSave,- onError,}: UseCheckDependenciesProps<Question>): UseCheckDependenciesResult<Question> {const store = useStore();@@ -35,6 +34,5 @@ export function useCheckCardDependencies({getCheckDependenciesRequest,useLazyCheckDependenciesQuery: useLazyCheckCardDependenciesQuery,onSave,- onError,});}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.unit.spec.tsindex 80f6242dc1c..362f4f99b36 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.unit.spec.ts@@ -1,4 +1,7 @@-import { setupCheckCardDependenciesEndpoint } from "__support__/server-mocks/dependencies";+import {+ setupCheckCardDependenciesEndpoint,+ setupCheckCardDependenciesEndpointError,+} from "__support__/server-mocks/dependencies";import { act, renderHookWithProviders } from "__support__/ui";import { SAMPLE_METADATA } from "metabase-lib/test-helpers";import Question from "metabase-lib/v1/Question";@@ -9,21 +12,26 @@ import { useCheckCardDependencies } from "./use-check-card-dependencies";type SetupOpts = {response?: CheckDependenciesResponse;+ hasError?: boolean;};function setup({response = createMockCheckDependenciesResponse(),+ hasError = false,}: SetupOpts = {}) {- setupCheckCardDependenciesEndpoint(response);+ if (hasError) {+ setupCheckCardDependenciesEndpointError();+ } else {+ setupCheckCardDependenciesEndpoint(response);+ }const onSave = jest.fn();- const onError = jest.fn();const { result } = renderHookWithProviders(- () => useCheckCardDependencies({ onSave, onError }),+ () => useCheckCardDependencies({ onSave }),{},);- return { result, onSave, onError };+ return { result, onSave };}describe("useCheckCardDependencies", () => {@@ -74,4 +82,13 @@ describe("useCheckCardDependencies", () => {expect(result.current.isConfirmationShown).toBe(false);expect(onSave).not.toHaveBeenCalled();});++ it("should save if there is a backend error when checking dependencies", async () => {+ const question = Question.create({ metadata: SAMPLE_METADATA });+ const { result, onSave } = setup({ hasError: true });++ await act(() => result.current.handleInitialSave(question));++ expect(onSave).toHaveBeenCalledWith(question);+ });});diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-dependencies/use-check-dependencies.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-dependencies/use-check-dependencies.tsindex bc80ac71d41..a6dde0a6987 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-dependencies/use-check-dependencies.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-dependencies/use-check-dependencies.ts@@ -23,14 +23,12 @@ type UseCheckDependenciesProps<TChange, TRequest> = {getCheckDependenciesRequest: (change: TChange) => TRequest;useLazyCheckDependenciesQuery: () => UseCheckDependenciesQueryResult<TRequest>;onSave: (change: TChange) => Promise<void>;- onError: (error: unknown) => void;};export function useCheckDependencies<TChange, TRequest>({getCheckDependenciesRequest,useLazyCheckDependenciesQuery,onSave,- onError,}: UseCheckDependenciesProps<TChange,TRequest@@ -46,7 +44,8 @@ export function useCheckDependencies<TChange, TRequest>({getCheckDependenciesRequest(change),);if (error != null) {- onError(error);+ console.error("Error when checking dependencies.", error);+ await onSave(change);} else if (data != null && !data.success) {setChange(change);setIsConfirmationShown(true);@@ -54,7 +53,7 @@ export function useCheckDependencies<TChange, TRequest>({await onSave(change);}},- [getCheckDependenciesRequest, checkDependencies, onSave, onError],+ [getCheckDependenciesRequest, checkDependencies, onSave],);const handleCloseConfirmation = useCallback(() => {diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-snippet-dependencies/use-check-snippet-dependencies.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-snippet-dependencies/use-check-snippet-dependencies.tsindex 8221931c6cf..e7c740a329a 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-snippet-dependencies/use-check-snippet-dependencies.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-snippet-dependencies/use-check-snippet-dependencies.ts@@ -12,13 +12,11 @@ import { useCheckDependencies } from "../use-check-dependencies";export function useCheckSnippetDependencies({onSave,- onError,}: UseCheckDependenciesProps<UpdateSnippetRequest>): UseCheckDependenciesResult<UpdateSnippetRequest> {return useCheckDependencies({getCheckDependenciesRequest,useLazyCheckDependenciesQuery: useLazyCheckSnippetDependenciesQuery,onSave,- onError,});}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-snippet-dependencies/use-check-snippet-dependencies.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-snippet-dependencies/use-check-snippet-dependencies.unit.spec.tsindex 6b0c28be68c..5476df8e34a 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-snippet-dependencies/use-check-snippet-dependencies.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-snippet-dependencies/use-check-snippet-dependencies.unit.spec.ts@@ -18,13 +18,12 @@ function setup({setupCheckSnippetDependenciesEndpoint(response);const onSave = jest.fn();- const onError = jest.fn();const { result } = renderHookWithProviders(- () => useCheckSnippetDependencies({ onSave, onError }),+ () => useCheckSnippetDependencies({ onSave }),{},);- return { result, onSave, onError };+ return { result, onSave };}describe("useCheckSnippetDependencies", () => {diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-transform-dependencies/use-check-transform-dependencies.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-transform-dependencies/use-check-transform-dependencies.tsindex fb55a754d46..57f3e416021 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-transform-dependencies/use-check-transform-dependencies.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-transform-dependencies/use-check-transform-dependencies.ts@@ -12,13 +12,11 @@ import { useCheckDependencies } from "../use-check-dependencies";export function useCheckTransformDependencies({onSave,- onError,}: UseCheckDependenciesProps<UpdateTransformRequest>): UseCheckDependenciesResult<UpdateTransformRequest> {return useCheckDependencies({getCheckDependenciesRequest,useLazyCheckDependenciesQuery: useLazyCheckTransformDependenciesQuery,onSave,- onError,});}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-transform-dependencies/use-check-transform-dependencies.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-transform-dependencies/use-check-transform-dependencies.unit.spec.tsindex 19276764a62..3a277df266b 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-transform-dependencies/use-check-transform-dependencies.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-transform-dependencies/use-check-transform-dependencies.unit.spec.ts@@ -18,13 +18,12 @@ function setup({setupCheckTransformDependenciesEndpoint(response);const onSave = jest.fn();- const onError = jest.fn();const { result } = renderHookWithProviders(- () => useCheckTransformDependencies({ onSave, onError }),+ () => useCheckTransformDependencies({ onSave }),{},);- return { result, onSave, onError };+ return { result, onSave };}describe("useCheckTransformDependencies", () => {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex 7a50a218344..c392cbc9a21 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -75,9 +75,6 @@ export function TransformQueryPageBody({dispatch(push(getTransformUrl(transform.id)));}},- onError: () => {- sendErrorToast(t`Failed to update transform query`);- },});const handleSaveSource = async (source: TransformSource) => {diff --git a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.tsx b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.tsxindex 48332900d26..78f3d6a4179 100644--- a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.tsx+++ b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.tsx@@ -30,9 +30,6 @@ export const SaveQuestionModal = ({handleSaveAfterConfirmation,} = PLUGIN_DEPENDENCIES.useCheckCardDependencies({onSave,- onError: (error) => {- throw error;- },});useEscapeToCloseModal(onClose);diff --git a/frontend/src/metabase/plugins/index.ts b/frontend/src/metabase/plugins/index.tsindex b71e7618b7b..4306d62d22d 100644--- a/frontend/src/metabase/plugins/index.ts+++ b/frontend/src/metabase/plugins/index.ts@@ -916,7 +916,6 @@ export type CheckDependenciesModalProps = {export type UseCheckDependenciesProps<TChange> = {onSave: (change: TChange) => Promise<void>;- onError: (error: unknown) => void;};export type UseCheckDependenciesResult<TChange> = {diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsxindex 5eb24df3f43..e6fde575450 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx@@ -492,9 +492,6 @@ const _DatasetEditorInner = (props: DatasetEditorInnerProps) => {await setQueryBuilderMode("view");runQuestionQuery();},- onError: (error) => {- throw error;- },});useLayoutEffect(() => {diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx b/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsxindex d25dea8265f..e25404a9fa0 100644--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx@@ -75,9 +75,6 @@ export function SnippetFormModal({handleCloseConfirmation,} = PLUGIN_DEPENDENCIES.useCheckSnippetDependencies({onSave: handleUpdate,- onError: (error) => {- throw error;- },});const handleSubmit = useCallback(diff --git a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditor.tsx b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditor.tsxindex 667db30f687..f2d765b2c02 100644--- a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditor.tsx+++ b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditor.tsx@@ -58,9 +58,6 @@ export const MetricEditor = forwardRef<HTMLDivElement, MetricEditorProps>(handleCloseConfirmation,} = PLUGIN_DEPENDENCIES.useCheckCardDependencies({onSave,- onError: (error) => {- throw error;- },});const handleCreate = (question: Question) => {diff --git a/frontend/test/__support__/server-mocks/dependencies.ts b/frontend/test/__support__/server-mocks/dependencies.tsindex 5c7696ec4e3..0e89ccc8b01 100644--- a/frontend/test/__support__/server-mocks/dependencies.ts+++ b/frontend/test/__support__/server-mocks/dependencies.ts@@ -8,6 +8,10 @@ export function setupCheckCardDependenciesEndpoint(fetchMock.post("path:/api/ee/dependencies/check_card", response);}+export function setupCheckCardDependenciesEndpointError() {+ fetchMock.post("path:/api/ee/dependencies/check_card", { status: 500 });+}+export function setupCheckSnippetDependenciesEndpoint(response: CheckDependenciesResponse,) {