Backmerge: #4192 - Export to SVG/PNG ignores "Show hydrogen labels" option

packages/ketcher-core/src/infrastructure/services/helpers.ts

@@ -0,0 +1,28 @@
+import { ShowHydrogenLabels } from 'application/render';
+import { ketcherProvider } from 'application/utils';
+
+enum IndigoShowHydrogenLabelsMode {
+  OFF = 'none',
+  HETERO = 'hetero',
+  TERMINAL_HETERO = 'terminal-hetero',
+  ALL = 'all',
+}
+
+export function getLabelRenderModeForIndigo() {
+  // Terminal does not supported by indigo so TERMINAL_HETERO used
+  // Off removing all labels in indigo so HETERO used
+  const renderModeMapping = {
+    [ShowHydrogenLabels.Off]: IndigoShowHydrogenLabelsMode.HETERO,
+    [ShowHydrogenLabels.Hetero]: IndigoShowHydrogenLabelsMode.HETERO,
+    [ShowHydrogenLabels.Terminal]: IndigoShowHydrogenLabelsMode.TERMINAL_HETERO,
+    [ShowHydrogenLabels.TerminalAndHetero]:
+      IndigoShowHydrogenLabelsMode.TERMINAL_HETERO,
+    [ShowHydrogenLabels.On]: IndigoShowHydrogenLabelsMode.ALL,
+  };
+
+  return (
+    renderModeMapping[
+      ketcherProvider.getKetcher().editor.options().showHydrogenLabels
+    ] || IndigoShowHydrogenLabelsMode.OFF
+  );
+}

packages/ketcher-core/src/infrastructure/services/index.ts

@@ -15,3 +15,4 @@
  ***************************************************************************/
 
 export * from './struct';
+export * from './helpers';

packages/ketcher-core/src/infrastructure/services/struct/remoteStructService.ts

@@ -44,6 +44,7 @@ import {
   StructServiceOptions,
 } from 'domain/services';
 import { KetcherLogger } from 'utilities';
+import { getLabelRenderModeForIndigo } from 'infrastructure/services/helpers';
 
 function pollDeferred(process, complete, timeGap, startTimeGap) {
   return new Promise((resolve, reject) => {
@@ -348,6 +349,7 @@ export class RemoteStructService implements StructService {
       {
         'render-output-format': outputFormat,
         'render-bond-line-width': bondThickness,
+        'render-label-mode': getLabelRenderModeForIndigo(),
       },
       (response) => response.then((resp) => resp.text()),
     );

packages/ketcher-standalone/src/infrastructure/services/struct/standaloneStructService.ts

@@ -63,6 +63,7 @@ import {
   RecognizeResult,
   StructService,
   StructServiceOptions,
+  getLabelRenderModeForIndigo,
 } from 'ketcher-core';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -702,6 +703,7 @@ class IndigoService implements StructService {
   ): Promise<string> {
     const { outputFormat, backgroundColor, bondThickness, ...restOptions } =
       options;
+
     return new Promise((resolve, reject) => {
       const action = ({ data }: OutputMessageWrapper) => {
         const msg: OutputMessage<string> = data;
@@ -717,8 +719,8 @@ class IndigoService implements StructService {
       const commandOptions: CommandOptions = {
         ...this.defaultOptions,
         ...restOptions,
+        'render-label-mode': getLabelRenderModeForIndigo(),
       };
-
       const commandData: GenerateImageCommandData = {
         struct: inputData,
         outputFormat: outputFormat || 'png',