Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit bda88eef68b787a34fa0a5120fd352868e502953
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Dec 13 08:13:34 2021 +0100

    Squashed commit of the following:

    bumped version number to 0.10.45

    commit c87751e0359b309e4b08075520e38329f0e22f0f
    Author: matej <matej.vavrek@m2ms.sk>
    Date:   Sun Dec 12 20:04:39 2021 +0100

    commit 29fe77f2dfcde7525a39da559a3531c8c20e8336
    Author: matej <matej.vavrek@m2ms.sk>
    Date:   Fri Dec 10 10:25:54 2021 +0100

        clean up of tagEditor

    commit 7f956dbd0d87adcad33916c5b9d7bf2267dbf23f
    Author: matej <matej.vavrek@m2ms.sk>
    Date:   Fri Dec 10 10:18:52 2021 +0100

commit 2d8c2cb0c347658f7325346dc65ef039ca0199f4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Dec 10 10:24:11 2021 +0100

    Squashed commit of the following:
    bumped version number to 0.10.44

    commit 7f956dbd0d87adcad33916c5b9d7bf2267dbf23f
    Author: matej <matej.vavrek@m2ms.sk>
    Date:   Fri Dec 10 10:18:52 2021 +0100

commit 72cd65e86ffc5c0447b9fc52bdbf2293e57e441e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Dec 10 09:45:34 2021 +0100

    - bumped version to 0.10.43

