From 545c57858a9e3bac562fea56a78853bf49f13a52 Mon Sep 17 00:00:00 2001 From: Boris Kovar Date: Tue, 5 Mar 2024 09:21:56 +0100 Subject: [PATCH] Squashed commit of the following: commit 0cdb89616bea17316aa21aacc32fadfce3929594 Author: Boris Kovar Date: Tue Mar 5 08:17:49 2024 +0100 - implemented #1357 commit 0e9169f0f0ff7622aa49618d5df49ab650290f9f Author: Boris Kovar Date: Mon Mar 4 10:07:06 2024 +0100 - implemented changes requested in #1326 commit 5d3e7d1b0cbe52b4c9e3269b0db02704b5a0c5ec Author: Boris Kovar Date: Mon Mar 4 08:45:22 2024 +0100 - fixed problem with tags not visually updating on observations commit 13b675c2be988d80e1cb506d405224b404aa1774 Author: matej Date: Mon Feb 26 21:36:12 2024 +0100 commit 7caa3846493f60051cc63c0936c0d0b796b055e5 Author: Boris Kovar Date: Tue Feb 20 08:52:28 2024 +0100 commit b543e504f14bba71d1cd3817438d93cebd52549e Merge: 779e80ee 21050e6d Author: matej Date: Fri Feb 16 10:48:07 2024 +0100 Merge branch 'stagingcandidate' of github.com:m2ms/fragalysis-frontend into stagingcandidate commit 21050e6d3748bee3735a3c4a95c846c91de120cd Author: Boris Kovar Date: Fri Feb 16 08:11:48 2024 +0100 Squashed commit of the following: commit 468491f23840faf5f8b0876fe61cceedab190d25 Author: Boris Kovar Date: Thu Feb 15 12:29:35 2024 +0100 - fixed #1283 commit 779e80ee5523de7dff2d5529ac3cde200960c46e Author: matej Date: Thu Feb 15 16:09:33 2024 +0100 commit 50ef8283190af6d186a3d45916c8dadf680e48e2 Author: Boris Kovar Date: Thu Feb 8 10:31:03 2024 +0100 - implemented #1324 commit 580c70ce2707b4d39e6fa4e82b035a08c06749e8 Merge: 1b83a871 b93571a6 Author: boriskovar-m2ms Date: Tue Feb 6 13:16:18 2024 +0100 Merge branch 'staging' into stagingcandidate commit b93571a6bc839d064e95e0ae14223c89c6276dd9 Author: boriskovar-m2ms Date: Tue Feb 6 09:50:48 2024 +0100 Implements #1277 (#406) * - additional fixes from #1321 * Squashed commit of the following: commit c347cb37df938a29bb6df92b39cedb245a1adb2b Author: Boris Kovar Date: Tue Feb 6 09:25:50 2024 +0100 - implemented #1277 commit 137f64895b1c598d6ea82952cb8ed36be4dd8a7e Author: boriskovar-m2ms Date: Fri Feb 2 14:19:35 2024 +0100 - additional fixes from #1321 (#405) commit c3626b032d89bdde7641efc60483cfebe103b63e Merge: 57b30e1b ef27226e Author: Warren Thompson Date: Thu Feb 1 13:28:37 2024 +0000 Merge pull request #404 from m2ms/stagingcandidate commit 57b30e1b0f0feac7467ef1d99b73e949a7cbf64d Author: boriskovar-m2ms Date: Thu Feb 1 09:50:31 2024 +0100 * Update build-main.yaml got rid of scheduled rebuild because it's messing up data * updated react16 to react 18.2, replaced hot-loaders modules by react-refresh, removed react-undo module * added proper values for Typography variant * renamed obsolete create theme function * #1063 added header and search * #1063 fixed body table, page count and search * #1063 fixed minor bugs and set clear filter * Squashed commit of the following: commit 10925d2c914673bfaa4e8b0205904e3e393d731d Author: RobertMatuska Date: Thu Sep 28 10:27:36 2023 +0200 * #1161 setted search and filter for old target list * #1161 fixed discourse icon padding * #1161 fixed filtered list sort * #1161 fixed target access sort and filter * #1161 fixed change page * #1145 preserve state of molecule rendering, save also actions of representation changes to snapshot * do not wrap display controls buttons * #1167 resize target list colmuns * #1161 fixed sorting * #1161 fixed sorting * #1161 edit sort functionality for filter table * #1161 fixed search, filter, sort by target access * #1161 created init date column * #1161 # filtering and sorting init date * #1161 fixed clear and sort init date * #1161 fixed target sorting * Squashed commit of the following: commit d4895261f303ae61a359579c485adf702cdff64e Merge: 1c45038a 411921f8 Author: Boris Kovar Date: Mon Oct 16 08:24:05 2023 +0200 Merge branch '#1173' of https://github.com/m2ms/fragalysis-frontend into #1173 commit 1c45038a42430f90f68430037027296021fe1974 Author: Boris Kovar Date: Fri Oct 13 11:03:49 2023 +0200 - implemented #1173 also with save/restore and undo/redo functionality commit 411921f8a4906c54dfcd31c8bc079f9bd3008baf Author: Boris Kovar Date: Fri Oct 13 11:03:49 2023 +0200 - implemented #1173 also with save/restore and undo/redo functionality * merge * Squashed commit of the following: commit 7883c1584fc80b0be8dae624c18e86ddbe3c906b Merge: 5e2b937d 19b9f243 Author: Boris Kovar Date: Mon Oct 16 11:19:36 2023 +0200 Merge branch '#1172' of https://github.com/m2ms/fragalysis-frontend into #1172 commit 5e2b937da95963afab366fac18912b4c596ccd78 Author: Boris Kovar Date: Mon Oct 16 11:16:15 2023 +0200 - added compound_set to csv export - #1172 commit 19b9f243cc996f8d3e28f6fd8a44c167894b358a Author: Boris Kovar Date: Mon Oct 16 11:16:15 2023 +0200 - added compound_set to csv export - #1172 commit 75ac125b5cae9d669d337410db9a184d6d31a456 Merge: f50666ce 574c7b5e Author: Boris Kovar Date: Mon Oct 16 08:26:08 2023 +0200 Merge branch '#1172' of https://github.com/m2ms/fragalysis-frontend into #1172 commit f50666cef87e491309347fbcb8514286fcb72adc Author: Boris Kovar Date: Fri Oct 13 13:45:34 2023 +0200 - implemented #1172 commit 574c7b5e65181e35865571ce7d9b6d01a40ce562 Author: Boris Kovar Date: Fri Oct 13 13:45:34 2023 +0200 - implemented #1172 * #1167 fixed issues * #1167 reworked resizer * #1161 fixed merge bugs * #1161 removed console * updated react16 to react 18.2, replaced hot-loaders modules by react-refresh, removed react-undo module * added proper values for Typography variant * renamed obsolete create theme function * changed deprecated justify= to justifyContent= * fixed some landing page errors, mostly missing key and using useState outside of useEffect in functional component * #1061 loading and toast functionality move from header context into LoadingContext and ToastContext, added loading indicator for tags and hits panes + hit/molecule control buttons * #1171 return representations when loading protein without quality to show it in display control * do not set logged in toast message if user is not logged in * fixed Tooltip error messages about its disabled child, fixed invalid variant type and removed xs from Grid container (it is Grid item property) * fixed null value for open property * fixed "ButtonGroup component doesn't accept a Fragment as a child. Consider providing an array instead" * fixed "
cannot appear as a descendant of

