Merge pull request #22 from uncountableinc/brendan/merge

Brendan/merge

.github/ISSUE_TEMPLATE/autotest_request.md

@@ -0,0 +1,11 @@
+---
+name: Autotest request
+about: Create autotests for particular feature
+title: 'Autotests: '
+labels: Autotests
+assignees: ''
+
+---
+
+**Source task(s):**
+ - 

.github/auto_assign.yml

@@ -4,10 +4,10 @@ useReviewGroups: true
 addAssignees: author
 reviewGroups:
   core:
-    - ilya-asiyuk-epam
+    - svvald
     - rrodionov91
   developers:
-    - StarlaStarla
+    - NataliaLoginova
   QA:
     - Zhirnoff
     - AlexeyGirin

.github/workflows/playwright-macromolecules.yml

@@ -18,10 +18,11 @@ env:
   IGNORE_UNSTABLE_TESTS: true
   CI_ENVIRONMENT: true
   ENABLE_POLYMER_EDITOR: true
+  USE_SEPARATE_INDIGO_WASM: true
 jobs:
   playwright_tests:
-    timeout-minutes: 40
-    runs-on: ubuntu-latest
+    timeout-minutes: 120
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
         with:
@@ -44,6 +45,7 @@ jobs:
           echo "IGNORE_UNSTABLE_TESTS=$IGNORE_UNSTABLE_TESTS" >> .env
           echo "CI_ENVIRONMENT=$CI_ENVIRONMENT" >> .env
           echo "ENABLE_POLYMER_EDITOR=$ENABLE_POLYMER_EDITOR" >> .env
+          echo "USE_SEPARATE_INDIGO_WASM=$USE_SEPARATE_INDIGO_WASM" >> .env
       - name: Build autotests for docker
         run: cd ketcher-autotests && npm run docker:build
       - name: Run playwright tests in docker
@@ -58,4 +60,4 @@ jobs:
           retention-days: 5
       - name: Remove unused docker images
         if: always()
-        run: docker system prune -f
+        run: docker system prune -f

.github/workflows/playwright.yml

@@ -17,9 +17,10 @@ env:
   DOCKER: true
   IGNORE_UNSTABLE_TESTS: true
   CI_ENVIRONMENT: true
+  USE_SEPARATE_INDIGO_WASM: true
 jobs:
   playwright_tests:
-    timeout-minutes: 60
+    timeout-minutes: 150
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
@@ -42,6 +43,7 @@ jobs:
           echo "MODE=$MODE" >> .env
           echo "IGNORE_UNSTABLE_TESTS=$IGNORE_UNSTABLE_TESTS" >> .env
           echo "CI_ENVIRONMENT=$CI_ENVIRONMENT" >> .env
+          echo "USE_SEPARATE_INDIGO_WASM=$USE_SEPARATE_INDIGO_WASM" >> .env
       - name: Build autotests for docker
         run: cd ketcher-autotests && npm run docker:build
       - name: Run playwright tests in docker

.gitignore