commit 220c75b651f04d2f735d37e1390fbfd6d7c8fd72
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Dec 10 09:44:28 2021 +0100

    Squashed commit of the following:

    commit b7a538056775d208b7099b41b9ed29308c9d75dd
    Author: Anton Gasperak <anton.gasperak@m2ms.sk>
    Date:   Fri Dec 3 11:47:48 2021 +0100

    commit 890dcdd365eb867767011bff20074fdf2420ea67
    Author: Anton Gasperak <anton.gasperak@m2ms.sk>
    Date:   Thu Dec 2 14:36:38 2021 +0100

    commit 9abcd4a468c3a079eb34411367982cae4a92b449
    Merge: aec57e18 aec99cd9
    Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
    Date:   Thu Dec 2 08:38:44 2021 +0100

        Merge branch 'master' into #672

    commit aec57e18886a1b96a76adb80202c8c70d57c7c92
    Merge: 25b900fc b83b3d35
    Author: Boris Kovar <boris.kovar@m2ms.sk>
    Date:   Thu Dec 2 08:37:09 2021 +0100

        Merge branch '#672' of https://github.com/m2ms/fragalysis-frontend into #672

    commit 25b900fc680806c508c0ecb0537b874d99ef6a9a
    Author: Boris Kovar <boris.kovar@m2ms.sk>
    Date:   Thu Dec 2 08:36:25 2021 +0100

        - fixed #694
        - bumped version to 0.10.40

    commit aec99cd9f6d9413cb9d39ca02b8fc5bd035e851d
    Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
    Date:   Thu Dec 2 06:45:27 2021 +0100

        * Update package.json

        - updated version number to 0.9.69

        * - prelim changes

        * #557 Bug? Snapshot doesn't restore precise RHS tab

        * #571 [L] toggle not restored from snapshot for things on Selected Compounds tab

        * - implemented first phase of discourse integration

        * Squashed commit of the following:

        commit 431c372cfd29dc1054cae3cd2f3083d369265816
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Wed Mar 24 15:56:39 2021 +0100

            - implemented first phase of discourse integration

        commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Thu Mar 11 10:50:30 2021 +0100

            - prelim changes

        * - updated version number to 0.10.1

        * Squashed commit of the following:

        commit 5761defb26b6103cfb3b16a4630400bc4c786478
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Wed Feb 3 14:23:02 2021 +0100

            Fixed layout and imports

        commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe
        Merge: 717ad541 083cc6da
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Wed Feb 3 13:55:03 2021 +0100

            Merge branch 'allfunctionality' into #487

        commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Wed Feb 3 13:54:33 2021 +0100

            Removed unnecessary parts

        commit 6c23110eaf43122acd1c37f156c02e61c7fa7819
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Wed Feb 3 13:36:29 2021 +0100

            Fixed undo

        commit 19f839c1c127c38d5f5f9b92956765e20322dc6d
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Mon Feb 1 15:31:13 2021 +0100

            Fixed button history tracking

        commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Mon Feb 1 14:15:34 2021 +0100

            Replaced throttle with debounce for nglView tracking

        commit 57b71e02848cf16db43a807b002437b768c765b6
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Mon Feb 1 12:58:06 2021 +0100

            Clear history on project change

        commit 419c2685812a25aa5732291102b559b60909ac00
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Mon Feb 1 12:10:50 2021 +0100

            Separate orientation actions

        commit 272c265c3dc2121f5ee9b515c522197145ed7b71
        Merge: f8440879 bef6400b
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Mon Feb 1 10:34:26 2021 +0100

            Merge branch 'allfunctionality' into #487

        commit f8440879ec6a11a453771540955f37f2611321b0
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Thu Jan 21 13:52:19 2021 +0100

            Ctreated temporary buttons

        commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Thu Jan 21 11:54:52 2021 +0100

            Tidying up

        commit cb6c477658dd8e970784b39a2dd9e396555ca2e3
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Thu Jan 21 11:25:23 2021 +0100

            Change ngl view on undo/redo

        commit edfb5715b81d17409f916bfb0e29831804821391
        Author: ag-m2ms <anton.gasperak@m2ms.sk>
        Date:   Wed Jan 20 16:37:42 2021 +0100

            Initial implementation

        * #593 Electron Density - D button behaviour

        * #593 Electron Density - D button behaviour

        * - implemented modal window for discourse errors

        * - updated version number to 0.10.2

        * - slightly updated error description

        * - loading discourse links in synchronous manner to avoid net::ERR_INSUFFICIENT_RESOURCES

        * - updated version number to 0.10.3

        * - implemented "lazy" handling of the Discourse

        * Squashed commit of the following:

        commit b9205ddf6d076bed7c4b3ee3b63d11acd3422fc6
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Mon Mar 29 15:13:32 2021 +0200

            - implemented "lazy" handling of the Discourse

        * - updated version number to 0.10.4

        * #595 Eletron Density - Settings and control panel

        * - hide link to project icon if no project is loaded

        * - updated version number to 0.10.5

        * - updated error message

        * #595 Eletron Density - Settings and control panel

        * - used icon button instead of link in the target list because it behaved differently in test env from behavior in local env

        * - updated version number to 0.10.6

        * #595 Eletron Density - Settings and control panel

        * - fixed issue when creating project from the preview and the first post for the first snapshot was not created

        * - updated version number to 0.10.7

        * - visual improvements

        * - updated version number to 0.10.8

        * #596 Atom Quality - Q button behaviour

        * - visual improvements

        * - updated version number to 0.10.9

        * #599 Atom Quality - Bad atoms rendering

        * #599 Atom Quality - Bad atoms rendering

        * #599 Atom Quality - Bad atoms rendering

        * #598 Atom Quality - Bad atoms identification

        * #597 Atom Quality - Warning icon behaviour and representation change

        * #597 Atom Quality - Warning icon behaviour and representation change

        * - fix (maybe) for that sometimes a discourse post was attempted before the project and/or snapshot were created

        * - updated version number to 0.10.10

        * - fixed problem where snapshot post was attempted before project post was completed which caused that the snapshot post was never created

        * - updated version number to 0.10.11

        * #597 Atom Quality - Warning icon behaviour and representation change

        * #594 Electron Density - Settings read file

        * #594 Electron Density - Settings read file

        * - fixed saving of the session actions

        * - updated version number to 0.10.12

        * - checkpoint

        * - updated version number to 0.10.13

        * #602 Snapshot tree and discourse posts

        * #602 Snapshot tree and discourse posts

        * #594 Electron Density - Settings read file

        * #594 Electron Density - Settings read file

        * - create discourse topic and post are disabled when creation process is ongoing
        - if discourse user doesn't exists the notice is displayed

        * - changed version number to 0.10.14

        * - open discourse link in the new tab

        * - updated version number to 0.10.15

        * - minor fixes

        * - updated version number to 0.10.16

        * - fixed #609

        * - updated version number to 0.10.17

        * #594 Electron Density - Settings read file

        * #594 Electron Density - Settings read file

        * #594 Electron Density - Settings read file

        * #612 Tag selector

        * #612 Tag selector

        * #612 Tag selector

        * #612 Tag selector

        * #614 Need a modal to edit a tag (name, colour, class, forum post)

        * #614 Need a modal to edit a tag (name, colour, class, forum post)

        * #615 Need a modal to add a tag

        * #615 Need a modal to add a tag

        * #615 Need a modal to add a tag

        * #614 Need a modal to edit a tag

        * #614 Need a modal to edit a tag

        * #614 Need a modal to edit a tag

        * - updated docker file

        * - checkpoint

        * - checkpoint

        * Squashed commit of the following:

        commit c8265ef701902aef183a6f5202e1c0156ef6731d
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Mon May 24 10:44:34 2021 +0200

            - checkpoint

        commit bd53a4efc56f0db18eeb5266a48261a6acf8a995
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Tue May 18 15:26:24 2021 +0200

            - checkpoint

        commit 16ec03519e10aae28e53be1cc0e1a746cc257c7b
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Mon May 17 12:38:55 2021 +0200

            - checkpoint

        commit ca1117e7cbe954d97db2d75df6cd57a5881963eb
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Fri May 14 10:48:16 2021 +0200

            - checkpoint

        commit 8b0d54d2ef27ac6c4d3141ef0666631ae8e9847c
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Tue May 11 09:00:53 2021 +0200

            - checkpoint

        commit 85f86e7e7aebf4b101e936f18cf305fb85f5611e
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Mon May 10 08:31:19 2021 +0200

            - updated discourse api key

        commit 4753d157c3e39f459591c80f0edae8f1369b7bb0
        Merge: 48497a66 b8dff587
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Mon May 10 08:18:13 2021 +0200

            Merge remote-tracking branch 'remotes/origin/#615' into #493

        commit 48497a660088039a12a6250b2cc333373fda62fd
        Merge: 7c3a92ee b5348ff8
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Mon May 10 08:18:01 2021 +0200

            Merge remote-tracking branch 'remotes/origin/#614' into #493

        commit 7c3a92eea37ee76ac366aa6160b3719cbc9161bc
        Merge: 1cb2075a 8ea6f5e1
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Mon May 10 08:17:43 2021 +0200

            Merge remote-tracking branch 'remotes/origin/#612' into #493

        commit 1cb2075a57a940261a28e886aee8c05e53812338
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Wed May 5 10:42:21 2021 +0200

            - check point

        commit c427c09e2d09a07b93d497fe4cc3fe436169f7fd
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Tue May 4 09:05:28 2021 +0200

            - checkpoint

        commit c3bca2d3041d5f82d508e0ec9ff78983dbfb9354
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Mon May 3 10:26:47 2021 +0200

            - checkpoint

        commit b3b4bc66723b5f66aeb61579e421f10969f01f94
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Mon May 3 06:39:29 2021 +0200

            Squashed commit of the following:

            commit 8ea6f5e18a7264d0ecbc49b2cb0659b2a2114bf1
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Fri Apr 30 10:31:21 2021 +0200

            commit 76edad867800165ebbdb8de3cbeebf9e2ec95961
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Thu Apr 29 15:00:31 2021 +0200

            commit 34de343b25675c54da170d5702fa29950dc2a169
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Thu Apr 29 10:53:54 2021 +0200

            commit 0c05b5f7b8acd4557849296eaa7fed8be8a0b235
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Wed Apr 28 16:37:20 2021 +0200

            commit 2089f77c768e442da07d90e238fcff4ef8f49bbe
            Merge: 24221dd1 1af366ba
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Mon Apr 26 12:05:19 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#594' into allfunctionality

            commit 1af366ba3eff83fc24207082fc7de995d12357b8
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Mon Apr 26 08:19:45 2021 +0200

            commit bab87973f5a0eabc43a4cb3bcb475a5a0f055683
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Fri Apr 23 15:02:08 2021 +0200

            commit 822224a41cad5e49ac04eb07dfdbf6670bfa8784
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Fri Apr 23 09:37:48 2021 +0200

            commit 24221dd1e664f0f26506fb86eb328fd0b3e5e2df
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed Apr 21 10:50:20 2021 +0200

                - updated version number to 0.10.17

            commit 711fe63726994ed0ff97630733c74ca2ba1c0465
            Merge: f7ca45cd ab907d4f
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed Apr 21 10:49:56 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit ab907d4f864b43b6e76fa28b8333a26bb0656bc1
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed Apr 21 10:48:31 2021 +0200

                - fixed #609

            commit f7ca45cd82a8631b72ea7182e797066064b97e4e
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Apr 20 10:12:19 2021 +0200

                - updated version number to 0.10.16

            commit c303cd498299823521f8bb6696a220149bba1c25
            Merge: 3fa65765 15ba22f5
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Apr 20 10:11:46 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 15ba22f51bad1f37091752bba8cda77e7412cbc5
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Apr 20 10:10:24 2021 +0200

                - minor fixes

            commit 3fa6576593e684663abc595557a9705061eb9352
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Apr 20 09:36:43 2021 +0200

                - updated version number to 0.10.15

            commit 5691cd5c18c088df6d2405346daec4e001587ce2
            Merge: 490eb622 578911f6
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Apr 20 09:36:10 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 578911f6986175c66325e287603000d33ed9e9a5
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Apr 20 09:35:18 2021 +0200

                - open discourse link in the new tab

            commit 490eb622f5218f77cb0c4a3fc86d0c7ae0ba24c2
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Apr 20 09:21:03 2021 +0200

                - changed version number to 0.10.14

            commit fbd84b30201a14be76eea37b016c93045d1544e3
            Merge: 5ffddf14 2903f4d7
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Apr 20 09:20:36 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 5ffddf14a201248ea76799ae39aa0bcedc1aa7cf
            Merge: 923f6091 6ac9da56
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Apr 20 09:20:23 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#602' into allfunctionality

            commit 2903f4d77bc7bec19c4652ffa099b4815f4f8185
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Apr 20 09:10:43 2021 +0200

                - create discourse topic and post are disabled when creation process is ongoing
                - if discourse user doesn't exists the notice is displayed

            commit 3bbece40609b5c71d3d96150d78206016ff59387
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Wed Apr 14 17:08:31 2021 +0200

            commit 5c1a7da674c986da53f427a63b582ac418e6b62e
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Tue Apr 13 16:16:12 2021 +0200

            commit 6ac9da5608a578acd50797cfd49421fd22d7c8d7
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Tue Apr 13 14:08:24 2021 +0200

            commit a3e9461401e6f5953abc37e9a85d04a85a283e26
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Tue Apr 13 13:24:39 2021 +0200

            commit 923f6091494f3683bed9a7a8f7a03eddac79e500
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Apr 12 09:05:33 2021 +0200

                - updated version number to 0.10.13

            commit d2c885472dc95c12f77c732f0f22af45d0e762e8
            Merge: f50f39f2 dc520c66
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Apr 12 09:05:26 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit dc520c669d6c8a4d03637480c6be8935937271eb
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Apr 12 09:02:05 2021 +0200

                - checkpoint

            commit f50f39f2174c54412c5de518b6012a098eeef1da
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Apr 12 08:20:14 2021 +0200

                - updated version number to 0.10.12

            commit 21859027ec65bbbe631a762c8b63a706c77f58dd
            Merge: 62ea93fb 10ccf727
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Apr 12 08:19:48 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 10ccf727cfbc8d040584812bf0ee015d5d65fcab
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Apr 12 08:17:42 2021 +0200

                - fixed saving of the session actions

            commit d6750ded565c41ddc8769006e1390cb3fec6999e
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Mon Apr 12 07:35:05 2021 +0200

            commit 397e33fd89dc336d1952a85e823a35448cf18a2f
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Thu Apr 8 15:19:30 2021 +0200

            commit ca142a363a2fe79cc1aca17211d7288ab14ff40d
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Thu Apr 8 09:06:59 2021 +0200

            commit 62ea93fb9c27f7114800bba78c39467903991689
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Apr 8 08:26:37 2021 +0200

                - updated version number to 0.10.11

            commit ae2733522476ab6742b2b66cc3d79e465eacc069
            Merge: c2fc9677 9d92d7e8
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Apr 8 08:26:01 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 9d92d7e8455bc442eba6c3640149694b47c43c62
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Apr 8 08:24:30 2021 +0200

                - fixed problem where snapshot post was attempted before project post was completed which caused that the snapshot post was never created

            commit c2fc96772e5cdf2195d6ec9c571c71eae1b2c8c4
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Apr 8 07:02:09 2021 +0200

                - updated version number to 0.10.10

            commit d5e504625f20467d6c3dbf38cd96917c88873171
            Merge: 5a0e4542 130f6b18
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Apr 8 07:01:37 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 130f6b18792cbd75a8e695dee01740e9d772a3c3
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Apr 8 06:58:58 2021 +0200

                - fix (maybe) for that sometimes a discourse post was attempted before the project and/or snapshot were created

            commit 14ecf43c12b50f98741701bb3605c5e02293d77e
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Wed Apr 7 15:19:17 2021 +0200

            commit 1b292d01548dd85b06c407296b370861d57fc618
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Wed Apr 7 10:35:46 2021 +0200

            commit 017fe48fe60ad381ea46d588dc9babef186b1ec2
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Tue Apr 6 15:20:13 2021 +0200

            commit c84ed6fb3a4416df816e8b8d41ef8025d1bd4eeb
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Tue Apr 6 12:06:12 2021 +0200

            commit fcf83775681eb7a7e16b4c4305c1821e4d02e46a
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Thu Apr 1 15:21:01 2021 +0200

            commit b8ce127f18c0e49cae830c2fe99812d9acdb95ed
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Wed Mar 31 15:23:02 2021 +0200

            commit 5a0e454291f7ce769c31558ee0187af8b1419404
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed Mar 31 12:42:24 2021 +0200

                - updated version number to 0.10.9

            commit 9536be7c3c0bd9e79238db40f23e30d7217a3047
            Merge: dc08c064 7cbfd280
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed Mar 31 12:41:47 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 7cbfd2802d213b09948cfb8cf2caa659218ddf99
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed Mar 31 11:25:58 2021 +0200

                - visual improvements

            commit cac166f30c32b8b1ec3037941179a39c629ba4c8
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Tue Mar 30 15:01:00 2021 +0200

            commit dc08c064528842edce9e955993cd760799d29a8c
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 09:58:33 2021 +0200

                - updated version number to 0.10.8

            commit 67536f679120efd55ab4048cd47a73ffa6cef170
            Merge: d1b0784c 6ba6045c
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 09:58:15 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 6ba6045cfe194f07e7964b89754f4e54e0b3fa1b
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 09:57:00 2021 +0200

                - visual improvements

            commit d1b0784ca469fd9689618b094fe7203c6e7b5243
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 09:30:32 2021 +0200

                - updated version number to 0.10.7

            commit d34e6c5aa165b08b6eb46b6a20a31ac0e41fe9c6
            Merge: 1645b5e5 82fdb414
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 09:30:12 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 82fdb414c05099c802b44d926bddc1fd3a8198b3
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 09:28:54 2021 +0200

                - fixed issue when creating project from the preview and the first post for the first snapshot was not created

            commit cf6999e0e9311b6b515ce4a961ec222ba54e6134
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Tue Mar 30 08:40:47 2021 +0200

            commit 1645b5e5c5d60891aea956b3dd855d22179298c5
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 08:34:35 2021 +0200

                - updated version number to 0.10.6

            commit bd320a1867073cd92d4a86f2465ad608107fe1c0
            Merge: 51f9a385 f7830d13
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 08:34:08 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit f7830d13434d404fc4e0a1f1739205036decc988
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 08:32:35 2021 +0200

                - used icon button instead of link in the target list because it behaved differently in test env from behavior in local env

            commit 997c08f3f4f04b0b033c177ad7bf44f8fca13cbb
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Tue Mar 30 08:31:12 2021 +0200

            commit 51f9a3853ab649f00f30eced9f4c5b399bbdea64
            Merge: bbc3c0bf 48af07df
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 07:52:02 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 48af07df5e9e5aed7baa58f770373d10e950df79
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 07:49:27 2021 +0200

                - updated error message

            commit bbc3c0bf3e94ae59130271f2309cf240546b4e72
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 07:34:57 2021 +0200

                - updated version number to 0.10.5

            commit e2e41c59580438ead4c6d10316b6720d0c897613
            Merge: 79c6540c f3a8cc91
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 07:34:30 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit f3a8cc91389661073b6fd17afe0e48fce5be8d15
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Tue Mar 30 07:32:07 2021 +0200

                - hide link to project icon if no project is loaded

            commit 21e0f7b805c67968041d27a0bdd55b1f76df7855
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Mon Mar 29 15:47:00 2021 +0200

            commit 79c6540ced23712c7ce35069de931453404f2c09
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 15:16:16 2021 +0200

                - updated version number to 0.10.4

            commit 905eb0231de118f676f0669558ed4413bc535522
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 15:15:49 2021 +0200

                Squashed commit of the following:

                commit b9205ddf6d076bed7c4b3ee3b63d11acd3422fc6
                Author: Boris Kovar <boris.kovar@m2ms.sk>
                Date:   Mon Mar 29 15:13:32 2021 +0200

                    - implemented "lazy" handling of the Discourse

            commit b9205ddf6d076bed7c4b3ee3b63d11acd3422fc6
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 15:13:32 2021 +0200

                - implemented "lazy" handling of the Discourse

            commit 8a9197e3bdee6bf4e2116910cbd971020d9c93f7
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 10:07:37 2021 +0200

                - updated version number to 0.10.3

            commit b09453a7d51a260866e58f7e427100054b80627d
            Merge: 2c04ce1e 69c3226a
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 10:07:20 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 69c3226aac08d85f4a1e1a054d2f20cfa3a6db2d
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 10:06:11 2021 +0200

                - loading discourse links in synchronous manner to avoid net::ERR_INSUFFICIENT_RESOURCES

            commit 2c04ce1e43535e97b7379756585d4f120ccb583a
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 08:17:59 2021 +0200

                - slightly updated error description

            commit 9ba95f8cc7ba035ed4c9543de8d0c2a651895ff4
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 06:54:00 2021 +0200

                - updated version number to 0.10.2

            commit 14351d551be84ef47b2da4453259531aff2ebe3f
            Merge: f75cc65a 07fdbbc1
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 06:53:35 2021 +0200

                Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality

            commit 07fdbbc167e23587a5ed2bba247da7d00428d656
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 06:47:13 2021 +0200

                - implemented modal window for discourse errors

            commit 760cd0eae09a04a9620bf62c1330a83ef0018da5
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Fri Mar 26 16:16:49 2021 +0100

            commit fb0e78efaf16c0d95add70fc3b4272994e968665
            Author: Adriána Kurillová <adriana.kurillova@m2ms.sk>
            Date:   Fri Mar 26 13:39:14 2021 +0100

            commit f75cc65a9352e0f845cb2b7b3bfa847bf4b81d63
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Mar 25 08:42:22 2021 +0100

                Squashed commit of the following:

                commit 5761defb26b6103cfb3b16a4630400bc4c786478
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Wed Feb 3 14:23:02 2021 +0100

                    Fixed layout and imports

                commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe
                Merge: 717ad541 083cc6da
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Wed Feb 3 13:55:03 2021 +0100

                    Merge branch 'allfunctionality' into #487

                commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Wed Feb 3 13:54:33 2021 +0100

                    Removed unnecessary parts

                commit 6c23110eaf43122acd1c37f156c02e61c7fa7819
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Wed Feb 3 13:36:29 2021 +0100

                    Fixed undo

                commit 19f839c1c127c38d5f5f9b92956765e20322dc6d
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Mon Feb 1 15:31:13 2021 +0100

                    Fixed button history tracking

                commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Mon Feb 1 14:15:34 2021 +0100

                    Replaced throttle with debounce for nglView tracking

                commit 57b71e02848cf16db43a807b002437b768c765b6
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Mon Feb 1 12:58:06 2021 +0100

                    Clear history on project change

                commit 419c2685812a25aa5732291102b559b60909ac00
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Mon Feb 1 12:10:50 2021 +0100

                    Separate orientation actions

                commit 272c265c3dc2121f5ee9b515c522197145ed7b71
                Merge: f8440879 bef6400b
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Mon Feb 1 10:34:26 2021 +0100

                    Merge branch 'allfunctionality' into #487

                commit f8440879ec6a11a453771540955f37f2611321b0
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Thu Jan 21 13:52:19 2021 +0100

                    Ctreated temporary buttons

                commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Thu Jan 21 11:54:52 2021 +0100

                    Tidying up

                commit cb6c477658dd8e970784b39a2dd9e396555ca2e3
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Thu Jan 21 11:25:23 2021 +0100

                    Change ngl view on undo/redo

                commit edfb5715b81d17409f916bfb0e29831804821391
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Wed Jan 20 16:37:42 2021 +0100

                    Initial implementation

            commit a56b85cbba16444ca382e1bf2201af11b89b1278
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Mar 25 08:35:11 2021 +0100

                - updated version number to 0.10.1

            commit 53adfa00ad61976f8bcc4d294172a7a9c3f7acbd
            Merge: 6022dca3 a063e677
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Mar 25 08:31:46 2021 +0100

                Merge remote-tracking branch 'remotes/origin/#571' into allfunctionality

            commit 6022dca3942755a58f7a2b9199d1180f329714c7
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Mar 25 08:31:09 2021 +0100

                Squashed commit of the following:

                commit 431c372cfd29dc1054cae3cd2f3083d369265816
                Author: Boris Kovar <boris.kovar@m2ms.sk>
                Date:   Wed Mar 24 15:56:39 2021 +0100

                    - implemented first phase of discourse integration

                commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743
                Author: Boris Kovar <boris.kovar@m2ms.sk>
                Date:   Thu Mar 11 10:50:30 2021 +0100

                    - prelim changes

            commit 431c372cfd29dc1054cae3cd2f3083d369265816
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed Mar 24 15:56:39 2021 +0100

                - implemented first phase of discourse integration

            commit a063e67765794a0a431397cd2c419b4390ead2aa
            Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
            Date:   Fri Mar 12 09:50:30 2021 +0100

            commit 5b7f462862e5b37000fa648590b25b37c58952ff
            Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
            Date:   Thu Mar 11 15:04:12 2021 +0100

            commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Mar 11 10:50:30 2021 +0100

                - prelim changes

        * -checkpoint

        * Squashed commit of the following:

        commit f1040db72122b957dd1f670e27316a02534eb73f
        Merge: b03f746b 95f445ab
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Wed Jul 21 17:50:09 2021 +0200

            Merge branch 'allfunctionality' of https://github.com/m2ms/fragalysis-frontend into allfunctionality

        commit b03f746b48927d9157eaf3ef0e16f6745fa63db9
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Wed Jul 21 17:48:28 2021 +0200

            - atoms which are not on the ligand are skipped during rendering
            - bumped version to 0.10.28

        commit 95f445abe1ffbdc6db64ecbbadc93364abf19607
        Merge: e085b621 ede38da7
        Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
        Date:   Wed Jul 21 16:56:00 2021 +0200

            Merge branch 'master' into allfunctionality

        commit e085b6213fed54b93cada286038990fbab6b1879
        Merge: 5d8057fe c67d86b1
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Wed Jul 21 16:51:16 2021 +0200

            Merge branch 'allfunctionality' of https://github.com/m2ms/fragalysis-frontend into allfunctionality

        commit 5d8057fe4ad3957412af6d5d79e666a5832c3d82
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Wed Jul 21 16:49:53 2021 +0200

            - added color mappings for AS, SE, I
            - bumped version number to 0.10.27

        commit ede38da71fad1127aeb56349d34be9191ebd1114
        Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
        Date:   Wed Jul 21 15:06:08 2021 +0200

            Allfunctionality - dual bond rendering (#247)

            * Update package.json

            - updated version number to 0.9.69

            * - prelim changes

            * #557 Bug? Snapshot doesn't restore precise RHS tab

            * #571 [L] toggle not restored from snapshot for things on Selected Compounds tab

            * - implemented first phase of discourse integration

            * Squashed commit of the following:

            commit 431c372cfd29dc1054cae3cd2f3083d369265816
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed Mar 24 15:56:39 2021 +0100

                - implemented first phase of discourse integration

            commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Mar 11 10:50:30 2021 +0100

                - prelim changes

            * - updated version number to 0.10.1

            * Squashed commit of the following:

            commit 5761defb26b6103cfb3b16a4630400bc4c786478
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Wed Feb 3 14:23:02 2021 +0100

                Fixed layout and imports

            commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe
            Merge: 717ad541 083cc6da
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Wed Feb 3 13:55:03 2021 +0100

                Merge branch 'allfunctionality' into #487

            commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Wed Feb 3 13:54:33 2021 +0100

                Removed unnecessary parts

            commit 6c23110eaf43122acd1c37f156c02e61c7fa7819
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Wed Feb 3 13:36:29 2021 +0100

                Fixed undo

            commit 19f839c1c127c38d5f5f9b92956765e20322dc6d
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Mon Feb 1 15:31:13 2021 +0100

                Fixed button history tracking

            commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Mon Feb 1 14:15:34 2021 +0100

                Replaced throttle with debounce for nglView tracking

            commit 57b71e02848cf16db43a807b002437b768c765b6
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Mon Feb 1 12:58:06 2021 +0100

                Clear history on project change

            commit 419c2685812a25aa5732291102b559b60909ac00
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Mon Feb 1 12:10:50 2021 +0100

                Separate orientation actions

            commit 272c265c3dc2121f5ee9b515c522197145ed7b71
            Merge: f8440879 bef6400b
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Mon Feb 1 10:34:26 2021 +0100

                Merge branch 'allfunctionality' into #487

            commit f8440879ec6a11a453771540955f37f2611321b0
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Thu Jan 21 13:52:19 2021 +0100

                Ctreated temporary buttons

            commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Thu Jan 21 11:54:52 2021 +0100

                Tidying up

            commit cb6c477658dd8e970784b39a2dd9e396555ca2e3
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Thu Jan 21 11:25:23 2021 +0100

                Change ngl view on undo/redo

            commit edfb5715b81d17409f916bfb0e29831804821391
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Wed Jan 20 16:37:42 2021 +0100

                Initial implementation

            * #593 Electron Density - D button behaviour

            * #593 Electron Density - D button behaviour

            * - implemented modal window for discourse errors

            * - updated version number to 0.10.2

            * - slightly updated error description

            * - loading discourse links in synchronous manner to avoid net::ERR_INSUFFICIENT_RESOURCES

            * - updated version number to 0.10.3

            * - implemented "lazy" handling of the Discourse

            * Squashed commit of the following:

            commit b9205ddf6d076bed7c4b3ee3b63d11acd3422fc6
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 15:13:32 2021 +0200

                - implemented "lazy" handling of the Discourse

            * - updated version number to 0.10.4

            * #595 Eletron Density - Settings and control panel

            * - hide link to project icon if no project is loaded

            * - updated version number to 0.10.5

            * - updated error message

            * #595 Eletron Density - Settings and control panel

            * - used icon button instead of link in the target list because it behaved differently in test env from behavior in local env

            * - updated version number to 0.10.6

            * #595 Eletron Density - Settings and control panel

            * - fixed issue when creating project from the preview and the first post for the first snapshot was not created

            * - updated version number to 0.10.7

            * - visual improvements

            * - updated version number to 0.10.8

            * #596 Atom Quality - Q button behaviour

            * - visual improvements

            * - updated version number to 0.10.9

            * #599 Atom Quality - Bad atoms rendering

            * #599 Atom Quality - Bad atoms rendering

            * #599 Atom Quality - Bad atoms rendering

            * #598 Atom Quality - Bad atoms identification

            * #597 Atom Quality - Warning icon behaviour and representation change

            * #597 Atom Quality - Warning icon behaviour and representation change

            * - fix (maybe) for that sometimes a discourse post was attempted before the project and/or snapshot were created

            * - updated version number to 0.10.10

            * - fixed problem where snapshot post was attempted before project post was completed which caused that the snapshot post was never created

            * - updated version number to 0.10.11

            * #597 Atom Quality - Warning icon behaviour and representation change

            * #594 Electron Density - Settings read file

            * #594 Electron Density - Settings read file

            * - fixed saving of the session actions

            * - updated version number to 0.10.12

            * - checkpoint

            * - updated version number to 0.10.13

            * #602 Snapshot tree and discourse posts

            * #602 Snapshot tree and discourse posts

            * #594 Electron Density - Settings read file

            * #594 Electron Density - Settings read file

            * - create discourse topic and post are disabled when creation process is ongoing
            - if discourse user doesn't exists the notice is displayed

            * - changed version number to 0.10.14

            * - open discourse link in the new tab

            * - updated version number to 0.10.15

            * - minor fixes

            * - updated version number to 0.10.16

            * - fixed #609

            * - updated version number to 0.10.17

            * #594 Electron Density - Settings read file

            * #594 Electron Density - Settings read file

            * #594 Electron Density - Settings read file

            * - updated version number to 0.10.18

            * Squashed commit of the following:

            commit 3361b3951a5cacf5f224c4841f227ec2e87487de
            Merge: 7699a373 eb1ed3b7
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu May 6 09:03:24 2021 +0200

                Merge remote-tracking branch 'upstream/master'

            commit eb1ed3b786a49f97c9939c681fd6276f66fd0ba9
            Merge: 123071bf 2d42a57a
            Author: Rachael Skyner <reskyner@googlemail.com>
            Date:   Wed May 5 15:06:45 2021 +0100

                Merge pull request #241 from alanbchristie/master

                Supports different GitHub and Docker Hub Account names in downstream Actions

            commit 2d42a57a9da3ca725d4e4f9585c51514c844a081
            Author: Alan Christie <alan.christie@matildapeak.com>
            Date:   Wed May 5 14:38:59 2021 +0100

                - Adds STACK_GITHUB_NAMESPACE (differs from STACK_GITHUB_NAMESPACE)

            commit 1c1349979eb5ab01593f408afcfc079b07f45ba8
            Author: Alan B. Christie <alan@kaitak.org>
            Date:   Wed May 5 10:30:58 2021 +0100

                Update README.md

                To trigger build

            commit 7699a3731e7b066b7d0b55644373111396839468
            Merge: 22a978cb 123071bf
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed May 5 10:51:59 2021 +0200

                Merge remote-tracking branch 'upstream/master'

            commit 123071bfbb412ab4426e6f83c96311ece3db0b97
            Author: Rachael Skyner <reskyner@googlemail.com>
            Date:   Tue Apr 27 13:50:47 2021 +0100

                Delete no.travis.yml

            commit 53659c72941b9d1c745a8297d265ed314280324a
            Author: Rachael Skyner <reskyner@googlemail.com>
            Date:   Tue Apr 27 13:50:36 2021 +0100

                Update README.md

            commit 5f043de577545d01d90d3a8674f0fa163314a501
            Merge: 87402117 2c8351ea
            Author: Rachael Skyner <reskyner@googlemail.com>
            Date:   Tue Apr 27 11:46:13 2021 +0100

                Merge pull request #240 from InformaticsMatters/master

                Switch form Travis to GitHub Actions

            commit 874021177850a4ed0a5ff389c2ca9f209a9de53a
            Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
            Date:   Wed Apr 21 14:38:15 2021 +0200

                Implementation of discourse  (#239)

                * Update package.json

                - updated version number to 0.9.69

                * - prelim changes

                * #557 Bug? Snapshot doesn't restore precise RHS tab

                * #571 [L] toggle not restored from snapshot for things on Selected Compounds tab

                * - implemented first phase of discourse integration

                * Squashed commit of the following:

                commit 431c372cfd29dc1054cae3cd2f3083d369265816
                Author: Boris Kovar <boris.kovar@m2ms.sk>
                Date:   Wed Mar 24 15:56:39 2021 +0100

                    - implemented first phase of discourse integration

                commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743
                Author: Boris Kovar <boris.kovar@m2ms.sk>
                Date:   Thu Mar 11 10:50:30 2021 +0100

                    - prelim changes

                * - updated version number to 0.10.1

                * Squashed commit of the following:

                commit 5761defb26b6103cfb3b16a4630400bc4c786478
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Wed Feb 3 14:23:02 2021 +0100

                    Fixed layout and imports

                commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe
                Merge: 717ad541 083cc6da
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Wed Feb 3 13:55:03 2021 +0100

                    Merge branch 'allfunctionality' into #487

                commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Wed Feb 3 13:54:33 2021 +0100

                    Removed unnecessary parts

                commit 6c23110eaf43122acd1c37f156c02e61c7fa7819
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Wed Feb 3 13:36:29 2021 +0100

                    Fixed undo

                commit 19f839c1c127c38d5f5f9b92956765e20322dc6d
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Mon Feb 1 15:31:13 2021 +0100

                    Fixed button history tracking

                commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Mon Feb 1 14:15:34 2021 +0100

                    Replaced throttle with debounce for nglView tracking

                commit 57b71e02848cf16db43a807b002437b768c765b6
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Mon Feb 1 12:58:06 2021 +0100

                    Clear history on project change

                commit 419c2685812a25aa5732291102b559b60909ac00
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Mon Feb 1 12:10:50 2021 +0100

                    Separate orientation actions

                commit 272c265c3dc2121f5ee9b515c522197145ed7b71
                Merge: f8440879 bef6400b
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Mon Feb 1 10:34:26 2021 +0100

                    Merge branch 'allfunctionality' into #487

                commit f8440879ec6a11a453771540955f37f2611321b0
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Thu Jan 21 13:52:19 2021 +0100

                    Ctreated temporary buttons

                commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Thu Jan 21 11:54:52 2021 +0100

                    Tidying up

                commit cb6c477658dd8e970784b39a2dd9e396555ca2e3
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Thu Jan 21 11:25:23 2021 +0100

                    Change ngl view on undo/redo

                commit edfb5715b81d17409f916bfb0e29831804821391
                Author: ag-m2ms <anton.gasperak@m2ms.sk>
                Date:   Wed Jan 20 16:37:42 2021 +0100

                    Initial implementation

                * - implemented modal window for discourse errors

                * - updated version number to 0.10.2

                * - slightly updated error description

                * - loading discourse links in synchronous manner to avoid net::ERR_INSUFFICIENT_RESOURCES

                * - updated version number to 0.10.3

                * - implemented "lazy" handling of the Discourse

                * Squashed commit of the following:

                commit b9205ddf6d076bed7c4b3ee3b63d11acd3422fc6
                Author: Boris Kovar <boris.kovar@m2ms.sk>
                Date:   Mon Mar 29 15:13:32 2021 +0200

                    - implemented "lazy" handling of the Discourse

                * - updated version number to 0.10.4

                * - hide link to project icon if no project is loaded

                * - updated version number to 0.10.5

                * - updated error message

                * - used icon button instead of link in the target list because it behaved differently in test env from behavior in local env

                * - updated version number to 0.10.6

                * - fixed issue when creating project from the preview and the first post for the first snapshot was not created

                * - updated version number to 0.10.7

                * - visual improvements

                * - updated version number to 0.10.8

                * - visual improvements

                * - updated version number to 0.10.9

                * - fix (maybe) for that sometimes a discourse post was attempted before the project and/or snapshot were created

                * - updated version number to 0.10.10

                * - fixed problem where snapshot post was attempted before project post was completed which caused that the snapshot post was never created

                * - updated version number to 0.10.11

                * - fixed saving of the session actions

                * - updated version number to 0.10.12

                * - checkpoint

                * - updated version number to 0.10.13

                * #602 Snapshot tree and discourse posts

                * #602 Snapshot tree and discourse posts

                * - create discourse topic and post are disabled when creation process is ongoing
                - if discourse user doesn't exists the notice is displayed

                * - changed version number to 0.10.14

                * - open discourse link in the new tab

                * - updated version number to 0.10.15

                * - minor fixes

                * - updated version number to 0.10.16

                * - fixed #609

                * - updated version number to 0.10.17

                Co-authored-by: Adriána Kohanová <adriana.kohanova@m2ms.sk>
                Co-authored-by: Adriána Kurillová <adriana.kurillova@m2ms.sk>

            commit 2c8351eaa4620921cf10c6c58e4d4a0d1c843b6c
            Author: Alan Christie <alan.christie@matildapeak.com>
            Date:   Tue Mar 23 00:01:22 2021 +0000

                - Use of production CI action

            commit dd4ead777f9fd5608f710f3db9a80781ecf39f7d
            Author: Alan Christie <alan.christie@matildapeak.com>
            Date:   Mon Mar 22 18:36:18 2021 +0000

                - Fix for stack ref

            commit 7191ae382f3f2d01504dc24360de0fe6d9316d80
            Author: Alan Christie <alan.christie@matildapeak.com>
            Date:   Mon Mar 22 18:30:02 2021 +0000

                - Another trigger fix

            commit 7f193ee6002b3418cf633361c8ede85183c62c74
            Author: Alan Christie <alan.christie@matildapeak.com>
            Date:   Mon Mar 22 18:18:01 2021 +0000

                - Fix trigger logic

            commit fb834c356dadf18e0c0715a70832f63851e8542c
            Author: Alan Christie <alan.christie@matildapeak.com>
            Date:   Mon Mar 22 18:08:10 2021 +0000

                - Experiment with stack trigger

            commit daca6eb5ea1ddae3faeb064df17c9f1f52d3e2a3
            Author: Alan Christie <alan.christie@matildapeak.com>
            Date:   Thu Mar 18 16:57:38 2021 +0000

                - Updates build badge

            commit c4e8f99099bfc39a3363a914d6173e6a00f01f7f
            Author: Alan Christie <alan.christie@matildapeak.com>
            Date:   Thu Mar 18 16:54:24 2021 +0000

                - Attempt to fix action

            commit c12f443e08531c4f0a09e030c04b3c0beeac68e3
            Author: Alan Christie <alan.christie@matildapeak.com>
            Date:   Thu Mar 18 16:38:02 2021 +0000

                - Adds Action (disables Travis)

            commit 56c0372c9e08292d1fa0d0445e0283088199977c
            Merge: 663dfebe 0c9816fe
            Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
            Date:   Wed Mar 3 12:17:55 2021 +0100

                Merge pull request #237 from m2ms/allfunctionality

                - #577 - implemented csv changes

            commit 663dfebec99a2425fc79d41021f96e580844ad64
            Merge: ca4517df 0c2cc4ea
            Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
            Date:   Tue Mar 2 14:56:06 2021 +0100

                Merge pull request #236 from m2ms/allfunctionality

                Allfunctionality

            commit ca4517df64ccd42322b3fa2eee813b5b8cedb037
            Merge: 8b125d35 3c677484
            Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
            Date:   Thu Feb 25 16:10:30 2021 +0100

                Merge pull request #234 from m2ms/allfunctionality

                Allfunctionality

            commit 8b125d357de3708695fc7a4cd4583aa843715cb3
            Merge: bc9480da 8d8a70a2
            Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
            Date:   Thu Feb 18 10:11:03 2021 +0100

                Merge pull request #233 from m2ms/allfunctionality

                Allfunctionality

            commit bc9480da9ea3c542c80d05c41fa5384eaafc9415
            Merge: 8b71b72d d46c2222
            Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
            Date:   Wed Feb 17 10:45:51 2021 +0100

                Merge pull request #232 from m2ms/allfunctionality

                Allfunctionality

            commit 8b71b72dae8aa48a85830226ada565d138f2ecc2
            Merge: 6d6e9212 6b12b03c
            Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
            Date:   Wed Feb 10 14:50:52 2021 +0100

                Merge pull request #231 from m2ms/allfunctionality

                Allfunctionality

            * - updated version number to 0.10.19

            * - checkpoint

            * - checkpoint

            * - maps stuff done

            * - minor fixes

            * - fixes for density maps

            * - fixed saving

            * - updated version number to 0.10.23

            * - updated version number to 0.10.24

            * Squashed commit of the following:

            commit 2a6672672fd8c77a5b6cab6ba97c4b976da2555a
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Jul 8 10:03:20 2021 +0200

                - fix for empty compound set

            commit a88c144f26a3c2d09153b2e3bd87b4f153ef0aa4
            Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
            Date:   Mon May 17 08:49:14 2021 +0200

                Update build-main.yaml

                got rid of scheduled rebuild because it's messing up data

            commit 3361b3951a5cacf5f224c4841f227ec2e87487de
            Merge: 7699a373 eb1ed3b7
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu May 6 09:03:24 2021 +0200

                Merge remote-tracking branch 'upstream/master'

            commit 7699a3731e7b066b7d0b55644373111396839468
            Merge: 22a978cb 123071bf
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed May 5 10:51:59 2021 +0200

                Merge remote-tracking branch 'upstream/master'

            * - bumped version to 0.10.25

            * - double bond rendering for atom quality
            - bumped version number to 0.10.26

            Co-authored-by: Adriána Kohanová <adriana.kohanova@m2ms.sk>
            Co-authored-by: Adriána Kurillová <adriana.kurillova@m2ms.sk>

        commit c67d86b1c32fbac2aff45fd32764a86182c3ba23
        Merge: 7c20b00c ffe89646
        Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
        Date:   Wed Jul 21 15:05:56 2021 +0200

            Merge branch 'master' into allfunctionality

        commit 7c20b00ce75708810f2c3b00c3ee737814676b24
        Author: Boris Kovar <boris.kovar@m2ms.sk>
        Date:   Wed Jul 21 14:44:41 2021 +0200

            - double bond rendering for atom quality
            - bumped version number to 0.10.26

        commit ffe89646ee442d9f63bd684492bf0797f1794bd4
        Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
        Date:   Mon Jul 12 08:58:37 2021 +0200

            fix for empty compound sets (#246)

            * Update package.json

            - updated version number to 0.9.69

            * - prelim changes

            * #557 Bug? Snapshot doesn't restore precise RHS tab

            * #571 [L] toggle not restored from snapshot for things on Selected Compounds tab

            * - implemented first phase of discourse integration

            * Squashed commit of the following:

            commit 431c372cfd29dc1054cae3cd2f3083d369265816
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Wed Mar 24 15:56:39 2021 +0100

                - implemented first phase of discourse integration

            commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Thu Mar 11 10:50:30 2021 +0100

                - prelim changes

            * - updated version number to 0.10.1

            * Squashed commit of the following:

            commit 5761defb26b6103cfb3b16a4630400bc4c786478
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Wed Feb 3 14:23:02 2021 +0100

                Fixed layout and imports

            commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe
            Merge: 717ad541 083cc6da
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Wed Feb 3 13:55:03 2021 +0100

                Merge branch 'allfunctionality' into #487

            commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Wed Feb 3 13:54:33 2021 +0100

                Removed unnecessary parts

            commit 6c23110eaf43122acd1c37f156c02e61c7fa7819
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Wed Feb 3 13:36:29 2021 +0100

                Fixed undo

            commit 19f839c1c127c38d5f5f9b92956765e20322dc6d
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Mon Feb 1 15:31:13 2021 +0100

                Fixed button history tracking

            commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Mon Feb 1 14:15:34 2021 +0100

                Replaced throttle with debounce for nglView tracking

            commit 57b71e02848cf16db43a807b002437b768c765b6
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Mon Feb 1 12:58:06 2021 +0100

                Clear history on project change

            commit 419c2685812a25aa5732291102b559b60909ac00
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Mon Feb 1 12:10:50 2021 +0100

                Separate orientation actions

            commit 272c265c3dc2121f5ee9b515c522197145ed7b71
            Merge: f8440879 bef6400b
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Mon Feb 1 10:34:26 2021 +0100

                Merge branch 'allfunctionality' into #487

            commit f8440879ec6a11a453771540955f37f2611321b0
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Thu Jan 21 13:52:19 2021 +0100

                Ctreated temporary buttons

            commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Thu Jan 21 11:54:52 2021 +0100

                Tidying up

            commit cb6c477658dd8e970784b39a2dd9e396555ca2e3
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Thu Jan 21 11:25:23 2021 +0100

                Change ngl view on undo/redo

            commit edfb5715b81d17409f916bfb0e29831804821391
            Author: ag-m2ms <anton.gasperak@m2ms.sk>
            Date:   Wed Jan 20 16:37:42 2021 +0100

                Initial implementation

            * #593 Electron Density - D button behaviour

            * #593 Electron Density - D button behaviour

            * - implemented modal window for discourse errors

            * - updated version number to 0.10.2

            * - slightly updated error description

            * - loading discourse links in synchronous manner to avoid net::ERR_INSUFFICIENT_RESOURCES

            * - updated version number to 0.10.3

            * - implemented "lazy" handling of the Discourse

            * Squashed commit of the following:

            commit b9205ddf6d076bed7c4b3ee3b63d11acd3422fc6
            Author: Boris Kovar <boris.kovar@m2ms.sk>
            Date:   Mon Mar 29 15:13:32 2021 +0200

                - implemented "lazy" handling of the Discourse

            * - updated version number to 0.10.4

            * #595 Eletron Density - Settings and control panel

            * - hide link to project icon if no project is loaded

   …
  • Loading branch information
@boriskovar-m2ms
boriskovar-m2ms committed Dec 15, 2021
1 parent cbaa408 commit 548713f
Show file tree
Hide file tree
Showing 28 changed files with 1,393 additions and 579 deletions.
6 changes: 5 additions & 1 deletion js/components/common/Components/ColorPicker/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { memo, useState } from 'react';
import React, { memo, useState, useEffect } from 'react';
import { makeStyles, Popper } from '@material-ui/core';
import { SketchPicker } from 'react-color';

Expand Down Expand Up @@ -36,6 +36,10 @@ export const ColorPicker = memo(({ selectedColor, setSelectedColor, anchorEl, di
const [color, setColor] = useState(selectedColor);
const [anchorE1, setAnchorE1] = useState(null);

useEffect(() => {
setColor(selectedColor);
}, [selectedColor]);

const handleClick = event => {
if (!disabled) {
setAnchorE1(event.currentTarget);
Expand Down
38 changes: 15 additions & 23 deletions js/components/common/Surfaces/Panel/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,7 @@ export const Panel = memo(
className={classes.headerGrid}
>
{title && (
<Grid
item
xs={hasExpansion || headerActions ? (headerActions && headerActions.length > 1 ? 4 : 6) : 12}
className={classes.headerTitle}
>
<Grid item className={classes.headerTitle}>
{withTooltip ? (
<Tooltip title={title}>
<Typography variant="h6" color="inherit" noWrap>
Expand All @@ -131,24 +127,20 @@ export const Panel = memo(
</Grid>
)}
{(headerActions || hasExpansion) && (
<Grid
item
container
direction="row"
justify="flex-end"
xs={title ? (headerActions && headerActions.length > 1 ? 8 : 6) : 12}
>
{headerActions &&
headerActions.map((action, index) => (
<Grid item key={index}>
{action}
</Grid>
))}
{hasExpansion && (
<IconButton onClick={handleTitleButtonClick} color="inherit">
{expanded ? <ExpandLess /> : <ExpandMore />}
</IconButton>
)}
<Grid item>
<Grid container direction="row" justify="flex-end">
{headerActions &&
headerActions.map((action, index) => (
<Grid item key={index}>
{action}
</Grid>
))}
{hasExpansion && (
<IconButton onClick={handleTitleButtonClick} color="inherit">
{expanded ? <ExpandLess /> : <ExpandMore />}
</IconButton>
)}
</Grid>
</Grid>
)}
</Grid>
Expand Down
18 changes: 10 additions & 8 deletions js/components/datasets/datasetMoleculeList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {
removeDatasetSurface,
autoHideDatasetDialogsOnScroll,
moveMoleculeInspirationsSettings,
removeAllSelectedDatasetMolecules
removeSelectedDatasetMolecules
} from './redux/dispatchActions';
import { setFilterDialogOpen, setSearchStringOfCompoundSet } from './redux/actions';
import { DatasetFilter } from './datasetFilter';
Expand Down Expand Up @@ -299,17 +299,19 @@ export const DatasetMoleculeList = memo(
surface: removeDatasetSurface
};

const removeOfAllSelectedTypesOfInspirations = skipTracking => {
let molecules = [...getJoinedMoleculeList, ...inspirationMoleculeDataList];
const removeSelectedTypesOfInspirations = (skipMolecules = [], skipTracking = false) => {
const molecules = [...getJoinedMoleculeList, ...inspirationMoleculeDataList].filter(
molecule => !skipMolecules.includes(molecule)
);
dispatch(hideAllSelectedMolecules(stage, [...molecules], false, skipTracking));
};

const removeOfAllSelectedTypes = skipTracking => {
dispatch(removeAllSelectedDatasetMolecules(stage, skipTracking));
const removeOSelectedTypes = (skipMolecules = {}, skipTracking = false) => {
dispatch(removeSelectedDatasetMolecules(stage, skipTracking, skipMolecules));
};

const moveSelectedMoleculeInspirationsSettings = (data, newItemData, skipTracking) => (dispatch, getState) => {
dispatch(
return dispatch(
moveMoleculeInspirationsSettings(
data,
newItemData,
Expand Down Expand Up @@ -666,8 +668,8 @@ export const DatasetMoleculeList = memo(
showCrossReferenceModal
previousItemData={index > 0 && array[index - 1]}
nextItemData={index < array?.length && array[index + 1]}
removeOfAllSelectedTypes={removeOfAllSelectedTypes}
removeOfAllSelectedTypesOfInspirations={removeOfAllSelectedTypesOfInspirations}
removeSelectedTypes={removeOSelectedTypes}
removeSelectedTypesOfInspirations={removeSelectedTypesOfInspirations}
moveSelectedMoleculeInspirationsSettings={moveSelectedMoleculeInspirationsSettings}
L={ligandList.includes(data.id)}
P={proteinList.includes(data.id)}
Expand Down
34 changes: 20 additions & 14 deletions js/components/datasets/datasetMoleculeView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ export const DatasetMoleculeView = memo(
index,
previousItemData,
nextItemData,
removeOfAllSelectedTypes,
removeOfAllSelectedTypesOfInspirations,
removeSelectedTypes,
removeSelectedTypesOfInspirations,
moveSelectedMoleculeInspirationsSettings,
L,
P,
Expand Down Expand Up @@ -486,7 +486,7 @@ export const DatasetMoleculeView = memo(
});
};

const handleClickOnDownArrow = () => {
const handleClickOnDownArrow = async () => {
const refNext = ref.current.nextSibling;
scrollToElement(refNext);

Expand All @@ -497,20 +497,22 @@ export const DatasetMoleculeView = memo(
let dataValue = { objectsInView, colourToggle, isLigandOn, isProteinOn, isComplexOn, isSurfaceOn };
dispatch(setArrowUpDown(datasetID, data, nextItem, ARROW_TYPE.DOWN, dataValue));

removeOfAllSelectedTypes(true);
removeOfAllSelectedTypesOfInspirations(true);

const inspirations = getInspirationsForMol(allInspirations, datasetID, nextItem.id);
dispatch(setInspirationMoleculeDataList(inspirations));
dispatch(moveSelectedMoleculeSettings(stage, data, nextItem, nextDatasetID, datasetID, dataValue, true));
dispatch(moveSelectedMoleculeInspirationsSettings(data, nextItem, true));
await Promise.all([
dispatch(moveSelectedMoleculeSettings(stage, data, nextItem, nextDatasetID, datasetID, dataValue, true)),
dispatch(moveSelectedMoleculeInspirationsSettings(data, nextItem, true))
]);
dispatch(setCrossReferenceCompoundName(moleculeTitleNext));
if (setRef && ref.current) {
setRef(refNext);
}

removeSelectedTypes({ [nextDatasetID]: [nextItem] }, true);
removeSelectedTypesOfInspirations([nextItem], true);
};

const handleClickOnUpArrow = () => {
const handleClickOnUpArrow = async () => {
const refPrevious = ref.current.previousSibling;
scrollToElement(refPrevious);

Expand All @@ -523,18 +525,22 @@ export const DatasetMoleculeView = memo(
let dataValue = { objectsInView, colourToggle, isLigandOn, isProteinOn, isComplexOn, isSurfaceOn };
dispatch(setArrowUpDown(datasetID, data, previousItem, ARROW_TYPE.UP, dataValue));

removeOfAllSelectedTypes(true);
removeOfAllSelectedTypesOfInspirations(true);

const inspirations = getInspirationsForMol(allInspirations, datasetID, previousItem.id);
dispatch(setInspirationMoleculeDataList(inspirations));
dispatch(moveSelectedMoleculeSettings(stage, data, previousItem, previousDatasetID, datasetID, dataValue, true));
await Promise.all([
dispatch(
moveSelectedMoleculeSettings(stage, data, previousItem, previousDatasetID, datasetID, dataValue, true)
),
dispatch(moveSelectedMoleculeInspirationsSettings(data, previousItem, true))
]);

dispatch(moveSelectedMoleculeInspirationsSettings(data, previousItem, true));
dispatch(setCrossReferenceCompoundName(moleculeTitlePrev));
if (setRef && ref.current) {
setRef(refPrevious);
}

removeSelectedTypes({ [previousDatasetID]: [previousItem] }, true);
removeSelectedTypesOfInspirations([previousItem], true);
};

const moleculeTitle = data && data.name;
Expand Down
4 changes: 2 additions & 2 deletions js/components/datasets/inspirationDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
removeLigand,
removeHitProtein,
removeSurface,
removeAllSelectedMolTypes
removeSelectedMolTypes
} from '../preview/molecule/redux/dispatchActions';
import MoleculeView from '../preview/molecule/moleculeView';
import { moleculeProperty } from '../preview/molecule/helperConstants';
Expand Down Expand Up @@ -211,7 +211,7 @@ export const InspirationDialog = memo(
const selectMoleculeSite = moleculeGroupSite => {};

const removeOfAllSelectedTypes = (skipTracking = false) => {
dispatch(removeAllSelectedMolTypes(stage, moleculeList, skipTracking, true));
dispatch(removeSelectedMolTypes(stage, moleculeList, skipTracking, true));
};

const removeSelectedType = (type, skipTracking = false) => {
Expand Down
Loading

0 comments on commit 548713f

Please sign in to comment.