" error by adding "component={'div'}" property to complex Typography component * removed invalid way of setting color for tag, it does not work - only throws error and with proper setting it is same as background color.. * fixed missing key error * fixed invalid references erros * fixed unknown properties error and missing key * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - changed configuration * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - fixed search bar placeholder for hits * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - #1139 - fixed snapshot creation and restoration * #1167 target and project list resizer * #1167 fixed project list width * #1161 changed width * - #1183 - dynamic handling of tag categories * - fixed #1186 * - job file transfer backend * - checkpoint * - new CI/CD * Update build-main.yaml got rid of scheduled rebuild because it's messing up data * updated react16 to react 18.2, replaced hot-loaders modules by react-refresh, removed react-undo module * added proper values for Typography variant * renamed obsolete create theme function * changed deprecated justify= to justifyContent= * fixed some landing page errors, mostly missing key and using useState outside of useEffect in functional component * rebase * #1171 return representations when loading protein without quality to show it in display control * do not set logged in toast message if user is not logged in * fixed Tooltip error messages about its disabled child, fixed invalid variant type and removed xs from Grid container (it is Grid item property) * fixed null value for open property * fixed "ButtonGroup component doesn't accept a Fragment as a child. Consider providing an array instead" * fixed "

cannot appear as a descendant of

