Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#5873 - Export to ket (and getKET function) change incrementally internal IDs every call #5916

Merged
merged 2 commits into from
Nov 6, 2024
Merged

#5873 - Export to ket (and getKET function) change incrementally internal IDs every call #5916

merged 2 commits into from
Nov 6, 2024

Conversation

rrodionov91
Copy link
Collaborator

@rrodionov91 rrodionov91 commented Nov 5, 2024 •
edited
Loading

How the feature works? / How did you fix the issue?

  • fixed monomer ids generation for serialization

Check list

  • unit-tests written
  • e2e-tests written
  • documentation updated
  • PR name follows the pattern #1234 – issue name
  • branch name doesn't contain '#'
  • PR is linked with the issue
  • base branch (master or release/xx) is correct
  • task status changed to "Code review"
  • reviewers are notified about the pull request

@rrodionov91
#5873 - Export to ket (and getKET function) change incrementally inte…
8373670 
…rnal IDs every call

- fixed monomer ids generation for serialization
@rrodionov91 rrodionov91 linked an issue Nov 5, 2024 that may be closed by this pull request
Export to ket (and getKET function) change incrementally internal IDs every call #5873
Closed
@rrodionov91 rrodionov91 merged commit 7851c09 into master Nov 6, 2024
5 checks passed
@rrodionov91 rrodionov91 deleted the 5873-Export_to_ket_(and_getKET_function)_change_incrementally_internal_IDs_every_call branch November 6, 2024 09:54
knadonenko pushed a commit that referenced this pull request Nov 12, 2024
@knadonenkoepam
Squashed commit of the following:
36e77ab 
commit 0bb3715
Author: Drimodaren <95479023+Drimodaren@users.noreply.github.com>
Date:   Tue Nov 12 12:08:05 2024 +0400

    #5842-info-button-i-for-some-properties-at-settings (#5912)

    * 5842-info-button-i-for-some-properties-at-settings

    * updated tests

    * change layout and update snapshot

    * updated test

    * updated tests

    * merge

    * add tooltip for after, updated tests

    * changes part 2

    * tests update

    * update tests

    * update tests

    * Revert specific files to previous state

    * Revert specific files to previous state

    * Revert specific files to previous state

    * format

    ---------

    Co-authored-by: Andrey Menshikov <andrey.menshikov@bostongene.com>

commit 168e713
Author: Alexey Girin <agirin@mail.ru>
Date:   Mon Nov 11 16:29:38 2024 +0300

    Autotests: #5832 - autotests expand macromolecules in micro mode 2 (#5913)

    * First banch

    * For Roman

    * For roman 2

    * - added clickOnAtomById helper

    * Zoom coordinates recalculation added

    * Verify that deleting an expanded monomer in a chain structure using the Erase tool cause Edit Abbreviations dialog to appear

    * fix

    * Verify that after using the Erase tool to delete an expanded monomer in both chain and ring structures, the Undo and Redo functionality works correctly, restoring or re-removing the expanded monomer and its bonds

    * Move collapsed monomer on Micro and Undo

    * Move expanded monomer on Micro and Undo

    * Verify switching back from micro mode to macro mode with expanded and collapsed monomers

    * Small fix

    * first draft

    * Verify saving collapsed monomers in Daylight SMARTS

    * Saving collapsed monomer to SMARTS

    * Last fix

    * last fix

    * lf 2

    * lf3

    * Micro molecules fix

    * lf4

    * Verify that expanding multiple monomers works in a left-to-right order within a chain fix

    * Verify that expanding multiple monomers works in a top-to-bottom order within a chain fix

    * Verify that expanding monomers with big mircomolecule ring structures in the middle behaves correctly without breaking the chain fix

    * Verify that deleting an expanded monomer in a chain structure using the Erase tool cause Edit Abbreviations dialog to appear fix

    * last fix

    * lf2

    * Move collapsed monomer on Micro and Undo fix

    * Last fix

    * last last fix

    * One more try

    * One more fix

    * macro-micro-switcher.spec.ts:3232 update

    * macro-micro-switcher.spec.ts:3093 update

    * all the rest

    * final

    * Horizontal split

    * one more fix

    * On more try

    * one more try

    * and one more

    * 260

    * last one

    * lf 2

    ---------

    Co-authored-by: Roman Rodionov <roman_rodionov@epam.com>

