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
Find the error page message in the reducer to stop CodeQL hanging (#85055)
Chris Vandoodewaardb460f1b83098
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsxindex d04191b8ef8..631c65f048a 100644--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx@@ -57,7 +57,6 @@ import type {NavigatedEntityParameters,} from "embedding-sdk-bundle/types/navigation";import type { MetabasePluginsConfig } from "embedding-sdk-bundle/types/plugins";-import { getErrorMessage } from "metabase/api/utils/errors";import { useConfirmation } from "metabase/common/hooks";import { useLocale } from "metabase/common/hooks/use-locale";import {@@ -595,9 +594,7 @@ const SdkDashboardInner = ({className={className}style={style}>- <SdkError- message={getErrorMessage(errorPage, t`Something's gone wrong`)}- />+ <SdkError message={errorPage.message ?? t`Something's gone wrong`} /></MaybeStyledWrapper>);}diff --git a/frontend/src/metabase/AppComponent.tsx b/frontend/src/metabase/AppComponent.tsxindex ace3c88d838..f991d054cec 100644--- a/frontend/src/metabase/AppComponent.tsx+++ b/frontend/src/metabase/AppComponent.tsx@@ -1,6 +1,5 @@import { useEffect, useState } from "react";-import { findErrorMessage } from "metabase/api/utils/errors";import { AppBarContainer } from "metabase/app/nav/AppBar";import { Navbar } from "metabase/app/nav/Navbar";import {@@ -44,7 +43,12 @@ import { Metabot } from "./metabot/components/Metabot";import { NewModals } from "./new/components/NewModals/NewModals";import { Palette } from "./palette/components/Palette";-const getErrorComponent = ({ status, data, context }: AppErrorDescriptor) => {+const getErrorComponent = ({+ status,+ data,+ context,+ message,+}: AppErrorDescriptor) => {if (status === 403 || data?.error_code === "unauthorized") {return <Unauthorized />;}@@ -57,7 +61,7 @@ const getErrorComponent = ({ status, data, context }: AppErrorDescriptor) => {if (data?.error_code === "archived" && context === "query-builder") {return <Archived entityName="question" linkTo="/questions/archive" />;}- return <GenericError details={findErrorMessage(data)} />;+ return <GenericError details={message} />;};export function App() {diff --git a/frontend/src/metabase/redux/app.ts b/frontend/src/metabase/redux/app.tsindex 9dbb1d4aa3e..c47de1fefe4 100644--- a/frontend/src/metabase/redux/app.ts+++ b/frontend/src/metabase/redux/app.ts@@ -4,6 +4,7 @@ import {createSlice,} from "@reduxjs/toolkit";+import { findErrorMessage } from "metabase/api/utils/errors";import { combineReducers, handleActions } from "metabase/redux";import type {DetailViewState,@@ -14,6 +15,7 @@ import type {import { LOCATION_CHANGE, navigate } from "metabase/router";import { shouldOpenInBlankWindow } from "metabase/urls";import { isSmallScreen, openInBlankWindow } from "metabase/utils/dom";+import { isObject } from "metabase-types/guards/common";interface LocationChangeAction {type: string; // "@@router/LOCATION_CHANGE"@@ -54,7 +56,10 @@ export const openUrl = (url: string) => () => {const errorPage = handleActions({- [SET_ERROR_PAGE]: (_, { payload }) => payload,+ [SET_ERROR_PAGE]: (_, { payload }: { payload: unknown }) =>+ isObject(payload)+ ? { ...payload, message: findErrorMessage(payload) }+ : payload,[RESET_ERROR_PAGE]: () => null,[LOCATION_CHANGE]: () => null,},diff --git a/frontend/src/metabase/redux/store/app.ts b/frontend/src/metabase/redux/store/app.tsindex 328155d2f52..44c12938a41 100644--- a/frontend/src/metabase/redux/store/app.ts+++ b/frontend/src/metabase/redux/store/app.ts@@ -18,6 +18,7 @@ export interface AppErrorDescriptor {message?: string;};context?: string;+ message?: string;}export interface AppBreadCrumbs {diff --git a/frontend/src/metabase/selectors/app.ts b/frontend/src/metabase/selectors/app.tsindex 3673e1e2f2c..77f4c6b3985 100644--- a/frontend/src/metabase/selectors/app.ts+++ b/frontend/src/metabase/selectors/app.ts@@ -1,7 +1,6 @@import type { Selector } from "@reduxjs/toolkit";import { createSelector } from "@reduxjs/toolkit";-import { findErrorMessage } from "metabase/api/utils/errors";import { getUser } from "metabase/current-user";import { getEmbedOptions } from "metabase/embedding/interactive-embedding";import type { State } from "metabase/redux/store";@@ -21,8 +20,7 @@ export const getDetailViewState = (state: State) => {};export const getErrorMessage = (state: State) => {- const errorPage = getErrorPage(state);- return findErrorMessage(errorPage?.data) ?? errorPage?.data;+ return getErrorPage(state)?.message;};export const getIsNavbarOpen: Selector<State, boolean> = createSelector(