" error by adding "component={'div'}" property to complex Typography component * removed invalid way of setting color for tag, it does not work - only throws error and with proper setting it is same as background color.. * fixed missing key error * fixed invalid references erros * fixed unknown properties error and missing key * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - changed configuration * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - fixed search bar placeholder for hits * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - #1139 - fixed snapshot creation and restoration * - #1183 - dynamic handling of tag categories * - job file transfer backend * - checkpoint * - new CI/CD * - fixed build errors * Squashed commit of the following: commit d5c97097a073d1298221f98b01e0431cbf520a47 Author: Boris Kovar Date: Thu Nov 16 07:36:56 2023 +0100 - fixes blank page * #1035 added front-end pert of status lights for services * #1035 added API endpoint and changed refresh rate to 30 seconds for now * #1035 do not end up on failed response * Squashed commit of the following: commit e1dd8bd5f2c9e61c829cefb80b63f0e3f23604c9 Author: Boris Kovar Date: Tue Nov 21 09:16:46 2023 +0100 - #1211 fixed and also fixed other problems which were hiding problems with snapshot restoration * Squashed commit of the following: commit e79b49f5fce9027910e24f30efdfc0aafa94be34 Author: Boris Kovar Date: Thu Dec 7 09:44:55 2023 +0100 - fixed RHS for #1239 * #1217 save all actions to action list for snapshot not only the first ones, fixed of possible crash, adjusted restoring representations from snapshot * - updated docker-compose * Squashed commit of the following: commit 50d574da89fc90425cfcd6eb18ab30348f371b73 Merge: 1fdebffa 3b4e7a7a Author: Boris Kovar Date: Wed Dec 13 09:06:19 2023 +0100 Merge branch '#1190' of https://github.com/m2ms/fragalysis-frontend into #1190 commit 1fdebffa19b741e99b1e14ec2dd2adffa4261837 Author: Boris Kovar Date: Wed Dec 13 08:14:58 2023 +0100 - RC of #1190 commit dabee45c26683c5e1b84d60b145850e199fd2ab0 Author: Boris Kovar Date: Tue Dec 5 09:20:02 2023 +0100 - checkpoint commit 4e9a6744ea75081129126dd1b9aad0d8410ae062 Author: Boris Kovar Date: Thu Nov 16 13:17:05 2023 +0100 - using new backend image commit c90fc473a059540aea9070715b6527de8a823899 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 515cb8bb4d6ee9fea192c9fa0768c80c03a524e3 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit ab0a2977c9f923183afa413fe5f9ae8c149b4b4e Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 216762b7094da2f07bb74ecd3ce0bd4526f47e57 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 6f628a7e7c637b9d5d80c27bca4470f7c7ffb527 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 823bf2c9c55d6e5f148c75fd55e888bcbbd5c105 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit a7aa657062c994b0ece88ea0fbf2a0d137bc3850 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 101751bab2d505f8f5dfaa3f4bac88529084d7da Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 5a6935a6f7d8ecaca16ca5072880ebb12f8656d0 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 1d01387260863790647f7324d4bd0c34ac4dcd03 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit b3c781364154acf103c33bf8d266353466cdc5d8 Author: Boris Kovar Date: Thu Nov 16 13:17:05 2023 +0100 - using new backend image commit f48dc9d21c5bf02df112d149adf8f3384d96b702 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 813b553e8db154a9103e45f349ccf08607ba6cd7 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit b49f773779790bbd231e418860eb2089b87b7919 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 98f566bcbb9d7493238fcbefc6cf87dcec1e7497 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit a01f097d1b2fc5290cb26d27edd45635ec2ae703 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit a6d8930b249c7cc9175b4e6cd2e386ed7803f7e6 Author: Boris Kovar Date: Tue Nov 14 16:42:23 2023 +0100 - #1190 - implemented tags commit 392938b34b29aacb1729d1ddc5d5d438a59dd773 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 69ab4c2701185f68a6d85cebf8d03367c60ef2a4 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit e6b700b602b708801ac38385bc79e3ef785d8af8 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit a7e6aad0a8f8ce7b80ba84c3d017581c659522c7 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 4fc93c0662050f834ccf3482ed23358ab9b9f8be Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit 58573f6fc68a4f405c93750ff40b9b5ec2cd0cd9 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit ecc3d6c1dd4a6c3437d29d6f00ecf6ce0897319d Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS commit 3b4e7a7ad2a663660f675b10dd91f09a81ca720e Author: Boris Kovar Date: Wed Dec 13 08:14:58 2023 +0100 - RC of #1190 commit 1debb802212c6b7c6fa954bba1b04c5e926ef0ea Author: Boris Kovar Date: Tue Dec 5 09:20:02 2023 +0100 - checkpoint commit 4f714be762940d796add2431a25dc9d11f795cd5 Merge: 730d9e5b bcc1568f Author: Boris Kovar Date: Wed Nov 22 07:41:51 2023 +0100 Merge branch '#1190' of https://github.com/m2ms/fragalysis-frontend into #1190 commit 730d9e5bd404a8c121403528626c51595dee3927 Author: Boris Kovar Date: Thu Nov 16 13:17:05 2023 +0100 - using new backend image commit 76ea646ba8b940037e85082bdddff8967971a602 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 67439de7a640ff33f1dba88ebb833894e4a53b06 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit a38e0a39093ecf59d39fe50f0a49f9fa7a9237d3 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 64b67c539245bb30fa67eeff011b9868b4b0d2fa Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 35b2777be98d8c3ad4af2ed5ab5ad90d349bc971 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 810451479e17147b03594ba4bc27bb6964d1c159 Author: Boris Kovar Date: Tue Nov 14 16:42:23 2023 +0100 - #1190 - implemented tags commit 5432a999f9bc440b403abbdacaf45b3a328d9dfa Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit f5ea66fd36a1ad860b4530d89382c569303b2efa Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit d3fb020d6f99bd9177f0442198a3ffb17cb90516 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 84d48899979a09bd7c649028dd6df0eaebcd9b6a Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 29796304e70cc2ae25c6a96271d0dd12f692de48 Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit 7241df5cbeaab971c7f56eaa54a920a1b8ed8fc8 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 195e30e1038a38ebe4ef4ffdfd3b8d93c12e3bda Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS commit bcc1568fbbb3b3143a668784f7aac4524f4276a3 Author: Boris Kovar Date: Thu Nov 16 13:17:05 2023 +0100 - using new backend image commit 60136ed9ddd47ca6c523375de5ba4d1f02fe6ab3 Merge: 85c06a92 a18f80f1 Author: Boris Kovar Date: Thu Nov 16 08:01:49 2023 +0100 Merge branch '#1190' of https://github.com/m2ms/fragalysis-frontend into #1190 commit 85c06a920ae62b6c379f0f9975e94cf384f8f47a Author: Boris Kovar Date: Tue Nov 14 16:42:23 2023 +0100 - #1190 - implemented tags commit 6dd0268d367c93d8104569719a3d6c841e19bd36 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 0854241b93a563bf8cabd24278c4248c15eec645 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 1686e029dca683334351b4ea02c1d40851a321d9 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit ffba65bf05019144cb62eb9c4a0bd22db22609cc Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 1f22288d14e96d8b09a1916591d6a70d2db45481 Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit e5a04e51c62f8e85b29fc4eb0ee1adb19622a978 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 155a96b066ca27243652b90b332ef2f7448e3ab0 Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS commit a18f80f1d1aaa1e6c0606c774ba7931b6bf527fc Author: Boris Kovar Date: Tue Nov 14 16:42:23 2023 +0100 - #1190 - implemented tags commit 43b74762ffa648dfcaec1d752800eba996af8784 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 1f9eba8250e2fcd084399eaf47243cacb0a094e0 Merge: 17b9cb1c 3d51ab04 Author: Boris Kovar Date: Mon Nov 13 08:52:19 2023 +0100 Merge branch '#1190' of https://github.com/m2ms/fragalysis-frontend into #1190 commit 17b9cb1cb7dc91d46f4cef569d63b481ee7a121a Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 63122eb9c63f7b647c578c50268ec3cb6069da9e Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit 362ec046ef25402126f651cbd8d17c9b0eb8e5f9 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 26d2f319c44d74f5d419c789bcd594f3b11f5375 Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS commit 3d51ab049bee5729706c5f59f8e2233c1c2e746c Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit e3138f7427c4e199a9b4000e0ef0c7a366e65afd Merge: 3beca8c7 c95b8412 Author: Boris Kovar Date: Thu Nov 9 13:47:44 2023 +0100 Merge branch '#1190' of https://github.com/m2ms/fragalysis-frontend into #1190 commit 3beca8c75b14dde5a8dc4a01c85b9f8e13edfa24 Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit 2d8e3c4b8c2ca5804dcca66e4d4a6dea2bc3fe68 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit fa13fe991f437cb209b723e2d22e33af56066aae Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS commit c95b841232971fee08e771664579505326a8383c Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit 74fb512d1adaabb39b37b2d3e69fc89bf9852f69 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 28337545084b3ad9e0f0505fd2a0851c158c4ec9 Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS * - fix for tags * - fixed issue with checkboxes for #1190 * #1181 fixed min width and maximum width design * #1181 created compound sets table * #1181 fixed layout with Compound sets * #1181 changed functionality for radio buttons * #1181 RHS UI improvements, fixed some related error * #1203 download compound molecules as csv export, populate compound summary table from common scores * #1181 changed active filter icon from different colour to red dot indicator * #1202 added rationale and ref_url info into inspiration dialog * #1204 search compound sets by title * #1181 added tooltips for all columns * #1202 updated visual of summary * #1181 adjusted columns widths, show number of compounds in set in # column * #1181 adjusted RHS height and increased maximum width * #1121 renamed references of unique_name to name since it was removed * Squashed commit of the following: commit a8e1fda76c4449188f931286f9725931c3f0a4ec Merge: e97995dd 7f619a7a Author: Boris Kovar Date: Wed Dec 20 10:21:56 2023 +0100 Merge branch '#1077' of https://github.com/m2ms/fragalysis-frontend into #1077 commit e97995ddcfe8778bc2b8de070810935b5e8f786a Author: Boris Kovar Date: Wed Dec 20 07:48:27 2023 +0100 - small fix for #1077 commit 8ee8cb1891c1d5f0f716ce130aa28f039241158f Author: Boris Kovar Date: Tue Dec 19 10:54:25 2023 +0100 - fixed problem with UI showing error that target from URL is not recognized when the targets are not yet loaded commit 32018c9968bb96c8b29074bd71bc242e25c54b39 Author: Boris Kovar Date: Tue Dec 19 10:27:28 2023 +0100 - checking out the sorting of target list commit da3abebacf95b8890b14149d9e6b88d3acbf0526 Author: Boris Kovar Date: Mon Dec 18 14:22:03 2023 +0100 - #1195 commit f593a1eef0b4622f37ccd3ad6afe8e8ebdf5abb8 Author: Boris Kovar Date: Mon Dec 18 12:41:31 2023 +0100 - #1166 commit 96733edf6dadd3555cc104a6b386fa97837a0b1b Author: Boris Kovar Date: Mon Dec 18 09:02:49 2023 +0100 - implemented #1077 commit 7f619a7a55ec9a9e33089c1548acc404a1c05aa9 Author: Boris Kovar Date: Wed Dec 20 07:48:27 2023 +0100 - small fix for #1077 commit c29b995f7c6eb9e48ec5fdeeb26914d845bd5e92 Author: Boris Kovar Date: Tue Dec 19 10:54:25 2023 +0100 - fixed problem with UI showing error that target from URL is not recognized when the targets are not yet loaded commit a70d4a2c31212407d77b145e688c80ecaa9e6b8b Author: Boris Kovar Date: Tue Dec 19 10:27:28 2023 +0100 - checking out the sorting of target list commit 5f1ea56baa55e3d40d34b99dbd2284c339f6d9e2 Author: Boris Kovar Date: Mon Dec 18 14:22:03 2023 +0100 - #1195 commit 7c5c6b5620e037e9d7f47e56ea783158d34e2204 Author: Boris Kovar Date: Mon Dec 18 12:41:31 2023 +0100 - #1166 commit d51914eace57384ef7586a82b186096a4c8404c2 Author: Boris Kovar Date: Mon Dec 18 09:02:49 2023 +0100 - implemented #1077 * - workaround for #1075 and partial implementation of #1256 * - updated 'download is preparing' message * - forgot to remove debug sleep... * - hot fix for #1075 * - hotfix for #1075 - weird merge by github * - #1256 - added link to success toast * Squashed commit of the following: commit 0e242e13301e4708ecf725b2742584b98f799704 Author: Boris Kovar Date: Tue Jan 16 13:52:38 2024 +0100 - additional fixes for #1075 - fixed #1267 - fixed #1260 - fixed #1270 * - copy now copies whole name of the compound/observationCmpView.js - target name was removed from the name of the compound/observation when displayed * #1249 dataset molecules can use side observation molecule for P, C, S renders * #1249 preserve color of RHS compound when toggling its P, C, S buttons * #1249 fixed inconsistent coloring of rendered objects on activating RHS/LHS compound buttons * - improved direct display comments to show issues and examples * - #1296, #1299, partial (?) #1305, partial #1303 * #1208 updated status lights on hover info and some logic behind it * #1208 added check for status change * #1208 do not spam toast of unavailable status * - probably fix for #1295 - fixed #1300 and #1315 --------- Co-authored-by: matej Co-authored-by: RobertMatuska commit f5b939eea1a3b265033b9d393b8f72a18486121c Author: boriskovar-m2ms Date: Tue Jan 30 10:11:35 2024 +0100 * Update build-main.yaml got rid of scheduled rebuild because it's messing up data * updated react16 to react 18.2, replaced hot-loaders modules by react-refresh, removed react-undo module * added proper values for Typography variant * renamed obsolete create theme function * #1063 added header and search * #1063 fixed body table, page count and search * #1063 fixed minor bugs and set clear filter * Squashed commit of the following: commit 10925d2c914673bfaa4e8b0205904e3e393d731d Author: RobertMatuska Date: Thu Sep 28 10:27:36 2023 +0200 * #1161 setted search and filter for old target list * #1161 fixed discourse icon padding * #1161 fixed filtered list sort * #1161 fixed target access sort and filter * #1161 fixed change page * #1145 preserve state of molecule rendering, save also actions of representation changes to snapshot * do not wrap display controls buttons * #1167 resize target list colmuns * #1161 fixed sorting * #1161 fixed sorting * #1161 edit sort functionality for filter table * #1161 fixed search, filter, sort by target access * #1161 created init date column * #1161 # filtering and sorting init date * #1161 fixed clear and sort init date * #1161 fixed target sorting * Squashed commit of the following: commit d4895261f303ae61a359579c485adf702cdff64e Merge: 1c45038a 411921f8 Author: Boris Kovar Date: Mon Oct 16 08:24:05 2023 +0200 Merge branch '#1173' of https://github.com/m2ms/fragalysis-frontend into #1173 commit 1c45038a42430f90f68430037027296021fe1974 Author: Boris Kovar Date: Fri Oct 13 11:03:49 2023 +0200 - implemented #1173 also with save/restore and undo/redo functionality commit 411921f8a4906c54dfcd31c8bc079f9bd3008baf Author: Boris Kovar Date: Fri Oct 13 11:03:49 2023 +0200 - implemented #1173 also with save/restore and undo/redo functionality * merge * Squashed commit of the following: commit 7883c1584fc80b0be8dae624c18e86ddbe3c906b Merge: 5e2b937d 19b9f243 Author: Boris Kovar Date: Mon Oct 16 11:19:36 2023 +0200 Merge branch '#1172' of https://github.com/m2ms/fragalysis-frontend into #1172 commit 5e2b937da95963afab366fac18912b4c596ccd78 Author: Boris Kovar Date: Mon Oct 16 11:16:15 2023 +0200 - added compound_set to csv export - #1172 commit 19b9f243cc996f8d3e28f6fd8a44c167894b358a Author: Boris Kovar Date: Mon Oct 16 11:16:15 2023 +0200 - added compound_set to csv export - #1172 commit 75ac125b5cae9d669d337410db9a184d6d31a456 Merge: f50666ce 574c7b5e Author: Boris Kovar Date: Mon Oct 16 08:26:08 2023 +0200 Merge branch '#1172' of https://github.com/m2ms/fragalysis-frontend into #1172 commit f50666cef87e491309347fbcb8514286fcb72adc Author: Boris Kovar Date: Fri Oct 13 13:45:34 2023 +0200 - implemented #1172 commit 574c7b5e65181e35865571ce7d9b6d01a40ce562 Author: Boris Kovar Date: Fri Oct 13 13:45:34 2023 +0200 - implemented #1172 * #1167 fixed issues * #1167 reworked resizer * #1161 fixed merge bugs * #1161 removed console * updated react16 to react 18.2, replaced hot-loaders modules by react-refresh, removed react-undo module * added proper values for Typography variant * renamed obsolete create theme function * changed deprecated justify= to justifyContent= * fixed some landing page errors, mostly missing key and using useState outside of useEffect in functional component * #1061 loading and toast functionality move from header context into LoadingContext and ToastContext, added loading indicator for tags and hits panes + hit/molecule control buttons * #1171 return representations when loading protein without quality to show it in display control * do not set logged in toast message if user is not logged in * fixed Tooltip error messages about its disabled child, fixed invalid variant type and removed xs from Grid container (it is Grid item property) * fixed null value for open property * fixed "ButtonGroup component doesn't accept a Fragment as a child. Consider providing an array instead" * fixed "

