feat: 🎸 1729 - error boundary wrapper (#1764)
* Add error boundaries * Fix PWA e2e. * feat: ErrorBoundaryDialog * replace component to use ErrorBoundaryDialog * add proptypes * fix context * remove ErrorBoundary from extensions Co-authored-by: igoroctaviano <igoroctaviano@gmail.com> Co-authored-by: James A. Petts <jamesapetts@gmail.com>
This commit is contained in:
22 files changed
+310
-145
No files matched your search
@@ -0,0 +1,52 @@
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { ErrorBoundary } from '@ohif/ui';
|
||||
import { servicesManager } from './../../App';
|
||||
|
||||
const { UIModalService } = servicesManager.services;
|
||||
|
||||
const ErrorBoundaryDialog = ({ context, children }) => {
|
||||
const handleOnError = (error, componentStack) => {
|
||||
const ErrorDialog = () => (
|
||||
<div className="ErrorFallback" role="alert">
|
||||
<div>
|
||||
<h3>
|
||||
{context}: <span>{error.message}</span>
|
||||
</h3>
|
||||
</div>
|
||||
<pre>{componentStack}</pre>
|
||||
</div>
|
||||
);
|
||||
|
||||
UIModalService.show({
|
||||
content: ErrorDialog,
|
||||
title: `${context}: ${error.message}`,
|
||||
});
|
||||
};
|
||||
|
||||
const fallbackComponent = () => (
|
||||
<div className="ErrorFallback" role="alert">
|
||||
<p>
|
||||
Error rendering {context}. <br /> Check the browser console for more
|
||||
details.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
|
||||
return (
|
||||
<ErrorBoundary
|
||||
fallbackComponent={fallbackComponent}
|
||||
context={context}
|
||||
onError={handleOnError}
|
||||
>
|
||||
{children}
|
||||
</ErrorBoundary>
|
||||
);
|
||||
};
|
||||
|
||||
ErrorBoundaryDialog.propTypes = {
|
||||
context: PropTypes.string.isRequired,
|
||||
children: PropTypes.node.isRequired,
|
||||
};
|
||||
|
||||
export default ErrorBoundaryDialog;
|
||||
@@ -0,0 +1,3 @@
|
||||
import ErrorBoundaryDialog from './ErrorBoundaryDialog';
|
||||
|
||||
export default ErrorBoundaryDialog;
|
||||
@@ -12,7 +12,7 @@ import EmptyViewport from './EmptyViewport.js';
|
||||
|
||||
const { loadAndCacheDerivedDisplaySets } = utils;
|
||||
|
||||
const ViewportGrid = function (props) {
|
||||
const ViewportGrid = function(props) {
|
||||
const {
|
||||
activeViewportIndex,
|
||||
availablePlugins,
|
||||
@@ -24,7 +24,7 @@ const ViewportGrid = function (props) {
|
||||
studies,
|
||||
viewportData,
|
||||
children,
|
||||
isStudyLoaded
|
||||
isStudyLoaded,
|
||||
} = props;
|
||||
|
||||
const rowSize = 100 / numRows;
|
||||
@@ -54,7 +54,7 @@ const ViewportGrid = function (props) {
|
||||
});
|
||||
});
|
||||
}
|
||||
}, [studies, viewportData, isStudyLoaded]);
|
||||
}, [studies, viewportData, isStudyLoaded, snackbar]);
|
||||
|
||||
const getViewportPanes = () =>
|
||||
layout.viewports.map((layout, viewportIndex) => {
|
||||
|
||||
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
|
||||
import classNames from 'classnames';
|
||||
import './ViewportPane.css';
|
||||
|
||||
const ViewportPane = function(props) {
|
||||
const ViewportPane = function (props) {
|
||||
const { children, onDrop, viewportIndex, className: propClassName } = props;
|
||||
const [{ hovered, highlighted }, drop] = useDrop({
|
||||
accept: 'thumbnail',
|
||||
|
||||
Reference in new issue
Block a user