Merge pull request #2835 from epam/#2824-tooltip-for-sl-button-is-sho…

…wing-custom-template-instead-structure-library #2824 Tooltip for SL button is showing 'Custom Template' instead 'Structure Library'
epam · Jun 30, 2023 · b8b78cb · b8b78cb
2 parents 19ed9d5 + ff45465
commit b8b78cb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/documentation/help.md b/documentation/help.md
@@ -733,7 +733,7 @@ _NOTE: `Mod` key is `Command` on OSX and `Ctrl` on PC systems_
 **Templates**
 | Shortcut  | Action                                                                                                                    |
 | --------- | ------------------------------------------------------------------------------------------------------------------------- |
-| `Shift+t` | Custom Templates                                                                                                          |
+| `Shift+t` | Structure Library                                                                                                         |
 | `t`       | Rotate between: Benzene, Cyclopentadiene, Cyclohexane, Cyclopentane, Cyclopropane, Cyclobutane, Cycloheptane, Cyclooctane |
 
 **FunctionalGroups**

diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts b/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts
@@ -7,13 +7,13 @@ import {
   moveMouseToTheMiddleOfTheScreen,
   selectAtomInToolbar,
   takeEditorScreenshot,
-  pressButton,
   AtomButton,
   selectFunctionalGroups,
   selectSaltsAndSolvents,
   FunctionalGroups,
   resetCurrentTool,
   SaltsAndSolvents,
+  selectTemplate,
 } from '@utils';
 
 test.describe('Click Functional Group on canvas', () => {
@@ -33,7 +33,7 @@ test.describe('Click Functional Group on canvas', () => {
     */
     await selectAtomInToolbar(AtomButton.Nitrogen, page);
     await clickInTheMiddleOfTheScreen(page);
-    await pressButton(page, 'Custom Templates');
+    await selectTemplate(page);
     await page.getByRole('tab', { name: 'Functional Groups' }).click();
     await selectFunctionalGroups(FunctionalGroups.Boc, page);
     await clickInTheMiddleOfTheScreen(page);
@@ -44,11 +44,11 @@ test.describe('Click Functional Group on canvas', () => {
       Test case: EPMLSOPKET-10106
       Description: when clicking with an FG template on an FG it should replace it
     */
-    await pressButton(page, 'Custom Templates');
+    await selectTemplate(page);
     await page.getByRole('tab', { name: 'Functional Groups' }).click();
     await selectFunctionalGroups(FunctionalGroups.Boc, page);
     await clickInTheMiddleOfTheScreen(page);
-    await pressButton(page, 'Custom Templates');
+    await selectTemplate(page);
     await selectFunctionalGroups(FunctionalGroups.Cbz, page);
     await clickInTheMiddleOfTheScreen(page);
   });
@@ -58,12 +58,12 @@ test.describe('Click Functional Group on canvas', () => {
       Test case: EPMLSOPKET-10107
       Description: when clicking with an FG template on a Salts and Solvents it should replace it
     */
-    await pressButton(page, 'Custom Templates');
+    await selectTemplate(page);
     await page.getByRole('tab', { name: 'Salts and Solvents' }).click();
     await selectSaltsAndSolvents(SaltsAndSolvents.MethaneSulphonicAcid, page);
     await clickInTheMiddleOfTheScreen(page);
 
-    await pressButton(page, 'Custom Templates');
+    await selectTemplate(page);
     await page.getByRole('tab', { name: 'Functional Groups' }).click();
     await selectFunctionalGroups(FunctionalGroups.CCl3, page);
     await clickInTheMiddleOfTheScreen(page);
@@ -84,7 +84,7 @@ test.describe('Click Functional Group on canvas', () => {
     await dragMouseTo(coordinatesWithShift, y, page);
     await resetCurrentTool(page);
 
-    await pressButton(page, 'Custom Templates');
+    await selectTemplate(page);
     await page.getByRole('tab', { name: 'Functional Groups' }).click();
     await selectFunctionalGroups(FunctionalGroups.CO2tBu, page);
     await clickInTheMiddleOfTheScreen(page);
@@ -98,15 +98,15 @@ test.describe('Click Functional Group on canvas', () => {
     await selectAtomInToolbar(AtomButton.Oxygen, page);
     await clickInTheMiddleOfTheScreen(page);
 
-    await pressButton(page, 'Custom Templates');
+    await selectTemplate(page);
     await page.getByRole('tab', { name: 'Functional Groups' }).click();
     await selectFunctionalGroups(FunctionalGroups.Cbz, page);
     await moveMouseToTheMiddleOfTheScreen(page);
     const { x, y } = await getCoordinatesOfTheMiddleOfTheScreen(page);
     const coordinatesWithShift = x + MAX_BOND_LENGTH;
     await dragMouseTo(coordinatesWithShift, y, page);
 
-    await pressButton(page, 'Custom Templates');
+    await selectTemplate(page);
     await page.getByRole('tab', { name: 'Functional Groups' }).click();
     await selectFunctionalGroups(FunctionalGroups.Ms, page);
     await page.mouse.click(coordinatesWithShift, y);

diff --git a/ketcher-autotests/tests/utils/selectors/buttons.ts b/ketcher-autotests/tests/utils/selectors/buttons.ts
@@ -74,7 +74,7 @@ export enum RingButton {
   Cyclooctane = 'Cyclooctane',
 }
 
-export const CustomTemplatesButton = 'Custom Templates';
+export const CustomTemplatesButton = 'Structure Library';
 
 export type ToolbarButton =
   | AtomButton

diff --git a/ketcher-autotests/tests/utils/selectors/templateModal.ts b/ketcher-autotests/tests/utils/selectors/templateModal.ts
@@ -5,9 +5,9 @@ import {
   dragMouseTo,
   getCoordinatesOfTheMiddleOfTheScreen,
   moveMouseToTheMiddleOfTheScreen,
-  pressButton,
   selectLeftPanelButton,
   takeEditorScreenshot,
+  selectTemplate,
 } from '@utils';
 
 export enum SaltsAndSolvents {
@@ -102,7 +102,7 @@ export async function drawFGAndDrag(
   shift: number,
   page: Page
 ) {
-  await pressButton(page, 'Custom Templates');
+  await selectTemplate(page);
   await page.getByRole('tab', { name: 'Functional Groups' }).click();
   await selectFunctionalGroups(itemToChoose, page);
   await moveMouseToTheMiddleOfTheScreen(page);
@@ -119,7 +119,7 @@ export async function drawSaltAndDrag(
   shift: number,
   page: Page
 ) {
-  await pressButton(page, 'Custom Templates');
+  await selectTemplate(page);
   await page.getByRole('tab', { name: 'Salts and Solvents' }).click();
   await selectSaltsAndSolvents(itemToChoose, page);
   await moveMouseToTheMiddleOfTheScreen(page);

diff --git a/packages/ketcher-react/src/script/ui/action/templates.js b/packages/ketcher-react/src/script/ui/action/templates.js
@@ -20,7 +20,7 @@ import isHidden from './isHidden'
 const templateLib = {
   'template-lib': {
     shortcut: 'Shift+t',
-    title: 'Custom Templates',
+    title: 'Structure Library',
     action: { dialog: 'templates', prop: { tab: null } },
     selected: (editor) => editor._tool.mode === 'classic',
     disabled: (editor, server, options) => !options.app.templates,