cannot appear as a descendant of

" error by adding "component={'div'}" property to complex Typography component * removed invalid way of setting color for tag, it does not work - only throws error and with proper setting it is same as background color.. * fixed missing key error * fixed invalid references erros * fixed unknown properties error and missing key * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - changed configuration * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - fixed search bar placeholder for hits * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - #1139 - fixed snapshot creation and restoration * #1167 target and project list resizer * #1167 fixed project list width * #1161 changed width * - #1183 - dynamic handling of tag categories * - fixed #1186 * - job file transfer backend * - checkpoint * - new CI/CD * Update build-main.yaml got rid of scheduled rebuild because it's messing up data * updated react16 to react 18.2, replaced hot-loaders modules by react-refresh, removed react-undo module * added proper values for Typography variant * renamed obsolete create theme function * changed deprecated justify= to justifyContent= * fixed some landing page errors, mostly missing key and using useState outside of useEffect in functional component * rebase * #1171 return representations when loading protein without quality to show it in display control * do not set logged in toast message if user is not logged in * fixed Tooltip error messages about its disabled child, fixed invalid variant type and removed xs from Grid container (it is Grid item property) * fixed null value for open property * fixed "ButtonGroup component doesn't accept a Fragment as a child. Consider providing an array instead" * fixed "

cannot appear as a descendant of

