#2922 - Add GLOBAL_ERROR_HANDLER event emission to load and analyse functions

Author: chgayane

packages/ketcher-react/src/script/ui/state/server/index.js

@@ -14,13 +14,19 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { ChemicalMimeType, KetcherLogger, KetSerializer } from 'ketcher-core';
+import {
+  ChemicalMimeType,
+  KetcherLogger,
+  KetSerializer,
+  ketcherProvider,
+} from 'ketcher-core';
 import { appUpdate, setStruct } from '../options';
 import { omit, without } from 'lodash/fp';
 
 import { checkErrors } from '../modal/form';
 import { indigoVerification } from '../request';
 import { load } from '../shared';
+import { GLOBAL_ERROR_HANDLER } from 'src/constants';
 
 export function checkServer() {
   return (dispatch, getState) => {
@@ -112,6 +118,7 @@ export function analyse() {
     });
     const { editor, server, options } = getState();
     const serverSettings = options.getServerSettings();
+    const ketcher = ketcherProvider.getKetcher();
     serverSettings.data = {
       properties: [
         'molecular-weight',
@@ -132,7 +139,9 @@ export function analyse() {
       .catch((e) => {
         KetcherLogger.error('index.js::analyse', e);
         editor.errorHandler(e);
-        throw e;
+        if (ketcher && ketcher.eventBus) {
+          ketcher.eventBus.emit(GLOBAL_ERROR_HANDLER, e);
+        }
       });
   };
 }

packages/ketcher-react/src/script/ui/state/shared.ts

@@ -26,11 +26,13 @@ import {
   Editor,
   KetcherLogger,
   SettingsManager,
+  ketcherProvider,
 } from 'ketcher-core';
 
 import { supportedSGroupTypes } from './constants';
 import { setAnalyzingFile } from './request';
 import tools from '../action/tools';
+import { GLOBAL_ERROR_HANDLER } from 'src/constants';
 
 export function onAction(action) {
   if (action && action.dialog) {
@@ -101,6 +103,7 @@ export function load(struct: Struct, options?) {
     const editor = state.editor as Editor;
     const server = state.server;
     const errorHandler = editor.errorHandler;
+    const ketcher = ketcherProvider.getKetcher();
     options = options || {};
     let { isPaste, ...otherOptions } = options;
     otherOptions = {
@@ -184,7 +187,9 @@ export function load(struct: Struct, options?) {
       KetcherLogger.error('shared.ts::load', e);
       dispatch(setAnalyzingFile(false));
       e && errorHandler && errorHandler(e.message);
-      throw e;
+      if (ketcher && ketcher.eventBus) {
+        ketcher.eventBus.emit(GLOBAL_ERROR_HANDLER, e.message);
+      }
     } finally {
       notifyRequestCompleted();
     }

packages/ketcher-react/src/script/ui/views/modal/components/document/Open/Open.tsx

@@ -22,8 +22,7 @@ import Recognize from '../../process/Recognize/Recognize';
 import { fileOpener } from '../../../../../utils/';
 import { DialogActionButton } from './components/DialogActionButton';
 import { ViewSwitcher } from './components/ViewSwitcher';
-import { getFormatMimeTypeByFileName, ketcherProvider } from 'ketcher-core';
-import { GLOBAL_ERROR_HANDLER } from 'src/constants';
+import { getFormatMimeTypeByFileName } from 'ketcher-core';
 import { useDispatch } from 'react-redux';
 import { load } from 'src/script/ui/state/shared';
 
@@ -117,17 +116,10 @@ const Open: FC<Props> = (props) => {
   // @TODO after Recognize is refactored this will not be necessary
   // currently not destructuring onOk with other props so we can pass it with ...rest to Recognize below
 
-  const ketcher = ketcherProvider.getKetcher();
   const onOk = async (res) => {
-    try {
-      await dispatch(
-        load(res.structStr, { badHeaderRecover: true, fragment: res.fragment }),
-      );
-    } catch (error: any) {
-      if (ketcher && ketcher.eventBus) {
-        ketcher.eventBus.emit(GLOBAL_ERROR_HANDLER, error.message);
-      }
-    }
+    await dispatch(
+      load(res.structStr, { badHeaderRecover: true, fragment: res.fragment }),
+    );
   };
 
   const copyHandler = () => {

packages/ketcher-react/src/script/ui/views/modal/components/process/Analyse/Analyse.jsx

@@ -153,14 +153,7 @@ const mapStateToProps = (state) => ({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  onAnalyse: () => {
-    return dispatch(analyse()).catch((error) => {
-      const ketcher = ketcherProvider.getKetcher();
-      if (ketcher && ketcher.eventBus) {
-        ketcher.eventBus.emit(GLOBAL_ERROR_HANDLER, error);
-      }
-    });
-  },
+  onAnalyse: () => dispatch(analyse()),
   onChangeRound: (roundName, val) => dispatch(changeRound(roundName, val)),
 });