Merge branch 'master' into #2423-hotkeys-for-atoms-dont-work-on-funct…

…ional-groups-and-salts-abbreviations

# Conflicts:
#	packages/ketcher-react/src/script/editor/tool/atom.ts

.github/auto_assign.yml

@@ -8,6 +8,6 @@ reviewGroups:
     - yuleicul
     - KonstantinEpam23
   developers:
-    - VandaPonikarova
     - VasilevDO
     - AnastasiiaPlyako
+    - gairon

.github/workflows/choose-reviewers.yml

@@ -1,13 +1,12 @@
 name: Choose reviewers
 on:
   pull_request:
-    types: [opened, ready_for_review, reopened]
+    types: [opened]
 
 jobs:
   add-reviews:
     runs-on: ubuntu-latest
     steps:
       - uses: kentaro-m/auto-assign-action@v1.2.5
         with:
-          configuration-path: '.github/auto_assign.yml'
-          repo-token: ${{ secrets.REVIEWER_LOTTERY_SECRET }}
+          configuration-path: '.github/auto_assign.yml'

packages/ketcher-core/src/application/editor/actions/sgroup.ts

@@ -24,7 +24,7 @@ import {
   SGroupDelete,
   SGroupRemoveFromHierarchy
 } from '../operations'
-import { Pile, SGroup } from 'domain/entities'
+import { FunctionalGroup, Pile, SGroup } from 'domain/entities'
 import { atomGetAttr, atomGetDegree, atomGetSGroups } from './utils'
 
 import { Action } from './action'
@@ -91,6 +91,29 @@ export function setExpandSGroup(restruct, sgid, attrs) {
   return action.perform(restruct)
 }
 
+// todo delete after supporting expand - collapse for 2 attachment points
+export function expandSGroupWithMultipleAttachmentPoint(restruct) {
+  const action = new Action()
+
+  const struct = restruct.molecule
+
+  struct.sgroups.forEach((sgroup) => {
+    const countAttachmentPoint = FunctionalGroup.getAttachmentPointCount(
+      sgroup,
+      struct
+    )
+    if (countAttachmentPoint > 1) {
+      action.mergeWith(
+        setExpandSGroup(restruct, sgroup.id, {
+          expanded: true
+        })
+      )
+    }
+  })
+
+  return action
+}
+
 export function sGroupAttributeAction(id, attrs) {
   const action = new Action()
 

packages/ketcher-core/src/application/render/restruct/reatom.ts

@@ -51,7 +51,15 @@ export enum ShowHydrogenLabels {
   Hetero = 'Hetero',
   Terminal = 'Terminal',
   TerminalAndHetero = 'Terminal and Hetero',
-  On = 'on'
+  On = 'all'
+}
+
+export enum ShowHydrogenLabelNames {
+  Off = 'Off',
+  Hetero = 'Hetero',
+  Terminal = 'Terminal',
+  TerminalAndHetero = 'Terminal and Hetero',
+  On = 'On'
 }
 
 class ReAtom extends ReObject {

packages/ketcher-core/src/typing.d.ts

@@ -0,0 +1,7 @@
+import { Ketcher } from 'ketcher-core'
+
+declare global {
+  interface Window {
+    ketcher: Ketcher
+  }
+}

packages/ketcher-core/src/utilities/emitEventRequestIsFinished.ts

@@ -0,0 +1,12 @@
+const REQUEST_IS_FINISHED = 'REQUEST_IS_FINISHED'
+
+/**
+ * Emit event when request is finished
+ * Used only for testers to prevent long delays in test cases
+ * Triggers on Add to canvas / Aromatize / Dearomatize
+ * Clean Up / Calculate CIP / Paste from clipboard
+ * maybe somewhere else
+ */
+export function emitEventRequestIsFinished(): void {
+  window?.ketcher?.eventBus.emit(REQUEST_IS_FINISHED)
+}

packages/ketcher-core/src/utilities/index.ts

@@ -18,3 +18,4 @@ export * from './ifDef'
 export * from './tfx'
 export * from './runAsyncAction'
 export * from './b64toBlob'
+export * from './emitEventRequestIsFinished'

packages/ketcher-react/jest.config.js

@@ -10,5 +10,6 @@ module.exports = {
   moduleNameMapper: {
     '\\.(css|less)$': 'identity-obj-proxy',
     'src(.*)$': '<rootDir>/src/$1'
-  }
+  },
+  setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts']
 }

packages/ketcher-react/src/script/editor/Editor.ts

@@ -35,7 +35,7 @@ import { customOnChangeHandler } from './utils'
 import { isEqual } from 'lodash/fp'
 import toolMap from './tool'
 import { Highlighter } from './highlighter'
-import { showFunctionalGroupsTooltip } from './utils/functionalGroupsTooltip'
+import { setFunctionalGroupsTooltip } from './utils/functionalGroupsTooltip'
 import { contextMenuInfo } from '../ui/views/components/ContextMenu/contextMenu.types'
 import { HoverIcon } from './HoverIcon'
 import RotateController from './tool/rotate-controller'
@@ -384,14 +384,23 @@ class Editor implements KetcherEditor {
 
     if (!event) return
 
-    showFunctionalGroupsTooltip(this)
+    setFunctionalGroupsTooltip({
+      editor: this,
+      event,
+      isShow: true
+    })
   }
 
   update(
     action: Action | true,
     ignoreHistory?: boolean,
     options = { resizeCanvas: true }
   ) {
+    setFunctionalGroupsTooltip({
+      editor: this,
+      isShow: false
+    })
+
     if (action === true) {
       this.render.update(true, null, options) // force
     } else {
@@ -462,7 +471,7 @@ class Editor implements KetcherEditor {
 
   subscribe(eventName: any, handler: any) {
     const subscriber = {
-      handler: handler
+      handler
     }
 
     switch (eventName) {