@@ -37,3 +37,50 @@ yarn-error.log*
 
 .pnp.*
 .yarn/*
+tests/test-data/KET/Nucleotide-Templates/01 - (R1) - Left only.ket
+tests/test-data/KET/Nucleotide-Templates/02 - (R2) - Right only.ket
+tests/test-data/KET/Nucleotide-Templates/03 - (R3) - Side only.ket
+tests/test-data/KET/Nucleotide-Templates/04 - (R1,R2) - R3 gap.ket
+tests/test-data/KET/Nucleotide-Templates/05 - (R1,R3) - R2 gap.ket
+tests/test-data/KET/Nucleotide-Templates/06 - (R2,R3) - R1 gap.ket
+tests/test-data/KET/Nucleotide-Templates/07 - (R3,R4).ket
+tests/test-data/KET/Nucleotide-Templates/08 - (R1,R2,R3).ket
+tests/test-data/KET/Nucleotide-Templates/09 - (R1,R3,R4).ket
+tests/test-data/KET/Nucleotide-Templates/10 - (R2,R3,R4).ket
+tests/test-data/KET/Nucleotide-Templates/11 - (R3,R4,R5).ket
+tests/test-data/KET/Nucleotide-Templates/12 - (R1,R2,R3,R4).ket
+tests/test-data/KET/Nucleotide-Templates/13 - (R1,R3,R4,R5).ket
+tests/test-data/KET/Nucleotide-Templates/14 - (R2,R3,R4,R5).ket
+tests/test-data/KET/Nucleotide-Templates/15 - (R1,R2,R3,R4,R5).ket
+tests/test-data/KET/Phosphate-Templates/01 - (R1) - Left only-expected.ket
+tests/test-data/KET/Phosphate-Templates/01 - (R1) - Left only.ket
+tests/test-data/KET/Phosphate-Templates/02 - (R2) - Right only-expected.ket
+tests/test-data/KET/Phosphate-Templates/02 - (R2) - Right only.ket
+tests/test-data/KET/Phosphate-Templates/03 - (R3) - Side only-expected.ket
+tests/test-data/KET/Phosphate-Templates/03 - (R3) - Side only.ket
+tests/test-data/KET/Phosphate-Templates/04 - (R1,R2) - R3 gap-expected.ket
+tests/test-data/KET/Phosphate-Templates/04 - (R1,R2) - R3 gap.ket
+tests/test-data/KET/Phosphate-Templates/05 - (R1,R3) - R2 gap-expected.ket
+tests/test-data/KET/Phosphate-Templates/05 - (R1,R3) - R2 gap.ket
+tests/test-data/KET/Phosphate-Templates/06 - (R2,R3) - R1 gap-expected.ket
+tests/test-data/KET/Phosphate-Templates/06 - (R2,R3) - R1 gap.ket
+tests/test-data/KET/Phosphate-Templates/07 - (R3,R4)-expected.ket
+tests/test-data/KET/Phosphate-Templates/07 - (R3,R4).ket
+tests/test-data/KET/Phosphate-Templates/08 - (R1,R2,R3)-expected.ket
+tests/test-data/KET/Phosphate-Templates/08 - (R1,R2,R3).ket
+tests/test-data/KET/Phosphate-Templates/09 - (R1,R3,R4)-expected.ket
+tests/test-data/KET/Phosphate-Templates/09 - (R1,R3,R4).ket
+tests/test-data/KET/Phosphate-Templates/10 - (R2,R3,R4)-expected.ket
+tests/test-data/KET/Phosphate-Templates/10 - (R2,R3,R4).ket
+tests/test-data/KET/Phosphate-Templates/11 - (R3,R4,R5)-expected.ket
+tests/test-data/KET/Phosphate-Templates/11 - (R3,R4,R5).ket
+tests/test-data/KET/Phosphate-Templates/12 - (R1,R2,R3,R4)-expected.ket
+tests/test-data/KET/Phosphate-Templates/12 - (R1,R2,R3,R4).ket
+tests/test-data/KET/Phosphate-Templates/13 - (R1,R3,R4,R5)-expected.ket
+tests/test-data/KET/Phosphate-Templates/13 - (R1,R3,R4,R5).ket
+tests/test-data/KET/Phosphate-Templates/14 - (R2,R3,R4,R5)-expected.ket
+tests/test-data/KET/Phosphate-Templates/14 - (R2,R3,R4,R5).ket
+tests/test-data/KET/Phosphate-Templates/15 - (R1,R2,R3,R4,R5)-expected.ket
+tests/test-data/KET/Phosphate-Templates/15 - (R1,R2,R3,R4,R5).ket
+tests/test-data/KET/Phosphate-Templates/peptide-connection-rules-cases-template.ket
+tests/test-data/KET/Phosphate-Templates/Test-6-P-x.ket

documentation/help.md

@@ -438,6 +438,13 @@ to open the drop-down list with the following tools:
 
 _Shape Ellipse_ (1), _Shape Rectangle_ (2), and _Shape Line_ (3).
 
+# Adding images on the canvas
+You can add images to the canvas. Select _Add Image_ tool <img src = images/60_add_image.png width = "42" /> in the Tools palette and click anywhere on the canvas.    
+System dialog to choose image file will be opened and upon selection of supported format image will be added to the canvas.    
+Center of the image will be at the place of the click.   
+Supported image types are: `.png`, `.svg`
+
+
 # Creating text objects on the canvas
 
 To add text to the canvas click the _Add text_ tool <img src = images/41_text_icon.png width = "42" />

example-ssr/.eslintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": "next/core-web-vitals"
+}

example-ssr/.gitignore

@@ -0,0 +1,36 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.yarn/install-state.gz
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts

example-ssr/README.md

@@ -0,0 +1,36 @@
+This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
+
+## Getting Started
+
+First, run the development server:
+
+```bash
+npm run dev
+# or
+yarn dev
+# or
+pnpm dev
+# or
+bun dev
+```
+
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+
+You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
+
+This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.
+
+## Learn More
+
+To learn more about Next.js, take a look at the following resources:
+
+- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+
+You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
+
+## Deploy on Vercel
+
+The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+
+Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.

example-ssr/next.config.mjs

@@ -0,0 +1,6 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  reactStrictMode: true,
+};
+
+export default nextConfig;