commit 94e560b
Author: Vladimir Nebolsin <107650674+mnmsvlw@users.noreply.github.com>
Date:   Fri Nov 8 03:56:30 2024 +0400

    #5351 – Inform User to Apply Layout after Settings Adjustment (#5921)

    * #5351 - inform user to apply layout after settings adjustment

    * Update reaction component margin size related tests

commit eb21a9d
Author: GlisicMirjana <133213397+GlisicMirjana@users.noreply.github.com>
Date:   Wed Nov 6 23:06:53 2024 +0100

    #5270 - Warning should not displayed for importing CDXML, base64 CDX, CDX formats (#5928)

commit 5a281ac
Author: Roman Rodionov <roman_rodionov@epam.com>
Date:   Wed Nov 6 16:26:42 2024 +0100

    Backmerge: #5886 - Loading a KET file in macro mode, bond connections are preserved but microstructures are shifted (#5919)

    - added repositioning for all entities during paste/open structures
    - updated screenshots

commit 5fe4ef3
Author: Roman Rodionov <roman_rodionov@epam.com>
Date:   Wed Nov 6 13:08:20 2024 +0100

    #5814 - On Remote environment, the reaction/molecule can't be saved to V3000 formats (returns V2000 instead): MOL, RXN, SDF, RDF (#5908) (#5911)

commit 9a1e91e
Author: ivanmaslow <165396466+ivanmaslow@users.noreply.github.com>
Date:   Wed Nov 6 14:54:14 2024 +0300

    #5915: Added two files, two tests, updated description (#5917)

commit 3a57f09
Author: aproskurnov <proskurn@gmail.com>
Date:   Wed Nov 6 11:39:28 2024 +0100

    Backmerge - #5833 Applied functional group drawing settings (#5883)

    * * applied functional group drawing settings

    * added micromolecules tests

    * added macromolecules tests

    * fixed bunch of micromol tests

    * fixed bunch of macromol tests

    * fixed micromolecule tests

    * fixed macro tests

    * fixed macromolecule tests

    * fixed micromolecule tests

    * fixed imports

    * fixed macro test

    * fixed micro tests

commit 7851c09
Author: Roman Rodionov <roman_rodionov@epam.com>
Date:   Wed Nov 6 10:54:25 2024 +0100

    #5873 - Export to ket (and getKET function) change incrementally internal IDs every call (#5916)

    - fixed monomer ids generation for serialization
    - updated test-data

commit eb5738f
Author: Nikita Chistousov <nikita_chistousov@epam.com>
Date:   Tue Nov 5 15:00:12 2024 +0100

    #5898 – Update indigo to 1.26.0-rc.1 in browser module (#5905)

    – updated indigo to 1.26.0-rc.1 in browser module
    - removed test which doesn't work

    ---------

    Co-authored-by: Roman Rodionov <roman_rodionov@epam.com>

commit a691731
Author: Nikita Chistousov <nikita_chistousov@epam.com>
Date:   Mon Nov 4 12:28:53 2024 +0100

    Backmerge: #5809 – Open correct context menu for expanded monomer while clicking on bond or atom (#5901)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@svvald svvald svvald approved these changes

@NataliaLoginova NataliaLoginova Awaiting requested review from NataliaLoginova

@Zhirnoff Zhirnoff Awaiting requested review from Zhirnoff

Assignees

@rrodionov91 rrodionov91

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Export to ket (and getKET function) change incrementally internal IDs every call
2 participants
@rrodionov91 @svvald