" error by adding "component={'div'}" property to complex Typography component * removed invalid way of setting color for tag, it does not work - only throws error and with proper setting it is same as background color.. * fixed missing key error * fixed invalid references erros * fixed unknown properties error and missing key * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - changed configuration * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - fixed search bar placeholder for hits * - #1139 - updated docker-compose file to be ready for new backend version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - initial implementation of #1139 - tags and molecules * - #1139 - tags, molecules updated to use new api - not final version * - #1139 - fixed snapshot creation and restoration * - #1183 - dynamic handling of tag categories * - job file transfer backend * - checkpoint * - new CI/CD * - fixed build errors * Squashed commit of the following: commit d5c97097a073d1298221f98b01e0431cbf520a47 Author: Boris Kovar Date: Thu Nov 16 07:36:56 2023 +0100 - fixes blank page * #1035 added front-end pert of status lights for services * #1035 added API endpoint and changed refresh rate to 30 seconds for now * #1035 do not end up on failed response * Squashed commit of the following: commit e1dd8bd5f2c9e61c829cefb80b63f0e3f23604c9 Author: Boris Kovar Date: Tue Nov 21 09:16:46 2023 +0100 - #1211 fixed and also fixed other problems which were hiding problems with snapshot restoration * Squashed commit of the following: commit e79b49f5fce9027910e24f30efdfc0aafa94be34 Author: Boris Kovar Date: Thu Dec 7 09:44:55 2023 +0100 - fixed RHS for #1239 * #1217 save all actions to action list for snapshot not only the first ones, fixed of possible crash, adjusted restoring representations from snapshot * - updated docker-compose * Squashed commit of the following: commit 50d574da89fc90425cfcd6eb18ab30348f371b73 Merge: 1fdebffa 3b4e7a7a Author: Boris Kovar Date: Wed Dec 13 09:06:19 2023 +0100 Merge branch '#1190' of https://github.com/m2ms/fragalysis-frontend into #1190 commit 1fdebffa19b741e99b1e14ec2dd2adffa4261837 Author: Boris Kovar Date: Wed Dec 13 08:14:58 2023 +0100 - RC of #1190 commit dabee45c26683c5e1b84d60b145850e199fd2ab0 Author: Boris Kovar Date: Tue Dec 5 09:20:02 2023 +0100 - checkpoint commit 4e9a6744ea75081129126dd1b9aad0d8410ae062 Author: Boris Kovar Date: Thu Nov 16 13:17:05 2023 +0100 - using new backend image commit c90fc473a059540aea9070715b6527de8a823899 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 515cb8bb4d6ee9fea192c9fa0768c80c03a524e3 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit ab0a2977c9f923183afa413fe5f9ae8c149b4b4e Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 216762b7094da2f07bb74ecd3ce0bd4526f47e57 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 6f628a7e7c637b9d5d80c27bca4470f7c7ffb527 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 823bf2c9c55d6e5f148c75fd55e888bcbbd5c105 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit a7aa657062c994b0ece88ea0fbf2a0d137bc3850 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 101751bab2d505f8f5dfaa3f4bac88529084d7da Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 5a6935a6f7d8ecaca16ca5072880ebb12f8656d0 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 1d01387260863790647f7324d4bd0c34ac4dcd03 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit b3c781364154acf103c33bf8d266353466cdc5d8 Author: Boris Kovar Date: Thu Nov 16 13:17:05 2023 +0100 - using new backend image commit f48dc9d21c5bf02df112d149adf8f3384d96b702 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 813b553e8db154a9103e45f349ccf08607ba6cd7 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit b49f773779790bbd231e418860eb2089b87b7919 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 98f566bcbb9d7493238fcbefc6cf87dcec1e7497 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit a01f097d1b2fc5290cb26d27edd45635ec2ae703 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit a6d8930b249c7cc9175b4e6cd2e386ed7803f7e6 Author: Boris Kovar Date: Tue Nov 14 16:42:23 2023 +0100 - #1190 - implemented tags commit 392938b34b29aacb1729d1ddc5d5d438a59dd773 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 69ab4c2701185f68a6d85cebf8d03367c60ef2a4 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit e6b700b602b708801ac38385bc79e3ef785d8af8 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit a7e6aad0a8f8ce7b80ba84c3d017581c659522c7 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 4fc93c0662050f834ccf3482ed23358ab9b9f8be Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit 58573f6fc68a4f405c93750ff40b9b5ec2cd0cd9 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit ecc3d6c1dd4a6c3437d29d6f00ecf6ce0897319d Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS commit 3b4e7a7ad2a663660f675b10dd91f09a81ca720e Author: Boris Kovar Date: Wed Dec 13 08:14:58 2023 +0100 - RC of #1190 commit 1debb802212c6b7c6fa954bba1b04c5e926ef0ea Author: Boris Kovar Date: Tue Dec 5 09:20:02 2023 +0100 - checkpoint commit 4f714be762940d796add2431a25dc9d11f795cd5 Merge: 730d9e5b bcc1568f Author: Boris Kovar Date: Wed Nov 22 07:41:51 2023 +0100 Merge branch '#1190' of https://github.com/m2ms/fragalysis-frontend into #1190 commit 730d9e5bd404a8c121403528626c51595dee3927 Author: Boris Kovar Date: Thu Nov 16 13:17:05 2023 +0100 - using new backend image commit 76ea646ba8b940037e85082bdddff8967971a602 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 67439de7a640ff33f1dba88ebb833894e4a53b06 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit a38e0a39093ecf59d39fe50f0a49f9fa7a9237d3 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 64b67c539245bb30fa67eeff011b9868b4b0d2fa Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 35b2777be98d8c3ad4af2ed5ab5ad90d349bc971 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 810451479e17147b03594ba4bc27bb6964d1c159 Author: Boris Kovar Date: Tue Nov 14 16:42:23 2023 +0100 - #1190 - implemented tags commit 5432a999f9bc440b403abbdacaf45b3a328d9dfa Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit f5ea66fd36a1ad860b4530d89382c569303b2efa Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit d3fb020d6f99bd9177f0442198a3ffb17cb90516 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 84d48899979a09bd7c649028dd6df0eaebcd9b6a Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 29796304e70cc2ae25c6a96271d0dd12f692de48 Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit 7241df5cbeaab971c7f56eaa54a920a1b8ed8fc8 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 195e30e1038a38ebe4ef4ffdfd3b8d93c12e3bda Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS commit bcc1568fbbb3b3143a668784f7aac4524f4276a3 Author: Boris Kovar Date: Thu Nov 16 13:17:05 2023 +0100 - using new backend image commit 60136ed9ddd47ca6c523375de5ba4d1f02fe6ab3 Merge: 85c06a92 a18f80f1 Author: Boris Kovar Date: Thu Nov 16 08:01:49 2023 +0100 Merge branch '#1190' of https://github.com/m2ms/fragalysis-frontend into #1190 commit 85c06a920ae62b6c379f0f9975e94cf384f8f47a Author: Boris Kovar Date: Tue Nov 14 16:42:23 2023 +0100 - #1190 - implemented tags commit 6dd0268d367c93d8104569719a3d6c841e19bd36 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 0854241b93a563bf8cabd24278c4248c15eec645 Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 1686e029dca683334351b4ea02c1d40851a321d9 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit ffba65bf05019144cb62eb9c4a0bd22db22609cc Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 1f22288d14e96d8b09a1916591d6a70d2db45481 Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit e5a04e51c62f8e85b29fc4eb0ee1adb19622a978 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 155a96b066ca27243652b90b332ef2f7448e3ab0 Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS commit a18f80f1d1aaa1e6c0606c774ba7931b6bf527fc Author: Boris Kovar Date: Tue Nov 14 16:42:23 2023 +0100 - #1190 - implemented tags commit 43b74762ffa648dfcaec1d752800eba996af8784 Author: Boris Kovar Date: Mon Nov 13 16:13:26 2023 +0100 - L, P, C, S, V buttons work now commit 1f9eba8250e2fcd084399eaf47243cacb0a094e0 Merge: 17b9cb1c 3d51ab04 Author: Boris Kovar Date: Mon Nov 13 08:52:19 2023 +0100 Merge branch '#1190' of https://github.com/m2ms/fragalysis-frontend into #1190 commit 17b9cb1cb7dc91d46f4cef569d63b481ee7a121a Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit 63122eb9c63f7b647c578c50268ec3cb6069da9e Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit 362ec046ef25402126f651cbd8d17c9b0eb8e5f9 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 26d2f319c44d74f5d419c789bcd594f3b11f5375 Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS commit 3d51ab049bee5729706c5f59f8e2233c1c2e746c Author: Boris Kovar Date: Mon Nov 13 08:28:59 2023 +0100 - checkpoint commit e3138f7427c4e199a9b4000e0ef0c7a366e65afd Merge: 3beca8c7 c95b8412 Author: Boris Kovar Date: Thu Nov 9 13:47:44 2023 +0100 Merge branch '#1190' of https://github.com/m2ms/fragalysis-frontend into #1190 commit 3beca8c75b14dde5a8dc4a01c85b9f8e13edfa24 Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit 2d8e3c4b8c2ca5804dcca66e4d4a6dea2bc3fe68 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit fa13fe991f437cb209b723e2d22e33af56066aae Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS commit c95b841232971fee08e771664579505326a8383c Author: Boris Kovar Date: Tue Nov 7 12:03:11 2023 +0100 - checkpoint commit 74fb512d1adaabb39b37b2d3e69fc89bf9852f69 Author: Boris Kovar Date: Tue Nov 7 06:42:52 2023 +0100 - checkpoint commit 28337545084b3ad9e0f0505fd2a0851c158c4ec9 Author: Boris Kovar Date: Thu Nov 2 07:59:19 2023 +0100 - #1190 - compounds for LHS * - fix for tags * - fixed issue with checkboxes for #1190 * #1181 fixed min width and maximum width design * #1181 created compound sets table * #1181 fixed layout with Compound sets * #1181 changed functionality for radio buttons * #1181 RHS UI improvements, fixed some related error * #1203 download compound molecules as csv export, populate compound summary table from common scores * #1181 changed active filter icon from different colour to red dot indicator * #1202 added rationale and ref_url info into inspiration dialog * #1204 search compound sets by title * #1181 added tooltips for all columns * #1202 updated visual of summary * #1181 adjusted columns widths, show number of compounds in set in # column * #1181 adjusted RHS height and increased maximum width * #1121 renamed references of unique_name to name since it was removed * Squashed commit of the following: commit a8e1fda76c4449188f931286f9725931c3f0a4ec Merge: e97995dd 7f619a7a Author: Boris Kovar Date: Wed Dec 20 10:21:56 2023 +0100 Merge branch '#1077' of https://github.com/m2ms/fragalysis-frontend into #1077 commit e97995ddcfe8778bc2b8de070810935b5e8f786a Author: Boris Kovar Date: Wed Dec 20 07:48:27 2023 +0100 - small fix for #1077 commit 8ee8cb1891c1d5f0f716ce130aa28f039241158f Author: Boris Kovar Date: Tue Dec 19 10:54:25 2023 +0100 - fixed problem with UI showing error that target from URL is not recognized when the targets are not yet loaded commit 32018c9968bb96c8b29074bd71bc242e25c54b39 Author: Boris Kovar Date: Tue Dec 19 10:27:28 2023 +0100 - checking out the sorting of target list commit da3abebacf95b8890b14149d9e6b88d3acbf0526 Author: Boris Kovar Date: Mon Dec 18 14:22:03 2023 +0100 - #1195 commit f593a1eef0b4622f37ccd3ad6afe8e8ebdf5abb8 Author: Boris Kovar Date: Mon Dec 18 12:41:31 2023 +0100 - #1166 commit 96733edf6dadd3555cc104a6b386fa97837a0b1b Author: Boris Kovar Date: Mon Dec 18 09:02:49 2023 +0100 - implemented #1077 commit 7f619a7a55ec9a9e33089c1548acc404a1c05aa9 Author: Boris Kovar Date: Wed Dec 20 07:48:27 2023 +0100 - small fix for #1077 commit c29b995f7c6eb9e48ec5fdeeb26914d845bd5e92 Author: Boris Kovar Date: Tue Dec 19 10:54:25 2023 +0100 - fixed problem with UI showing error that target from URL is not recognized when the targets are not yet loaded commit a70d4a2c31212407d77b145e688c80ecaa9e6b8b Author: Boris Kovar Date: Tue Dec 19 10:27:28 2023 +0100 - checking out the sorting of target list commit 5f1ea56baa55e3d40d34b99dbd2284c339f6d9e2 Author: Boris Kovar Date: Mon Dec 18 14:22:03 2023 +0100 - #1195 commit 7c5c6b5620e037e9d7f47e56ea783158d34e2204 Author: Boris Kovar Date: Mon Dec 18 12:41:31 2023 +0100 - #1166 commit d51914eace57384ef7586a82b186096a4c8404c2 Author: Boris Kovar Date: Mon Dec 18 09:02:49 2023 +0100 - implemented #1077 * - workaround for #1075 and partial implementation of #1256 * - updated 'download is preparing' message * - forgot to remove debug sleep... * - hot fix for #1075 * - hotfix for #1075 - weird merge by github * - #1256 - added link to success toast * Squashed commit of the following: commit 0e242e13301e4708ecf725b2742584b98f799704 Author: Boris Kovar Date: Tue Jan 16 13:52:38 2024 +0100 - additional fixes for #1075 - fixed #1267 - fixed #1260 - fixed #1270 * - copy now copies whole name of the compound/observationCmpView.js - target name was removed from the name of the compound/observation when displayed * #1249 dataset molecules can use side observation molecule for P, C, S renders * #1249 preserve color of RHS compound when toggling its P, C, S buttons * #1249 fixed inconsistent coloring of rendered objects on activating RHS/LHS compound buttons * - improved direct display comments to show issues and examples * - #1296, #1299, partial (?) #1305, partial #1303 * #1208 updated status lights on hover info and some logic behind it * #1208 added check for status change * #1208 do not spam toast of unavailable status --------- Co-authored-by: matej Co-authored-by: RobertMatuska --- .../observationCmpView/observationCmpView.js | 63 ++++++++++++++----- .../preview/tags/details/newTagDetailRow.js | 51 ++++++++++----- js/components/preview/tags/modal/tagEditor.js | 21 ++++++- js/components/preview/tags/tagCategory.js | 5 +- js/components/preview/tags/tagView.js | 4 +- js/components/preview/tags/utils/tagUtils.js | 25 +++++++- .../modals/downloadStructuresDialog.js | 10 ++- js/constants/constants.js | 7 +++ js/reducers/api/actions.js | 7 +++ js/reducers/api/apiReducers.js | 13 +++- js/reducers/api/constants.js | 3 +- 11 files changed, 162 insertions(+), 47 deletions(-) diff --git a/js/components/preview/molecule/observationCmpView/observationCmpView.js b/js/components/preview/molecule/observationCmpView/observationCmpView.js index cd3c7e002..0fadba08e 100644 --- a/js/components/preview/molecule/observationCmpView/observationCmpView.js +++ b/js/components/preview/molecule/observationCmpView/observationCmpView.js @@ -524,28 +524,41 @@ const ObservationCmpView = memo( setTagPopoverOpen(null); }; - const resolveTagBackgroundColor = tag => { - let color = DEFAULT_TAG_COLOR; + const resolveTagBackgroundColor = useCallback( + tag => { + let color = DEFAULT_TAG_COLOR; - if (tag.colour && tag.colour !== '') { - color = tag.colour; - } else { - const category = dispatch(getCategoryById(tag.category)); - if (category) { - color = `#${category.colour}`; + if (tag.colour && tag.colour !== '') { + color = tag.colour; + } else { + const category = dispatch(getCategoryById(tag.category)); + if (category) { + color = `#${category.colour}`; + } } - } - return color; - }; + return color; + }, + [dispatch] + ); - const resolveTagForegroundColor = tag => { - const bgColor = resolveTagBackgroundColor(tag); - return getFontColorByBackgroundColor(bgColor); - }; + const resolveTagForegroundColor = useCallback( + tag => { + const bgColor = resolveTagBackgroundColor(tag); + return getFontColorByBackgroundColor(bgColor); + }, + [resolveTagBackgroundColor] + ); - const generateTagPopover = () => { + const generateTagPopover = useCallback(() => { + // console.log('generateTagPopover'); const allData = getAllTagsForLHSCmp(observations, tagList, tagCategories); + // console.log( + // `generateTagPopover ${observations[0].compound_code} assigned tags: ${observations[0].tags_set} count: ` + + // allData?.length + + // ' ' + + // JSON.stringify(allData) + // ); // const sortedData = [...allData].sort((a, b) => a.tag.localeCompare(b.tag)); const modifiedObjects = allData.map((obj, index) => { @@ -772,7 +785,23 @@ const ObservationCmpView = memo( ); - }; + }, [ + classes.editButtonIcon, + classes.paper, + classes.popover, + classes.tagPopover, + dispatch, + observations, + open, + resolveTagBackgroundColor, + resolveTagForegroundColor, + setRef, + tagCategories, + tagEditModalOpenNew, + tagEditorOpen, + tagList, + tagPopoverOpen + ]); // componentDidMount useEffect(() => { diff --git a/js/components/preview/tags/details/newTagDetailRow.js b/js/components/preview/tags/details/newTagDetailRow.js index c52ada057..927a9cd99 100644 --- a/js/components/preview/tags/details/newTagDetailRow.js +++ b/js/components/preview/tags/details/newTagDetailRow.js @@ -1,4 +1,4 @@ -import React, { memo, useState, useEffect } from 'react'; +import React, { memo, useState, useEffect, useMemo } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { CATEGORY_TYPE, CATEGORY_ID, CATEGORY_TYPE_BY_ID } from '../../../../constants/constants'; import { ColorPicker } from '../../../common/Components/ColorPicker'; @@ -6,7 +6,8 @@ import { DEFAULT_CATEGORY, DEFAULT_TAG_COLOR, augumentTagObjectWithId, - createMoleculeTagObject + createMoleculeTagObject, + getEditNewTagCategories } from '../utils/tagUtils'; import { DJANGO_CONTEXT } from '../../../../utils/djangoContext'; import { updateTagProp, removeSelectedTag } from '../redux/dispatchActions'; @@ -73,11 +74,15 @@ const NewTagDetailRow = memo(({ moleculesToEditIds, moleculesToEdit }) => { const allMolList = useSelector(state => state.apiReducers.all_mol_lists); const categoriesList = useSelector(state => state.apiReducers.categoryList); - const [newTagCategory, setNewTagCategory] = useState(1); + const [newTagCategory, setNewTagCategory] = useState(DEFAULT_CATEGORY); const [newTagColor, setNewTagColor] = useState(DEFAULT_TAG_COLOR); const [newTagName, setNewTagName] = useState(''); const [newTagLink, setNewTagLink] = useState(''); + const comboCategories = useMemo(() => { + return getEditNewTagCategories(categoriesList); + }, [categoriesList]); + useEffect(() => { const category = dispatch(getCategoryById(DEFAULT_CATEGORY)); if (category) { @@ -160,18 +165,32 @@ const NewTagDetailRow = memo(({ moleculesToEditIds, moleculesToEdit }) => { const updateTag = () => { if (tagToEdit && newTagCategory && newTagName) { // update all props at once - dispatch( - updateTagProp( - Object.assign({}, tagToEdit, { - category: newTagCategory, - colour: newTagColor, - tag: newTagName, - discourse_url: newTagLink - }), - newTagName, - 'tag' - ) - ); + if (newTagCategory) { + dispatch( + updateTagProp( + Object.assign({}, tagToEdit, { + category: newTagCategory, + colour: newTagColor, + tag: newTagName, + discourse_url: newTagLink + }), + newTagName, + 'tag' + ) + ); + } else { + dispatch( + updateTagProp( + Object.assign({}, tagToEdit, { + colour: newTagColor, + tag: newTagName, + discourse_url: newTagLink + }), + newTagName, + 'tag' + ) + ); + } // reset tag/fields after updating selected one resetTagToEditState(); } @@ -240,7 +259,7 @@ const NewTagDetailRow = memo(({ moleculesToEditIds, moleculesToEdit }) => { onChange={onCategoryForNewTagChange} disabled={!DJANGO_CONTEXT.pk} > - {categoriesList?.map(c => ( + {comboCategories?.map(c => ( {c.category} diff --git a/js/components/preview/tags/modal/tagEditor.js b/js/components/preview/tags/modal/tagEditor.js index a8dcb1dfa..e220242da 100644 --- a/js/components/preview/tags/modal/tagEditor.js +++ b/js/components/preview/tags/modal/tagEditor.js @@ -3,7 +3,7 @@ import { Grid, Popper, IconButton, Tooltip, makeStyles, FormControlLabel, Switch import { Panel } from '../../../common'; import { Close } from '@material-ui/icons'; import { useDispatch, useSelector } from 'react-redux'; -import { updateMoleculeInMolLists, updateMoleculeTag } from '../../../../reducers/api/actions'; +import { updateLHSCompound, updateMoleculeInMolLists, updateMoleculeTag } from '../../../../reducers/api/actions'; import { getMoleculeForId } from '../redux/dispatchActions'; import { setMoleculeForTagEdit, @@ -130,6 +130,8 @@ export const TagEditor = memo( const moleculesToEditIdsSt = useSelector(state => state.selectionReducers.moleculesToEdit) || []; + const lhsCompounds = useSelector(state => state.apiReducers.lhs_compounds_list); + const [taggingInProgress, setTaggingInProgress] = useState(false); const [isError, setIsError] = useState(false); const [molsLeftForTagging, setMolsLeftForTagging] = useState(0); @@ -142,6 +144,12 @@ export const TagEditor = memo( } const moleculesToEdit = moleculesToEditIds.map(id => dispatch(getMoleculeForId(id))); + let lhsCmp = null; + if (moleculesToEdit?.length > 0) { + const firstMolToEdit = moleculesToEdit[0]; + const cmpId = firstMolToEdit.cmpd; + lhsCmp = lhsCompounds?.find(c => c.origId === cmpId && firstMolToEdit.canon_site_conf === c.canonSiteConf); + } moleculeTags = moleculeTags.sort(compareTagsAsc); const assignTagEditorOpen = useSelector(state => state.selectionReducers.tagEditorOpened); @@ -170,6 +178,15 @@ export const TagEditor = memo( } }; + const updateCmp = (cmp, obs) => { + let newCmp = { ...cmp }; + const index = newCmp.associatedObs.findIndex(o => o.id === obs.id); + if (index >= 0) { + newCmp.associatedObs[index] = obs; + dispatch(updateLHSCompound(newCmp)); + } + }; + const handleTagClick = async (selected, tag) => { try { setTaggingInProgress(true); @@ -189,6 +206,7 @@ export const TagEditor = memo( moleculesToEdit.forEach(m => { let newMol = { ...m }; newMol.tags_set = newMol.tags_set.filter(id => id !== tag.id); + updateCmp(lhsCmp, newMol); dispatch(updateMoleculeInMolLists(newMol)); const moleculeTag = getMoleculeTagForTag(moleculeTags, tag.id); @@ -217,6 +235,7 @@ export const TagEditor = memo( if (!m.tags_set.some(id => id === tag.id)) { let newMol = { ...m }; newMol.tags_set.push(tag.id); + updateCmp(lhsCmp, newMol); dispatch(updateMoleculeInMolLists(newMol)); const moleculeTag = getMoleculeTagForTag(moleculeTags, tag.id); let mtObject = molTagObjects.find(mto => mto.tag === tag.tag); diff --git a/js/components/preview/tags/tagCategory.js b/js/components/preview/tags/tagCategory.js index ffcce463f..25465e6b2 100644 --- a/js/components/preview/tags/tagCategory.js +++ b/js/components/preview/tags/tagCategory.js @@ -4,7 +4,7 @@ import { useSelector } from 'react-redux'; import TagCategoryView from './tagCategoryListView'; import TagCategoryGridView from './tagCategoryGridView'; import { CATEGORY_TYPE } from '../../../constants/constants'; -import { compareTagsAsc } from './utils/tagUtils'; +import { compareTagsAsc, getProhibitedCategoriesForEditIds } from './utils/tagUtils'; const useStyles = makeStyles(theme => ({ category: { @@ -16,10 +16,11 @@ const TagCategory = memo(({ tagClickCallback, disabled = false }) => { const classes = useStyles(); const categoryList = useSelector(state => state.apiReducers.categoryList); + const listOfProhibitedCategories = getProhibitedCategoriesForEditIds(categoryList); let tagList = useSelector(state => state.apiReducers.tagList); tagList = tagList .filter(t => { - if (t.additional_info?.downloadName) { + if (t.additional_info?.downloadName || listOfProhibitedCategories.some(cid => cid === t.category)) { return false; } else { return true; diff --git a/js/components/preview/tags/tagView.js b/js/components/preview/tags/tagView.js index 9f69c3c33..3254fb536 100644 --- a/js/components/preview/tags/tagView.js +++ b/js/components/preview/tags/tagView.js @@ -130,9 +130,11 @@ const TagView = memo( if (tagCategory) { if (!tag.colour || tag.colour === '') { setBgColor(`#${tagCategory.colour}`); + } else { + setBgColor(`${tag.colour}`); } } - }, [tagCategory]); + }, [tagCategory, tag.colour, tagCategories]); useEffect(() => { if (assignTagView === undefined) { diff --git a/js/components/preview/tags/utils/tagUtils.js b/js/components/preview/tags/utils/tagUtils.js index 372e0ea99..e0cc5865c 100644 --- a/js/components/preview/tags/utils/tagUtils.js +++ b/js/components/preview/tags/utils/tagUtils.js @@ -3,11 +3,12 @@ import { CATEGORY_TYPE_BY_ID, OBSERVATION_TAG_CATEGORIES, COMPOUND_PRIO_TAG_CATEGORIES, - TAG_DETAILS_REMOVED_CATEGORIES + TAG_DETAILS_REMOVED_CATEGORIES, + NON_ASSIGNABLE_CATEGORIES } from '../../../../constants/constants'; export const DEFAULT_TAG_COLOR = '#E0E0E0'; -export const DEFAULT_CATEGORY = 1; +export const DEFAULT_CATEGORY = 8; export const createMoleculeTagObject = ( tagName, @@ -247,3 +248,23 @@ export const getAllTagsForLHSCmp = (observations, tagList, tagCategoryList) => { export const getDefaultTagDiscoursePostText = tag => { return `This post for tag ${tag.tag} is here to discuss its contents.`; }; + +export const getEditNewTagCategories = tagCategoryList => { + let result = []; + + result = tagCategoryList?.filter(categ => !NON_ASSIGNABLE_CATEGORIES.some(c => c === categ.category)) || []; + + return result; +}; + +export const getProhibitedCategoriesForEdit = tagCategoryList => { + let result = []; + + result = tagCategoryList?.filter(categ => NON_ASSIGNABLE_CATEGORIES.some(c => c === categ.category)) || []; + + return result; +}; + +export const getProhibitedCategoriesForEditIds = tagCategoryList => { + return getProhibitedCategoriesForEdit(tagCategoryList).map(c => c.id); +}; diff --git a/js/components/snapshot/modals/downloadStructuresDialog.js b/js/components/snapshot/modals/downloadStructuresDialog.js index bca38c4db..e4775552e 100644 --- a/js/components/snapshot/modals/downloadStructuresDialog.js +++ b/js/components/snapshot/modals/downloadStructuresDialog.js @@ -105,7 +105,7 @@ const MAP_FILES = [ ]; const CRYSTALLOGRAPHIC_FILES = [ - { flag: 'NAN', text: 'Coordinate files (not re-aligned) (.pdb)', defaultValue: false }, + { flag: 'pdb_info', text: 'Coordinate files (not re-aligned) (.pdb)', defaultValue: false }, { flag: 'mtz_info', text: 'Reflections and map coefficients (.mtz)', defaultValue: false }, { flag: 'cif_info', text: 'Ligand definitions and geometry restrains (.cif)', defaultValue: false }, { flag: 'map_info', text: 'Real-space map files (VERY BIG!!) (.map)', defaultValue: false, disabled: true } @@ -117,8 +117,8 @@ const PERMALINK_OPTIONS = [ ]; const OTHERS = [ - { flag: 'single_sdf_file', text: 'Single SDF of all ligands', defaultValue: true }, - { flag: 'sdf_info', text: 'Separate SDFs in subdirectory', defaultValue: false } + { flag: 'single_sdf_file', text: 'Single SDF of all ligands', defaultValue: true } + // { flag: 'sdf_info', text: 'Separate SDFs in subdirectory', defaultValue: false } ]; // Creates an object with flag as keys with boolean values @@ -238,10 +238,8 @@ export const DownloadStructureDialog = memo(({}) => { ...mapFiles, ...crystallographicFiles, ...other, - apo_file: pdb, - bound_file: bound, + all_aligned_structures: true, metadata_info: metadata, - smiles_info: smiles, static_link: isStaticDownload(), file_url: '' }; diff --git a/js/constants/constants.js b/js/constants/constants.js index 3f38e612a..11c1a6230 100644 --- a/js/constants/constants.js +++ b/js/constants/constants.js @@ -55,6 +55,13 @@ export const CATEGORY_TYPE_BY_ID = { export const OBSERVATION_TAG_CATEGORIES = ['ConformerSites', 'CrystalformSites', 'Quatassemblies', 'Crystalforms']; export const COMPOUND_PRIO_TAG_CATEGORIES = ['CanonSites']; export const TAG_DETAILS_REMOVED_CATEGORIES = ['CrystalformSites', 'ConformerSites']; +export const NON_ASSIGNABLE_CATEGORIES = [ + 'ConformerSites', + 'CanonSites', + 'CrystalformSites', + 'Quatassemblies', + 'Crystalforms' +]; export const TAG_TYPE = { ALL: 'ALL', diff --git a/js/reducers/api/actions.js b/js/reducers/api/actions.js index a07ecb43e..bfca124d5 100644 --- a/js/reducers/api/actions.js +++ b/js/reducers/api/actions.js @@ -161,6 +161,13 @@ export const updateMoleculeInMolLists = mol => { }; }; +export const updateLHSCompound = cmp => { + return { + type: constants.UPDATE_LHS_COMPOUND, + cmp: cmp + }; +}; + export const setSavingState = function(savingState) { return { type: constants.SET_SAVING_STATE, diff --git a/js/reducers/api/apiReducers.js b/js/reducers/api/apiReducers.js index 7ef91833a..b74af2b7a 100644 --- a/js/reducers/api/apiReducers.js +++ b/js/reducers/api/apiReducers.js @@ -176,7 +176,7 @@ export default function apiReducers(state = INITIAL_STATE, action = {}) { const indexOfMol = newList.findIndex(m => m.id === action.mol.id); if (indexOfMol >= 0) { newList[indexOfMol] = { ...action.mol }; - return { ...state, all_mol_lists: newList }; + return { ...state, all_mol_lists: [...newList] }; } else { return state; } @@ -184,6 +184,17 @@ export default function apiReducers(state = INITIAL_STATE, action = {}) { case constants.SET_LHS_COMPOUNDS_LIST: return { ...state, lhs_compounds_list: action.lhs_compounds_list }; + case constants.UPDATE_LHS_COMPOUND: { + let newList = [...state.lhs_compounds_list]; + const indexOfCmp = newList.findIndex(c => c.id === action.cmp.id); + if (indexOfCmp >= 0) { + newList[indexOfCmp] = { ...action.cmp }; + return { ...state, lhs_compounds_list: [...newList] }; + } else { + return state; + } + } + case constants.SET_PANNDA_EVENT_LIST: return Object.assign({}, state, { pandda_event_list: action.pandda_event_list diff --git a/js/reducers/api/constants.js b/js/reducers/api/constants.js index 22a5b3277..baf9ab700 100644 --- a/js/reducers/api/constants.js +++ b/js/reducers/api/constants.js @@ -53,5 +53,6 @@ export const constants = { SET_ALL_DATA_LOADED: prefix + 'SET_ALL_DATA_LOADED', SET_SNAPSHOT_LOADING_IN_PROGRESS: prefix + 'SET_SNAPSHOT_LOADING_IN_PROGRESS', SET_IS_SNAPSHOT: prefix + 'SET_IS_SNAPSHOT', - SET_LHS_COMPOUNDS_LIST: prefix + 'SET_LHS_COMPOUNDS_LIST' + SET_LHS_COMPOUNDS_LIST: prefix + 'SET_LHS_COMPOUNDS_LIST', + UPDATE_LHS_COMPOUND: prefix + 'UPDATE_LHS_COMPOUND' };