diff --git a/src/App.jsx b/src/App.jsx index 5b6633c1..f26a9dc2 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -92,10 +92,10 @@ const AppContent = () => { - + + - { /> - - + + diff --git a/src/components/Dashboard/context/ActionsContext.jsx b/src/components/Dashboard/context/ActionsContext.jsx index d04a470d..7021bbf9 100644 --- a/src/components/Dashboard/context/ActionsContext.jsx +++ b/src/components/Dashboard/context/ActionsContext.jsx @@ -24,7 +24,20 @@ import { AuthContext } from './AuthContext' import { ElectronContext } from './ElectronContext' import { useNavigationTabs } from './NavigationTabsContext' -const ActionsContext = createContext() +const noop = () => {} + +const defaultActions = { + currentObject: null, + currentObjectType: null, + setCurrentObject: noop, + setCurrentObjectType: noop, + callAction: noop, + clearAction: noop, + setOnModalOk: noop, + ctrlDown: false +} + +const ActionsContext = createContext(defaultActions) const ActionsProvider = ({ children }) => { const navigate = useNavigate() diff --git a/src/components/Dashboard/context/ApiServerContext.jsx b/src/components/Dashboard/context/ApiServerContext.jsx index 6570673e..c0e3d5d1 100644 --- a/src/components/Dashboard/context/ApiServerContext.jsx +++ b/src/components/Dashboard/context/ApiServerContext.jsx @@ -1625,16 +1625,18 @@ const ApiServerProvider = ({ children }) => { const showError = useCallback( (error, callback = null) => { console.error(error) - console.error(error.response) - console.error(error.response.data) - console.error(error.response.data.code) - console.error(error.response.data.error) - console.error(error.response.data.message) - console.error(error.response.data.status) - console.error(error.response.data.timestamp) - console.error(error.response.data.path) - console.error(error.response.data.method) - const code = error.response.data.code || 'UNKNOWN' + const responseData = error?.response?.data + const data = + responseData && + typeof responseData === 'object' && + !(responseData instanceof Blob) + ? responseData + : null + if (data) { + console.error(error.response) + console.error(data) + } + const code = data?.code || 'UNKNOWN' if (code == 'UNAUTHORIZED') { if (token) { setUnauthenticated() @@ -1655,8 +1657,8 @@ const ApiServerProvider = ({ children }) => { return } var content = `Error ${error.code} (${error.status}): ${error.message}` - if (error.response?.data?.error) { - content = `${error.response?.data?.error} (${error.status})` + if (data?.error) { + content = `${data.error} (${error.status})` } setErrorModalContent(content) setRetryCallback(() => callback) @@ -2174,6 +2176,8 @@ const ApiServerProvider = ({ children }) => { return fileURL } catch (err) { console.error(err) + if (err?.code === 'ERR_CANCELED') return + await normalizeAxiosBlobError(err) showError(err, () => { fetchFileContent(file, download, onProgress) })