From 58657e95cde297036096ea0f702a1980bde90b51 Mon Sep 17 00:00:00 2001 From: boriskovar-m2ms Date: Tue, 12 Oct 2021 12:08:16 +0200 Subject: [PATCH] #617 - tag editor fixes (#258) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Date: Wed Mar 24 15:56:39 2021 +0100 - implemented first phase of discourse integration commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743 Author: Boris Kovar 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 Date: Wed Feb 3 14:23:02 2021 +0100 Fixed layout and imports commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe Merge: 717ad541 083cc6da Author: ag-m2ms Date: Wed Feb 3 13:55:03 2021 +0100 Merge branch 'allfunctionality' into #487 commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c Author: ag-m2ms Date: Wed Feb 3 13:54:33 2021 +0100 Removed unnecessary parts commit 6c23110eaf43122acd1c37f156c02e61c7fa7819 Author: ag-m2ms Date: Wed Feb 3 13:36:29 2021 +0100 Fixed undo commit 19f839c1c127c38d5f5f9b92956765e20322dc6d Author: ag-m2ms Date: Mon Feb 1 15:31:13 2021 +0100 Fixed button history tracking commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039 Author: ag-m2ms Date: Mon Feb 1 14:15:34 2021 +0100 Replaced throttle with debounce for nglView tracking commit 57b71e02848cf16db43a807b002437b768c765b6 Author: ag-m2ms Date: Mon Feb 1 12:58:06 2021 +0100 Clear history on project change commit 419c2685812a25aa5732291102b559b60909ac00 Author: ag-m2ms Date: Mon Feb 1 12:10:50 2021 +0100 Separate orientation actions commit 272c265c3dc2121f5ee9b515c522197145ed7b71 Merge: f8440879 bef6400b Author: ag-m2ms Date: Mon Feb 1 10:34:26 2021 +0100 Merge branch 'allfunctionality' into #487 commit f8440879ec6a11a453771540955f37f2611321b0 Author: ag-m2ms Date: Thu Jan 21 13:52:19 2021 +0100 Ctreated temporary buttons commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7 Author: ag-m2ms Date: Thu Jan 21 11:54:52 2021 +0100 Tidying up commit cb6c477658dd8e970784b39a2dd9e396555ca2e3 Author: ag-m2ms Date: Thu Jan 21 11:25:23 2021 +0100 Change ngl view on undo/redo commit edfb5715b81d17409f916bfb0e29831804821391 Author: ag-m2ms 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 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 Date: Mon May 24 10:44:34 2021 +0200 - checkpoint commit bd53a4efc56f0db18eeb5266a48261a6acf8a995 Author: Boris Kovar Date: Tue May 18 15:26:24 2021 +0200 - checkpoint commit 16ec03519e10aae28e53be1cc0e1a746cc257c7b Author: Boris Kovar Date: Mon May 17 12:38:55 2021 +0200 - checkpoint commit ca1117e7cbe954d97db2d75df6cd57a5881963eb Author: Boris Kovar Date: Fri May 14 10:48:16 2021 +0200 - checkpoint commit 8b0d54d2ef27ac6c4d3141ef0666631ae8e9847c Author: Boris Kovar Date: Tue May 11 09:00:53 2021 +0200 - checkpoint commit 85f86e7e7aebf4b101e936f18cf305fb85f5611e Author: Boris Kovar Date: Mon May 10 08:31:19 2021 +0200 - updated discourse api key commit 4753d157c3e39f459591c80f0edae8f1369b7bb0 Merge: 48497a66 b8dff587 Author: Boris Kovar 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 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 Date: Mon May 10 08:17:43 2021 +0200 Merge remote-tracking branch 'remotes/origin/#612' into #493 commit 1cb2075a57a940261a28e886aee8c05e53812338 Author: Boris Kovar Date: Wed May 5 10:42:21 2021 +0200 - check point commit c427c09e2d09a07b93d497fe4cc3fe436169f7fd Author: Boris Kovar Date: Tue May 4 09:05:28 2021 +0200 - checkpoint commit c3bca2d3041d5f82d508e0ec9ff78983dbfb9354 Author: Boris Kovar Date: Mon May 3 10:26:47 2021 +0200 - checkpoint commit b3b4bc66723b5f66aeb61579e421f10969f01f94 Author: Boris Kovar Date: Mon May 3 06:39:29 2021 +0200 Squashed commit of the following: commit 8ea6f5e18a7264d0ecbc49b2cb0659b2a2114bf1 Author: Adriána Kurillová Date: Fri Apr 30 10:31:21 2021 +0200 #612 Tag selector commit 76edad867800165ebbdb8de3cbeebf9e2ec95961 Author: Adriána Kurillová Date: Thu Apr 29 15:00:31 2021 +0200 #612 Tag selector commit 34de343b25675c54da170d5702fa29950dc2a169 Author: Adriána Kurillová Date: Thu Apr 29 10:53:54 2021 +0200 #612 Tag selector commit 0c05b5f7b8acd4557849296eaa7fed8be8a0b235 Author: Adriána Kurillová Date: Wed Apr 28 16:37:20 2021 +0200 #612 Tag selector commit 2089f77c768e442da07d90e238fcff4ef8f49bbe Merge: 24221dd1 1af366ba Author: Adriána Kurillová Date: Mon Apr 26 12:05:19 2021 +0200 Merge remote-tracking branch 'remotes/origin/#594' into allfunctionality # Conflicts: # docker-compose.dev.vector.yml # js/reducers/ngl/dispatchActions.js commit 1af366ba3eff83fc24207082fc7de995d12357b8 Author: Adriána Kurillová Date: Mon Apr 26 08:19:45 2021 +0200 #594 Electron Density - Settings read file commit bab87973f5a0eabc43a4cb3bcb475a5a0f055683 Author: Adriána Kurillová Date: Fri Apr 23 15:02:08 2021 +0200 #594 Electron Density - Settings read file commit 822224a41cad5e49ac04eb07dfdbf6670bfa8784 Author: Adriána Kurillová Date: Fri Apr 23 09:37:48 2021 +0200 #594 Electron Density - Settings read file commit 24221dd1e664f0f26506fb86eb328fd0b3e5e2df Author: Boris Kovar Date: Wed Apr 21 10:50:20 2021 +0200 - updated version number to 0.10.17 commit 711fe63726994ed0ff97630733c74ca2ba1c0465 Merge: f7ca45cd ab907d4f Author: Boris Kovar Date: Wed Apr 21 10:49:56 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit ab907d4f864b43b6e76fa28b8333a26bb0656bc1 Author: Boris Kovar Date: Wed Apr 21 10:48:31 2021 +0200 - fixed #609 commit f7ca45cd82a8631b72ea7182e797066064b97e4e Author: Boris Kovar Date: Tue Apr 20 10:12:19 2021 +0200 - updated version number to 0.10.16 commit c303cd498299823521f8bb6696a220149bba1c25 Merge: 3fa65765 15ba22f5 Author: Boris Kovar Date: Tue Apr 20 10:11:46 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 15ba22f51bad1f37091752bba8cda77e7412cbc5 Author: Boris Kovar Date: Tue Apr 20 10:10:24 2021 +0200 - minor fixes commit 3fa6576593e684663abc595557a9705061eb9352 Author: Boris Kovar Date: Tue Apr 20 09:36:43 2021 +0200 - updated version number to 0.10.15 commit 5691cd5c18c088df6d2405346daec4e001587ce2 Merge: 490eb622 578911f6 Author: Boris Kovar Date: Tue Apr 20 09:36:10 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 578911f6986175c66325e287603000d33ed9e9a5 Author: Boris Kovar Date: Tue Apr 20 09:35:18 2021 +0200 - open discourse link in the new tab commit 490eb622f5218f77cb0c4a3fc86d0c7ae0ba24c2 Author: Boris Kovar Date: Tue Apr 20 09:21:03 2021 +0200 - changed version number to 0.10.14 commit fbd84b30201a14be76eea37b016c93045d1544e3 Merge: 5ffddf14 2903f4d7 Author: Boris Kovar 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 Date: Tue Apr 20 09:20:23 2021 +0200 Merge remote-tracking branch 'remotes/origin/#602' into allfunctionality commit 2903f4d77bc7bec19c4652ffa099b4815f4f8185 Author: Boris Kovar 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á Date: Wed Apr 14 17:08:31 2021 +0200 #594 Electron Density - Settings read file commit 5c1a7da674c986da53f427a63b582ac418e6b62e Author: Adriána Kurillová Date: Tue Apr 13 16:16:12 2021 +0200 #594 Electron Density - Settings read file commit 6ac9da5608a578acd50797cfd49421fd22d7c8d7 Author: Adriána Kurillová Date: Tue Apr 13 14:08:24 2021 +0200 #602 Snapshot tree and discourse posts commit a3e9461401e6f5953abc37e9a85d04a85a283e26 Author: Adriána Kurillová Date: Tue Apr 13 13:24:39 2021 +0200 #602 Snapshot tree and discourse posts commit 923f6091494f3683bed9a7a8f7a03eddac79e500 Author: Boris Kovar Date: Mon Apr 12 09:05:33 2021 +0200 - updated version number to 0.10.13 commit d2c885472dc95c12f77c732f0f22af45d0e762e8 Merge: f50f39f2 dc520c66 Author: Boris Kovar Date: Mon Apr 12 09:05:26 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit dc520c669d6c8a4d03637480c6be8935937271eb Author: Boris Kovar Date: Mon Apr 12 09:02:05 2021 +0200 - checkpoint commit f50f39f2174c54412c5de518b6012a098eeef1da Author: Boris Kovar Date: Mon Apr 12 08:20:14 2021 +0200 - updated version number to 0.10.12 commit 21859027ec65bbbe631a762c8b63a706c77f58dd Merge: 62ea93fb 10ccf727 Author: Boris Kovar Date: Mon Apr 12 08:19:48 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 10ccf727cfbc8d040584812bf0ee015d5d65fcab Author: Boris Kovar Date: Mon Apr 12 08:17:42 2021 +0200 - fixed saving of the session actions commit d6750ded565c41ddc8769006e1390cb3fec6999e Author: Adriána Kurillová Date: Mon Apr 12 07:35:05 2021 +0200 #594 Electron Density - Settings read file commit 397e33fd89dc336d1952a85e823a35448cf18a2f Author: Adriána Kurillová Date: Thu Apr 8 15:19:30 2021 +0200 #594 Electron Density - Settings read file commit ca142a363a2fe79cc1aca17211d7288ab14ff40d Author: Adriána Kurillová Date: Thu Apr 8 09:06:59 2021 +0200 #597 Atom Quality - Warning icon behaviour and representation change commit 62ea93fb9c27f7114800bba78c39467903991689 Author: Boris Kovar Date: Thu Apr 8 08:26:37 2021 +0200 - updated version number to 0.10.11 commit ae2733522476ab6742b2b66cc3d79e465eacc069 Merge: c2fc9677 9d92d7e8 Author: Boris Kovar Date: Thu Apr 8 08:26:01 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 9d92d7e8455bc442eba6c3640149694b47c43c62 Author: Boris Kovar 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 Date: Thu Apr 8 07:02:09 2021 +0200 - updated version number to 0.10.10 commit d5e504625f20467d6c3dbf38cd96917c88873171 Merge: 5a0e4542 130f6b18 Author: Boris Kovar Date: Thu Apr 8 07:01:37 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 130f6b18792cbd75a8e695dee01740e9d772a3c3 Author: Boris Kovar 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á Date: Wed Apr 7 15:19:17 2021 +0200 #597 Atom Quality - Warning icon behaviour and representation change commit 1b292d01548dd85b06c407296b370861d57fc618 Author: Adriána Kurillová Date: Wed Apr 7 10:35:46 2021 +0200 #597 Atom Quality - Warning icon behaviour and representation change commit 017fe48fe60ad381ea46d588dc9babef186b1ec2 Author: Adriána Kurillová Date: Tue Apr 6 15:20:13 2021 +0200 #598 Atom Quality - Bad atoms identification commit c84ed6fb3a4416df816e8b8d41ef8025d1bd4eeb Author: Adriána Kurillová Date: Tue Apr 6 12:06:12 2021 +0200 #599 Atom Quality - Bad atoms rendering commit fcf83775681eb7a7e16b4c4305c1821e4d02e46a Author: Adriána Kurillová Date: Thu Apr 1 15:21:01 2021 +0200 #599 Atom Quality - Bad atoms rendering commit b8ce127f18c0e49cae830c2fe99812d9acdb95ed Author: Adriána Kurillová Date: Wed Mar 31 15:23:02 2021 +0200 #599 Atom Quality - Bad atoms rendering commit 5a0e454291f7ce769c31558ee0187af8b1419404 Author: Boris Kovar Date: Wed Mar 31 12:42:24 2021 +0200 - updated version number to 0.10.9 commit 9536be7c3c0bd9e79238db40f23e30d7217a3047 Merge: dc08c064 7cbfd280 Author: Boris Kovar Date: Wed Mar 31 12:41:47 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 7cbfd2802d213b09948cfb8cf2caa659218ddf99 Author: Boris Kovar Date: Wed Mar 31 11:25:58 2021 +0200 - visual improvements commit cac166f30c32b8b1ec3037941179a39c629ba4c8 Author: Adriána Kurillová Date: Tue Mar 30 15:01:00 2021 +0200 #596 Atom Quality - Q button behaviour commit dc08c064528842edce9e955993cd760799d29a8c Author: Boris Kovar Date: Tue Mar 30 09:58:33 2021 +0200 - updated version number to 0.10.8 commit 67536f679120efd55ab4048cd47a73ffa6cef170 Merge: d1b0784c 6ba6045c Author: Boris Kovar Date: Tue Mar 30 09:58:15 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 6ba6045cfe194f07e7964b89754f4e54e0b3fa1b Author: Boris Kovar Date: Tue Mar 30 09:57:00 2021 +0200 - visual improvements commit d1b0784ca469fd9689618b094fe7203c6e7b5243 Author: Boris Kovar Date: Tue Mar 30 09:30:32 2021 +0200 - updated version number to 0.10.7 commit d34e6c5aa165b08b6eb46b6a20a31ac0e41fe9c6 Merge: 1645b5e5 82fdb414 Author: Boris Kovar Date: Tue Mar 30 09:30:12 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 82fdb414c05099c802b44d926bddc1fd3a8198b3 Author: Boris Kovar 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á Date: Tue Mar 30 08:40:47 2021 +0200 #595 Eletron Density - Settings and control panel commit 1645b5e5c5d60891aea956b3dd855d22179298c5 Author: Boris Kovar Date: Tue Mar 30 08:34:35 2021 +0200 - updated version number to 0.10.6 commit bd320a1867073cd92d4a86f2465ad608107fe1c0 Merge: 51f9a385 f7830d13 Author: Boris Kovar Date: Tue Mar 30 08:34:08 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit f7830d13434d404fc4e0a1f1739205036decc988 Author: Boris Kovar 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á Date: Tue Mar 30 08:31:12 2021 +0200 #595 Eletron Density - Settings and control panel commit 51f9a3853ab649f00f30eced9f4c5b399bbdea64 Merge: bbc3c0bf 48af07df Author: Boris Kovar Date: Tue Mar 30 07:52:02 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 48af07df5e9e5aed7baa58f770373d10e950df79 Author: Boris Kovar Date: Tue Mar 30 07:49:27 2021 +0200 - updated error message commit bbc3c0bf3e94ae59130271f2309cf240546b4e72 Author: Boris Kovar Date: Tue Mar 30 07:34:57 2021 +0200 - updated version number to 0.10.5 commit e2e41c59580438ead4c6d10316b6720d0c897613 Merge: 79c6540c f3a8cc91 Author: Boris Kovar Date: Tue Mar 30 07:34:30 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit f3a8cc91389661073b6fd17afe0e48fce5be8d15 Author: Boris Kovar 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á Date: Mon Mar 29 15:47:00 2021 +0200 #595 Eletron Density - Settings and control panel commit 79c6540ced23712c7ce35069de931453404f2c09 Author: Boris Kovar Date: Mon Mar 29 15:16:16 2021 +0200 - updated version number to 0.10.4 commit 905eb0231de118f676f0669558ed4413bc535522 Author: Boris Kovar Date: Mon Mar 29 15:15:49 2021 +0200 Squashed commit of the following: commit b9205ddf6d076bed7c4b3ee3b63d11acd3422fc6 Author: Boris Kovar Date: Mon Mar 29 15:13:32 2021 +0200 - implemented "lazy" handling of the Discourse commit b9205ddf6d076bed7c4b3ee3b63d11acd3422fc6 Author: Boris Kovar Date: Mon Mar 29 15:13:32 2021 +0200 - implemented "lazy" handling of the Discourse commit 8a9197e3bdee6bf4e2116910cbd971020d9c93f7 Author: Boris Kovar Date: Mon Mar 29 10:07:37 2021 +0200 - updated version number to 0.10.3 commit b09453a7d51a260866e58f7e427100054b80627d Merge: 2c04ce1e 69c3226a Author: Boris Kovar Date: Mon Mar 29 10:07:20 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 69c3226aac08d85f4a1e1a054d2f20cfa3a6db2d Author: Boris Kovar 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 Date: Mon Mar 29 08:17:59 2021 +0200 - slightly updated error description commit 9ba95f8cc7ba035ed4c9543de8d0c2a651895ff4 Author: Boris Kovar Date: Mon Mar 29 06:54:00 2021 +0200 - updated version number to 0.10.2 commit 14351d551be84ef47b2da4453259531aff2ebe3f Merge: f75cc65a 07fdbbc1 Author: Boris Kovar Date: Mon Mar 29 06:53:35 2021 +0200 Merge remote-tracking branch 'remotes/origin/#470' into allfunctionality commit 07fdbbc167e23587a5ed2bba247da7d00428d656 Author: Boris Kovar Date: Mon Mar 29 06:47:13 2021 +0200 - implemented modal window for discourse errors commit 760cd0eae09a04a9620bf62c1330a83ef0018da5 Author: Adriána Kurillová Date: Fri Mar 26 16:16:49 2021 +0100 #593 Electron Density - D button behaviour commit fb0e78efaf16c0d95add70fc3b4272994e968665 Author: Adriána Kurillová Date: Fri Mar 26 13:39:14 2021 +0100 #593 Electron Density - D button behaviour commit f75cc65a9352e0f845cb2b7b3bfa847bf4b81d63 Author: Boris Kovar Date: Thu Mar 25 08:42:22 2021 +0100 Squashed commit of the following: commit 5761defb26b6103cfb3b16a4630400bc4c786478 Author: ag-m2ms Date: Wed Feb 3 14:23:02 2021 +0100 Fixed layout and imports commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe Merge: 717ad541 083cc6da Author: ag-m2ms Date: Wed Feb 3 13:55:03 2021 +0100 Merge branch 'allfunctionality' into #487 commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c Author: ag-m2ms Date: Wed Feb 3 13:54:33 2021 +0100 Removed unnecessary parts commit 6c23110eaf43122acd1c37f156c02e61c7fa7819 Author: ag-m2ms Date: Wed Feb 3 13:36:29 2021 +0100 Fixed undo commit 19f839c1c127c38d5f5f9b92956765e20322dc6d Author: ag-m2ms Date: Mon Feb 1 15:31:13 2021 +0100 Fixed button history tracking commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039 Author: ag-m2ms Date: Mon Feb 1 14:15:34 2021 +0100 Replaced throttle with debounce for nglView tracking commit 57b71e02848cf16db43a807b002437b768c765b6 Author: ag-m2ms Date: Mon Feb 1 12:58:06 2021 +0100 Clear history on project change commit 419c2685812a25aa5732291102b559b60909ac00 Author: ag-m2ms Date: Mon Feb 1 12:10:50 2021 +0100 Separate orientation actions commit 272c265c3dc2121f5ee9b515c522197145ed7b71 Merge: f8440879 bef6400b Author: ag-m2ms Date: Mon Feb 1 10:34:26 2021 +0100 Merge branch 'allfunctionality' into #487 commit f8440879ec6a11a453771540955f37f2611321b0 Author: ag-m2ms Date: Thu Jan 21 13:52:19 2021 +0100 Ctreated temporary buttons commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7 Author: ag-m2ms Date: Thu Jan 21 11:54:52 2021 +0100 Tidying up commit cb6c477658dd8e970784b39a2dd9e396555ca2e3 Author: ag-m2ms Date: Thu Jan 21 11:25:23 2021 +0100 Change ngl view on undo/redo commit edfb5715b81d17409f916bfb0e29831804821391 Author: ag-m2ms Date: Wed Jan 20 16:37:42 2021 +0100 Initial implementation commit a56b85cbba16444ca382e1bf2201af11b89b1278 Author: Boris Kovar Date: Thu Mar 25 08:35:11 2021 +0100 - updated version number to 0.10.1 commit 53adfa00ad61976f8bcc4d294172a7a9c3f7acbd Merge: 6022dca3 a063e677 Author: Boris Kovar Date: Thu Mar 25 08:31:46 2021 +0100 Merge remote-tracking branch 'remotes/origin/#571' into allfunctionality commit 6022dca3942755a58f7a2b9199d1180f329714c7 Author: Boris Kovar Date: Thu Mar 25 08:31:09 2021 +0100 Squashed commit of the following: commit 431c372cfd29dc1054cae3cd2f3083d369265816 Author: Boris Kovar Date: Wed Mar 24 15:56:39 2021 +0100 - implemented first phase of discourse integration commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743 Author: Boris Kovar Date: Thu Mar 11 10:50:30 2021 +0100 - prelim changes commit 431c372cfd29dc1054cae3cd2f3083d369265816 Author: Boris Kovar Date: Wed Mar 24 15:56:39 2021 +0100 - implemented first phase of discourse integration commit a063e67765794a0a431397cd2c419b4390ead2aa Author: Adriána Kohanová Date: Fri Mar 12 09:50:30 2021 +0100 #571 [L] toggle not restored from snapshot for things on Selected Compounds tab commit 5b7f462862e5b37000fa648590b25b37c58952ff Author: Adriána Kohanová Date: Thu Mar 11 15:04:12 2021 +0100 #557 Bug? Snapshot doesn't restore precise RHS tab commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743 Author: Boris Kovar 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 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 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 Date: Wed Jul 21 16:56:00 2021 +0200 Merge branch 'master' into allfunctionality commit e085b6213fed54b93cada286038990fbab6b1879 Merge: 5d8057fe c67d86b1 Author: Boris Kovar 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 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 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 Date: Wed Mar 24 15:56:39 2021 +0100 - implemented first phase of discourse integration commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743 Author: Boris Kovar 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 Date: Wed Feb 3 14:23:02 2021 +0100 Fixed layout and imports commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe Merge: 717ad541 083cc6da Author: ag-m2ms Date: Wed Feb 3 13:55:03 2021 +0100 Merge branch 'allfunctionality' into #487 commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c Author: ag-m2ms Date: Wed Feb 3 13:54:33 2021 +0100 Removed unnecessary parts commit 6c23110eaf43122acd1c37f156c02e61c7fa7819 Author: ag-m2ms Date: Wed Feb 3 13:36:29 2021 +0100 Fixed undo commit 19f839c1c127c38d5f5f9b92956765e20322dc6d Author: ag-m2ms Date: Mon Feb 1 15:31:13 2021 +0100 Fixed button history tracking commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039 Author: ag-m2ms Date: Mon Feb 1 14:15:34 2021 +0100 Replaced throttle with debounce for nglView tracking commit 57b71e02848cf16db43a807b002437b768c765b6 Author: ag-m2ms Date: Mon Feb 1 12:58:06 2021 +0100 Clear history on project change commit 419c2685812a25aa5732291102b559b60909ac00 Author: ag-m2ms Date: Mon Feb 1 12:10:50 2021 +0100 Separate orientation actions commit 272c265c3dc2121f5ee9b515c522197145ed7b71 Merge: f8440879 bef6400b Author: ag-m2ms Date: Mon Feb 1 10:34:26 2021 +0100 Merge branch 'allfunctionality' into #487 commit f8440879ec6a11a453771540955f37f2611321b0 Author: ag-m2ms Date: Thu Jan 21 13:52:19 2021 +0100 Ctreated temporary buttons commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7 Author: ag-m2ms Date: Thu Jan 21 11:54:52 2021 +0100 Tidying up commit cb6c477658dd8e970784b39a2dd9e396555ca2e3 Author: ag-m2ms Date: Thu Jan 21 11:25:23 2021 +0100 Change ngl view on undo/redo commit edfb5715b81d17409f916bfb0e29831804821391 Author: ag-m2ms 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 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 Date: Thu May 6 09:03:24 2021 +0200 Merge remote-tracking branch 'upstream/master' commit eb1ed3b786a49f97c9939c681fd6276f66fd0ba9 Merge: 123071bf 2d42a57a Author: Rachael Skyner 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 Date: Wed May 5 14:38:59 2021 +0100 - Adds STACK_GITHUB_NAMESPACE (differs from STACK_GITHUB_NAMESPACE) commit 1c1349979eb5ab01593f408afcfc079b07f45ba8 Author: Alan B. Christie Date: Wed May 5 10:30:58 2021 +0100 Update README.md To trigger build commit 7699a3731e7b066b7d0b55644373111396839468 Merge: 22a978cb 123071bf Author: Boris Kovar Date: Wed May 5 10:51:59 2021 +0200 Merge remote-tracking branch 'upstream/master' commit 123071bfbb412ab4426e6f83c96311ece3db0b97 Author: Rachael Skyner Date: Tue Apr 27 13:50:47 2021 +0100 Delete no.travis.yml commit 53659c72941b9d1c745a8297d265ed314280324a Author: Rachael Skyner Date: Tue Apr 27 13:50:36 2021 +0100 Update README.md commit 5f043de577545d01d90d3a8674f0fa163314a501 Merge: 87402117 2c8351ea Author: Rachael Skyner 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 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 Date: Wed Mar 24 15:56:39 2021 +0100 - implemented first phase of discourse integration commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743 Author: Boris Kovar 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 Date: Wed Feb 3 14:23:02 2021 +0100 Fixed layout and imports commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe Merge: 717ad541 083cc6da Author: ag-m2ms Date: Wed Feb 3 13:55:03 2021 +0100 Merge branch 'allfunctionality' into #487 commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c Author: ag-m2ms Date: Wed Feb 3 13:54:33 2021 +0100 Removed unnecessary parts commit 6c23110eaf43122acd1c37f156c02e61c7fa7819 Author: ag-m2ms Date: Wed Feb 3 13:36:29 2021 +0100 Fixed undo commit 19f839c1c127c38d5f5f9b92956765e20322dc6d Author: ag-m2ms Date: Mon Feb 1 15:31:13 2021 +0100 Fixed button history tracking commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039 Author: ag-m2ms Date: Mon Feb 1 14:15:34 2021 +0100 Replaced throttle with debounce for nglView tracking commit 57b71e02848cf16db43a807b002437b768c765b6 Author: ag-m2ms Date: Mon Feb 1 12:58:06 2021 +0100 Clear history on project change commit 419c2685812a25aa5732291102b559b60909ac00 Author: ag-m2ms Date: Mon Feb 1 12:10:50 2021 +0100 Separate orientation actions commit 272c265c3dc2121f5ee9b515c522197145ed7b71 Merge: f8440879 bef6400b Author: ag-m2ms Date: Mon Feb 1 10:34:26 2021 +0100 Merge branch 'allfunctionality' into #487 commit f8440879ec6a11a453771540955f37f2611321b0 Author: ag-m2ms Date: Thu Jan 21 13:52:19 2021 +0100 Ctreated temporary buttons commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7 Author: ag-m2ms Date: Thu Jan 21 11:54:52 2021 +0100 Tidying up commit cb6c477658dd8e970784b39a2dd9e396555ca2e3 Author: ag-m2ms Date: Thu Jan 21 11:25:23 2021 +0100 Change ngl view on undo/redo commit edfb5715b81d17409f916bfb0e29831804821391 Author: ag-m2ms 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 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á Co-authored-by: Adriána Kurillová commit 2c8351eaa4620921cf10c6c58e4d4a0d1c843b6c Author: Alan Christie Date: Tue Mar 23 00:01:22 2021 +0000 - Use of production CI action commit dd4ead777f9fd5608f710f3db9a80781ecf39f7d Author: Alan Christie Date: Mon Mar 22 18:36:18 2021 +0000 - Fix for stack ref commit 7191ae382f3f2d01504dc24360de0fe6d9316d80 Author: Alan Christie Date: Mon Mar 22 18:30:02 2021 +0000 - Another trigger fix commit 7f193ee6002b3418cf633361c8ede85183c62c74 Author: Alan Christie Date: Mon Mar 22 18:18:01 2021 +0000 - Fix trigger logic commit fb834c356dadf18e0c0715a70832f63851e8542c Author: Alan Christie Date: Mon Mar 22 18:08:10 2021 +0000 - Experiment with stack trigger commit daca6eb5ea1ddae3faeb064df17c9f1f52d3e2a3 Author: Alan Christie Date: Thu Mar 18 16:57:38 2021 +0000 - Updates build badge commit c4e8f99099bfc39a3363a914d6173e6a00f01f7f Author: Alan Christie Date: Thu Mar 18 16:54:24 2021 +0000 - Attempt to fix action commit c12f443e08531c4f0a09e030c04b3c0beeac68e3 Author: Alan Christie Date: Thu Mar 18 16:38:02 2021 +0000 - Adds Action (disables Travis) commit 56c0372c9e08292d1fa0d0445e0283088199977c Merge: 663dfebe 0c9816fe Author: boriskovar-m2ms 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 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 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 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 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 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 Date: Thu Jul 8 10:03:20 2021 +0200 - fix for empty compound set commit a88c144f26a3c2d09153b2e3bd87b4f153ef0aa4 Author: boriskovar-m2ms 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 Date: Thu May 6 09:03:24 2021 +0200 Merge remote-tracking branch 'upstream/master' commit 7699a3731e7b066b7d0b55644373111396839468 Merge: 22a978cb 123071bf Author: Boris Kovar 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á Co-authored-by: Adriána Kurillová commit c67d86b1c32fbac2aff45fd32764a86182c3ba23 Merge: 7c20b00c ffe89646 Author: boriskovar-m2ms Date: Wed Jul 21 15:05:56 2021 +0200 Merge branch 'master' into allfunctionality commit 7c20b00ce75708810f2c3b00c3ee737814676b24 Author: Boris Kovar 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 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 Date: Wed Mar 24 15:56:39 2021 +0100 - implemented first phase of discourse integration commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743 Author: Boris Kovar 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 Date: Wed Feb 3 14:23:02 2021 +0100 Fixed layout and imports commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe Merge: 717ad541 083cc6da Author: ag-m2ms Date: Wed Feb 3 13:55:03 2021 +0100 Merge branch 'allfunctionality' into #487 commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c Author: ag-m2ms Date: Wed Feb 3 13:54:33 2021 +0100 Removed unnecessary parts commit 6c23110eaf43122acd1c37f156c02e61c7fa7819 Author: ag-m2ms Date: Wed Feb 3 13:36:29 2021 +0100 Fixed undo commit 19f839c1c127c38d5f5f9b92956765e20322dc6d Author: ag-m2ms Date: Mon Feb 1 15:31:13 2021 +0100 Fixed button history tracking commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039 Author: ag-m2ms Date: Mon Feb 1 14:15:34 2021 +0100 Replaced throttle with debounce for nglView tracking commit 57b71e02848cf16db43a807b002437b768c765b6 Author: ag-m2ms Date: Mon Feb 1 12:58:06 2021 +0100 Clear history on project change commit 419c2685812a25aa5732291102b559b60909ac00 Author: ag-m2ms Date: Mon Feb 1 12:10:50 2021 +0100 Separate orientation actions commit 272c265c3dc2121f5ee9b515c522197145ed7b71 Merge: f8440879 bef6400b Author: ag-m2ms Date: Mon Feb 1 10:34:26 2021 +0100 Merge branch 'allfunctionality' into #487 commit f8440879ec6a11a453771540955f37f2611321b0 Author: ag-m2ms Date: Thu Jan 21 13:52:19 2021 +0100 Ctreated temporary buttons commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7 Author: ag-m2ms Date: Thu Jan 21 11:54:52 2021 +0100 Tidying up commit cb6c477658dd8e970784b39a2dd9e396555ca2e3 Author: ag-m2ms Date: Thu Jan 21 11:25:23 2021 +0100 Change ngl view on undo/redo commit edfb5715b81d17409f916bfb0e29831804821391 Author: ag-m2ms 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 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 Date: Thu May 6 09:03:24 2021 +0200 Merge remote-tracking branch 'upstream/master' commit eb1ed3b786a49f97c9939c681fd6276f66fd0ba9 Merge: 123071bf 2d42a57a Author: Rachael Skyner 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 Date: Wed May 5 14:38:59 2021 +0100 - Adds STACK_GITHUB_NAMESPACE (differs from STACK_GITHUB_NAMESPACE) commit 1c1349979eb5ab01593f408afcfc079b07f45ba8 Author: Alan B. Christie Date: Wed May 5 10:30:58 2021 +0100 Update README.md To trigger build commit 7699a3731e7b066b7d0b55644373111396839468 Merge: 22a978cb 123071bf Author: Boris Kovar Date: Wed May 5 10:51:59 2021 +0200 Merge remote-tracking branch 'upstream/master' commit 123071bfbb412ab4426e6f83c96311ece3db0b97 Author: Rachael Skyner Date: Tue Apr 27 13:50:47 2021 +0100 Delete no.travis.yml commit 53659c72941b9d1c745a8297d265ed314280324a Author: Rachael Skyner Date: Tue Apr 27 13:50:36 2021 +0100 Update README.md commit 5f043de577545d01d90d3a8674f0fa163314a501 Merge: 87402117 2c8351ea Author: Rachael Skyner 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 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 Date: Wed Mar 24 15:56:39 2021 +0100 - implemented first phase of discourse integration commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743 Author: Boris Kovar 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 Date: Wed Feb 3 14:23:02 2021 +0100 Fixed layout and imports commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe Merge: 717ad541 083cc6da Author: ag-m2ms Date: Wed Feb 3 13:55:03 2021 +0100 Merge branch 'allfunctionality' into #487 commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c Author: ag-m2ms Date: Wed Feb 3 13:54:33 2021 +0100 Removed unnecessary parts commit 6c23110eaf43122acd1c37f156c02e61c7fa7819 Author: ag-m2ms Date: Wed Feb 3 13:36:29 2021 +0100 Fixed undo commit 19f839c1c127c38d5f5f9b92956765e20322dc6d Author: ag-m2ms Date: Mon Feb 1 15:31:13 2021 +0100 Fixed button history tracking commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039 Author: ag-m2ms Date: Mon Feb 1 14:15:34 2021 +0100 Replaced throttle with debounce for nglView tracking commit 57b71e02848cf16db43a807b002437b768c765b6 Author: ag-m2ms Date: Mon Feb 1 12:58:06 2021 +0100 Clear history on project change commit 419c2685812a25aa5732291102b559b60909ac00 Author: ag-m2ms Date: Mon Feb 1 12:10:50 2021 +0100 Separate orientation actions commit 272c265c3dc2121f5ee9b515c522197145ed7b71 Merge: f8440879 bef6400b Author: ag-m2ms Date: Mon Feb 1 10:34:26 2021 +0100 Merge branch 'allfunctionality' into #487 commit f8440879ec6a11a453771540955f37f2611321b0 Author: ag-m2ms Date: Thu Jan 21 13:52:19 2021 +0100 Ctreated temporary buttons commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7 Author: ag-m2ms Date: Thu Jan 21 11:54:52 2021 +0100 Tidying up commit cb6c477658dd8e970784b39a2dd9e396555ca2e3 Author: ag-m2ms Date: Thu Jan 21 11:25:23 2021 +0100 Change ngl view on undo/redo commit edfb5715b81d17409f916bfb0e29831804821391 Author: ag-m2ms 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 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á Co-authored-by: Adriána Kurillová commit 2c8351eaa4620921cf10c6c58e4d4a0d1c843b6c Author: Alan Christie Date: Tue Mar 23 00:01:22 2021 +0000 - Use of production CI action commit dd4ead777f9fd5608f710f3db9a80781ecf39f7d Author: Alan Christie Date: Mon Mar 22 18:36:18 2021 +0000 - Fix for stack ref commit 7191ae382f3f2d01504dc24360de0fe6d9316d80 Author: Alan Christie Date: Mon Mar 22 18:30:02 2021 +0000 - Another trigger fix commit 7f193ee6002b3418cf633361c8ede85183c62c74 Author: Alan Christie Date: Mon Mar 22 18:18:01 2021 +0000 - Fix trigger logic commit fb834c356dadf18e0c0715a70832f63851e8542c Author: Alan Christie Date: Mon Mar 22 18:08:10 2021 +0000 - Experiment with stack trigger commit daca6eb5ea1ddae3faeb064df17c9f1f52d3e2a3 Author: Alan Christie Date: Thu Mar 18 16:57:38 2021 +0000 - Updates build badge commit c4e8f99099bfc39a3363a914d6173e6a00f01f7f Author: Alan Christie Date: Thu Mar 18 16:54:24 2021 +0000 - Attempt to fix action commit c12f443e08531c4f0a09e030c04b3c0beeac68e3 Author: Alan Christie Date: Thu Mar 18 16:38:02 2021 +0000 - Adds Action (disables Travis) commit 56c0372c9e08292d1fa0d0445e0283088199977c Merge: 663dfebe 0c9816fe Author: boriskovar-m2ms 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 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 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 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 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 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 Date: Thu Jul 8 10:03:20 2021 +0200 - fix for empty compound set commit a88c144f26a3c2d09153b2e3bd87b4f153ef0aa4 Author: boriskovar-m2ms 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 Date: Thu May 6 09:03:24 2021 +0200 Merge remote-tracking branch 'upstream/master' commit 7699a3731e7b066b7d0b55644373111396839468 Merge: 22a978cb 123071bf Author: Boris Kovar Date: Wed May 5 10:51:59 2021 +0200 Merge remote-tracking branch 'upstream/master' * - bumped version to 0.10.25 Co-authored-by: Adriána Kohanová Co-authored-by: Adriána Kurillová commit 70bd6c5e392b54f845931e87b0bf7dc7dd1a558a Merge: 7f7b587f 16416ed4 Author: boriskovar-m2ms Date: Mon Jul 12 08:58:22 2021 +0200 Merge branch 'master' into allfunctionality commit 7f7b587fbdecf1d828e5e1edc41903e396cd565b Author: Boris Kovar Date: Mon Jul 12 08:52:19 2021 +0200 - bumped version to 0.10.25 commit 5a15a1173935ef598281a3cc0fd1d3207cc12a0e Merge: 964d1aac e35f5d0a Author: Boris Kovar Date: Mon Jul 12 08:49:12 2021 +0200 Merge branch 'allfunctionality' of https://github.com/m2ms/fragalysis-frontend into allfunctionality commit 964d1aaca87d45414179520e12b55c7717afca78 Author: Boris Kovar Date: Mon Jul 12 08:48:26 2021 +0200 Squashed commit of the following: commit 2a6672672fd8c77a5b6cab6ba97c4b976da2555a Author: Boris Kovar Date: Thu Jul 8 10:03:20 2021 +0200 - fix for empty compound set commit a88c144f26a3c2d09153b2e3bd87b4f153ef0aa4 Author: boriskovar-m2ms 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 Date: Thu May 6 09:03:24 2021 +0200 Merge remote-tracking branch 'upstream/master' commit 7699a3731e7b066b7d0b55644373111396839468 Merge: 22a978cb 123071bf Author: Boris Kovar Date: Wed May 5 10:51:59 2021 +0200 Merge remote-tracking branch 'upstream/master' commit 16416ed4773167f336db9aea3c9247fc6c519125 Author: boriskovar-m2ms Date: Wed Jul 7 12:26:13 2021 +0200 Allfunctionality (#245) * 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 Date: Wed Mar 24 15:56:39 2021 +0100 - implemented first phase of discourse integration commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743 Author: Boris Kovar 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 Date: Wed Feb 3 14:23:02 2021 +0100 Fixed layout and imports commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe Merge: 717ad541 083cc6da Author: ag-m2ms Date: Wed Feb 3 13:55:03 2021 +0100 Merge branch 'allfunctionality' into #487 commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c Author: ag-m2ms Date: Wed Feb 3 13:54:33 2021 +0100 Removed unnecessary parts commit 6c23110eaf43122acd1c37f156c02e61c7fa7819 Author: ag-m2ms Date: Wed Feb 3 13:36:29 2021 +0100 Fixed undo commit 19f839c1c127c38d5f5f9b92956765e20322dc6d Author: ag-m2ms Date: Mon Feb 1 15:31:13 2021 +0100 Fixed button history tracking commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039 Author: ag-m2ms Date: Mon Feb 1 14:15:34 2021 +0100 Replaced throttle with debounce for nglView tracking commit 57b71e02848cf16db43a807b002437b768c765b6 Author: ag-m2ms Date: Mon Feb 1 12:58:06 2021 +0100 Clear history on project change commit 419c2685812a25aa5732291102b559b60909ac00 Author: ag-m2ms Date: Mon Feb 1 12:10:50 2021 +0100 Separate orientation actions commit 272c265c3dc2121f5ee9b515c522197145ed7b71 Merge: f8440879 bef6400b Author: ag-m2ms Date: Mon Feb 1 10:34:26 2021 +0100 Merge branch 'allfunctionality' into #487 commit f8440879ec6a11a453771540955f37f2611321b0 Author: ag-m2ms Date: Thu Jan 21 13:52:19 2021 +0100 Ctreated temporary buttons commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7 Author: ag-m2ms Date: Thu Jan 21 11:54:52 2021 +0100 Tidying up commit cb6c477658dd8e970784b39a2dd9e396555ca2e3 Author: ag-m2ms Date: Thu Jan 21 11:25:23 2021 +0100 Change ngl view on undo/redo commit edfb5715b81d17409f916bfb0e29831804821391 Author: ag-m2ms 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 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 Date: Thu May 6 09:03:24 2021 +0200 Merge remote-tracking branch 'upstream/master' commit eb1ed3b786a49f97c9939c681fd6276f66fd0ba9 Merge: 123071bf 2d42a57a Author: Rachael Skyner 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 Date: Wed May 5 14:38:59 2021 +0100 - Adds STACK_GITHUB_NAMESPACE (differs from STACK_GITHUB_NAMESPACE) commit 1c1349979eb5ab01593f408afcfc079b07f45ba8 Author: Alan B. Christie Date: Wed May 5 10:30:58 2021 +0100 Update README.md To trigger build commit 7699a3731e7b066b7d0b55644373111396839468 Merge: 22a978cb 123071bf Author: Boris Kovar Date: Wed May 5 10:51:59 2021 +0200 Merge remote-tracking branch 'upstream/master' commit 123071bfbb412ab4426e6f83c96311ece3db0b97 Author: Rachael Skyner Date: Tue Apr 27 13:50:47 2021 +0100 Delete no.travis.yml commit 53659c72941b9d1c745a8297d265ed314280324a Author: Rachael Skyner Date: Tue Apr 27 13:50:36 2021 +0100 Update README.md commit 5f043de577545d01d90d3a8674f0fa163314a501 Merge: 87402117 2c8351ea Author: Rachael Skyner 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 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 Date: Wed Mar 24 15:56:39 2021 +0100 - implemented first phase of discourse integration commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743 Author: Boris Kovar 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 Date: Wed Feb 3 14:23:02 2021 +0100 Fixed layout and imports commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe Merge: 717ad541 083cc6da Author: ag-m2ms Date: Wed Feb 3 13:55:03 2021 +0100 Merge branch 'allfunctionality' into #487 commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c Author: ag-m2ms Date: Wed Feb 3 13:54:33 2021 +0100 Removed unnecessary parts commit 6c23110eaf43122acd1c37f156c02e61c7fa7819 Author: ag-m2ms Date: Wed Feb 3 13:36:29 2021 +0100 Fixed undo commit 19f839c1c127c38d5f5f9b92956765e20322dc6d Author: ag-m2ms Date: Mon Feb 1 15:31:13 2021 +0100 Fixed button history tracking commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039 Author: ag-m2ms Date: Mon Feb 1 14:15:34 2021 +0100 Replaced throttle with debounce for nglView tracking commit 57b71e02848cf16db43a807b002437b768c765b6 Author: ag-m2ms Date: Mon Feb 1 12:58:06 2021 +0100 Clear history on project change commit 419c2685812a25aa5732291102b559b60909ac00 Author: ag-m2ms Date: Mon Feb 1 12:10:50 2021 +0100 Separate orientation actions commit 272c265c3dc2121f5ee9b515c522197145ed7b71 Merge: f8440879 bef6400b Author: ag-m2ms Date: Mon Feb 1 10:34:26 2021 +0100 Merge branch 'allfunctionality' into #487 commit f8440879ec6a11a453771540955f37f2611321b0 Author: ag-m2ms Date: Thu Jan 21 13:52:19 2021 +0100 Ctreated temporary buttons commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7 Author: ag-m2ms Date: Thu Jan 21 11:54:52 2021 +0100 Tidying up commit cb6c477658dd8e970784b39a2dd9e396555ca2e3 Author: ag-m2ms Date: Thu Jan 21 11:25:23 2021 +0100 Change ngl view on undo/redo commit edfb5715b81d17409f916bfb0e29831804821391 Author: ag-m2ms 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 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á Co-authored-by: Adriána Kurillová commit 2c8351eaa4620921cf10c6c58e4d4a0d1c843b6c Author: Alan Christie Date: Tue Mar 23 00:01:22 2021 +0000 - Use of production CI action commit dd4ead777f9fd5608f710f3db9a80781ecf39f7d Author: Alan Christie Date: Mon Mar 22 18:36:18 2021 +0000 - Fix for stack ref commit 7191ae382f3f2d01504dc24360de0fe6d9316d80 Author: Alan Christie Date: Mon Mar 22 18:30:02 2021 +0000 - Another trigger fix commit 7f193ee6002b3418cf633361c8ede85183c62c74 Author: Alan Christie Date: Mon Mar 22 18:18:01 2021 +0000 - Fix trigger logic commit fb834c356dadf18e0c0715a70832f63851e8542c Author: Alan Christie Date: Mon Mar 22 18:08:10 2021 +0000 - Experiment with stack trigger commit daca6eb5ea1ddae3faeb064df17c9f1f52d3e2a3 Author: Alan Christie Date: Thu Mar 18 16:57:38 2021 +0000 - Updates build badge commit c4e8f99099bfc39a3363a914d6173e6a00f01f7f Author: Alan Christie Date: Thu Mar 18 16:54:24 2021 +0000 - Attempt to fix action commit c12f443e08531c4f0a09e030c04b3c0beeac68e3 Author: Alan Christie Date: Thu Mar 18 16:38:02 2021 +0000 - Adds Action (disables Travis) commit 56c0372c9e08292d1fa0d0445e0283088199977c Merge: 663dfebe 0c9816fe Author: boriskovar-m2ms 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 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 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 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 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 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 Co-authored-by: Adriána Kohanová Co-authored-by: Adriána Kurillová commit e35f5d0a7c615f12db6aaddd092432418441253d Merge: 1704cb6c a2178902 Author: boriskovar-m2ms Date: Wed Jul 7 12:26:03 2021 +0200 Merge branch 'master' into allfunctionality commit 1704cb6c6059debe345747c0e1d3d6e401a5a618 Author: Boris Kovar Date: Wed Jul 7 12:24:24 2021 +0200 - updated version number to 0.10.24 commit a217890243dd0ff36bc6900897336d247c580769 Author: boriskovar-m2ms Date: Tue Jun 29 09:57:53 2021 +0200 Allfunctionality (#244) * 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 Date: Wed Mar 24 15:56:39 2021 +0100 - implemented first phase of discourse integration commit 103da7e4a72380042fc9e7d97cd4171f9e9e5743 Author: Boris Kovar 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 Date: Wed Feb 3 14:23:02 2021 +0100 Fixed layout and imports commit d9b589587cd46d97ba0369e8c8f428e2b970fbbe Merge: 717ad541 083cc6da Author: ag-m2ms Date: Wed Feb 3 13:55:03 2021 +0100 Merge branch 'allfunctionality' into #487 commit 717ad54119a1a00c2e1ac5bcebd3536917db5e2c Author: ag-m2ms Date: Wed Feb 3 13:54:33 2021 +0100 Removed unnecessary parts commit 6c23110eaf43122acd1c37f156c02e61c7fa7819 Author: ag-m2ms Date: Wed Feb 3 13:36:29 2021 +0100 Fixed undo commit 19f839c1c127c38d5f5f9b92956765e20322dc6d Author: ag-m2ms Date: Mon Feb 1 15:31:13 2021 +0100 Fixed button history tracking commit bf7b8a8b6a445ac2de305be0d3d07024c8c5f039 Author: ag-m2ms Date: Mon Feb 1 14:15:34 2021 +0100 Replaced throttle with debounce for nglView tracking commit 57b71e02848cf16db43a807b002437b768c765b6 Author: ag-m2ms Date: Mon Feb 1 12:58:06 2021 +0100 Clear history on project change commit 419c2685812a25aa5732291102b559b60909ac00 Author: ag-m2ms Date: Mon Feb 1 12:10:50 2021 +0100 Separate orientation actions commit 272c265c3dc2121f5ee9b515c522197145ed7b71 Merge: f8440879 bef6400b Author: ag-m2ms Date: Mon Feb 1 10:34:26 2021 +0100 Merge branch 'allfunctionality' into #487 commit f8440879ec6a11a453771540955f37f2611321b0 Author: ag-m2ms Date: Thu Jan 21 13:52:19 2021 +0100 Ctreated temporary buttons commit 9b8a2ac8b943d21350ee515cccf64b5180d94ff7 Author: ag-m2ms Date: Thu Jan 21 11:54:52 2021 +0100 Tidying up commit cb6c477658dd8e970784b39a2dd9e396555ca2e3 Author: ag-m2ms Date: Thu Jan 21 11:25:23 2021 +0100 Change ngl view on undo/redo commit edfb5715b81d17409f916bfb0e29831804821391 Author: ag-m2ms 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 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… * -checkpoint * - checkpoint - layout of the tageditor * - checkpoint - first but not clean layout of tab editor component * - checkpoint - fixed horizontal scroll bar * - first version for staging * - bumped version to 0.10.29 * - checkpoint before logic for opening and closing tag editor is changed * fixed: - After changing the category of the tag it sometimes jumps to Other - Remove display All in 3D button - After you search for something and close the dialog the search is not reset - In the tooltip of the tag editor for given molecule show all tags which are assigned to the molecule - After clicking the button in the molecule again it will close the dialog - Can't have multiple dialogs open - Make buttons (A and D) explicit - full text - Interaction with Load All is weird * bumped version number to 0.10.30 * Revert "Merge branch 'master' into #617" This reverts commit a5d570a4a9fc13e6b5f02143ce773dd76a8268af, reversing changes made to 266566294277612edd57abf1b2620abc31c07d98. * - fixed problem where user was not able to remove tag from molecule * - bumped version to 0.10.31 * - reworked tag editor so now edit of tags for multiple molecules is possible * - changed layout of tag editor * - fixed display all in the list Co-authored-by: Adriána Kohanová Co-authored-by: Adriána Kurillová --- .../preview/molecule/moleculeList.js | 111 +++++++--- .../preview/molecule/moleculeView.js | 26 ++- .../preview/molecule/redux/dispatchActions.js | 5 +- .../preview/molecule/redux/selectors.js | 23 +- js/components/preview/tags/modal/tagEditor.js | 209 ++++++++---------- js/components/preview/tags/redux/data.js | 6 - .../preview/tags/redux/dispatchActions.js | 46 ++-- js/components/preview/tags/tagCategory.js | 3 +- js/components/preview/tags/tagCategoryView.js | 18 +- js/components/preview/tags/tagSelector.js | 22 +- js/components/preview/tags/tagView.js | 74 +++++-- js/reducers/api/apiReducers.js | 4 +- js/reducers/selection/actions.js | 34 ++- js/reducers/selection/constants.js | 8 +- js/reducers/selection/selectionReducers.js | 29 ++- 15 files changed, 380 insertions(+), 238 deletions(-) delete mode 100644 js/components/preview/tags/redux/data.js diff --git a/js/components/preview/molecule/moleculeList.js b/js/components/preview/molecule/moleculeList.js index 8fc12d7ba..903ce51de 100644 --- a/js/components/preview/molecule/moleculeList.js +++ b/js/components/preview/molecule/moleculeList.js @@ -44,30 +44,33 @@ import { removeDensity, addLigand, removeLigand, - hideAllSelectedMolecules, initializeMolecules, applyDirectSelection, removeAllSelectedMolTypes, addQuality, - removeQuality, - getProteinData + removeQuality } from './redux/dispatchActions'; import { DEFAULT_FILTER, PREDEFINED_FILTERS } from '../../../reducers/selection/constants'; -import { DeleteSweep, FilterList, Search } from '@material-ui/icons'; +import { Edit, FilterList, Search } from '@material-ui/icons'; import { selectAllMoleculeList, selectJoinedMoleculeList } from './redux/selectors'; import { debounce } from 'lodash'; import { MOL_ATTRIBUTES } from './redux/constants'; import { setFilter } from '../../../reducers/selection/actions'; import { initializeFilter } from '../../../reducers/selection/dispatchActions'; -import { getUrl, loadAllMolsFromMolGroup } from '../../../utils/genericList'; import * as listType from '../../../constants/listTypes'; import { useRouteMatch } from 'react-router-dom'; import { setSortDialogOpen } from './redux/actions'; -import { setMoleculeList, setAllMolLists, setAllMolecules } from '../../../reducers/api/actions'; import { AlertModal } from '../../common/Modal/AlertModal'; import { onSelectMoleculeGroup } from '../moleculeGroups/redux/dispatchActions'; -import { setSelectedAllByType, setDeselectedAllByType, setTagEditorOpen } from '../../../reducers/selection/actions'; +import { + setSelectedAllByType, + setDeselectedAllByType, + setTagEditorOpen, + setDisplayedMoleculesInHitNav, + setIsTagGlobalEdit +} from '../../../reducers/selection/actions'; import { TagEditor } from '../tags/modal/tagEditor'; +import { getMoleculeForId } from '../tags/redux/dispatchActions'; const useStyles = makeStyles(theme => ({ container: { @@ -243,7 +246,8 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei const sortDialogOpen = useSelector(state => state.previewReducers.molecule.sortDialogOpen); const filter = useSelector(state => state.selectionReducers.filter); const getJoinedMoleculeList = useSelector(state => selectJoinedMoleculeList(state)); - const getAllMoleculeList = useSelector(state => selectAllMoleculeList(state)); + const allMoleculesList = useSelector(state => selectAllMoleculeList(state)); + const selectedAll = useRef(false); const proteinList = useSelector(state => state.selectionReducers.proteinList); @@ -256,11 +260,10 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei const vectorOnList = useSelector(state => state.selectionReducers.vectorOnList); const informationList = useSelector(state => state.selectionReducers.informationList); const isTagEditorOpen = useSelector(state => state.selectionReducers.tagEditorOpened); + const molForTagEditId = useSelector(state => state.selectionReducers.molForTagEdit); + const moleculesToEditIds = useSelector(state => state.selectionReducers.moleculesToEdit); const object_selection = useSelector(state => state.selectionReducers.mol_group_selection); - const firstLoad = useSelector(state => state.selectionReducers.firstLoad); - const target_on = useSelector(state => state.apiReducers.target_on); - const mol_group_on = useSelector(state => state.apiReducers.mol_group_on); const allInspirationMoleculeDataList = useSelector(state => state.datasetsReducers.allInspirationMoleculeDataList); @@ -284,7 +287,7 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei const filterRef = useRef(); const tagEditorRef = useRef(); - const [selectedMoleculeRef, setSelectedMoleculeRef] = useState(null); + const [tagEditorAnchorEl, setTagEditorAnchorEl] = useState(null); // const disableUserInteraction = useDisableUserInteraction(); @@ -299,13 +302,13 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei let joinedMoleculeLists = useMemo(() => { if (searchString) { - return getAllMoleculeList.filter(molecule => + return allMoleculesList.filter(molecule => molecule.protein_code.toLowerCase().includes(searchString.toLowerCase()) ); } else { return getJoinedMoleculeList; } - }, [getJoinedMoleculeList, getAllMoleculeList, searchString]); + }, [getJoinedMoleculeList, allMoleculesList, searchString]); const addSelectedMoleculesFromUnselectedSites = useCallback( (joinedMoleculeLists, list) => { @@ -314,7 +317,7 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei list?.forEach(moleculeID => { const foundJoinedMolecule = addedMols.find(mol => mol.id === moleculeID); if (!foundJoinedMolecule) { - const molecule = getAllMoleculeList.find(mol => mol.id === moleculeID); + const molecule = allMoleculesList.find(mol => mol.id === moleculeID); if (molecule) { addedMols.push(molecule); onlyAlreadySelected.push(molecule); @@ -325,43 +328,59 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei const result = [...onlyAlreadySelected, ...joinedMoleculeLists]; return result; }, - [getAllMoleculeList] + [allMoleculesList] ); + //the dependencies which are marked by compiler as unnecessary are actually necessary because without them the memo returns + //old joinedMoleculeLists in situation where we want to preserve molecule in view which shouldn't be there + //but want to remove it after the tag editor dialog is closed joinedMoleculeLists = useMemo(() => addSelectedMoleculesFromUnselectedSites(joinedMoleculeLists, proteinList), [ addSelectedMoleculesFromUnselectedSites, joinedMoleculeLists, - proteinList + proteinList, + molForTagEditId, + isTagEditorOpen ]); joinedMoleculeLists = useMemo(() => addSelectedMoleculesFromUnselectedSites(joinedMoleculeLists, complexList), [ addSelectedMoleculesFromUnselectedSites, joinedMoleculeLists, - complexList + complexList, + molForTagEditId, + isTagEditorOpen ]); joinedMoleculeLists = useMemo( () => addSelectedMoleculesFromUnselectedSites(joinedMoleculeLists, fragmentDisplayList), - [addSelectedMoleculesFromUnselectedSites, joinedMoleculeLists, fragmentDisplayList] + [ + addSelectedMoleculesFromUnselectedSites, + joinedMoleculeLists, + fragmentDisplayList, + molForTagEditId, + isTagEditorOpen + ] ); joinedMoleculeLists = useMemo(() => addSelectedMoleculesFromUnselectedSites(joinedMoleculeLists, surfaceList), [ addSelectedMoleculesFromUnselectedSites, joinedMoleculeLists, - surfaceList + surfaceList, + molForTagEditId, + isTagEditorOpen ]); joinedMoleculeLists = useMemo(() => addSelectedMoleculesFromUnselectedSites(joinedMoleculeLists, densityList), [ addSelectedMoleculesFromUnselectedSites, joinedMoleculeLists, - densityList + densityList, + molForTagEditId, + isTagEditorOpen ]); joinedMoleculeLists = useMemo(() => addSelectedMoleculesFromUnselectedSites(joinedMoleculeLists, vectorOnList), [ addSelectedMoleculesFromUnselectedSites, joinedMoleculeLists, - vectorOnList + vectorOnList, + molForTagEditId, + isTagEditorOpen ]); - if (!isActiveFilter) { - // default sort is by site - joinedMoleculeLists.sort((a, b) => a.site - b.site || a.number - b.number); - } else { + if (isActiveFilter) { joinedMoleculeLists = filterMolecules(joinedMoleculeLists, filter); } @@ -369,8 +388,26 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei setCurrentPage(currentPage + 1); }; + if (molForTagEditId && !joinedMoleculeLists.some(m => m.id === molForTagEditId)) { + const tagEditMol = dispatch(getMoleculeForId(molForTagEditId)); + if (tagEditMol) { + // joinedMoleculeLists = [tagEditMol, ...joinedMoleculeLists]; + joinedMoleculeLists.push(tagEditMol); + joinedMoleculeLists.sort((a, b) => { + if (a.protein_code < b.protein_code) { + return -1; + } + if (a.protein_code > b.protein_code) { + return 1; + } + return 0; + }); + } + } + const listItemOffset = (currentPage + 1) * moleculesPerPage + nextXMolecules; const currentMolecules = joinedMoleculeLists.slice(0, listItemOffset); + dispatch(setDisplayedMoleculesInHitNav(currentMolecules)); const canLoadMore = listItemOffset < joinedMoleculeLists.length; const wereMoleculesInitialized = useRef(false); @@ -626,6 +663,8 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei debouncedFn(); }; + const openGlobalTagEditor = () => {}; + const actions = [ - - - - - + + + + {filteredTags && @@ -388,6 +401,7 @@ export const TagEditor = memo( editable={true} disabled={!DJANGO_CONTEXT.pk} isEdit={true} + isTagEditor={true} > @@ -419,22 +433,8 @@ export const TagEditor = memo( ))} - - { - if (e.key === 'Enter') { - onUpdateTag(tag, e.target.value, 'discourse_url'); - } - }} - /> - - - + + - - */} ]} onExpandChange={expand => { diff --git a/js/components/preview/tags/tagView.js b/js/components/preview/tags/tagView.js index dad2ae33b..f779af270 100644 --- a/js/components/preview/tags/tagView.js +++ b/js/components/preview/tags/tagView.js @@ -1,6 +1,6 @@ import React, { memo, useState } from 'react'; import { Grid, makeStyles, Chip, Tooltip } from '@material-ui/core'; -import { Edit } from '@material-ui/icons'; +import { Edit, Check } from '@material-ui/icons'; import { useDispatch } from 'react-redux'; import { getFontColorByBackgroundColor } from '../../../utils/colors'; import { TagEditModal } from './modal/tagEditModal'; @@ -36,7 +36,17 @@ const useStyles = makeStyles(theme => ({ })); const TagView = memo( - ({ tag, selected, allTags, isSpecialTag, handleClick, editable = false, disabled = false, isEdit = false }) => { + ({ + tag, + selected, + allTags, + isSpecialTag, + handleClick, + editable = false, + disabled = false, + isEdit = false, + isTagEditor = false + }) => { const tagData = tag; const classes = useStyles(); const dispatch = useDispatch(); @@ -45,11 +55,19 @@ const TagView = memo( // console.log(`Tag: ${tagData.tag}`); const tagColor = selected ? 'primary' : 'default'; // console.log(`tagColor: ${tagColor}`); - const bgColor = selected ? tagColor : (tagData.colour && tagData.colour) || tagColor; + const bgColor = isTagEditor + ? tagData.colour || tagColor + : selected + ? tagColor + : (tagData.colour && tagData.colour) || tagColor; // console.log(`bgColor: ${bgColor}`); const color = getFontColorByBackgroundColor(bgColor); // console.log(`font color: ${color}`); - const style = selected ? {} : { backgroundColor: bgColor, color: color }; + const style = isTagEditor + ? { backgroundColor: bgColor, color: color } + : selected + ? {} + : { backgroundColor: bgColor, color: color }; // console.log(`style: ${style}`); // console.log('-------------------------------'); @@ -85,22 +103,46 @@ const TagView = memo( } }; + const generateProps = () => { + if (selected && isTagEditor) { + return { + size: 'small', + className: `${classes.chip} ${selected && !isSpecialTag ? classes.chipSelected : null}`, + label: tagData.tag, + clickable: true, + color: tagColor, + style: style, + onClick: () => { + handleClick && handleClick(selected, tag, allTags); + }, + deleteIcon: getDeleteIcon(), + onDelete: getDeleteAction(), + disabled: determineDisabled(), + icon: + }; + } else { + return { + size: 'small', + className: `${classes.chip} ${selected && !isSpecialTag ? classes.chipSelected : null}`, + label: tagData.tag, + clickable: true, + color: tagColor, + style: style, + onClick: () => { + handleClick && handleClick(selected, tag, allTags); + }, + deleteIcon: getDeleteIcon(), + onDelete: getDeleteAction(), + disabled: determineDisabled() + }; + } + }; + return ( <> - handleClick && handleClick(selected, tag, allTags)} - deleteIcon={getDeleteIcon()} - onDelete={getDeleteAction()} - disabled={determineDisabled()} - /> + diff --git a/js/reducers/api/apiReducers.js b/js/reducers/api/apiReducers.js index 15780535e..259d8bf24 100644 --- a/js/reducers/api/apiReducers.js +++ b/js/reducers/api/apiReducers.js @@ -130,7 +130,7 @@ export default function apiReducers(state = INITIAL_STATE, action = {}) { case constants.UPDATE_MOLECULE_TAG: let newMolTagsList = [...state.moleculeTags]; const indexOfTag = newMolTagsList.findIndex(t => t.id === action.tag.id); - if (indexOfTag > 0) { + if (indexOfTag >= 0) { newMolTagsList[indexOfTag] = { ...action.tag }; return { ...state, moleculeTags: newMolTagsList }; } else { @@ -143,7 +143,7 @@ export default function apiReducers(state = INITIAL_STATE, action = {}) { case constants.UPDATE_MOL_IN_ALL_MOL_LISTS: let newList = [...state.all_mol_lists]; const indexOfMol = newList.findIndex(m => m.id === action.mol.id); - if (indexOfMol > 0) { + if (indexOfMol >= 0) { newList[indexOfMol] = { ...action.mol }; return { ...state, all_mol_lists: newList }; } else { diff --git a/js/reducers/selection/actions.js b/js/reducers/selection/actions.js index 9e42833cd..d0546a833 100644 --- a/js/reducers/selection/actions.js +++ b/js/reducers/selection/actions.js @@ -500,10 +500,38 @@ export const updateTag = (item, skipTracking = false) => { }; }; -export const setSpecialTagList = function(tagList, skipTracking = false) { +export const setDisplayedMoleculesInHitNav = (list, skipTracking = true) => { return { - type: constants.SET_SPECIAL_TAG_LIST, - tagList: tagList, + type: constants.SET_DISPLAYED_MOLECULES_HIT_NAV, + list: list, skipTracking }; }; + +export const setIsTagGlobalEdit = isGlobalEdit => { + return { + type: constants.SET_IS_TAG_GLOBAL_EDIT, + isGlobalEdit: isGlobalEdit + }; +}; + +export const setMolListToEdit = list => { + return { + type: constants.SET_MOL_LIST_TO_EDIT, + list: list + }; +}; + +export const appendToMolListToEdit = molId => { + return { + type: constants.APPEND_TO_MOL_LIST_TO_EDIT, + molId: molId + }; +}; + +export const removeFromMolListToEdit = molId => { + return { + type: constants.REMOVE_FROM_MOL_LIST_TO_EDIT, + molId: molId + }; +}; diff --git a/js/reducers/selection/constants.js b/js/reducers/selection/constants.js index 6df6c2976..4763d0dd0 100644 --- a/js/reducers/selection/constants.js +++ b/js/reducers/selection/constants.js @@ -63,7 +63,6 @@ export const constants = { SET_CATEGORY_LIST: prefix + 'SET_CATEGORY_LIST', APPEND_CATEGORY_LIST: prefix + 'APPEND_CATEGORY_LIST', REMOVE_FROM_CATEGORY_LIST: prefix + 'REMOVE_FROM_CATEGORY_LIST', - SET_SPECIAL_TAG_LIST: prefix + 'SET_SPECIAL_TAG_LIST', SET_TAG_LIST: prefix + 'SET_TAG_LIST', UPDATE_TAG: prefix + 'UPDATE_TAG', APPEND_TAG_LIST: prefix + 'APPEND_TAG_LIST', @@ -78,7 +77,12 @@ export const constants = { RESET_COMPOUNDS_OF_VECTORS: prefix + 'RESET_COMPOUNDS_OF_VECTORS', UPDATE_VECTOR_COMPOUNDS: prefix + 'UPDATE_VECTOR_COMPOUNDS', RESET_BOND_COLOR_MAP_OF_VECTORS: prefix + 'RESET_BOND_COLOR_MAP_OF_VECTORS', - UPDATE_BOND_COLOR_MAP_OF_COMPOUNDS: prefix + 'UPDATE_BOND_COLOR_MAP_OF_COMPOUNDS' + UPDATE_BOND_COLOR_MAP_OF_COMPOUNDS: prefix + 'UPDATE_BOND_COLOR_MAP_OF_COMPOUNDS', + SET_DISPLAYED_MOLECULES_HIT_NAV: prefix + 'SET_DISPLAYED_MOLECULES_HIT_NAV', + SET_IS_TAG_GLOBAL_EDIT: prefix + 'SET_IS_TAG_GLOBAL_EDIT', + SET_MOL_LIST_TO_EDIT: prefix + 'SET_MOL_LIST_TO_EDIT', + APPEND_TO_MOL_LIST_TO_EDIT: prefix + 'APPEND_TO_MOL_LIST_TO_EDIT', + REMOVE_FROM_MOL_LIST_TO_EDIT: prefix + 'REMOVE_FROM_MOL_LIST_TO_EDIT' }; export const PREDEFINED_FILTERS = { diff --git a/js/reducers/selection/selectionReducers.js b/js/reducers/selection/selectionReducers.js index 8f488abfd..cc8e5e6ed 100644 --- a/js/reducers/selection/selectionReducers.js +++ b/js/reducers/selection/selectionReducers.js @@ -30,7 +30,7 @@ export const INITIAL_STATE = { categoryList: [], tagList: [], selectedTagList: [], - specialTagList: [], + isGlobalEdit: false, listAllList: [], displayAllInNGLList: [], @@ -43,7 +43,9 @@ export const INITIAL_STATE = { // bondColorMapOfVectors: { // [vectorID] :{} // based on currentVector (smile) // } - currentVector: null // selected vector smile (ID) of compoundsOfVectors + currentVector: null, // selected vector smile (ID) of compoundsOfVectors + displayedMoleculesInHitNav: [], + moleculesToEdit: [] }; export function selectionReducers(state = INITIAL_STATE, action = {}) { @@ -422,13 +424,6 @@ export function selectionReducers(state = INITIAL_STATE, action = {}) { diminishedCategoryList.delete(action.item); return Object.assign({}, state, { categoryList: [...diminishedCategoryList] }); - case constants.SET_SPECIAL_TAG_LIST: - let newSpecialTagList = new Set(); - action.tagList.forEach(f => { - newSpecialTagList.add(f); - }); - return Object.assign({}, state, { specialTagList: [...newSpecialTagList] }); - case constants.SET_TAG_LIST: let newTagList = new Set(); action.tagList.forEach(f => { @@ -474,6 +469,22 @@ export function selectionReducers(state = INITIAL_STATE, action = {}) { diminishedSelectedTagList.delete(action.item); return Object.assign({}, state, { selectedTagList: [...diminishedSelectedTagList] }); + case constants.SET_DISPLAYED_MOLECULES_HIT_NAV: + return { ...state, displayedMoleculesInHitNav: [...action.list] }; + + case constants.SET_IS_TAG_GLOBAL_EDIT: + return { ...state, isGlobalEdit: action.isGlobalEdit }; + + case constants.SET_MOL_LIST_TO_EDIT: + return { ...state, moleculesToEdit: [...action.list] }; + + case constants.APPEND_TO_MOL_LIST_TO_EDIT: + return { ...state, moleculesToEdit: [...state.moleculesToEdit, action.molId] }; + + case constants.REMOVE_FROM_MOL_LIST_TO_EDIT: + let reducedMolListToEdit = state.moleculesToEdit.filter(mid => mid !== action.molId); + return { ...state, moleculesToEdit: [...reducedMolListToEdit] }; + // Cases like: @@redux/INIT default: return state;