From 11cbc5397dd496b083cc4e4134b049b2ed64dbaf Mon Sep 17 00:00:00 2001 From: Boris Kovar Date: Fri, 25 Aug 2023 15:49:00 +0200 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit eeeed7b8d7fe18c56fe1a4cfc121983ac64d191e Merge: cfb37b18 21609e56 Author: RobertMatuska Date: Fri Aug 25 09:33:38 2023 +0200 Merge branch '1102_1108_741' into stagingcandidate commit 21609e56a351865000fe5d344fe86466952cda8d Merge: 19989c58 193908be Author: RobertMatuska Date: Thu Aug 24 13:35:41 2023 +0200 #1102_1108_741 change column size for assign tags commit cfb37b1897c6b9ed9cdb6c471ddd27ff8fa59d89 Merge: ef00ddfe a643c7b2 Author: boriskovar-m2ms Date: Thu Aug 24 12:58:50 2023 +0200 Merge branch 'staging' into stagingcandidate commit ef00ddfea24e57b1fafd85bf2ba3d552713e08e8 Author: Boris Kovar Date: Thu Aug 24 12:53:25 2023 +0200 Squashed commit of the following: commit 0a899872335a20b3fdef14ec4c0fc9acafe11c2e Author: Boris Kovar Date: Thu Aug 24 12:51:34 2023 +0200 - red pen and autoselect text commit 0be7970f6a8a149f57f1c4932042dbc9b0f0095f Merge: 72e182cf a9f515d3 Author: Boris Kovar Date: Thu Aug 24 10:31:28 2023 +0200 Merge branch '#1107' of https://github.com/m2ms/fragalysis-frontend into #1107 commit 72e182cfe60b4dfec95b4a3a146386f64ec5fb8b Author: Boris Kovar Date: Thu Aug 24 09:39:32 2023 +0200 - #1107 - changed looks of the color filter commit edda836088f5dc53c3ae71d551051aaa13f6cad5 Author: Boris Kovar Date: Thu Aug 24 10:23:40 2023 +0200 - new arrows commit a9f515d3a06f77e3a2ff0c40a6fc4b179c2475cc Author: Boris Kovar Date: Thu Aug 24 09:39:32 2023 +0200 - #1107 - changed looks of the color filter commit b1d0b1df0f7e5c614dddab2f66df75cb87250561 Author: Boris Kovar Date: Wed Aug 23 12:28:35 2023 +0200 - #1109 - additional fixes for how inspirations dialog is displayed and how it moves using the arrows commit 1556345036b541cc2bf586e72a021a8697a16c2b Author: Boris Kovar Date: Tue Aug 22 15:12:17 2023 +0200 - additional fixes commit 7351481a29275ac4f2b634464e8157b7185a0392 Author: Boris Kovar Date: Tue Aug 22 14:44:39 2023 +0200 - additional fixes commit 1edbaa305ac8f6bcf56d0530127a20f75f3c9b61 Author: Boris Kovar Date: Tue Aug 22 13:57:05 2023 +0200 - fixed scrolling with local arrows commit 9d1156a1690cd827ce6213ea850d89848eb0d1ec Author: Boris Kovar Date: Tue Aug 22 13:32:48 2023 +0200 - resolved autoscroll problems commit 1d10b21882a9704b34a80286507460de26e12e45 Author: Boris Kovar Date: Tue Aug 22 10:02:37 2023 +0200 - #1109 - fixed selected compounds list so now it works and doesn't crash iteration when there are also compounds from expansion vectors commit 5bd9d18d83607257b7689c70e8c69fcaa5d4a36b Author: Boris Kovar Date: Mon Aug 21 15:34:19 2023 +0200 - rough #1109 implementation should be done commit 890c89a888209c9085d04766400fd1662d82a717 Author: Boris Kovar Date: Mon Aug 21 09:06:12 2023 +0200 - initial commit commit 6cd22c49f03f2edf1df7dd161ac296b9d89a8c1d Author: Boris Kovar Date: Fri Aug 18 08:57:06 2023 +0200 Squashed commit of the following: commit ca88200ded3002c782589a8dccbc08a7156d3f54 Merge: b6c21b9f 5262a81c Author: boriskovar-m2ms Date: Tue Aug 15 12:56:46 2023 +0200 Merge branch 'staging' into stagingcandidate commit b6c21b9f74a0281bcf9883a7da07165bbbdc5695 Author: Boris Kovar Date: Tue Aug 15 12:32:55 2023 +0200 Squashed commit of the following: commit 60528709e830d424c07d290a7daf65cfcf3d9b2c Author: Boris Kovar Date: Tue Aug 15 12:31:31 2023 +0200 - implemented #1129 commit 86a1a7c9e26d899d34af4f6cdb85ceb19f207d0d Author: Boris Kovar Date: Tue Aug 15 09:49:39 2023 +0200 Squashed commit of the following: commit 0550be26180579a58c85c520b0930c44f4999011 Author: Boris Kovar Date: Tue Aug 15 08:46:33 2023 +0200 - fixed #1092 commit fcf418da068289847e2d7da1d72a19570a8832b0 Author: Boris Kovar Date: Fri Aug 11 09:19:38 2023 +0200 Squashed commit of the following: commit 5adc61adf29db66e7e09fd2d663c18d064305c33 Merge: a8c90f24 1aef079a Author: RobertMatuska Date: Thu Aug 10 15:31:40 2023 +0200 Merge branch '#1118' of https://github.com/m2ms/fragalysis-frontend into #1118 commit a8c90f245cf29df1cfee1b7053454cb7d0c0ad4a Author: RobertMatuska Date: Thu Aug 10 15:31:35 2023 +0200 commit 1aef079a1728061be8c56f41967bf60666c79a17 Author: boriskovar-m2ms Date: Thu Aug 10 08:25:48 2023 +0200 Update package.json triggering build action commit 594ac1970c7099ecfb94cecc3707a6cc9ef2894f Merge: 5564d2ce de09cdc6 Author: RobertMatuska Date: Wed Aug 9 11:59:25 2023 +0200 Merge branch '#1106' into #1118 commit 5564d2ceaaea797542514f1a9fdfd8901591fb2b Author: RobertMatuska Date: Wed Aug 9 11:26:34 2023 +0200 commit de09cdc6e9386ca3f6aea63fa373ef75938dec6d Merge: 4caeef7b 8b73ee22 Author: Boris Kovar Date: Tue Aug 8 11:38:09 2023 +0200 Merge branch '#1106' of https://github.com/m2ms/fragalysis-frontend into #1106 commit 4caeef7b2f6f9acbf617989b94e62030e6ed8052 Author: Boris Kovar Date: Tue Aug 8 11:37:40 2023 +0200 - updated table styling commit 8b73ee22d38fb5b93435c4c03fc537334adc3ebc Author: boriskovar-m2ms Date: Mon Aug 7 13:24:08 2023 +0200 Update package.json just to trigger build action commit d16130686039662cd7ebe0f9b6eeaadbe57d7d37 Author: Boris Kovar Date: Mon Aug 7 12:55:44 2023 +0200 - table is now autosized commit e867e77c40598a12fa10ca6ab526880274936752 Author: RobertMatuska Date: Mon Aug 7 09:03:11 2023 +0200 commit 5262a81ca9a1b9c940e60c736924f88cbad4a8aa Merge: d9821b23 c74c7ae1 Author: Max Winokan <36866506+mwinokan@users.noreply.github.com> Date: Thu Aug 10 16:22:35 2023 +0100 Merge pull request #364 from xchem/m2ms-1046 Streamlined CI builds (less noisy) commit d9821b2329e98647eab02838114c22b993d10ebb Author: boriskovar-m2ms Date: Thu Aug 10 15:04:04 2023 +0200 Fixed problem with new job (#365) * Squashed commit of the following: commit d53d1c008f3db605dd4b1e5ae9dfe10302da28fb Merge: c924ce24 bc13c611 Author: Boris Kovar Date: Wed Aug 2 16:35:15 2023 +0200 Merge branch 'RedRelease20230525' of https://github.com/m2ms/fragalysis-frontend into RedRelease20230525 commit c924ce24af3190079baf7c3b7fc2cd1fb819e93e Author: Boris Kovar Date: Wed Aug 2 16:34:40 2023 +0200 - fixed overflow for target list commit bc13c6114bbf02d88bd6aa833c20c3acc6d8b685 Merge: 7b88603b 74ffba6f Author: boriskovar-m2ms Date: Wed Aug 2 16:03:35 2023 +0200 Merge branch 'staging' into RedRelease20230525 commit 7b88603bf0d93b60c6fa996a35b5afb21a3d8835 Author: RobertMatuska Date: Tue Aug 1 15:29:56 2023 +0200 commit 6951206f2d9285ac2aa59f34c20cd2383735ba8f Author: RobertMatuska Date: Tue Aug 1 08:41:52 2023 +0200 commit 11df780229077611f93ab766c508c485d4bcb7b3 Author: RobertMatuska Date: Tue Aug 1 08:37:10 2023 +0200 commit 1252aa88178d9b745e32a5c20c4ca353049545f1 Author: Boris Kovar Date: Mon Jul 31 15:40:06 2023 +0200 - fixed overflow commit f2d8eac83d6685ba4bc8929754519f9b48730cb5 Author: Boris Kovar Date: Mon Jul 31 14:51:19 2023 +0200 - fixed problem from #1112 where page-ination controls were not visible commit 62227fbd35fb110dc9dec60342beb66ef2582762 Author: Boris Kovar Date: Mon Jul 31 13:51:34 2023 +0200 - fixed issue when implicit actions setSearchString was tracked which caused that user had to click undo twice after clicking on the dataset tab commit 3bb794549e6eda0c4cb43ceeeac1df152648ba0e Author: Boris Kovar Date: Mon Jul 31 13:33:30 2023 +0200 - fixed #1116 + whole bunch of other bugs related to preserving and restoring search (both LHS and RHS) string from snapshot commit f1d0db5f2161a14201b4e447317eeea640f80f06 Author: Boris Kovar Date: Mon Jul 31 11:01:21 2023 +0200 - fixed #1117 commit 1038f80e842e5df9490554d5244427402dd7d6b7 Author: Boris Kovar Date: Mon Jul 31 10:11:26 2023 +0200 - fixed issue #1113 commit 74ffba6f3fc623959595bc3a4aa57bf1af11d718 Author: boriskovar-m2ms Date: Thu Jul 27 16:18:53 2023 +0200 Redrelease20230525-firstBatch (#354) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging * - schema expansion test * Update package.json just to trigger build action * Update package.json to trigger build action * - add button to job table to copy snapshot associated with the job run * - fixed problem for 'add button to job table to copy snapshot associated with the job run' * added searchString to action and TimeLine * #576 restored searchString from snapshot for RHS * #576 edited time for search response * #576 restore search string for hit navigator * #576 Restore search for project history * #978 added new button and conditions for showing * #978 change modal background and position * #978 setted modal window position under buttons * #978 fixed onClick for close modal * #576 edited tag detail added toggle union/intersec * #576 added buttons to Tag Detail * #978 added new column and sort by columns * #978 edited sort and filter project list table * #978 edited filter and search data * #576 edit width count * Update package.json - just to trigger build action * - fixed instance when project is missing from session-project (which AFAIK should never happen though) * Update package.json - just to trigger build action * #978 filter for project list and other fix * #576 edited LHS height and Tag detail colors * #576 added "Select displayed button" * #978 edited save change for NGL * - semicolons? * -merge * Squashed commit of the following: commit 66118b5d4dfbddd50cdce5af77c857e90325a78b Author: Boris Kovar Date: Tue Jul 4 08:00:12 2023 +0200 - fixed #1073 commit ae8406cfdb405dce01d075de39754d2acd6cc55a Author: Boris Kovar Date: Wed Jun 7 08:26:20 2023 +0200 Squashed commit of the following: commit e42baf37a2503f3378c856e26e8d699bc71bd3ac Merge: d266f99b 949f4734 Author: boriskovar-m2ms Date: Wed Apr 26 11:17:58 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit d266f99bfbccd23d6a9951bdba71bf487554e9bc Author: Boris Kovar Date: Wed Apr 26 10:50:48 2023 +0200 - fixed problem for 'add button to job table to copy snapshot associated with the job run' commit 62784948247ed7f0521b10418b1b8a271e7062f0 Author: Boris Kovar Date: Wed Apr 26 09:43:11 2023 +0200 - add button to job table to copy snapshot associated with the job run commit 949f47340369a671516a7c6317f8f7e35ba86984 Author: boriskovar-m2ms Date: Mon Apr 24 14:47:39 2023 +0200 Ms 2022 08 18 yellow (#351) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging * - schema expansion test * Update package.json just to trigger build action * Update package.json to trigger build action commit f41cdb0d525e993a7a48c0dbb397618e0ea76bc9 Merge: eaadb729 8d437c3f Author: boriskovar-m2ms Date: Mon Apr 24 14:35:37 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit eaadb729f90441417c899cf4869e26a1b789bb42 Author: boriskovar-m2ms Date: Mon Apr 24 12:39:23 2023 +0200 Update package.json to trigger build action commit 1b46f37c6ac11d5c7e9a0a1ceff7b68dad785b27 Author: boriskovar-m2ms Date: Mon Apr 24 11:26:05 2023 +0200 Update package.json just to trigger build action commit 09007706e2ec26c6006d7d19a756129d093ac306 Author: Boris Kovar Date: Mon Apr 24 09:36:38 2023 +0200 - schema expansion test commit 8d437c3f6b735953eb07f06fec82bdfdd26d7e44 Author: boriskovar-m2ms Date: Tue Apr 11 17:00:05 2023 +0200 Ms 2022 08 18 yellow (#350) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging commit 7790dfbc261a302018423ce1a506eb33eb48d683 Merge: bf42cc20 45438127 Author: Boris Kovar Date: Tue Apr 11 16:57:36 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit bf42cc20b514c4b3708b606557cb576324f02a20 Author: Boris Kovar Date: Tue Apr 11 16:57:18 2023 +0200 - fixed bad merge from staging commit adc2f5b9e3fd8495c92b8089fb851ae3bc5a49fa Author: boriskovar-m2ms Date: Tue Apr 11 15:47:17 2023 +0200 Ms 2022 08 18 yellow (#349) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects commit 45438127c520d201677dd1b5c1fd876cdfb035e4 Merge: 73b5d4c7 dcbf19fd Author: boriskovar-m2ms Date: Tue Apr 11 15:46:11 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 73b5d4c7e705124ed5e1941226cae17ab5044ef6 Merge: b74587f0 1447b079 Author: Boris Kovar Date: Tue Apr 11 15:28:34 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit b74587f0bdd68af93e44692c6c41517ed36ad4b1 Author: Boris Kovar Date: Tue Apr 11 15:27:49 2023 +0200 - hopefully fixed problem with reloading older projects commit dcbf19fd11a4734d18714b154b7b6e577b0ccd69 Author: boriskovar-m2ms Date: Tue Apr 11 12:42:14 2023 +0200 Ms 2022 08 18 yellow (#348) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 1447b079e018d9ce1d67b96161be626b7d97a6bd Merge: b774ac60 d7b5e5c2 Author: boriskovar-m2ms Date: Tue Apr 11 12:41:03 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit b774ac6044bc97f38ef5b2e62a6eeea2a94e0dc5 Author: Boris Kovar Date: Tue Apr 11 12:05:53 2023 +0200 frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 56ce17ff1db67e6deb96d2e16c4c7ae4e0b6c39b Author: Boris Kovar Date: Thu Apr 6 14:20:00 2023 +0200 - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag commit d7b5e5c26dae7824d3c930fb263a02c592a2c042 Author: boriskovar-m2ms Date: Thu Apr 6 10:43:08 2023 +0200 Ms 2022 08 18 yellow (#347) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available commit 17e89cefe8264584ebe0fadc637a1fac542704ac Author: Boris Kovar Date: Thu Apr 6 10:23:27 2023 +0200 - can't go to squonk job execution page if the url is not available commit 16f0cbddafd994293e45573f3d6ebeeeab1e4b22 Author: boriskovar-m2ms Date: Thu Apr 6 09:11:52 2023 +0200 Minor fixes before the release (#346) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image commit c8b5f20dd521c7007f08531736541ca84b041a85 Merge: 8d500638 2cd48e04 Author: Boris Kovar Date: Wed Apr 5 14:35:17 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8d50063887bc2f6335550f15fe69cc93b17be30e Author: Boris Kovar Date: Wed Apr 5 14:34:49 2023 +0200 - new BE image commit 2cd48e0474f31fe9f0d0f4eb256cad32ed5516cd Merge: 0fddd791 b20adee8 Author: boriskovar-m2ms Date: Wed Apr 5 13:00:20 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 0fddd791812ce9e4093a784850c8e4c5698f3f18 Author: boriskovar-m2ms Date: Wed Apr 5 12:09:36 2023 +0200 Update package.json triggering the build action commit bed2dc1bf438a2f61b61fdd2d1b18753d1ef58be Author: Boris Kovar Date: Wed Apr 5 10:44:24 2023 +0200 - before the release fixes commit b10160928bff787161a140e4cffd8aa783a4c482 Merge: f6699d10 9f5f2b7c Author: Boris Kovar Date: Fri Mar 31 09:38:39 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit f6699d106af94bbba6be1494a0c83e0cf1a5b084 Author: Boris Kovar Date: Fri Mar 31 09:37:22 2023 +0200 - minor typo fix commit 9f5f2b7cad0ebb482d8069114d52bf65ca6c6531 Author: boriskovar-m2ms Date: Fri Mar 24 14:00:10 2023 +0100 Update package.json just to trigger build action commit 5a37013c71469f9433c36d956174b1efc1e698ab Author: boriskovar-m2ms Date: Fri Mar 24 12:43:27 2023 +0100 Update package.json to trigger build action commit b54cdaa4ea816719128c07939a14a99152a8e990 Merge: 5dfc38be d6d5216d Author: Boris Kovar Date: Fri Mar 24 11:36:29 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 5dfc38bef9b0a0fead21b824db58461c185f98fd Author: Boris Kovar Date: Fri Mar 24 11:35:57 2023 +0100 - updated build-dev.yaml commit d6d5216dce40de14910bde76b5f4fb8650bdbd9c Author: boriskovar-m2ms Date: Fri Mar 24 08:52:55 2023 +0100 Update package.json trigger build action commit 6bd9fcb0773fc3bbf5266ab9022d6e365dff9cfc Author: boriskovar-m2ms Date: Fri Mar 24 08:46:51 2023 +0100 Update package.json to trigger build action commit b20adee8140c7f46573eb5e7525e97427d23d4d4 Author: boriskovar-m2ms Date: Thu Mar 16 17:29:15 2023 +0100 Ms 2022 08 18 yellow (#345) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit 3a9a478d3bdbcb54802346efe2ec5e1f18242721 Merge: d777f117 4cb92f6c Author: boriskovar-m2ms Date: Thu Mar 16 10:50:04 2023 +0100 Merge branch 'staging' into ms-2022-08-18-yellow commit d777f117bbfab9a367ef8ad04c2fcf540cf19ef6 Author: Boris Kovar Date: Thu Mar 16 10:17:34 2023 +0100 - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit ae0cbdc8540aa440c776be3b84508c710a215d36 Author: Boris Kovar Date: Thu Mar 16 09:01:48 2023 +0100 - fixed bugs found in staging commit 4cb92f6ca3c986a087b840f9327e921ed17e1b4c Author: boriskovar-m2ms Date: Thu Mar 9 13:05:06 2023 +0100 Ms 2022 08 18 yellow (#344) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action commit bc13d845aa206aa7d8d151a8bb53f53335761084 Author: boriskovar-m2ms Date: Thu Mar 9 10:38:18 2023 +0100 Update package.json triggering build action commit 49d1ad57042d353f76c7368944601a8d64e44596 Author: boriskovar-m2ms Date: Thu Mar 9 10:32:30 2023 +0100 Update package.json to trigger build action commit fd0df1c021010f4f5e028090493464721b8b2600 Author: Boris Kovar Date: Thu Mar 9 09:11:44 2023 +0100 - added message when access to squonk is denied commit 622b635472e0ed7be1ae36062addd0f91d9ff6f4 Author: Boris Kovar Date: Wed Mar 8 14:35:57 2023 +0100 - fixed problem with id commit 74a1a62ca7a564d481be34c4301771ce7f5dd76a Author: Boris Kovar Date: Wed Mar 8 14:18:47 2023 +0100 - authorize user for viewing squonk job commit aa55bc41ee6a6fce4d8b146362e276265eed0af3 Author: Boris Kovar Date: Wed Mar 8 12:58:15 2023 +0100 - added more logs commit d97a512d75aa621be77ee69b547b21e1653386e1 Author: Boris Kovar Date: Wed Mar 8 12:19:18 2023 +0100 fixed problem with entries function commit 7e28e41d96e57998b979752d3651304bf36713c9 Author: Boris Kovar Date: Wed Mar 8 12:13:08 2023 +0100 - added debug logs commit f4becf9c94cf8c5eec225fde7b24c73131e0e338 Author: Boris Kovar Date: Wed Mar 8 11:29:23 2023 +0100 - implemented #890 commit bcd3ec01ddc68d3dd1dce78f1f3ca165e1633fd4 Author: Boris Kovar Date: Sun Mar 5 18:50:08 2023 +0100 - fixes because can't debug this locally commit 59779b6b80ec7e21af68b219a543a017aa837b14 Author: Boris Kovar Date: Sun Mar 5 18:29:05 2023 +0100 - trying to fix a bug with inputs commit 76ccc089efc43589bb381ea6589567dce538aa8b Author: Boris Kovar Date: Sun Mar 5 18:12:34 2023 +0100 - reworked show inputs in jobs table commit e862c726c81b0328cc9b7538d9820481b7d85cd8 Author: Boris Kovar Date: Sun Mar 5 16:46:29 2023 +0100 - added debug info commit 471d947b83f159bde413a32de06dbd10b9c4dfaf Author: Boris Kovar Date: Sun Mar 5 16:33:00 2023 +0100 - added debug info commit c4b11af95a56786493e13735ac92b1b1f766af79 Author: Boris Kovar Date: Sun Mar 5 16:13:41 2023 +0100 - added debug info commit 6adc86d4f95a362b38747e001f55bde2a104baff Author: Boris Kovar Date: Sun Mar 5 15:53:49 2023 +0100 - added debug info commit e42ed05162106109c927e80620d67b5af31b7ef1 Author: Boris Kovar Date: Sun Mar 5 15:34:10 2023 +0100 - added debug info commit 39034c54b97f4da301365c69d985640a66c75469 Author: Boris Kovar Date: Sun Mar 5 15:09:04 2023 +0100 - added debug info commit 9eee228b45b94479edfab5d6279d3e0ce4ccb8d1 Author: Boris Kovar Date: Sun Mar 5 14:48:45 2023 +0100 - added debug info commit 13a00cf2ba8f4ae13de4865096f9def349acd158 Merge: 0a36ae5c d0317f60 Author: rsanchezgarc Date: Tue Feb 21 20:43:31 2023 +0000 Merge pull request #341 from m2ms/ms-2022-08-18-yellow Ms 2022 08 18 yellow release commit d0317f607def3b6e1a5651554b338161fce4f040 Merge: 53164d21 8c4ca1d0 Author: Boris Kovar Date: Mon Feb 20 13:58:48 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 53164d21b23e7a918a772ced6292817b4306031e Author: Boris Kovar Date: Mon Feb 20 13:57:25 2023 +0100 Squashed commit of the following: commit 19b3910d84f9707b8047524cfe44dfa1f8696644 Author: Boris Kovar Date: Mon Feb 20 13:33:18 2023 +0100 - new dev BE commit af427c71d9499c975e12b314202bdb0f0ec13826 Author: boriskovar-m2ms Date: Fri Feb 17 08:44:14 2023 +0100 Update package.json just to trigger build action commit 4cb19eb371b0147dfc51b704a36dba842543d311 Author: boriskovar-m2ms Date: Thu Feb 16 09:09:27 2023 +0100 Update package.json just to trigger build action commit 7612967a111ec486f2072ca3ddd88330b4ad37c9 Author: boriskovar-m2ms Date: Wed Feb 15 14:01:32 2023 +0100 Update package.json just to trigger build action commit 4e8b27d9b65fe372e06df45bc720abb52f81dbe2 Author: Boris Kovar Date: Tue Feb 14 08:50:44 2023 +0100 - fixed direct links and direct download links commit c08da4bf71caf536e95423fb8b1e5d8ab01c60e7 Author: Boris Kovar Date: Thu Feb 9 14:02:18 2023 +0100 - fixed job name commit 4b9a491f0478849e268dc7b825ba358585cdb2ab Author: Boris Kovar Date: Thu Feb 9 13:28:20 2023 +0100 - added fragmenstein-combine-multi-scoring.json commit ca4f946d07074e87a74ac6a3d2272c1735343cb1 Author: Boris Kovar Date: Thu Feb 9 13:25:35 2023 +0100 - checkpoint commit b43373e1c228d9e46f4c831fc46269d614013e92 Author: Boris Kovar Date: Thu Feb 9 10:43:27 2023 +0100 - fixed problem where UI would crash if there was a problem during job file transfer of job launch commit 3618b10e2b77f4a7a173f38a8d8bbdc0a853805b Author: Boris Kovar Date: Thu Feb 9 09:54:36 2023 +0100 - fixed bad project capture from url commit 7d588895cebd0e363aa5d62b36770499364aef06 Merge: 11180a5c 4fc7f7bd Author: Boris Kovar Date: Wed Feb 8 09:27:51 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 11180a5c0142ea18624ae14ddaad16793fdcb435 Author: Boris Kovar Date: Wed Feb 8 09:26:31 2023 +0100 - prevent crash when there is a project associated with target which user is not authorized to see commit 4fc7f7bd2d0aae799099b29e256e3c0834e9576f Author: boriskovar-m2ms Date: Wed Feb 8 07:25:12 2023 +0100 Update package.json just to trigger build action commit 2b2665cfc609f621eb9bf505b9a86e6bd4fb3d35 Author: boriskovar-m2ms Date: Thu Feb 2 15:43:38 2023 +0100 Update package.json just to trigger the build action commit d0d429c473307ce2bfa825ad9e556084082accd8 Author: boriskovar-m2ms Date: Thu Feb 2 15:20:25 2023 +0100 Update package.json just to trigger the build action commit fcf377b863abf9110e1c0ce752b29bce073349cf Author: Boris Kovar Date: Thu Feb 2 14:51:17 2023 +0100 - fixed problem when job config windows closes on error commit c9e39f4da281f333c620811cf7ccfb6b8438cc1f Merge: 5a3d56bf 0f8e702a Author: Boris Kovar Date: Thu Feb 2 13:19:16 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 5a3d56bf87d9c8d8e6007dba5db8c1239dbf39a2 Author: Boris Kovar Date: Thu Feb 2 13:18:30 2023 +0100 - now sending id of the project and not target_access_string commit 0f8e702a023e2f786c5ba46eab2205f158a75480 Author: boriskovar-m2ms Date: Thu Feb 2 12:59:19 2023 +0100 Update package.json just to trigger build action commit 585076db67dc32b58083c184e1ca11a6dddc434b Author: Boris Kovar Date: Thu Feb 2 12:39:19 2023 +0100 - fixed problem when project pane was not showing up right after a project was created commit fa7fd759c30c3abf4e12b1c17af4107424993dc4 Author: Boris Kovar Date: Thu Feb 2 12:08:23 2023 +0100 - fix for missing project pane commit ba0a1fe55bd53f719d31d795d71877d81366cac9 Author: Boris Kovar Date: Thu Feb 2 09:05:50 2023 +0100 - version for job execution - broken UI commit 51555e1ba1eeb12e1eef340f108d7d3b595e6210 Merge: 51e97af1 a42cad71 Author: Boris Kovar Date: Wed Feb 1 13:58:27 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 51e97af1db45d3b4bb9b5d1fdd55a07991a9a19a Author: Boris Kovar Date: Wed Feb 1 13:57:49 2023 +0100 - partial implementation of #1020 commit a42cad7193b8c8f02c04378bba01f6f44114ec88 Author: boriskovar-m2ms Date: Thu Jan 26 08:34:01 2023 +0100 Update package.json just to trigger build action commit 96c0216e8b29169c9c1bf29471eafb5bddd24e5b Author: boriskovar-m2ms Date: Wed Jan 25 09:39:06 2023 +0100 Update package.json just to trigger build action commit c7de9cf16f783fad2bdfb78224a818221fa24ba1 Author: boriskovar-m2ms Date: Tue Jan 24 15:10:11 2023 +0100 Update package.json just to trigger the build action commit e8e5657cc5f7beecf5813040210605b6cf410cef Author: boriskovar-m2ms Date: Tue Jan 24 14:04:56 2023 +0100 Update package.json just to trigger build commit 24dc912bfdae3bec9c52867f2d638754635cecbb Author: Boris Kovar Date: Tue Jan 24 12:49:58 2023 +0100 - sensitive data moved to .env file commit a98c51751368104300a872f116cc22acc09cec44 Author: Boris Kovar Date: Tue Jan 24 12:49:06 2023 +0100 - added .env to gitignore commit 13b4bed082612315afc948192fe758fb42edf63d Author: Boris Kovar Date: Tue Jan 24 12:47:56 2023 +0100 - mending an error commit 5b74eb4326389e11b923b560f6603586bfc3b87c Author: Boris Kovar Date: Wed Jan 18 09:52:19 2023 +0100 - checkpoint commit d4b88dfe5c525b7c471d97ac47d46f9d992bfa48 Author: Boris Kovar Date: Tue Jan 17 10:10:27 2023 +0100 - initial implementation #1020 commit 8c4ca1d022f2a5841d68dde70edd9f433c539b83 Author: boriskovar-m2ms Date: Mon Jan 16 11:35:37 2023 +0100 Update package.json just to trigger build action commit 436196bb65fe5eb44f38abc3bc18cf827f09c8d6 Author: boriskovar-m2ms Date: Fri Jan 13 10:47:51 2023 +0100 Update package.json just to trigger build action commit 0d6abaa08dc7a174d915d33e21a1667accd39423 Author: boriskovar-m2ms Date: Thu Jan 12 10:18:23 2023 +0100 Update package.json just to trigger build action commit d5905966cb9bf2994f93668911873108832d7578 Author: Boris Kovar Date: Wed Jan 11 11:02:25 2023 +0100 - forgot to reset debug constants commit df7057032baa70df6451b7faf0a232fa75a1e55b Author: Boris Kovar Date: Wed Jan 11 08:05:23 2023 +0100 - minor fix for upload_status commit 698d123634ded171f161c3bb9f27e4e1600730be Author: Boris Kovar Date: Tue Jan 10 15:42:30 2023 +0100 - minor fix for upload_status commit 89bb79b92d6cef9fb410259ee93ae7e11859239a Author: Boris Kovar Date: Tue Jan 10 15:26:03 2023 +0100 - upload_failed now taken into the account commit 3f9f3ea181ab267ee9c1f52b88a620c0620fa34b Author: boriskovar-m2ms Date: Tue Jan 10 13:35:25 2023 +0100 Update package.json - just to trigger build action commit e6fbd6d213418dfd9708e206da341e8e37e776c3 Author: boriskovar-m2ms Date: Tue Jan 10 11:54:17 2023 +0100 Update package.json just to trigger build action commit 2d0a5257e2308d3b3241ec63a61ea5896981dc5e Author: Boris Kovar Date: Fri Dec 23 13:01:20 2022 +0100 - updated README.md commit 0a36ae5cc0f40aaab45ced9837e242308d17b578 Merge: 6a7a0dda 782b84b5 Author: rsanchezgarc Date: Tue Dec 20 18:11:19 2022 +0000 Merge pull request #337 from m2ms/ms-2022-08-18-yellow-wo-970 Animate to new orientation matrix first commit 5504bd464e1d699833f258b994e344cb339cb234 Author: Boris Kovar Date: Tue Dec 20 08:06:06 2022 +0100 Squashed commit of the following: commit cec398dcf0a14f7e433b2baec849e29001358839 Author: Boris Kovar Date: Tue Dec 20 08:00:30 2022 +0100 - commit 885f08e18f7983723a0944bd90cec646c869ee89 Author: Boris Kovar Date: Fri Dec 16 13:18:38 2022 +0100 - bug fix in progress for #970 commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 6fa2432f7226be0d54f7ce608719c0d59863d367 Author: Boris Kovar Date: Mon Dec 19 10:09:59 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 782b84b50f1d66742a3ed491b91d4ecf379b2edd Merge: eaa4ccbd f07779ce Author: Boris Kovar Date: Mon Dec 19 10:08:49 2022 +0100 Merge branch 'ms-2022-08-18-yellow-wo-970' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow-wo-970 commit eaa4ccbdf4282a772a19badf68fc2c14579d9173 Author: Boris Kovar Date: Mon Dec 19 10:08:30 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 6a7a0dda77266978a5afdaf82a5e8f89f5aa0d4e Merge: 356e625e f07779ce Author: rsanchezgarc Date: Fri Dec 16 12:44:21 2022 +0000 Merge pull request #334 from m2ms/ms-2022-08-18-yellow-wo-970 Ms 2022 08 18 yellow wo 970 commit f07779ce30667465ea1aba424085e8978827641a Merge: 57336b82 dcc2c882 Author: boriskovar-m2ms Date: Fri Dec 16 13:24:09 2022 +0100 Merge branch 'master' into ms-2022-08-18-yellow-wo-970 commit 21b437e8dd24102aebe35302d8b1ef2d18c6c040 Author: Boris Kovar Date: Thu Dec 15 16:32:57 2022 +0100 Squashed commit of the following: commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 2be8ed349ffdffa3602a2a393b4019bb3115ba5f Merge: 8ac386cd 57336b82 Author: Boris Kovar Date: Wed Dec 14 06:28:30 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8ac386cd710d9b6bf65cccac8d5962e6f6d730a5 Author: Boris Kovar Date: Wed Dec 14 06:27:11 2022 +0100 Squashed commit of the following: commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 57336b825cb95aecb3dfff78ab571bb85e906073 Author: boriskovar-m2ms Date: Thu Dec 8 11:41:44 2022 +0100 Update package.json just to trigger action commit c6c3ed0b16414d528684d63befca6a01634683d0 Author: boriskovar-m2ms Date: Wed Dec 7 11:57:33 2022 +0100 Update package.json just to trigger action commit 614b01c80882557160777ba96abc92c2d328112e Author: boriskovar-m2ms Date: Wed Dec 7 09:38:38 2022 +0100 Update package.json just to trigger action commit c0d2b3858d074b33303eef48e42f11e7eefac474 Author: boriskovar-m2ms Date: Wed Dec 7 08:39:23 2022 +0100 Update package.json just to trigger action commit bbf6f91e8498586d666204c3493405c4ca4e7268 Author: boriskovar-m2ms Date: Wed Dec 7 08:31:30 2022 +0100 Update package.json just to trigger rebuild commit 5edd5c4c387405b5f30ee88b19f1f2a2e91d8022 Author: Boris Kovar Date: Mon Dec 5 08:28:17 2022 +0100 Squashed commit of the following: commit 8d6edcb01a41b4abdddf86e94fe754682fb17964 Author: Boris Kovar Date: Mon Dec 5 08:14:43 2022 +0100 - #1001 commit 8c52f55f808f5566f83e6068e3dbe76cf06860b0 Author: Boris Kovar Date: Thu Dec 1 09:10:59 2022 +0100 Squashed commit of the following: commit 91f3363f245ec336810dd27b9d34aaaa82512a8a Author: Boris Kovar Date: Thu Dec 1 09:08:03 2022 +0100 - implemented #1012 commit f8eb4067e0ece9d170e3405bebe21a689927442c Author: Boris Kovar Date: Tue Nov 29 10:24:56 2022 +0100 Squashed commit of the following: commit a5b8f281ebd05cc6be2163fc7124855f6cee8418 Author: Boris Kovar Date: Tue Nov 29 10:22:31 2022 +0100 - fixed #1013 commit db173bcdd76574055d5132ec3cd34012a727656d Author: Boris Kovar Date: Mon Nov 28 14:39:16 2022 +0100 Squashed commit of the following: commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit 68d1a2fbd2be5620cca635c662dc0278dd578fcb Author: Boris Kovar Date: Mon Nov 28 09:08:21 2022 +0100 Squashed commit of the following: commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 356e625e4a0d7cee6bf1bd3c3b1627b59375e88d Merge: 0530324b 7b7cbe99 Author: rsanchezgarc Date: Mon Nov 14 09:59:45 2022 +0000 Merge pull request #329 from m2ms/#977-ngl Fast switching between snapshots commit 7b7cbe99952000f6c550727e082cb920cafa144c Author: Boris Kovar Date: Tue Nov 8 10:04:33 2022 +0100 - #977 - fixed issue with ngl settings were not saved and restored commit d1abaa872675f8a748f7c573aa74d79cdf629a0c Author: Boris Kovar Date: Mon Nov 7 10:14:18 2022 +0100 Squashed commit of the following: commit 4a8a532f6ea217d2921ed5fab6b6705442ca682f Author: Boris Kovar Date: Thu Nov 3 08:01:05 2022 +0100 - fixed ngl view was not tracked commit 0530324b9faae6876d0b42c48ac4b26a9eaf3c26 Merge: 931a5aea 5746062a Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:51:39 2022 +0100 Merge pull request #325 from xchem/production Action doc tweaks commit 5746062aacabb5201feefed8ea09e3e34066a175 Merge: b0e75d17 dc2ff23d Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:50:50 2022 +0100 Merge pull request #324 from alanbchristie/production Action doc tweaks commit dc2ff23d773157c74f864931e06ccb0fd21cf335 Author: Alan Christie Date: Thu Oct 27 15:48:48 2022 +0100 Add doc for production workflow commit c5ee4068a880a85d4fc5ed164dbbd711e4c5d0ec Author: Alan Christie Date: Thu Oct 27 15:35:27 2022 +0100 Tweak action docs commit 931a5aea583997a80bab66d8099f743529f8d98f Merge: cb4246e7 b0e75d17 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:51:21 2022 +0100 Merge pull request #323 from xchem/production Production now triggers stack commit b0e75d174217c507b2db2f4d6329e4ed2315e887 Merge: cb4246e7 ac3297e4 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:50:08 2022 +0100 Merge pull request #322 from alanbchristie/production Production now triggers stack commit ac3297e47b5ce9ca5a9ca1386818a317bc8098f2 Author: Alan Christie Date: Thu Oct 27 12:49:11 2022 +0100 Production now triggers stack Fix for BE tag commit cb4246e7f7acde133a4ca2081c30115dd5c87f56 Merge: dcc2c882 dec6f785 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 11:15:06 2022 +0100 Merge pull request #321 from alanbchristie/production CI changes for new branch policy commit dec6f785663f6e3050262c5a4b4704109d2e446a Author: Alan Christie Date: Thu Oct 27 10:58:08 2022 +0100 Removed personal repo references commit 2147aa18af1211a32f55e228c1023491008204ac Author: Boris Kovar Date: Wed Oct 26 10:00:07 2022 +0200 - updated squonk project id for dev stacks commit b2bc6e79197baa4c7336822fca2bfbf54eded377 Author: Boris Kovar Date: Mon Oct 24 16:47:24 2022 +0200 - first real version of the final implementation of ticket #977 - also added functionality that only if user did something with the snapshot, only then user will be prompted if new snapshot (or current overridden) should be saved or not - note: in this current version undoing an action does not undo the 'dirty' status of the snapshot commit 204a86d7f8901b9d39cf6495e625c709d82a8c72 Author: Boris Kovar Date: Thu Oct 20 07:32:33 2022 +0200 - nearly complete issue #977 commit dcc2c8824378b69e118564a664b332456d5632e4 Author: boriskovar-m2ms Date: Thu Sep 29 12:48:42 2022 +0200 edited in correct squonk project id commit 725f6d5267d568afd34f29f22b0869458d759832 Author: boriskovar-m2ms Date: Thu Sep 29 12:47:31 2022 +0200 removed Upload button from Job popup (#320) * - initial commit * - checkpoint * - new backend * Update package.json bumped version to 0.10.109 * Update package.json bumped version to 0.10.111 * Update package.json version bumped to 0.10.112 * Update package.json bumped version to 0.10.113 * Update package.json bumped version to 0.10.114 * Update package.json bumped version to 0.10.115 * - added new back-end * Squashed commit of the following: commit 949573bd930afaa0171a728f05dafa08c2425341 Merge: deb0d1c3 74ea6613 Author: Boris Kovar Date: Thu Jul 14 06:56:52 2022 +0200 Merge branch '#885-bugfix' of https://github.com/m2ms/fragalysis-frontend into #885-bugfix commit deb0d1c31aa68fb38c1d1541aca6bd81410e515b Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit e2a00641039dd34b348ce2084eefd8f33ae04343 Author: Boris Kovar Date: Mon Jun 6 06:05:49 2022 +0200 Squashed commit of the following: -bumped version to 0.10.93 commit dfa24f68c4cb0e84ad37ac663ec08caadd2f3fbb Author: Anton Gasperak Date: Wed Jun 1 11:53:32 2022 +0200 commit 0ae63081e822a514443a7b6c6e1fb3826a8c6178 Author: Anton Gasperak Date: Wed Jun 1 11:43:17 2022 +0200 commit b884e0b59c5e9000422adbf6e6adf7b14847b51f Author: Anton Gasperak Date: Wed Jun 1 11:10:44 2022 +0200 commit ab825ccf3369af8fbaab9c8d25d68c5a1699d773 Author: Anton Gasperak Date: Wed Jun 1 10:54:57 2022 +0200 commit 4103e3984bc9b3fbf2cc48bef3b9d65864a4814b Author: Anton Gasperak Date: Wed Jun 1 10:08:28 2022 +0200 commit f3b3b10a879447705b2709b88d48b62fe50e14cc Author: Anton Gasperak Date: Wed Jun 1 09:59:23 2022 +0200 commit 02aa5955918abace2d5473e89bb9260ff10d7338 Author: Anton Gasperak Date: Wed Jun 1 09:40:29 2022 +0200 commit d059ee8d4de0ddc34be64ef9c55a71c4f2bd96df Author: Anton Gasperak Date: Wed Jun 1 08:43:26 2022 +0200 commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 commit 74ea6613da0306f5251a440bdfdaa44f225ccb69 Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 commit bd3ff2b3f22dada64afadd4df1685bcc46ab2d21 Author: Anton Gasperak Date: Fri Jun 3 08:36:34 2022 +0200 * updated fragmentstein job spec Squashed commit of the following: commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 * Squashed commit of the following: commit de09cdc6e9386ca3f6aea63fa373ef75938dec6d Merge: 4caeef7b 8b73ee22 Author: Boris Kovar Date: Tue Aug 8 11:38:09 2023 +0200 Merge branch '#1106' of https://github.com/m2ms/fragalysis-frontend into #1106 commit 4caeef7b2f6f9acbf617989b94e62030e6ed8052 Author: Boris Kovar Date: Tue Aug 8 11:37:40 2023 +0200 - updated table styling commit 8b73ee22d38fb5b93435c4c03fc537334adc3ebc Author: boriskovar-m2ms Date: Mon Aug 7 13:24:08 2023 +0200 Update package.json just to trigger build action commit d16130686039662cd7ebe0f9b6eeaadbe57d7d37 Author: Boris Kovar Date: Mon Aug 7 12:55:44 2023 +0200 - table is now autosized commit e867e77c40598a12fa10ca6ab526880274936752 Author: RobertMatuska Date: Mon Aug 7 09:03:11 2023 +0200 commit 7b88603bf0d93b60c6fa996a35b5afb21a3d8835 Author: RobertMatuska Date: Tue Aug 1 15:29:56 2023 +0200 commit 6951206f2d9285ac2aa59f34c20cd2383735ba8f Author: RobertMatuska Date: Tue Aug 1 08:41:52 2023 +0200 commit 11df780229077611f93ab766c508c485d4bcb7b3 Author: RobertMatuska Date: Tue Aug 1 08:37:10 2023 +0200 commit 1252aa88178d9b745e32a5c20c4ca353049545f1 Author: Boris Kovar Date: Mon Jul 31 15:40:06 2023 +0200 - fixed overflow commit f2d8eac83d6685ba4bc8929754519f9b48730cb5 Author: Boris Kovar Date: Mon Jul 31 14:51:19 2023 +0200 - fixed problem from #1112 where page-ination controls were not visible commit 62227fbd35fb110dc9dec60342beb66ef2582762 Author: Boris Kovar Date: Mon Jul 31 13:51:34 2023 +0200 - fixed issue when implicit actions setSearchString was tracked which caused that user had to click undo twice after clicking on the dataset tab commit 3bb794549e6eda0c4cb43ceeeac1df152648ba0e Author: Boris Kovar Date: Mon Jul 31 13:33:30 2023 +0200 - fixed #1116 + whole bunch of other bugs related to preserving and restoring search (both LHS and RHS) string from snapshot commit f1d0db5f2161a14201b4e447317eeea640f80f06 Author: Boris Kovar Date: Mon Jul 31 11:01:21 2023 +0200 - fixed #1117 commit 1038f80e842e5df9490554d5244427402dd7d6b7 Author: Boris Kovar Date: Mon Jul 31 10:11:26 2023 +0200 - fixed issue #1113 commit aff597978d59b4095f7e76be3ee834ffc5bc0873 Merge: 81a2e968 d7370794 Author: Boris Kovar Date: Thu Jul 27 16:10:24 2023 +0200 Merge branch 'RedRelease20230525' of https://github.com/m2ms/fragalysis-frontend into RedRelease20230525 commit 81a2e96813768ec718f50389bef30cbc4bc82aff Author: Boris Kovar Date: Thu Jul 27 16:09:42 2023 +0200 - navigation arrows highlighting commit d737079487147e02f1703f543d8264536e6c5f80 Merge: 899b7e36 48299e86 Author: boriskovar-m2ms Date: Thu Jul 27 14:47:09 2023 +0200 Merge branch 'staging' into RedRelease20230525 commit 899b7e36076b30af93e3fe6fdea0077b13737ff1 Author: Boris Kovar Date: Thu Jul 27 13:18:20 2023 +0200 - highlighted arrows commit 7991d5c18c24c6663fe2c5d8effcc7cd048951ac Author: Boris Kovar Date: Thu Jul 27 10:16:02 2023 +0200 - when creating project a default snapshot is created automatically commit 3bf735365696020858d5c2b718250c106578debf Author: Boris Kovar Date: Thu Jul 27 09:22:30 2023 +0200 Squashed commit of the following: commit 040d9bdbf30fb9dc239969916f108cb5056911c0 Author: RobertMatuska Date: Thu Jul 27 08:38:51 2023 +0200 commit 3d18d6d017c3c2ab01a75a2aef1823e252a802c8 Author: Boris Kovar Date: Wed Jul 26 21:04:39 2023 +0200 - first bunch of fixes commit aa097721670867f85d5a789cd41a548bb57d16b7 Author: Boris Kovar Date: Wed Jul 26 17:36:34 2023 +0200 - minor fix to button color behavior commit a0f0933086ebeadb1d1e47879021121a49f3cde7 Author: Boris Kovar Date: Wed Jul 26 16:57:32 2023 +0200 - fixed select displayed hits button commit 6f200d2c86dfb14aad6ea3776842841766cfccfe Author: Boris Kovar Date: Wed Jul 26 13:32:39 2023 +0200 Squashed commit of the following: commit 66118b5d4dfbddd50cdce5af77c857e90325a78b Author: Boris Kovar Date: Tue Jul 4 08:00:12 2023 +0200 - fixed #1073 commit ae8406cfdb405dce01d075de39754d2acd6cc55a Author: Boris Kovar Date: Wed Jun 7 08:26:20 2023 +0200 Squashed commit of the following: commit e42baf37a2503f3378c856e26e8d699bc71bd3ac Merge: d266f99b 949f4734 Author: boriskovar-m2ms Date: Wed Apr 26 11:17:58 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit d266f99bfbccd23d6a9951bdba71bf487554e9bc Author: Boris Kovar Date: Wed Apr 26 10:50:48 2023 +0200 - fixed problem for 'add button to job table to copy snapshot associated with the job run' commit 62784948247ed7f0521b10418b1b8a271e7062f0 Author: Boris Kovar Date: Wed Apr 26 09:43:11 2023 +0200 - add button to job table to copy snapshot associated with the job run commit 949f47340369a671516a7c6317f8f7e35ba86984 Author: boriskovar-m2ms Date: Mon Apr 24 14:47:39 2023 +0200 Ms 2022 08 18 yellow (#351) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging * - schema expansion test * Update package.json just to trigger build action * Update package.json to trigger build action commit f41cdb0d525e993a7a48c0dbb397618e0ea76bc9 Merge: eaadb729 8d437c3f Author: boriskovar-m2ms Date: Mon Apr 24 14:35:37 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit eaadb729f90441417c899cf4869e26a1b789bb42 Author: boriskovar-m2ms Date: Mon Apr 24 12:39:23 2023 +0200 Update package.json to trigger build action commit 1b46f37c6ac11d5c7e9a0a1ceff7b68dad785b27 Author: boriskovar-m2ms Date: Mon Apr 24 11:26:05 2023 +0200 Update package.json just to trigger build action commit 09007706e2ec26c6006d7d19a756129d093ac306 Author: Boris Kovar Date: Mon Apr 24 09:36:38 2023 +0200 - schema expansion test commit 8d437c3f6b735953eb07f06fec82bdfdd26d7e44 Author: boriskovar-m2ms Date: Tue Apr 11 17:00:05 2023 +0200 Ms 2022 08 18 yellow (#350) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging commit 7790dfbc261a302018423ce1a506eb33eb48d683 Merge: bf42cc20 45438127 Author: Boris Kovar Date: Tue Apr 11 16:57:36 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit bf42cc20b514c4b3708b606557cb576324f02a20 Author: Boris Kovar Date: Tue Apr 11 16:57:18 2023 +0200 - fixed bad merge from staging commit adc2f5b9e3fd8495c92b8089fb851ae3bc5a49fa Author: boriskovar-m2ms Date: Tue Apr 11 15:47:17 2023 +0200 Ms 2022 08 18 yellow (#349) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects commit 45438127c520d201677dd1b5c1fd876cdfb035e4 Merge: 73b5d4c7 dcbf19fd Author: boriskovar-m2ms Date: Tue Apr 11 15:46:11 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 73b5d4c7e705124ed5e1941226cae17ab5044ef6 Merge: b74587f0 1447b079 Author: Boris Kovar Date: Tue Apr 11 15:28:34 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit b74587f0bdd68af93e44692c6c41517ed36ad4b1 Author: Boris Kovar Date: Tue Apr 11 15:27:49 2023 +0200 - hopefully fixed problem with reloading older projects commit dcbf19fd11a4734d18714b154b7b6e577b0ccd69 Author: boriskovar-m2ms Date: Tue Apr 11 12:42:14 2023 +0200 Ms 2022 08 18 yellow (#348) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 1447b079e018d9ce1d67b96161be626b7d97a6bd Merge: b774ac60 d7b5e5c2 Author: boriskovar-m2ms Date: Tue Apr 11 12:41:03 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit b774ac6044bc97f38ef5b2e62a6eeea2a94e0dc5 Author: Boris Kovar Date: Tue Apr 11 12:05:53 2023 +0200 frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 56ce17ff1db67e6deb96d2e16c4c7ae4e0b6c39b Author: Boris Kovar Date: Thu Apr 6 14:20:00 2023 +0200 - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag commit d7b5e5c26dae7824d3c930fb263a02c592a2c042 Author: boriskovar-m2ms Date: Thu Apr 6 10:43:08 2023 +0200 Ms 2022 08 18 yellow (#347) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available commit 17e89cefe8264584ebe0fadc637a1fac542704ac Author: Boris Kovar Date: Thu Apr 6 10:23:27 2023 +0200 - can't go to squonk job execution page if the url is not available commit 16f0cbddafd994293e45573f3d6ebeeeab1e4b22 Author: boriskovar-m2ms Date: Thu Apr 6 09:11:52 2023 +0200 Minor fixes before the release (#346) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image commit c8b5f20dd521c7007f08531736541ca84b041a85 Merge: 8d500638 2cd48e04 Author: Boris Kovar Date: Wed Apr 5 14:35:17 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8d50063887bc2f6335550f15fe69cc93b17be30e Author: Boris Kovar Date: Wed Apr 5 14:34:49 2023 +0200 - new BE image commit 2cd48e0474f31fe9f0d0f4eb256cad32ed5516cd Merge: 0fddd791 b20adee8 Author: boriskovar-m2ms Date: Wed Apr 5 13:00:20 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 0fddd791812ce9e4093a784850c8e4c5698f3f18 Author: boriskovar-m2ms Date: Wed Apr 5 12:09:36 2023 +0200 Update package.json triggering the build action commit bed2dc1bf438a2f61b61fdd2d1b18753d1ef58be Author: Boris Kovar Date: Wed Apr 5 10:44:24 2023 +0200 - before the release fixes commit b10160928bff787161a140e4cffd8aa783a4c482 Merge: f6699d10 9f5f2b7c Author: Boris Kovar Date: Fri Mar 31 09:38:39 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit f6699d106af94bbba6be1494a0c83e0cf1a5b084 Author: Boris Kovar Date: Fri Mar 31 09:37:22 2023 +0200 - minor typo fix commit 9f5f2b7cad0ebb482d8069114d52bf65ca6c6531 Author: boriskovar-m2ms Date: Fri Mar 24 14:00:10 2023 +0100 Update package.json just to trigger build action commit 5a37013c71469f9433c36d956174b1efc1e698ab Author: boriskovar-m2ms Date: Fri Mar 24 12:43:27 2023 +0100 Update package.json to trigger build action commit b54cdaa4ea816719128c07939a14a99152a8e990 Merge: 5dfc38be d6d5216d Author: Boris Kovar Date: Fri Mar 24 11:36:29 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 5dfc38bef9b0a0fead21b824db58461c185f98fd Author: Boris Kovar Date: Fri Mar 24 11:35:57 2023 +0100 - updated build-dev.yaml commit d6d5216dce40de14910bde76b5f4fb8650bdbd9c Author: boriskovar-m2ms Date: Fri Mar 24 08:52:55 2023 +0100 Update package.json trigger build action commit 6bd9fcb0773fc3bbf5266ab9022d6e365dff9cfc Author: boriskovar-m2ms Date: Fri Mar 24 08:46:51 2023 +0100 Update package.json to trigger build action commit b20adee8140c7f46573eb5e7525e97427d23d4d4 Author: boriskovar-m2ms Date: Thu Mar 16 17:29:15 2023 +0100 Ms 2022 08 18 yellow (#345) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit 3a9a478d3bdbcb54802346efe2ec5e1f18242721 Merge: d777f117 4cb92f6c Author: boriskovar-m2ms Date: Thu Mar 16 10:50:04 2023 +0100 Merge branch 'staging' into ms-2022-08-18-yellow commit d777f117bbfab9a367ef8ad04c2fcf540cf19ef6 Author: Boris Kovar Date: Thu Mar 16 10:17:34 2023 +0100 - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit ae0cbdc8540aa440c776be3b84508c710a215d36 Author: Boris Kovar Date: Thu Mar 16 09:01:48 2023 +0100 - fixed bugs found in staging commit 4cb92f6ca3c986a087b840f9327e921ed17e1b4c Author: boriskovar-m2ms Date: Thu Mar 9 13:05:06 2023 +0100 Ms 2022 08 18 yellow (#344) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action commit bc13d845aa206aa7d8d151a8bb53f53335761084 Author: boriskovar-m2ms Date: Thu Mar 9 10:38:18 2023 +0100 Update package.json triggering build action commit 49d1ad57042d353f76c7368944601a8d64e44596 Author: boriskovar-m2ms Date: Thu Mar 9 10:32:30 2023 +0100 Update package.json to trigger build action commit fd0df1c021010f4f5e028090493464721b8b2600 Author: Boris Kovar Date: Thu Mar 9 09:11:44 2023 +0100 - added message when access to squonk is denied commit 622b635472e0ed7be1ae36062addd0f91d9ff6f4 Author: Boris Kovar Date: Wed Mar 8 14:35:57 2023 +0100 - fixed problem with id commit 74a1a62ca7a564d481be34c4301771ce7f5dd76a Author: Boris Kovar Date: Wed Mar 8 14:18:47 2023 +0100 - authorize user for viewing squonk job commit aa55bc41ee6a6fce4d8b146362e276265eed0af3 Author: Boris Kovar Date: Wed Mar 8 12:58:15 2023 +0100 - added more logs commit d97a512d75aa621be77ee69b547b21e1653386e1 Author: Boris Kovar Date: Wed Mar 8 12:19:18 2023 +0100 fixed problem with entries function commit 7e28e41d96e57998b979752d3651304bf36713c9 Author: Boris Kovar Date: Wed Mar 8 12:13:08 2023 +0100 - added debug logs commit f4becf9c94cf8c5eec225fde7b24c73131e0e338 Author: Boris Kovar Date: Wed Mar 8 11:29:23 2023 +0100 - implemented #890 commit bcd3ec01ddc68d3dd1dce78f1f3ca165e1633fd4 Author: Boris Kovar Date: Sun Mar 5 18:50:08 2023 +0100 - fixes because can't debug this locally commit 59779b6b80ec7e21af68b219a543a017aa837b14 Author: Boris Kovar Date: Sun Mar 5 18:29:05 2023 +0100 - trying to fix a bug with inputs commit 76ccc089efc43589bb381ea6589567dce538aa8b Author: Boris Kovar Date: Sun Mar 5 18:12:34 2023 +0100 - reworked show inputs in jobs table commit e862c726c81b0328cc9b7538d9820481b7d85cd8 Author: Boris Kovar Date: Sun Mar 5 16:46:29 2023 +0100 - added debug info commit 471d947b83f159bde413a32de06dbd10b9c4dfaf Author: Boris Kovar Date: Sun Mar 5 16:33:00 2023 +0100 - added debug info commit c4b11af95a56786493e13735ac92b1b1f766af79 Author: Boris Kovar Date: Sun Mar 5 16:13:41 2023 +0100 - added debug info commit 6adc86d4f95a362b38747e001f55bde2a104baff Author: Boris Kovar Date: Sun Mar 5 15:53:49 2023 +0100 - added debug info commit e42ed05162106109c927e80620d67b5af31b7ef1 Author: Boris Kovar Date: Sun Mar 5 15:34:10 2023 +0100 - added debug info commit 39034c54b97f4da301365c69d985640a66c75469 Author: Boris Kovar Date: Sun Mar 5 15:09:04 2023 +0100 - added debug info commit 9eee228b45b94479edfab5d6279d3e0ce4ccb8d1 Author: Boris Kovar Date: Sun Mar 5 14:48:45 2023 +0100 - added debug info commit 13a00cf2ba8f4ae13de4865096f9def349acd158 Merge: 0a36ae5c d0317f60 Author: rsanchezgarc Date: Tue Feb 21 20:43:31 2023 +0000 Merge pull request #341 from m2ms/ms-2022-08-18-yellow Ms 2022 08 18 yellow release commit d0317f607def3b6e1a5651554b338161fce4f040 Merge: 53164d21 8c4ca1d0 Author: Boris Kovar Date: Mon Feb 20 13:58:48 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 53164d21b23e7a918a772ced6292817b4306031e Author: Boris Kovar Date: Mon Feb 20 13:57:25 2023 +0100 Squashed commit of the following: commit 19b3910d84f9707b8047524cfe44dfa1f8696644 Author: Boris Kovar Date: Mon Feb 20 13:33:18 2023 +0100 - new dev BE commit af427c71d9499c975e12b314202bdb0f0ec13826 Author: boriskovar-m2ms Date: Fri Feb 17 08:44:14 2023 +0100 Update package.json just to trigger build action commit 4cb19eb371b0147dfc51b704a36dba842543d311 Author: boriskovar-m2ms Date: Thu Feb 16 09:09:27 2023 +0100 Update package.json just to trigger build action commit 7612967a111ec486f2072ca3ddd88330b4ad37c9 Author: boriskovar-m2ms Date: Wed Feb 15 14:01:32 2023 +0100 Update package.json just to trigger build action commit 4e8b27d9b65fe372e06df45bc720abb52f81dbe2 Author: Boris Kovar Date: Tue Feb 14 08:50:44 2023 +0100 - fixed direct links and direct download links commit c08da4bf71caf536e95423fb8b1e5d8ab01c60e7 Author: Boris Kovar Date: Thu Feb 9 14:02:18 2023 +0100 - fixed job name commit 4b9a491f0478849e268dc7b825ba358585cdb2ab Author: Boris Kovar Date: Thu Feb 9 13:28:20 2023 +0100 - added fragmenstein-combine-multi-scoring.json commit ca4f946d07074e87a74ac6a3d2272c1735343cb1 Author: Boris Kovar Date: Thu Feb 9 13:25:35 2023 +0100 - checkpoint commit b43373e1c228d9e46f4c831fc46269d614013e92 Author: Boris Kovar Date: Thu Feb 9 10:43:27 2023 +0100 - fixed problem where UI would crash if there was a problem during job file transfer of job launch commit 3618b10e2b77f4a7a173f38a8d8bbdc0a853805b Author: Boris Kovar Date: Thu Feb 9 09:54:36 2023 +0100 - fixed bad project capture from url commit 7d588895cebd0e363aa5d62b36770499364aef06 Merge: 11180a5c 4fc7f7bd Author: Boris Kovar Date: Wed Feb 8 09:27:51 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 11180a5c0142ea18624ae14ddaad16793fdcb435 Author: Boris Kovar Date: Wed Feb 8 09:26:31 2023 +0100 - prevent crash when there is a project associated with target which user is not authorized to see commit 4fc7f7bd2d0aae799099b29e256e3c0834e9576f Author: boriskovar-m2ms Date: Wed Feb 8 07:25:12 2023 +0100 Update package.json just to trigger build action commit 2b2665cfc609f621eb9bf505b9a86e6bd4fb3d35 Author: boriskovar-m2ms Date: Thu Feb 2 15:43:38 2023 +0100 Update package.json just to trigger the build action commit d0d429c473307ce2bfa825ad9e556084082accd8 Author: boriskovar-m2ms Date: Thu Feb 2 15:20:25 2023 +0100 Update package.json just to trigger the build action commit fcf377b863abf9110e1c0ce752b29bce073349cf Author: Boris Kovar Date: Thu Feb 2 14:51:17 2023 +0100 - fixed problem when job config windows closes on error commit c9e39f4da281f333c620811cf7ccfb6b8438cc1f Merge: 5a3d56bf 0f8e702a Author: Boris Kovar Date: Thu Feb 2 13:19:16 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 5a3d56bf87d9c8d8e6007dba5db8c1239dbf39a2 Author: Boris Kovar Date: Thu Feb 2 13:18:30 2023 +0100 - now sending id of the project and not target_access_string commit 0f8e702a023e2f786c5ba46eab2205f158a75480 Author: boriskovar-m2ms Date: Thu Feb 2 12:59:19 2023 +0100 Update package.json just to trigger build action commit 585076db67dc32b58083c184e1ca11a6dddc434b Author: Boris Kovar Date: Thu Feb 2 12:39:19 2023 +0100 - fixed problem when project pane was not showing up right after a project was created commit fa7fd759c30c3abf4e12b1c17af4107424993dc4 Author: Boris Kovar Date: Thu Feb 2 12:08:23 2023 +0100 - fix for missing project pane commit ba0a1fe55bd53f719d31d795d71877d81366cac9 Author: Boris Kovar Date: Thu Feb 2 09:05:50 2023 +0100 - version for job execution - broken UI commit 51555e1ba1eeb12e1eef340f108d7d3b595e6210 Merge: 51e97af1 a42cad71 Author: Boris Kovar Date: Wed Feb 1 13:58:27 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 51e97af1db45d3b4bb9b5d1fdd55a07991a9a19a Author: Boris Kovar Date: Wed Feb 1 13:57:49 2023 +0100 - partial implementation of #1020 commit a42cad7193b8c8f02c04378bba01f6f44114ec88 Author: boriskovar-m2ms Date: Thu Jan 26 08:34:01 2023 +0100 Update package.json just to trigger build action commit 96c0216e8b29169c9c1bf29471eafb5bddd24e5b Author: boriskovar-m2ms Date: Wed Jan 25 09:39:06 2023 +0100 Update package.json just to trigger build action commit c7de9cf16f783fad2bdfb78224a818221fa24ba1 Author: boriskovar-m2ms Date: Tue Jan 24 15:10:11 2023 +0100 Update package.json just to trigger the build action commit e8e5657cc5f7beecf5813040210605b6cf410cef Author: boriskovar-m2ms Date: Tue Jan 24 14:04:56 2023 +0100 Update package.json just to trigger build commit 24dc912bfdae3bec9c52867f2d638754635cecbb Author: Boris Kovar Date: Tue Jan 24 12:49:58 2023 +0100 - sensitive data moved to .env file commit a98c51751368104300a872f116cc22acc09cec44 Author: Boris Kovar Date: Tue Jan 24 12:49:06 2023 +0100 - added .env to gitignore commit 13b4bed082612315afc948192fe758fb42edf63d Author: Boris Kovar Date: Tue Jan 24 12:47:56 2023 +0100 - mending an error commit 5b74eb4326389e11b923b560f6603586bfc3b87c Author: Boris Kovar Date: Wed Jan 18 09:52:19 2023 +0100 - checkpoint commit d4b88dfe5c525b7c471d97ac47d46f9d992bfa48 Author: Boris Kovar Date: Tue Jan 17 10:10:27 2023 +0100 - initial implementation #1020 commit 8c4ca1d022f2a5841d68dde70edd9f433c539b83 Author: boriskovar-m2ms Date: Mon Jan 16 11:35:37 2023 +0100 Update package.json just to trigger build action commit 436196bb65fe5eb44f38abc3bc18cf827f09c8d6 Author: boriskovar-m2ms Date: Fri Jan 13 10:47:51 2023 +0100 Update package.json just to trigger build action commit 0d6abaa08dc7a174d915d33e21a1667accd39423 Author: boriskovar-m2ms Date: Thu Jan 12 10:18:23 2023 +0100 Update package.json just to trigger build action commit d5905966cb9bf2994f93668911873108832d7578 Author: Boris Kovar Date: Wed Jan 11 11:02:25 2023 +0100 - forgot to reset debug constants commit df7057032baa70df6451b7faf0a232fa75a1e55b Author: Boris Kovar Date: Wed Jan 11 08:05:23 2023 +0100 - minor fix for upload_status commit 698d123634ded171f161c3bb9f27e4e1600730be Author: Boris Kovar Date: Tue Jan 10 15:42:30 2023 +0100 - minor fix for upload_status commit 89bb79b92d6cef9fb410259ee93ae7e11859239a Author: Boris Kovar Date: Tue Jan 10 15:26:03 2023 +0100 - upload_failed now taken into the account commit 3f9f3ea181ab267ee9c1f52b88a620c0620fa34b Author: boriskovar-m2ms Date: Tue Jan 10 13:35:25 2023 +0100 Update package.json - just to trigger build action commit e6fbd6d213418dfd9708e206da341e8e37e776c3 Author: boriskovar-m2ms Date: Tue Jan 10 11:54:17 2023 +0100 Update package.json just to trigger build action commit 2d0a5257e2308d3b3241ec63a61ea5896981dc5e Author: Boris Kovar Date: Fri Dec 23 13:01:20 2022 +0100 - updated README.md commit 0a36ae5cc0f40aaab45ced9837e242308d17b578 Merge: 6a7a0dda 782b84b5 Author: rsanchezgarc Date: Tue Dec 20 18:11:19 2022 +0000 Merge pull request #337 from m2ms/ms-2022-08-18-yellow-wo-970 Animate to new orientation matrix first commit 5504bd464e1d699833f258b994e344cb339cb234 Author: Boris Kovar Date: Tue Dec 20 08:06:06 2022 +0100 Squashed commit of the following: commit cec398dcf0a14f7e433b2baec849e29001358839 Author: Boris Kovar Date: Tue Dec 20 08:00:30 2022 +0100 - commit 885f08e18f7983723a0944bd90cec646c869ee89 Author: Boris Kovar Date: Fri Dec 16 13:18:38 2022 +0100 - bug fix in progress for #970 commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 6fa2432f7226be0d54f7ce608719c0d59863d367 Author: Boris Kovar Date: Mon Dec 19 10:09:59 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 782b84b50f1d66742a3ed491b91d4ecf379b2edd Merge: eaa4ccbd f07779ce Author: Boris Kovar Date: Mon Dec 19 10:08:49 2022 +0100 Merge branch 'ms-2022-08-18-yellow-wo-970' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow-wo-970 commit eaa4ccbdf4282a772a19badf68fc2c14579d9173 Author: Boris Kovar Date: Mon Dec 19 10:08:30 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 6a7a0dda77266978a5afdaf82a5e8f89f5aa0d4e Merge: 356e625e f07779ce Author: rsanchezgarc Date: Fri Dec 16 12:44:21 2022 +0000 Merge pull request #334 from m2ms/ms-2022-08-18-yellow-wo-970 Ms 2022 08 18 yellow wo 970 commit f07779ce30667465ea1aba424085e8978827641a Merge: 57336b82 dcc2c882 Author: boriskovar-m2ms Date: Fri Dec 16 13:24:09 2022 +0100 Merge branch 'master' into ms-2022-08-18-yellow-wo-970 commit 21b437e8dd24102aebe35302d8b1ef2d18c6c040 Author: Boris Kovar Date: Thu Dec 15 16:32:57 2022 +0100 Squashed commit of the following: commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 2be8ed349ffdffa3602a2a393b4019bb3115ba5f Merge: 8ac386cd 57336b82 Author: Boris Kovar Date: Wed Dec 14 06:28:30 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8ac386cd710d9b6bf65cccac8d5962e6f6d730a5 Author: Boris Kovar Date: Wed Dec 14 06:27:11 2022 +0100 Squashed commit of the following: commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 57336b825cb95aecb3dfff78ab571bb85e906073 Author: boriskovar-m2ms Date: Thu Dec 8 11:41:44 2022 +0100 Update package.json just to trigger action commit c6c3ed0b16414d528684d63befca6a01634683d0 Author: boriskovar-m2ms Date: Wed Dec 7 11:57:33 2022 +0100 Update package.json just to trigger action commit 614b01c80882557160777ba96abc92c2d328112e Author: boriskovar-m2ms Date: Wed Dec 7 09:38:38 2022 +0100 Update package.json just to trigger action commit c0d2b3858d074b33303eef48e42f11e7eefac474 Author: boriskovar-m2ms Date: Wed Dec 7 08:39:23 2022 +0100 Update package.json just to trigger action commit bbf6f91e8498586d666204c3493405c4ca4e7268 Author: boriskovar-m2ms Date: Wed Dec 7 08:31:30 2022 +0100 Update package.json just to trigger rebuild commit 5edd5c4c387405b5f30ee88b19f1f2a2e91d8022 Author: Boris Kovar Date: Mon Dec 5 08:28:17 2022 +0100 Squashed commit of the following: commit 8d6edcb01a41b4abdddf86e94fe754682fb17964 Author: Boris Kovar Date: Mon Dec 5 08:14:43 2022 +0100 - #1001 commit 8c52f55f808f5566f83e6068e3dbe76cf06860b0 Author: Boris Kovar Date: Thu Dec 1 09:10:59 2022 +0100 Squashed commit of the following: commit 91f3363f245ec336810dd27b9d34aaaa82512a8a Author: Boris Kovar Date: Thu Dec 1 09:08:03 2022 +0100 - implemented #1012 commit f8eb4067e0ece9d170e3405bebe21a689927442c Author: Boris Kovar Date: Tue Nov 29 10:24:56 2022 +0100 Squashed commit of the following: commit a5b8f281ebd05cc6be2163fc7124855f6cee8418 Author: Boris Kovar Date: Tue Nov 29 10:22:31 2022 +0100 - fixed #1013 commit db173bcdd76574055d5132ec3cd34012a727656d Author: Boris Kovar Date: Mon Nov 28 14:39:16 2022 +0100 Squashed commit of the following: commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit 68d1a2fbd2be5620cca635c662dc0278dd578fcb Author: Boris Kovar Date: Mon Nov 28 09:08:21 2022 +0100 Squashed commit of the following: commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 356e625e4a0d7cee6bf1bd3c3b1627b59375e88d Merge: 0530324b 7b7cbe99 Author: rsanchezgarc Date: Mon Nov 14 09:59:45 2022 +0000 Merge pull request #329 from m2ms/#977-ngl Fast switching between snapshots commit 7b7cbe99952000f6c550727e082cb920cafa144c Author: Boris Kovar Date: Tue Nov 8 10:04:33 2022 +0100 - #977 - fixed issue with ngl settings were not saved and restored commit d1abaa872675f8a748f7c573aa74d79cdf629a0c Author: Boris Kovar Date: Mon Nov 7 10:14:18 2022 +0100 Squashed commit of the following: commit 4a8a532f6ea217d2921ed5fab6b6705442ca682f Author: Boris Kovar Date: Thu Nov 3 08:01:05 2022 +0100 - fixed ngl view was not tracked commit 0530324b9faae6876d0b42c48ac4b26a9eaf3c26 Merge: 931a5aea 5746062a Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:51:39 2022 +0100 Merge pull request #325 from xchem/production Action doc tweaks commit 5746062aacabb5201feefed8ea09e3e34066a175 Merge: b0e75d17 dc2ff23d Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:50:50 2022 +0100 Merge pull request #324 from alanbchristie/production Action doc tweaks commit dc2ff23d773157c74f864931e06ccb0fd21cf335 Author: Alan Christie Date: Thu Oct 27 15:48:48 2022 +0100 Add doc for production workflow commit c5ee4068a880a85d4fc5ed164dbbd711e4c5d0ec Author: Alan Christie Date: Thu Oct 27 15:35:27 2022 +0100 Tweak action docs commit 931a5aea583997a80bab66d8099f743529f8d98f Merge: cb4246e7 b0e75d17 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:51:21 2022 +0100 Merge pull request #323 from xchem/production Production now triggers stack commit b0e75d174217c507b2db2f4d6329e4ed2315e887 Merge: cb4246e7 ac3297e4 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:50:08 2022 +0100 Merge pull request #322 from alanbchristie/production Production now triggers stack commit ac3297e47b5ce9ca5a9ca1386818a317bc8098f2 Author: Alan Christie Date: Thu Oct 27 12:49:11 2022 +0100 Production now triggers stack Fix for BE tag commit cb4246e7f7acde133a4ca2081c30115dd5c87f56 Merge: dcc2c882 dec6f785 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 11:15:06 2022 +0100 Merge pull request #321 from alanbchristie/production CI changes for new branch policy commit dec6f785663f6e3050262c5a4b4704109d2e446a Author: Alan Christie Date: Thu Oct 27 10:58:08 2022 +0100 Removed personal repo references commit 2147aa18af1211a32f55e228c1023491008204ac Author: Boris Kovar Date: Wed Oct 26 10:00:07 2022 +0200 - updated squonk project id for dev stacks commit b2bc6e79197baa4c7336822fca2bfbf54eded377 Author: Boris Kovar Date: Mon Oct 24 16:47:24 2022 +0200 - first real version of the final implementation of ticket #977 - also added functionality that only if user did something with the snapshot, only then user will be prompted if new snapshot (or current overridden) should be saved or not - note: in this current version undoing an action does not undo the 'dirty' status of the snapshot commit 204a86d7f8901b9d39cf6495e625c709d82a8c72 Author: Boris Kovar Date: Thu Oct 20 07:32:33 2022 +0200 - nearly complete issue #977 commit dcc2c8824378b69e118564a664b332456d5632e4 Author: boriskovar-m2ms Date: Thu Sep 29 12:48:42 2022 +0200 edited in correct squonk project id commit 725f6d5267d568afd34f29f22b0869458d759832 Author: boriskovar-m2ms Date: Thu Sep 29 12:47:31 2022 +0200 removed Upload button from Job popup (#320) * - initial commit * - checkpoint * - new backend * Update package.json bumped version to 0.10.109 * Update package.json bumped version to 0.10.111 * Update package.json version bumped to 0.10.112 * Update package.json bumped version to 0.10.113 * Update package.json bumped version to 0.10.114 * Update package.json bumped version to 0.10.115 * - added new back-end * Squashed commit of the following: commit 949573bd930afaa0171a728f05dafa08c2425341 Merge: deb0d1c3 74ea6613 Author: Boris Kovar Date: Thu Jul 14 06:56:52 2022 +0200 Merge branch '#885-bugfix' of https://github.com/m2ms/fragalysis-frontend into #885-bugfix commit deb0d1c31aa68fb38c1d1541aca6bd81410e515b Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit e2a00641039dd34b348ce2084eefd8f33ae04343 Author: Boris Kovar Date: Mon Jun 6 06:05:49 2022 +0200 Squashed commit of the following: -bumped version to 0.10.93 commit dfa24f68c4cb0e84ad37ac663ec08caadd2f3fbb Author: Anton Gasperak Date: Wed Jun 1 11:53:32 2022 +0200 commit 0ae63081e822a514443a7b6c6e1fb3826a8c6178 Author: Anton Gasperak Date: Wed Jun 1 11:43:17 2022 +0200 commit b884e0b59c5e9000422adbf6e6adf7b14847b51f Author: Anton Gasperak Date: Wed Jun 1 11:10:44 2022 +0200 commit ab825ccf3369af8fbaab9c8d25d68c5a1699d773 Author: Anton Gasperak Date: Wed Jun 1 10:54:57 2022 +0200 commit 4103e3984bc9b3fbf2cc48bef3b9d65864a4814b Author: Anton Gasperak Date: Wed Jun 1 10:08:28 2022 +0200 commit f3b3b10a879447705b2709b88d48b62fe50e14cc Author: Anton Gasperak Date: Wed Jun 1 09:59:23 2022 +0200 commit 02aa5955918abace2d5473e89bb9260ff10d7338 Author: Anton Gasperak Date: Wed Jun 1 09:40:29 2022 +0200 commit d059ee8d4de0ddc34be64ef9c55a71c4f2bd96df Author: Anton Gasperak Date: Wed Jun 1 08:43:26 2022 +0200 commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 commit 74ea6613da0306f5251a440bdfdaa44f225ccb69 Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 commit bd3ff2b3f22dada64afadd4df1685bcc46ab2d21 Author: Anton Gasperak Date: Fri Jun 3 08:36:34 2022 +0200 * updated fragmentstein job spec Squashed commit of the following: commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 commit bd3ff2b3f22dada64afadd4df1685bcc46ab2d21 Author: Anton Gasperak Date: Fri Jun 3 08:36:34 2022 +0200 * - changed default value for output file * Update package.json bumped version to 0.10.116 * - new backend test * Update package.json bumped version to 0.10.120 * Update package.json bumped version to 0.10.122 * - new version of the backend added * Squashed commit of the following: commit c6c605ed21996d470a36b0de0a51a4e145792884 Author: Boris Kovar Date: Thu Aug 4 09:25:18 2022 +0200 - fixed #949 commit 2118900c0f7b92aa3ff7b6a1aefd943ab506c287 Author: Boris Kovar Date: Wed Aug 3 15:42:41 2022 +0200 - fixed problem where there are no selected inputs for a job commit db6f6436af34cfead10d7e788bf4d9c3a9029294 Author: Boris Kovar Date: Wed Aug 3 08:47:55 2022 +0200 - fix… * Squashed commit of the following: commit e7075fd464984f7ca83c683594737ede8a2d6156 Author: RobertMatuska Date: Thu Aug 10 09:22:56 2023 +0200 * Squashed commit of the following: commit 9047a700d7d206e2ab01fd6dff574162fc4483e3 Author: Boris Kovar Date: Thu Jun 15 09:53:13 2023 +0200 - implemented all the features for #944 commit 716eb0e7a8f11d34c8744cf20ad60ce3cbe41dd6 Author: Boris Kovar Date: Thu Jun 8 09:13:42 2023 +0200 - initial commit * - fixed new job commit c74c7ae129e1a70ebd4c25d8b8425632a4bb648c Author: Alan Christie Date: Thu Aug 10 13:30:44 2023 +0100 ci: Streamlined builds (less noisy) Staging builds now use latest bacxkend (rather than stable). Production changes no longer trigger stack builds, it simply runs yarn. Updated to latest GitHub action virsions. commit 901af8d8fa78a1c20e1d123b32961be0a62cdca3 Author: Boris Kovar Date: Thu Aug 17 09:36:58 2023 +0200 Squashed commit of the following: commit b6c21b9f74a0281bcf9883a7da07165bbbdc5695 Author: Boris Kovar Date: Tue Aug 15 12:32:55 2023 +0200 Squashed commit of the following: commit 60528709e830d424c07d290a7daf65cfcf3d9b2c Author: Boris Kovar Date: Tue Aug 15 12:31:31 2023 +0200 - implemented #1129 commit 86a1a7c9e26d899d34af4f6cdb85ceb19f207d0d Author: Boris Kovar Date: Tue Aug 15 09:49:39 2023 +0200 Squashed commit of the following: commit 0550be26180579a58c85c520b0930c44f4999011 Author: Boris Kovar Date: Tue Aug 15 08:46:33 2023 +0200 - fixed #1092 commit fcf418da068289847e2d7da1d72a19570a8832b0 Author: Boris Kovar Date: Fri Aug 11 09:19:38 2023 +0200 Squashed commit of the following: commit 5adc61adf29db66e7e09fd2d663c18d064305c33 Merge: a8c90f24 1aef079a Author: RobertMatuska Date: Thu Aug 10 15:31:40 2023 +0200 Merge branch '#1118' of https://github.com/m2ms/fragalysis-frontend into #1118 commit a8c90f245cf29df1cfee1b7053454cb7d0c0ad4a Author: RobertMatuska Date: Thu Aug 10 15:31:35 2023 +0200 commit 1aef079a1728061be8c56f41967bf60666c79a17 Author: boriskovar-m2ms Date: Thu Aug 10 08:25:48 2023 +0200 Update package.json triggering build action commit 594ac1970c7099ecfb94cecc3707a6cc9ef2894f Merge: 5564d2ce de09cdc6 Author: RobertMatuska Date: Wed Aug 9 11:59:25 2023 +0200 Merge branch '#1106' into #1118 commit 5564d2ceaaea797542514f1a9fdfd8901591fb2b Author: RobertMatuska Date: Wed Aug 9 11:26:34 2023 +0200 commit de09cdc6e9386ca3f6aea63fa373ef75938dec6d Merge: 4caeef7b 8b73ee22 Author: Boris Kovar Date: Tue Aug 8 11:38:09 2023 +0200 Merge branch '#1106' of https://github.com/m2ms/fragalysis-frontend into #1106 commit 4caeef7b2f6f9acbf617989b94e62030e6ed8052 Author: Boris Kovar Date: Tue Aug 8 11:37:40 2023 +0200 - updated table styling commit 8b73ee22d38fb5b93435c4c03fc537334adc3ebc Author: boriskovar-m2ms Date: Mon Aug 7 13:24:08 2023 +0200 Update package.json just to trigger build action commit d16130686039662cd7ebe0f9b6eeaadbe57d7d37 Author: Boris Kovar Date: Mon Aug 7 12:55:44 2023 +0200 - table is now autosized commit e867e77c40598a12fa10ca6ab526880274936752 Author: RobertMatuska Date: Mon Aug 7 09:03:11 2023 +0200 commit 5fd5b90f510d95ab189dc2f074f55a8b4f223599 Author: Boris Kovar Date: Tue Aug 15 14:05:24 2023 +0200 Squashed commit of the following: commit b6c21b9f74a0281bcf9883a7da07165bbbdc5695 Author: Boris Kovar Date: Tue Aug 15 12:32:55 2023 +0200 Squashed commit of the following: commit 60528709e830d424c07d290a7daf65cfcf3d9b2c Author: Boris Kovar Date: Tue Aug 15 12:31:31 2023 +0200 - implemented #1129 commit 86a1a7c9e26d899d34af4f6cdb85ceb19f207d0d Author: Boris Kovar Date: Tue Aug 15 09:49:39 2023 +0200 Squashed commit of the following: commit 0550be26180579a58c85c520b0930c44f4999011 Author: Boris Kovar Date: Tue Aug 15 08:46:33 2023 +0200 - fixed #1092 commit fcf418da068289847e2d7da1d72a19570a8832b0 Author: Boris Kovar Date: Fri Aug 11 09:19:38 2023 +0200 Squashed commit of the following: commit 5adc61adf29db66e7e09fd2d663c18d064305c33 Merge: a8c90f24 1aef079a Author: RobertMatuska Date: Thu Aug 10 15:31:40 2023 +0200 Merge branch '#1118' of https://github.com/m2ms/fragalysis-frontend into #1118 commit a8c90f245cf29df1cfee1b7053454cb7d0c0ad4a Author: RobertMatuska Date: Thu Aug 10 15:31:35 2023 +0200 commit 1aef079a1728061be8c56f41967bf60666c79a17 Author: boriskovar-m2ms Date: Thu Aug 10 08:25:48 2023 +0200 Update package.json triggering build action commit 594ac1970c7099ecfb94cecc3707a6cc9ef2894f Merge: 5564d2ce de09cdc6 Author: RobertMatuska Date: Wed Aug 9 11:59:25 2023 +0200 Merge branch '#1106' into #1118 commit 5564d2ceaaea797542514f1a9fdfd8901591fb2b Author: RobertMatuska Date: Wed Aug 9 11:26:34 2023 +0200 commit de09cdc6e9386ca3f6aea63fa373ef75938dec6d Merge: 4caeef7b 8b73ee22 Author: Boris Kovar Date: Tue Aug 8 11:38:09 2023 +0200 Merge branch '#1106' of https://github.com/m2ms/fragalysis-frontend into #1106 commit 4caeef7b2f6f9acbf617989b94e62030e6ed8052 Author: Boris Kovar Date: Tue Aug 8 11:37:40 2023 +0200 - updated table styling commit 8b73ee22d38fb5b93435c4c03fc537334adc3ebc Author: boriskovar-m2ms Date: Mon Aug 7 13:24:08 2023 +0200 Update package.json just to trigger build action commit d16130686039662cd7ebe0f9b6eeaadbe57d7d37 Author: Boris Kovar Date: Mon Aug 7 12:55:44 2023 +0200 - table is now autosized commit e867e77c40598a12fa10ca6ab526880274936752 Author: RobertMatuska Date: Mon Aug 7 09:03:11 2023 +0200 commit 19989c5844b50b50bdd508a60ffa9da17411a26e Merge: dfa208a3 eb509259 Author: RobertMatuska Date: Thu Aug 24 12:09:19 2023 +0200 Merge branch '#741' into 1102_1108_741 commit eb509259f06253489e112f1b79bdf25f89898938 Author: RobertMatuska Date: Thu Aug 24 10:24:24 2023 +0200 #741 edited tag opacity commit dfa208a3b56bd2caa3747331af2439cf3b9d4831 Author: RobertMatuska Date: Thu Aug 24 09:39:32 2023 +0200 #1102 fixed additional issues commit 0fd9300b7142b61c545d00bbd99d240b163738cd Author: RobertMatuska Date: Wed Aug 23 11:55:21 2023 +0200 #741 added tags for hit navigator commit 482622b564dfbb92db5604dc3604257f2119e0e5 Author: RobertMatuska Date: Tue Aug 22 08:22:01 2023 +0200 #1102 fixed tag position and changed tags width commit 0fb0eae4b405160125fc822afb3b03066289ac11 Author: RobertMatuska Date: Mon Aug 21 12:35:56 2023 +0200 #741 added grid/list switch button commit ca398414464b33c51741b6dfd4ea30a3da0bae0d Author: RobertMatuska Date: Fri Aug 18 14:13:26 2023 +0200 #1102 added grid layout commit a643c7b2e82f4bdd8b43ceea37ec158b05537170 Merge: a770a7f3 0173fdf7 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Wed Aug 16 14:30:56 2023 +0100 Merge branch 'production' into staging commit a770a7f3298a320506a2a20388237331bd36ff12 Author: boriskovar-m2ms Date: Tue Aug 15 13:00:10 2023 +0200 Implemented #1092 #1118 #1129 (#367) * Squashed commit of the following: commit d53d1c008f3db605dd4b1e5ae9dfe10302da28fb Merge: c924ce24 bc13c611 Author: Boris Kovar Date: Wed Aug 2 16:35:15 2023 +0200 Merge branch 'RedRelease20230525' of https://github.com/m2ms/fragalysis-frontend into RedRelease20230525 commit c924ce24af3190079baf7c3b7fc2cd1fb819e93e Author: Boris Kovar Date: Wed Aug 2 16:34:40 2023 +0200 - fixed overflow for target list commit bc13c6114bbf02d88bd6aa833c20c3acc6d8b685 Merge: 7b88603b 74ffba6f Author: boriskovar-m2ms Date: Wed Aug 2 16:03:35 2023 +0200 Merge branch 'staging' into RedRelease20230525 commit 7b88603bf0d93b60c6fa996a35b5afb21a3d8835 Author: RobertMatuska Date: Tue Aug 1 15:29:56 2023 +0200 #1112 fixed project list filter commit 6951206f2d9285ac2aa59f34c20cd2383735ba8f Author: RobertMatuska Date: Tue Aug 1 08:41:52 2023 +0200 #1112 fixed numb rows per page vs numb of projects commit 11df780229077611f93ab766c508c485d4bcb7b3 Author: RobertMatuska Date: Tue Aug 1 08:37:10 2023 +0200 #1112 fixed pagination numbers in dropdown commit 1252aa88178d9b745e32a5c20c4ca353049545f1 Author: Boris Kovar Date: Mon Jul 31 15:40:06 2023 +0200 - fixed overflow commit f2d8eac83d6685ba4bc8929754519f9b48730cb5 Author: Boris Kovar Date: Mon Jul 31 14:51:19 2023 +0200 - fixed problem from #1112 where page-ination controls were not visible commit 62227fbd35fb110dc9dec60342beb66ef2582762 Author: Boris Kovar Date: Mon Jul 31 13:51:34 2023 +0200 - fixed issue when implicit actions setSearchString was tracked which caused that user had to click undo twice after clicking on the dataset tab commit 3bb794549e6eda0c4cb43ceeeac1df152648ba0e Author: Boris Kovar Date: Mon Jul 31 13:33:30 2023 +0200 - fixed #1116 + whole bunch of other bugs related to preserving and restoring search (both LHS and RHS) string from snapshot commit f1d0db5f2161a14201b4e447317eeea640f80f06 Author: Boris Kovar Date: Mon Jul 31 11:01:21 2023 +0200 - fixed #1117 commit 1038f80e842e5df9490554d5244427402dd7d6b7 Author: Boris Kovar Date: Mon Jul 31 10:11:26 2023 +0200 - fixed issue #1113 commit 74ffba6f3fc623959595bc3a4aa57bf1af11d718 Author: boriskovar-m2ms Date: Thu Jul 27 16:18:53 2023 +0200 Redrelease20230525-firstBatch (#354) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging * - schema expansion test * Update package.json just to trigger build action * Update package.json to trigger build action * - add button to job table to copy snapshot associated with the job run * - fixed problem for 'add button to job table to copy snapshot associated with the job run' * added searchString to action and TimeLine * #576 restored searchString from snapshot for RHS * #576 edited time for search response * #576 restore search string for hit navigator * #576 Restore search for project history * #978 added new button and conditions for showing * #978 change modal background and position * #978 setted modal window position under buttons * #978 fixed onClick for close modal * #576 edited tag detail added toggle union/intersec * #576 added buttons to Tag Detail * #978 added new column and sort by columns * #978 edited sort and filter project list table * #978 edited filter and search data * #576 edit width count * Update package.json - just to trigger build action * - fixed instance when project is missing from session-project (which AFAIK should never happen though) * Update package.json - just to trigger build action * #978 filter for project list and other fix * #576 edited LHS height and Tag detail colors * #576 added "Select displayed button" * #978 edited save change for NGL * - semicolons? * -merge * Squashed commit of the following: commit 66118b5d4dfbddd50cdce5af77c857e90325a78b Author: Boris Kovar Date: Tue Jul 4 08:00:12 2023 +0200 - fixed #1073 commit ae8406cfdb405dce01d075de39754d2acd6cc55a Author: Boris Kovar Date: Wed Jun 7 08:26:20 2023 +0200 Squashed commit of the following: commit e42baf37a2503f3378c856e26e8d699bc71bd3ac Merge: d266f99b 949f4734 Author: boriskovar-m2ms Date: Wed Apr 26 11:17:58 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit d266f99bfbccd23d6a9951bdba71bf487554e9bc Author: Boris Kovar Date: Wed Apr 26 10:50:48 2023 +0200 - fixed problem for 'add button to job table to copy snapshot associated with the job run' commit 62784948247ed7f0521b10418b1b8a271e7062f0 Author: Boris Kovar Date: Wed Apr 26 09:43:11 2023 +0200 - add button to job table to copy snapshot associated with the job run commit 949f47340369a671516a7c6317f8f7e35ba86984 Author: boriskovar-m2ms Date: Mon Apr 24 14:47:39 2023 +0200 Ms 2022 08 18 yellow (#351) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging * - schema expansion test * Update package.json just to trigger build action * Update package.json to trigger build action commit f41cdb0d525e993a7a48c0dbb397618e0ea76bc9 Merge: eaadb729 8d437c3f Author: boriskovar-m2ms Date: Mon Apr 24 14:35:37 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit eaadb729f90441417c899cf4869e26a1b789bb42 Author: boriskovar-m2ms Date: Mon Apr 24 12:39:23 2023 +0200 Update package.json to trigger build action commit 1b46f37c6ac11d5c7e9a0a1ceff7b68dad785b27 Author: boriskovar-m2ms Date: Mon Apr 24 11:26:05 2023 +0200 Update package.json just to trigger build action commit 09007706e2ec26c6006d7d19a756129d093ac306 Author: Boris Kovar Date: Mon Apr 24 09:36:38 2023 +0200 - schema expansion test commit 8d437c3f6b735953eb07f06fec82bdfdd26d7e44 Author: boriskovar-m2ms Date: Tue Apr 11 17:00:05 2023 +0200 Ms 2022 08 18 yellow (#350) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging commit 7790dfbc261a302018423ce1a506eb33eb48d683 Merge: bf42cc20 45438127 Author: Boris Kovar Date: Tue Apr 11 16:57:36 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit bf42cc20b514c4b3708b606557cb576324f02a20 Author: Boris Kovar Date: Tue Apr 11 16:57:18 2023 +0200 - fixed bad merge from staging commit adc2f5b9e3fd8495c92b8089fb851ae3bc5a49fa Author: boriskovar-m2ms Date: Tue Apr 11 15:47:17 2023 +0200 Ms 2022 08 18 yellow (#349) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects commit 45438127c520d201677dd1b5c1fd876cdfb035e4 Merge: 73b5d4c7 dcbf19fd Author: boriskovar-m2ms Date: Tue Apr 11 15:46:11 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 73b5d4c7e705124ed5e1941226cae17ab5044ef6 Merge: b74587f0 1447b079 Author: Boris Kovar Date: Tue Apr 11 15:28:34 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit b74587f0bdd68af93e44692c6c41517ed36ad4b1 Author: Boris Kovar Date: Tue Apr 11 15:27:49 2023 +0200 - hopefully fixed problem with reloading older projects commit dcbf19fd11a4734d18714b154b7b6e577b0ccd69 Author: boriskovar-m2ms Date: Tue Apr 11 12:42:14 2023 +0200 Ms 2022 08 18 yellow (#348) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 1447b079e018d9ce1d67b96161be626b7d97a6bd Merge: b774ac60 d7b5e5c2 Author: boriskovar-m2ms Date: Tue Apr 11 12:41:03 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit b774ac6044bc97f38ef5b2e62a6eeea2a94e0dc5 Author: Boris Kovar Date: Tue Apr 11 12:05:53 2023 +0200 frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 56ce17ff1db67e6deb96d2e16c4c7ae4e0b6c39b Author: Boris Kovar Date: Thu Apr 6 14:20:00 2023 +0200 - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag commit d7b5e5c26dae7824d3c930fb263a02c592a2c042 Author: boriskovar-m2ms Date: Thu Apr 6 10:43:08 2023 +0200 Ms 2022 08 18 yellow (#347) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available commit 17e89cefe8264584ebe0fadc637a1fac542704ac Author: Boris Kovar Date: Thu Apr 6 10:23:27 2023 +0200 - can't go to squonk job execution page if the url is not available commit 16f0cbddafd994293e45573f3d6ebeeeab1e4b22 Author: boriskovar-m2ms Date: Thu Apr 6 09:11:52 2023 +0200 Minor fixes before the release (#346) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image commit c8b5f20dd521c7007f08531736541ca84b041a85 Merge: 8d500638 2cd48e04 Author: Boris Kovar Date: Wed Apr 5 14:35:17 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8d50063887bc2f6335550f15fe69cc93b17be30e Author: Boris Kovar Date: Wed Apr 5 14:34:49 2023 +0200 - new BE image commit 2cd48e0474f31fe9f0d0f4eb256cad32ed5516cd Merge: 0fddd791 b20adee8 Author: boriskovar-m2ms Date: Wed Apr 5 13:00:20 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 0fddd791812ce9e4093a784850c8e4c5698f3f18 Author: boriskovar-m2ms Date: Wed Apr 5 12:09:36 2023 +0200 Update package.json triggering the build action commit bed2dc1bf438a2f61b61fdd2d1b18753d1ef58be Author: Boris Kovar Date: Wed Apr 5 10:44:24 2023 +0200 - before the release fixes commit b10160928bff787161a140e4cffd8aa783a4c482 Merge: f6699d10 9f5f2b7c Author: Boris Kovar Date: Fri Mar 31 09:38:39 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit f6699d106af94bbba6be1494a0c83e0cf1a5b084 Author: Boris Kovar Date: Fri Mar 31 09:37:22 2023 +0200 - minor typo fix commit 9f5f2b7cad0ebb482d8069114d52bf65ca6c6531 Author: boriskovar-m2ms Date: Fri Mar 24 14:00:10 2023 +0100 Update package.json just to trigger build action commit 5a37013c71469f9433c36d956174b1efc1e698ab Author: boriskovar-m2ms Date: Fri Mar 24 12:43:27 2023 +0100 Update package.json to trigger build action commit b54cdaa4ea816719128c07939a14a99152a8e990 Merge: 5dfc38be d6d5216d Author: Boris Kovar Date: Fri Mar 24 11:36:29 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 5dfc38bef9b0a0fead21b824db58461c185f98fd Author: Boris Kovar Date: Fri Mar 24 11:35:57 2023 +0100 - updated build-dev.yaml commit d6d5216dce40de14910bde76b5f4fb8650bdbd9c Author: boriskovar-m2ms Date: Fri Mar 24 08:52:55 2023 +0100 Update package.json trigger build action commit 6bd9fcb0773fc3bbf5266ab9022d6e365dff9cfc Author: boriskovar-m2ms Date: Fri Mar 24 08:46:51 2023 +0100 Update package.json to trigger build action commit b20adee8140c7f46573eb5e7525e97427d23d4d4 Author: boriskovar-m2ms Date: Thu Mar 16 17:29:15 2023 +0100 Ms 2022 08 18 yellow (#345) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit 3a9a478d3bdbcb54802346efe2ec5e1f18242721 Merge: d777f117 4cb92f6c Author: boriskovar-m2ms Date: Thu Mar 16 10:50:04 2023 +0100 Merge branch 'staging' into ms-2022-08-18-yellow commit d777f117bbfab9a367ef8ad04c2fcf540cf19ef6 Author: Boris Kovar Date: Thu Mar 16 10:17:34 2023 +0100 - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit ae0cbdc8540aa440c776be3b84508c710a215d36 Author: Boris Kovar Date: Thu Mar 16 09:01:48 2023 +0100 - fixed bugs found in staging commit 4cb92f6ca3c986a087b840f9327e921ed17e1b4c Author: boriskovar-m2ms Date: Thu Mar 9 13:05:06 2023 +0100 Ms 2022 08 18 yellow (#344) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action commit bc13d845aa206aa7d8d151a8bb53f53335761084 Author: boriskovar-m2ms Date: Thu Mar 9 10:38:18 2023 +0100 Update package.json triggering build action commit 49d1ad57042d353f76c7368944601a8d64e44596 Author: boriskovar-m2ms Date: Thu Mar 9 10:32:30 2023 +0100 Update package.json to trigger build action commit fd0df1c021010f4f5e028090493464721b8b2600 Author: Boris Kovar Date: Thu Mar 9 09:11:44 2023 +0100 - added message when access to squonk is denied commit 622b635472e0ed7be1ae36062addd0f91d9ff6f4 Author: Boris Kovar Date: Wed Mar 8 14:35:57 2023 +0100 - fixed problem with id commit 74a1a62ca7a564d481be34c4301771ce7f5dd76a Author: Boris Kovar Date: Wed Mar 8 14:18:47 2023 +0100 - authorize user for viewing squonk job commit aa55bc41ee6a6fce4d8b146362e276265eed0af3 Author: Boris Kovar Date: Wed Mar 8 12:58:15 2023 +0100 - added more logs commit d97a512d75aa621be77ee69b547b21e1653386e1 Author: Boris Kovar Date: Wed Mar 8 12:19:18 2023 +0100 fixed problem with entries function commit 7e28e41d96e57998b979752d3651304bf36713c9 Author: Boris Kovar Date: Wed Mar 8 12:13:08 2023 +0100 - added debug logs commit f4becf9c94cf8c5eec225fde7b24c73131e0e338 Author: Boris Kovar Date: Wed Mar 8 11:29:23 2023 +0100 - implemented #890 commit bcd3ec01ddc68d3dd1dce78f1f3ca165e1633fd4 Author: Boris Kovar Date: Sun Mar 5 18:50:08 2023 +0100 - fixes because can't debug this locally commit 59779b6b80ec7e21af68b219a543a017aa837b14 Author: Boris Kovar Date: Sun Mar 5 18:29:05 2023 +0100 - trying to fix a bug with inputs commit 76ccc089efc43589bb381ea6589567dce538aa8b Author: Boris Kovar Date: Sun Mar 5 18:12:34 2023 +0100 - reworked show inputs in jobs table commit e862c726c81b0328cc9b7538d9820481b7d85cd8 Author: Boris Kovar Date: Sun Mar 5 16:46:29 2023 +0100 - added debug info commit 471d947b83f159bde413a32de06dbd10b9c4dfaf Author: Boris Kovar Date: Sun Mar 5 16:33:00 2023 +0100 - added debug info commit c4b11af95a56786493e13735ac92b1b1f766af79 Author: Boris Kovar Date: Sun Mar 5 16:13:41 2023 +0100 - added debug info commit 6adc86d4f95a362b38747e001f55bde2a104baff Author: Boris Kovar Date: Sun Mar 5 15:53:49 2023 +0100 - added debug info commit e42ed05162106109c927e80620d67b5af31b7ef1 Author: Boris Kovar Date: Sun Mar 5 15:34:10 2023 +0100 - added debug info commit 39034c54b97f4da301365c69d985640a66c75469 Author: Boris Kovar Date: Sun Mar 5 15:09:04 2023 +0100 - added debug info commit 9eee228b45b94479edfab5d6279d3e0ce4ccb8d1 Author: Boris Kovar Date: Sun Mar 5 14:48:45 2023 +0100 - added debug info commit 13a00cf2ba8f4ae13de4865096f9def349acd158 Merge: 0a36ae5c d0317f60 Author: rsanchezgarc Date: Tue Feb 21 20:43:31 2023 +0000 Merge pull request #341 from m2ms/ms-2022-08-18-yellow Ms 2022 08 18 yellow release commit d0317f607def3b6e1a5651554b338161fce4f040 Merge: 53164d21 8c4ca1d0 Author: Boris Kovar Date: Mon Feb 20 13:58:48 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 53164d21b23e7a918a772ced6292817b4306031e Author: Boris Kovar Date: Mon Feb 20 13:57:25 2023 +0100 Squashed commit of the following: commit 19b3910d84f9707b8047524cfe44dfa1f8696644 Author: Boris Kovar Date: Mon Feb 20 13:33:18 2023 +0100 - new dev BE commit af427c71d9499c975e12b314202bdb0f0ec13826 Author: boriskovar-m2ms Date: Fri Feb 17 08:44:14 2023 +0100 Update package.json just to trigger build action commit 4cb19eb371b0147dfc51b704a36dba842543d311 Author: boriskovar-m2ms Date: Thu Feb 16 09:09:27 2023 +0100 Update package.json just to trigger build action commit 7612967a111ec486f2072ca3ddd88330b4ad37c9 Author: boriskovar-m2ms Date: Wed Feb 15 14:01:32 2023 +0100 Update package.json just to trigger build action commit 4e8b27d9b65fe372e06df45bc720abb52f81dbe2 Author: Boris Kovar Date: Tue Feb 14 08:50:44 2023 +0100 - fixed direct links and direct download links commit c08da4bf71caf536e95423fb8b1e5d8ab01c60e7 Author: Boris Kovar Date: Thu Feb 9 14:02:18 2023 +0100 - fixed job name commit 4b9a491f0478849e268dc7b825ba358585cdb2ab Author: Boris Kovar Date: Thu Feb 9 13:28:20 2023 +0100 - added fragmenstein-combine-multi-scoring.json commit ca4f946d07074e87a74ac6a3d2272c1735343cb1 Author: Boris Kovar Date: Thu Feb 9 13:25:35 2023 +0100 - checkpoint commit b43373e1c228d9e46f4c831fc46269d614013e92 Author: Boris Kovar Date: Thu Feb 9 10:43:27 2023 +0100 - fixed problem where UI would crash if there was a problem during job file transfer of job launch commit 3618b10e2b77f4a7a173f38a8d8bbdc0a853805b Author: Boris Kovar Date: Thu Feb 9 09:54:36 2023 +0100 - fixed bad project capture from url commit 7d588895cebd0e363aa5d62b36770499364aef06 Merge: 11180a5c 4fc7f7bd Author: Boris Kovar Date: Wed Feb 8 09:27:51 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 11180a5c0142ea18624ae14ddaad16793fdcb435 Author: Boris Kovar Date: Wed Feb 8 09:26:31 2023 +0100 - prevent crash when there is a project associated with target which user is not authorized to see commit 4fc7f7bd2d0aae799099b29e256e3c0834e9576f Author: boriskovar-m2ms Date: Wed Feb 8 07:25:12 2023 +0100 Update package.json just to trigger build action commit 2b2665cfc609f621eb9bf505b9a86e6bd4fb3d35 Author: boriskovar-m2ms Date: Thu Feb 2 15:43:38 2023 +0100 Update package.json just to trigger the build action commit d0d429c473307ce2bfa825ad9e556084082accd8 Author: boriskovar-m2ms Date: Thu Feb 2 15:20:25 2023 +0100 Update package.json just to trigger the build action commit fcf377b863abf9110e1c0ce752b29bce073349cf Author: Boris Kovar Date: Thu Feb 2 14:51:17 2023 +0100 - fixed problem when job config windows closes on error commit c9e39f4da281f333c620811cf7ccfb6b8438cc1f Merge: 5a3d56bf 0f8e702a Author: Boris Kovar Date: Thu Feb 2 13:19:16 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 5a3d56bf87d9c8d8e6007dba5db8c1239dbf39a2 Author: Boris Kovar Date: Thu Feb 2 13:18:30 2023 +0100 - now sending id of the project and not target_access_string commit 0f8e702a023e2f786c5ba46eab2205f158a75480 Author: boriskovar-m2ms Date: Thu Feb 2 12:59:19 2023 +0100 Update package.json just to trigger build action commit 585076db67dc32b58083c184e1ca11a6dddc434b Author: Boris Kovar Date: Thu Feb 2 12:39:19 2023 +0100 - fixed problem when project pane was not showing up right after a project was created commit fa7fd759c30c3abf4e12b1c17af4107424993dc4 Author: Boris Kovar Date: Thu Feb 2 12:08:23 2023 +0100 - fix for missing project pane commit ba0a1fe55bd53f719d31d795d71877d81366cac9 Author: Boris Kovar Date: Thu Feb 2 09:05:50 2023 +0100 - version for job execution - broken UI commit 51555e1ba1eeb12e1eef340f108d7d3b595e6210 Merge: 51e97af1 a42cad71 Author: Boris Kovar Date: Wed Feb 1 13:58:27 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 51e97af1db45d3b4bb9b5d1fdd55a07991a9a19a Author: Boris Kovar Date: Wed Feb 1 13:57:49 2023 +0100 - partial implementation of #1020 commit a42cad7193b8c8f02c04378bba01f6f44114ec88 Author: boriskovar-m2ms Date: Thu Jan 26 08:34:01 2023 +0100 Update package.json just to trigger build action commit 96c0216e8b29169c9c1bf29471eafb5bddd24e5b Author: boriskovar-m2ms Date: Wed Jan 25 09:39:06 2023 +0100 Update package.json just to trigger build action commit c7de9cf16f783fad2bdfb78224a818221fa24ba1 Author: boriskovar-m2ms Date: Tue Jan 24 15:10:11 2023 +0100 Update package.json just to trigger the build action commit e8e5657cc5f7beecf5813040210605b6cf410cef Author: boriskovar-m2ms Date: Tue Jan 24 14:04:56 2023 +0100 Update package.json just to trigger build commit 24dc912bfdae3bec9c52867f2d638754635cecbb Author: Boris Kovar Date: Tue Jan 24 12:49:58 2023 +0100 - sensitive data moved to .env file commit a98c51751368104300a872f116cc22acc09cec44 Author: Boris Kovar Date: Tue Jan 24 12:49:06 2023 +0100 - added .env to gitignore commit 13b4bed082612315afc948192fe758fb42edf63d Author: Boris Kovar Date: Tue Jan 24 12:47:56 2023 +0100 - mending an error commit 5b74eb4326389e11b923b560f6603586bfc3b87c Author: Boris Kovar Date: Wed Jan 18 09:52:19 2023 +0100 - checkpoint commit d4b88dfe5c525b7c471d97ac47d46f9d992bfa48 Author: Boris Kovar Date: Tue Jan 17 10:10:27 2023 +0100 - initial implementation #1020 commit 8c4ca1d022f2a5841d68dde70edd9f433c539b83 Author: boriskovar-m2ms Date: Mon Jan 16 11:35:37 2023 +0100 Update package.json just to trigger build action commit 436196bb65fe5eb44f38abc3bc18cf827f09c8d6 Author: boriskovar-m2ms Date: Fri Jan 13 10:47:51 2023 +0100 Update package.json just to trigger build action commit 0d6abaa08dc7a174d915d33e21a1667accd39423 Author: boriskovar-m2ms Date: Thu Jan 12 10:18:23 2023 +0100 Update package.json just to trigger build action commit d5905966cb9bf2994f93668911873108832d7578 Author: Boris Kovar Date: Wed Jan 11 11:02:25 2023 +0100 - forgot to reset debug constants commit df7057032baa70df6451b7faf0a232fa75a1e55b Author: Boris Kovar Date: Wed Jan 11 08:05:23 2023 +0100 - minor fix for upload_status commit 698d123634ded171f161c3bb9f27e4e1600730be Author: Boris Kovar Date: Tue Jan 10 15:42:30 2023 +0100 - minor fix for upload_status commit 89bb79b92d6cef9fb410259ee93ae7e11859239a Author: Boris Kovar Date: Tue Jan 10 15:26:03 2023 +0100 - upload_failed now taken into the account commit 3f9f3ea181ab267ee9c1f52b88a620c0620fa34b Author: boriskovar-m2ms Date: Tue Jan 10 13:35:25 2023 +0100 Update package.json - just to trigger build action commit e6fbd6d213418dfd9708e206da341e8e37e776c3 Author: boriskovar-m2ms Date: Tue Jan 10 11:54:17 2023 +0100 Update package.json just to trigger build action commit 2d0a5257e2308d3b3241ec63a61ea5896981dc5e Author: Boris Kovar Date: Fri Dec 23 13:01:20 2022 +0100 - updated README.md commit 0a36ae5cc0f40aaab45ced9837e242308d17b578 Merge: 6a7a0dda 782b84b5 Author: rsanchezgarc Date: Tue Dec 20 18:11:19 2022 +0000 Merge pull request #337 from m2ms/ms-2022-08-18-yellow-wo-970 Animate to new orientation matrix first commit 5504bd464e1d699833f258b994e344cb339cb234 Author: Boris Kovar Date: Tue Dec 20 08:06:06 2022 +0100 Squashed commit of the following: commit cec398dcf0a14f7e433b2baec849e29001358839 Author: Boris Kovar Date: Tue Dec 20 08:00:30 2022 +0100 - commit 885f08e18f7983723a0944bd90cec646c869ee89 Author: Boris Kovar Date: Fri Dec 16 13:18:38 2022 +0100 - bug fix in progress for #970 commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 6fa2432f7226be0d54f7ce608719c0d59863d367 Author: Boris Kovar Date: Mon Dec 19 10:09:59 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 782b84b50f1d66742a3ed491b91d4ecf379b2edd Merge: eaa4ccbd f07779ce Author: Boris Kovar Date: Mon Dec 19 10:08:49 2022 +0100 Merge branch 'ms-2022-08-18-yellow-wo-970' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow-wo-970 commit eaa4ccbdf4282a772a19badf68fc2c14579d9173 Author: Boris Kovar Date: Mon Dec 19 10:08:30 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 6a7a0dda77266978a5afdaf82a5e8f89f5aa0d4e Merge: 356e625e f07779ce Author: rsanchezgarc Date: Fri Dec 16 12:44:21 2022 +0000 Merge pull request #334 from m2ms/ms-2022-08-18-yellow-wo-970 Ms 2022 08 18 yellow wo 970 commit f07779ce30667465ea1aba424085e8978827641a Merge: 57336b82 dcc2c882 Author: boriskovar-m2ms Date: Fri Dec 16 13:24:09 2022 +0100 Merge branch 'master' into ms-2022-08-18-yellow-wo-970 commit 21b437e8dd24102aebe35302d8b1ef2d18c6c040 Author: Boris Kovar Date: Thu Dec 15 16:32:57 2022 +0100 Squashed commit of the following: commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 2be8ed349ffdffa3602a2a393b4019bb3115ba5f Merge: 8ac386cd 57336b82 Author: Boris Kovar Date: Wed Dec 14 06:28:30 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8ac386cd710d9b6bf65cccac8d5962e6f6d730a5 Author: Boris Kovar Date: Wed Dec 14 06:27:11 2022 +0100 Squashed commit of the following: commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 57336b825cb95aecb3dfff78ab571bb85e906073 Author: boriskovar-m2ms Date: Thu Dec 8 11:41:44 2022 +0100 Update package.json just to trigger action commit c6c3ed0b16414d528684d63befca6a01634683d0 Author: boriskovar-m2ms Date: Wed Dec 7 11:57:33 2022 +0100 Update package.json just to trigger action commit 614b01c80882557160777ba96abc92c2d328112e Author: boriskovar-m2ms Date: Wed Dec 7 09:38:38 2022 +0100 Update package.json just to trigger action commit c0d2b3858d074b33303eef48e42f11e7eefac474 Author: boriskovar-m2ms Date: Wed Dec 7 08:39:23 2022 +0100 Update package.json just to trigger action commit bbf6f91e8498586d666204c3493405c4ca4e7268 Author: boriskovar-m2ms Date: Wed Dec 7 08:31:30 2022 +0100 Update package.json just to trigger rebuild commit 5edd5c4c387405b5f30ee88b19f1f2a2e91d8022 Author: Boris Kovar Date: Mon Dec 5 08:28:17 2022 +0100 Squashed commit of the following: commit 8d6edcb01a41b4abdddf86e94fe754682fb17964 Author: Boris Kovar Date: Mon Dec 5 08:14:43 2022 +0100 - #1001 commit 8c52f55f808f5566f83e6068e3dbe76cf06860b0 Author: Boris Kovar Date: Thu Dec 1 09:10:59 2022 +0100 Squashed commit of the following: commit 91f3363f245ec336810dd27b9d34aaaa82512a8a Author: Boris Kovar Date: Thu Dec 1 09:08:03 2022 +0100 - implemented #1012 commit f8eb4067e0ece9d170e3405bebe21a689927442c Author: Boris Kovar Date: Tue Nov 29 10:24:56 2022 +0100 Squashed commit of the following: commit a5b8f281ebd05cc6be2163fc7124855f6cee8418 Author: Boris Kovar Date: Tue Nov 29 10:22:31 2022 +0100 - fixed #1013 commit db173bcdd76574055d5132ec3cd34012a727656d Author: Boris Kovar Date: Mon Nov 28 14:39:16 2022 +0100 Squashed commit of the following: commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit 68d1a2fbd2be5620cca635c662dc0278dd578fcb Author: Boris Kovar Date: Mon Nov 28 09:08:21 2022 +0100 Squashed commit of the following: commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 356e625e4a0d7cee6bf1bd3c3b1627b59375e88d Merge: 0530324b 7b7cbe99 Author: rsanchezgarc Date: Mon Nov 14 09:59:45 2022 +0000 Merge pull request #329 from m2ms/#977-ngl Fast switching between snapshots commit 7b7cbe99952000f6c550727e082cb920cafa144c Author: Boris Kovar Date: Tue Nov 8 10:04:33 2022 +0100 - #977 - fixed issue with ngl settings were not saved and restored commit d1abaa872675f8a748f7c573aa74d79cdf629a0c Author: Boris Kovar Date: Mon Nov 7 10:14:18 2022 +0100 Squashed commit of the following: commit 4a8a532f6ea217d2921ed5fab6b6705442ca682f Author: Boris Kovar Date: Thu Nov 3 08:01:05 2022 +0100 - fixed ngl view was not tracked commit 0530324b9faae6876d0b42c48ac4b26a9eaf3c26 Merge: 931a5aea 5746062a Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:51:39 2022 +0100 Merge pull request #325 from xchem/production Action doc tweaks commit 5746062aacabb5201feefed8ea09e3e34066a175 Merge: b0e75d17 dc2ff23d Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:50:50 2022 +0100 Merge pull request #324 from alanbchristie/production Action doc tweaks commit dc2ff23d773157c74f864931e06ccb0fd21cf335 Author: Alan Christie Date: Thu Oct 27 15:48:48 2022 +0100 Add doc for production workflow commit c5ee4068a880a85d4fc5ed164dbbd711e4c5d0ec Author: Alan Christie Date: Thu Oct 27 15:35:27 2022 +0100 Tweak action docs commit 931a5aea583997a80bab66d8099f743529f8d98f Merge: cb4246e7 b0e75d17 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:51:21 2022 +0100 Merge pull request #323 from xchem/production Production now triggers stack commit b0e75d174217c507b2db2f4d6329e4ed2315e887 Merge: cb4246e7 ac3297e4 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:50:08 2022 +0100 Merge pull request #322 from alanbchristie/production Production now triggers stack commit ac3297e47b5ce9ca5a9ca1386818a317bc8098f2 Author: Alan Christie Date: Thu Oct 27 12:49:11 2022 +0100 Production now triggers stack Fix for BE tag commit cb4246e7f7acde133a4ca2081c30115dd5c87f56 Merge: dcc2c882 dec6f785 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 11:15:06 2022 +0100 Merge pull request #321 from alanbchristie/production CI changes for new branch policy commit dec6f785663f6e3050262c5a4b4704109d2e446a Author: Alan Christie Date: Thu Oct 27 10:58:08 2022 +0100 Removed personal repo references commit 2147aa18af1211a32f55e228c1023491008204ac Author: Boris Kovar Date: Wed Oct 26 10:00:07 2022 +0200 - updated squonk project id for dev stacks commit b2bc6e79197baa4c7336822fca2bfbf54eded377 Author: Boris Kovar Date: Mon Oct 24 16:47:24 2022 +0200 - first real version of the final implementation of ticket #977 - also added functionality that only if user did something with the snapshot, only then user will be prompted if new snapshot (or current overridden) should be saved or not - note: in this current version undoing an action does not undo the 'dirty' status of the snapshot commit 204a86d7f8901b9d39cf6495e625c709d82a8c72 Author: Boris Kovar Date: Thu Oct 20 07:32:33 2022 +0200 - nearly complete issue #977 commit dcc2c8824378b69e118564a664b332456d5632e4 Author: boriskovar-m2ms Date: Thu Sep 29 12:48:42 2022 +0200 edited in correct squonk project id commit 725f6d5267d568afd34f29f22b0869458d759832 Author: boriskovar-m2ms Date: Thu Sep 29 12:47:31 2022 +0200 removed Upload button from Job popup (#320) * - initial commit * - checkpoint * - new backend * Update package.json bumped version to 0.10.109 * Update package.json bumped version to 0.10.111 * Update package.json version bumped to 0.10.112 * Update package.json bumped version to 0.10.113 * Update package.json bumped version to 0.10.114 * Update package.json bumped version to 0.10.115 * - added new back-end * Squashed commit of the following: commit 949573bd930afaa0171a728f05dafa08c2425341 Merge: deb0d1c3 74ea6613 Author: Boris Kovar Date: Thu Jul 14 06:56:52 2022 +0200 Merge branch '#885-bugfix' of https://github.com/m2ms/fragalysis-frontend into #885-bugfix commit deb0d1c31aa68fb38c1d1541aca6bd81410e515b Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit e2a00641039dd34b348ce2084eefd8f33ae04343 Author: Boris Kovar Date: Mon Jun 6 06:05:49 2022 +0200 Squashed commit of the following: -bumped version to 0.10.93 commit dfa24f68c4cb0e84ad37ac663ec08caadd2f3fbb Author: Anton Gasperak Date: Wed Jun 1 11:53:32 2022 +0200 #883 - Remove unused selection action commit 0ae63081e822a514443a7b6c6e1fb3826a8c6178 Author: Anton Gasperak Date: Wed Jun 1 11:43:17 2022 +0200 #883 - Remove countOfPendingVectorLoadRequests from selectionReducers with unused hook commit b884e0b59c5e9000422adbf6e6adf7b14847b51f Author: Anton Gasperak Date: Wed Jun 1 11:10:44 2022 +0200 #883 - Remove associatedDownloadTagName from selectionReducers commit ab825ccf3369af8fbaab9c8d25d68c5a1699d773 Author: Anton Gasperak Date: Wed Jun 1 10:54:57 2022 +0200 #883 - Remove displayedMoleculesInHitNav from selectionReducers commit 4103e3984bc9b3fbf2cc48bef3b9d65864a4814b Author: Anton Gasperak Date: Wed Jun 1 10:08:28 2022 +0200 #883 - Remove displayAllInNGLList from selectionReducers commit f3b3b10a879447705b2709b88d48b62fe50e14cc Author: Anton Gasperak Date: Wed Jun 1 09:59:23 2022 +0200 #883 - Remove listAllList from selectionReducers commit 02aa5955918abace2d5473e89bb9260ff10d7338 Author: Anton Gasperak Date: Wed Jun 1 09:40:29 2022 +0200 #883 - Move categoryList from selectionReducers to apiReducers commit d059ee8d4de0ddc34be64ef9c55a71c4f2bd96df Author: Anton Gasperak Date: Wed Jun 1 08:43:26 2022 +0200 #883 - Move tagList from selectionReducers to apiReducers commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 #885 - Add the possibility to recompile variables before job launching commit 74ea6613da0306f5251a440bdfdaa44f225ccb69 Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 #885 - Adjust and compile schema commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 #885 - Reuse the merged schema in JobVariablesDialog commit bd3ff2b3f22dada64afadd4df1685bcc46ab2d21 Author: Anton Gasperak Date: Fri Jun 3 08:36:34 2022 +0200 #885 - Add new job definition * updated fragmentstein job spec Squashed commit of the following: commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 #885 - Add the possibility to recompile variables before job launching commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 #885 - Adjust and compile schema commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 #885 - Reuse the merged schema in JobVariable… * Squashed commit of the following: commit de09cdc6e9386ca3f6aea63fa373ef75938dec6d Merge: 4caeef7b 8b73ee22 Author: Boris Kovar Date: Tue Aug 8 11:38:09 2023 +0200 Merge branch '#1106' of https://github.com/m2ms/fragalysis-frontend into #1106 commit 4caeef7b2f6f9acbf617989b94e62030e6ed8052 Author: Boris Kovar Date: Tue Aug 8 11:37:40 2023 +0200 - updated table styling commit 8b73ee22d38fb5b93435c4c03fc537334adc3ebc Author: boriskovar-m2ms Date: Mon Aug 7 13:24:08 2023 +0200 Update package.json just to trigger build action commit d16130686039662cd7ebe0f9b6eeaadbe57d7d37 Author: Boris Kovar Date: Mon Aug 7 12:55:44 2023 +0200 - table is now autosized commit e867e77c40598a12fa10ca6ab526880274936752 Author: RobertMatuska Date: Mon Aug 7 09:03:11 2023 +0200 #1106 edited columns size commit 7b88603bf0d93b60c6fa996a35b5afb21a3d8835 Author: RobertMatuska Date: Tue Aug 1 15:29:56 2023 +0200 #1112 fixed project list filter commit 6951206f2d9285ac2aa59f34c20cd2383735ba8f Author: RobertMatuska Date: Tue Aug 1 08:41:52 2023 +0200 #1112 fixed numb rows per page vs numb of projects commit 11df780229077611f93ab766c508c485d4bcb7b3 Author: RobertMatuska Date: Tue Aug 1 08:37:10 2023 +0200 #1112 fixed pagination numbers in dropdown commit 1252aa88178d9b745e32a5c20c4ca353049545f1 Author: Boris Kovar Date: Mon Jul 31 15:40:06 2023 +0200 - fixed overflow commit f2d8eac83d6685ba4bc8929754519f9b48730cb5 Author: Boris Kovar Date: Mon Jul 31 14:51:19 2023 +0200 - fixed problem from #1112 where page-ination controls were not visible commit 62227fbd35fb110dc9dec60342beb66ef2582762 Author: Boris Kovar Date: Mon Jul 31 13:51:34 2023 +0200 - fixed issue when implicit actions setSearchString was tracked which caused that user had to click undo twice after clicking on the dataset tab commit 3bb794549e6eda0c4cb43ceeeac1df152648ba0e Author: Boris Kovar Date: Mon Jul 31 13:33:30 2023 +0200 - fixed #1116 + whole bunch of other bugs related to preserving and restoring search (both LHS and RHS) string from snapshot commit f1d0db5f2161a14201b4e447317eeea640f80f06 Author: Boris Kovar Date: Mon Jul 31 11:01:21 2023 +0200 - fixed #1117 commit 1038f80e842e5df9490554d5244427402dd7d6b7 Author: Boris Kovar Date: Mon Jul 31 10:11:26 2023 +0200 - fixed issue #1113 commit aff597978d59b4095f7e76be3ee834ffc5bc0873 Merge: 81a2e968 d7370794 Author: Boris Kovar Date: Thu Jul 27 16:10:24 2023 +0200 Merge branch 'RedRelease20230525' of https://github.com/m2ms/fragalysis-frontend into RedRelease20230525 commit 81a2e96813768ec718f50389bef30cbc4bc82aff Author: Boris Kovar Date: Thu Jul 27 16:09:42 2023 +0200 - navigation arrows highlighting commit d737079487147e02f1703f543d8264536e6c5f80 Merge: 899b7e36 48299e86 Author: boriskovar-m2ms Date: Thu Jul 27 14:47:09 2023 +0200 Merge branch 'staging' into RedRelease20230525 commit 899b7e36076b30af93e3fe6fdea0077b13737ff1 Author: Boris Kovar Date: Thu Jul 27 13:18:20 2023 +0200 - highlighted arrows commit 7991d5c18c24c6663fe2c5d8effcc7cd048951ac Author: Boris Kovar Date: Thu Jul 27 10:16:02 2023 +0200 - when creating project a default snapshot is created automatically commit 3bf735365696020858d5c2b718250c106578debf Author: Boris Kovar Date: Thu Jul 27 09:22:30 2023 +0200 Squashed commit of the following: commit 040d9bdbf30fb9dc239969916f108cb5056911c0 Author: RobertMatuska Date: Thu Jul 27 08:38:51 2023 +0200 #576 fixed design bug commit 3d18d6d017c3c2ab01a75a2aef1823e252a802c8 Author: Boris Kovar Date: Wed Jul 26 21:04:39 2023 +0200 - first bunch of fixes commit aa097721670867f85d5a789cd41a548bb57d16b7 Author: Boris Kovar Date: Wed Jul 26 17:36:34 2023 +0200 - minor fix to button color behavior commit a0f0933086ebeadb1d1e47879021121a49f3cde7 Author: Boris Kovar Date: Wed Jul 26 16:57:32 2023 +0200 - fixed select displayed hits button commit 6f200d2c86dfb14aad6ea3776842841766cfccfe Author: Boris Kovar Date: Wed Jul 26 13:32:39 2023 +0200 Squashed commit of the following: commit 66118b5d4dfbddd50cdce5af77c857e90325a78b Author: Boris Kovar Date: Tue Jul 4 08:00:12 2023 +0200 - fixed #1073 commit ae8406cfdb405dce01d075de39754d2acd6cc55a Author: Boris Kovar Date: Wed Jun 7 08:26:20 2023 +0200 Squashed commit of the following: commit e42baf37a2503f3378c856e26e8d699bc71bd3ac Merge: d266f99b 949f4734 Author: boriskovar-m2ms Date: Wed Apr 26 11:17:58 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit d266f99bfbccd23d6a9951bdba71bf487554e9bc Author: Boris Kovar Date: Wed Apr 26 10:50:48 2023 +0200 - fixed problem for 'add button to job table to copy snapshot associated with the job run' commit 62784948247ed7f0521b10418b1b8a271e7062f0 Author: Boris Kovar Date: Wed Apr 26 09:43:11 2023 +0200 - add button to job table to copy snapshot associated with the job run commit 949f47340369a671516a7c6317f8f7e35ba86984 Author: boriskovar-m2ms Date: Mon Apr 24 14:47:39 2023 +0200 Ms 2022 08 18 yellow (#351) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging * - schema expansion test * Update package.json just to trigger build action * Update package.json to trigger build action commit f41cdb0d525e993a7a48c0dbb397618e0ea76bc9 Merge: eaadb729 8d437c3f Author: boriskovar-m2ms Date: Mon Apr 24 14:35:37 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit eaadb729f90441417c899cf4869e26a1b789bb42 Author: boriskovar-m2ms Date: Mon Apr 24 12:39:23 2023 +0200 Update package.json to trigger build action commit 1b46f37c6ac11d5c7e9a0a1ceff7b68dad785b27 Author: boriskovar-m2ms Date: Mon Apr 24 11:26:05 2023 +0200 Update package.json just to trigger build action commit 09007706e2ec26c6006d7d19a756129d093ac306 Author: Boris Kovar Date: Mon Apr 24 09:36:38 2023 +0200 - schema expansion test commit 8d437c3f6b735953eb07f06fec82bdfdd26d7e44 Author: boriskovar-m2ms Date: Tue Apr 11 17:00:05 2023 +0200 Ms 2022 08 18 yellow (#350) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging commit 7790dfbc261a302018423ce1a506eb33eb48d683 Merge: bf42cc20 45438127 Author: Boris Kovar Date: Tue Apr 11 16:57:36 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit bf42cc20b514c4b3708b606557cb576324f02a20 Author: Boris Kovar Date: Tue Apr 11 16:57:18 2023 +0200 - fixed bad merge from staging commit adc2f5b9e3fd8495c92b8089fb851ae3bc5a49fa Author: boriskovar-m2ms Date: Tue Apr 11 15:47:17 2023 +0200 Ms 2022 08 18 yellow (#349) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects commit 45438127c520d201677dd1b5c1fd876cdfb035e4 Merge: 73b5d4c7 dcbf19fd Author: boriskovar-m2ms Date: Tue Apr 11 15:46:11 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 73b5d4c7e705124ed5e1941226cae17ab5044ef6 Merge: b74587f0 1447b079 Author: Boris Kovar Date: Tue Apr 11 15:28:34 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit b74587f0bdd68af93e44692c6c41517ed36ad4b1 Author: Boris Kovar Date: Tue Apr 11 15:27:49 2023 +0200 - hopefully fixed problem with reloading older projects commit dcbf19fd11a4734d18714b154b7b6e577b0ccd69 Author: boriskovar-m2ms Date: Tue Apr 11 12:42:14 2023 +0200 Ms 2022 08 18 yellow (#348) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 1447b079e018d9ce1d67b96161be626b7d97a6bd Merge: b774ac60 d7b5e5c2 Author: boriskovar-m2ms Date: Tue Apr 11 12:41:03 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit b774ac6044bc97f38ef5b2e62a6eeea2a94e0dc5 Author: Boris Kovar Date: Tue Apr 11 12:05:53 2023 +0200 frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 56ce17ff1db67e6deb96d2e16c4c7ae4e0b6c39b Author: Boris Kovar Date: Thu Apr 6 14:20:00 2023 +0200 - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag commit d7b5e5c26dae7824d3c930fb263a02c592a2c042 Author: boriskovar-m2ms Date: Thu Apr 6 10:43:08 2023 +0200 Ms 2022 08 18 yellow (#347) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available commit 17e89cefe8264584ebe0fadc637a1fac542704ac Author: Boris Kovar Date: Thu Apr 6 10:23:27 2023 +0200 - can't go to squonk job execution page if the url is not available commit 16f0cbddafd994293e45573f3d6ebeeeab1e4b22 Author: boriskovar-m2ms Date: Thu Apr 6 09:11:52 2023 +0200 Minor fixes before the release (#346) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image commit c8b5f20dd521c7007f08531736541ca84b041a85 Merge: 8d500638 2cd48e04 Author: Boris Kovar Date: Wed Apr 5 14:35:17 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8d50063887bc2f6335550f15fe69cc93b17be30e Author: Boris Kovar Date: Wed Apr 5 14:34:49 2023 +0200 - new BE image commit 2cd48e0474f31fe9f0d0f4eb256cad32ed5516cd Merge: 0fddd791 b20adee8 Author: boriskovar-m2ms Date: Wed Apr 5 13:00:20 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 0fddd791812ce9e4093a784850c8e4c5698f3f18 Author: boriskovar-m2ms Date: Wed Apr 5 12:09:36 2023 +0200 Update package.json triggering the build action commit bed2dc1bf438a2f61b61fdd2d1b18753d1ef58be Author: Boris Kovar Date: Wed Apr 5 10:44:24 2023 +0200 - before the release fixes commit b10160928bff787161a140e4cffd8aa783a4c482 Merge: f6699d10 9f5f2b7c Author: Boris Kovar Date: Fri Mar 31 09:38:39 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit f6699d106af94bbba6be1494a0c83e0cf1a5b084 Author: Boris Kovar Date: Fri Mar 31 09:37:22 2023 +0200 - minor typo fix commit 9f5f2b7cad0ebb482d8069114d52bf65ca6c6531 Author: boriskovar-m2ms Date: Fri Mar 24 14:00:10 2023 +0100 Update package.json just to trigger build action commit 5a37013c71469f9433c36d956174b1efc1e698ab Author: boriskovar-m2ms Date: Fri Mar 24 12:43:27 2023 +0100 Update package.json to trigger build action commit b54cdaa4ea816719128c07939a14a99152a8e990 Merge: 5dfc38be d6d5216d Author: Boris Kovar Date: Fri Mar 24 11:36:29 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 5dfc38bef9b0a0fead21b824db58461c185f98fd Author: Boris Kovar Date: Fri Mar 24 11:35:57 2023 +0100 - updated build-dev.yaml commit d6d5216dce40de14910bde76b5f4fb8650bdbd9c Author: boriskovar-m2ms Date: Fri Mar 24 08:52:55 2023 +0100 Update package.json trigger build action commit 6bd9fcb0773fc3bbf5266ab9022d6e365dff9cfc Author: boriskovar-m2ms Date: Fri Mar 24 08:46:51 2023 +0100 Update package.json to trigger build action commit b20adee8140c7f46573eb5e7525e97427d23d4d4 Author: boriskovar-m2ms Date: Thu Mar 16 17:29:15 2023 +0100 Ms 2022 08 18 yellow (#345) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit 3a9a478d3bdbcb54802346efe2ec5e1f18242721 Merge: d777f117 4cb92f6c Author: boriskovar-m2ms Date: Thu Mar 16 10:50:04 2023 +0100 Merge branch 'staging' into ms-2022-08-18-yellow commit d777f117bbfab9a367ef8ad04c2fcf540cf19ef6 Author: Boris Kovar Date: Thu Mar 16 10:17:34 2023 +0100 - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit ae0cbdc8540aa440c776be3b84508c710a215d36 Author: Boris Kovar Date: Thu Mar 16 09:01:48 2023 +0100 - fixed bugs found in staging commit 4cb92f6ca3c986a087b840f9327e921ed17e1b4c Author: boriskovar-m2ms Date: Thu Mar 9 13:05:06 2023 +0100 Ms 2022 08 18 yellow (#344) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action commit bc13d845aa206aa7d8d151a8bb53f53335761084 Author: boriskovar-m2ms Date: Thu Mar 9 10:38:18 2023 +0100 Update package.json triggering build action commit 49d1ad57042d353f76c7368944601a8d64e44596 Author: boriskovar-m2ms Date: Thu Mar 9 10:32:30 2023 +0100 Update package.json to trigger build action commit fd0df1c021010f4f5e028090493464721b8b2600 Author: Boris Kovar Date: Thu Mar 9 09:11:44 2023 +0100 - added message when access to squonk is denied commit 622b635472e0ed7be1ae36062addd0f91d9ff6f4 Author: Boris Kovar Date: Wed Mar 8 14:35:57 2023 +0100 - fixed problem with id commit 74a1a62ca7a564d481be34c4301771ce7f5dd76a Author: Boris Kovar Date: Wed Mar 8 14:18:47 2023 +0100 - authorize user for viewing squonk job commit aa55bc41ee6a6fce4d8b146362e276265eed0af3 Author: Boris Kovar Date: Wed Mar 8 12:58:15 2023 +0100 - added more logs commit d97a512d75aa621be77ee69b547b21e1653386e1 Author: Boris Kovar Date: Wed Mar 8 12:19:18 2023 +0100 fixed problem with entries function commit 7e28e41d96e57998b979752d3651304bf36713c9 Author: Boris Kovar Date: Wed Mar 8 12:13:08 2023 +0100 - added debug logs commit f4becf9c94cf8c5eec225fde7b24c73131e0e338 Author: Boris Kovar Date: Wed Mar 8 11:29:23 2023 +0100 - implemented #890 commit bcd3ec01ddc68d3dd1dce78f1f3ca165e1633fd4 Author: Boris Kovar Date: Sun Mar 5 18:50:08 2023 +0100 - fixes because can't debug this locally commit 59779b6b80ec7e21af68b219a543a017aa837b14 Author: Boris Kovar Date: Sun Mar 5 18:29:05 2023 +0100 - trying to fix a bug with inputs commit 76ccc089efc43589bb381ea6589567dce538aa8b Author: Boris Kovar Date: Sun Mar 5 18:12:34 2023 +0100 - reworked show inputs in jobs table commit e862c726c81b0328cc9b7538d9820481b7d85cd8 Author: Boris Kovar Date: Sun Mar 5 16:46:29 2023 +0100 - added debug info commit 471d947b83f159bde413a32de06dbd10b9c4dfaf Author: Boris Kovar Date: Sun Mar 5 16:33:00 2023 +0100 - added debug info commit c4b11af95a56786493e13735ac92b1b1f766af79 Author: Boris Kovar Date: Sun Mar 5 16:13:41 2023 +0100 - added debug info commit 6adc86d4f95a362b38747e001f55bde2a104baff Author: Boris Kovar Date: Sun Mar 5 15:53:49 2023 +0100 - added debug info commit e42ed05162106109c927e80620d67b5af31b7ef1 Author: Boris Kovar Date: Sun Mar 5 15:34:10 2023 +0100 - added debug info commit 39034c54b97f4da301365c69d985640a66c75469 Author: Boris Kovar Date: Sun Mar 5 15:09:04 2023 +0100 - added debug info commit 9eee228b45b94479edfab5d6279d3e0ce4ccb8d1 Author: Boris Kovar Date: Sun Mar 5 14:48:45 2023 +0100 - added debug info commit 13a00cf2ba8f4ae13de4865096f9def349acd158 Merge: 0a36ae5c d0317f60 Author: rsanchezgarc Date: Tue Feb 21 20:43:31 2023 +0000 Merge pull request #341 from m2ms/ms-2022-08-18-yellow Ms 2022 08 18 yellow release commit d0317f607def3b6e1a5651554b338161fce4f040 Merge: 53164d21 8c4ca1d0 Author: Boris Kovar Date: Mon Feb 20 13:58:48 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 53164d21b23e7a918a772ced6292817b4306031e Author: Boris Kovar Date: Mon Feb 20 13:57:25 2023 +0100 Squashed commit of the following: commit 19b3910d84f9707b8047524cfe44dfa1f8696644 Author: Boris Kovar Date: Mon Feb 20 13:33:18 2023 +0100 - new dev BE commit af427c71d9499c975e12b314202bdb0f0ec13826 Author: boriskovar-m2ms Date: Fri Feb 17 08:44:14 2023 +0100 Update package.json just to trigger build action commit 4cb19eb371b0147dfc51b704a36dba842543d311 Author: boriskovar-m2ms Date: Thu Feb 16 09:09:27 2023 +0100 Update package.json just to trigger build action commit 7612967a111ec486f2072ca3ddd88330b4ad37c9 Author: boriskovar-m2ms Date: Wed Feb 15 14:01:32 2023 +0100 Update package.json just to trigger build action commit 4e8b27d9b65fe372e06df45bc720abb52f81dbe2 Author: Boris Kovar Date: Tue Feb 14 08:50:44 2023 +0100 - fixed direct links and direct download links commit c08da4bf71caf536e95423fb8b1e5d8ab01c60e7 Author: Boris Kovar Date: Thu Feb 9 14:02:18 2023 +0100 - fixed job name commit 4b9a491f0478849e268dc7b825ba358585cdb2ab Author: Boris Kovar Date: Thu Feb 9 13:28:20 2023 +0100 - added fragmenstein-combine-multi-scoring.json commit ca4f946d07074e87a74ac6a3d2272c1735343cb1 Author: Boris Kovar Date: Thu Feb 9 13:25:35 2023 +0100 - checkpoint commit b43373e1c228d9e46f4c831fc46269d614013e92 Author: Boris Kovar Date: Thu Feb 9 10:43:27 2023 +0100 - fixed problem where UI would crash if there was a problem during job file transfer of job launch commit 3618b10e2b77f4a7a173f38a8d8bbdc0a853805b Author: Boris Kovar Date: Thu Feb 9 09:54:36 2023 +0100 - fixed bad project capture from url commit 7d588895cebd0e363aa5d62b36770499364aef06 Merge: 11180a5c 4fc7f7bd Author: Boris Kovar Date: Wed Feb 8 09:27:51 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 11180a5c0142ea18624ae14ddaad16793fdcb435 Author: Boris Kovar Date: Wed Feb 8 09:26:31 2023 +0100 - prevent crash when there is a project associated with target which user is not authorized to see commit 4fc7f7bd2d0aae799099b29e256e3c0834e9576f Author: boriskovar-m2ms Date: Wed Feb 8 07:25:12 2023 +0100 Update package.json just to trigger build action commit 2b2665cfc609f621eb9bf505b9a86e6bd4fb3d35 Author: boriskovar-m2ms Date: Thu Feb 2 15:43:38 2023 +0100 Update package.json just to trigger the build action commit d0d429c473307ce2bfa825ad9e556084082accd8 Author: boriskovar-m2ms Date: Thu Feb 2 15:20:25 2023 +0100 Update package.json just to trigger the build action commit fcf377b863abf9110e1c0ce752b29bce073349cf Author: Boris Kovar Date: Thu Feb 2 14:51:17 2023 +0100 - fixed problem when job config windows closes on error commit c9e39f4da281f333c620811cf7ccfb6b8438cc1f Merge: 5a3d56bf 0f8e702a Author: Boris Kovar Date: Thu Feb 2 13:19:16 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 5a3d56bf87d9c8d8e6007dba5db8c1239dbf39a2 Author: Boris Kovar Date: Thu Feb 2 13:18:30 2023 +0100 - now sending id of the project and not target_access_string commit 0f8e702a023e2f786c5ba46eab2205f158a75480 Author: boriskovar-m2ms Date: Thu Feb 2 12:59:19 2023 +0100 Update package.json just to trigger build action commit 585076db67dc32b58083c184e1ca11a6dddc434b Author: Boris Kovar Date: Thu Feb 2 12:39:19 2023 +0100 - fixed problem when project pane was not showing up right after a project was created commit fa7fd759c30c3abf4e12b1c17af4107424993dc4 Author: Boris Kovar Date: Thu Feb 2 12:08:23 2023 +0100 - fix for missing project pane commit ba0a1fe55bd53f719d31d795d71877d81366cac9 Author: Boris Kovar Date: Thu Feb 2 09:05:50 2023 +0100 - version for job execution - broken UI commit 51555e1ba1eeb12e1eef340f108d7d3b595e6210 Merge: 51e97af1 a42cad71 Author: Boris Kovar Date: Wed Feb 1 13:58:27 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 51e97af1db45d3b4bb9b5d1fdd55a07991a9a19a Author: Boris Kovar Date: Wed Feb 1 13:57:49 2023 +0100 - partial implementation of #1020 commit a42cad7193b8c8f02c04378bba01f6f44114ec88 Author: boriskovar-m2ms Date: Thu Jan 26 08:34:01 2023 +0100 Update package.json just to trigger build action commit 96c0216e8b29169c9c1bf29471eafb5bddd24e5b Author: boriskovar-m2ms Date: Wed Jan 25 09:39:06 2023 +0100 Update package.json just to trigger build action commit c7de9cf16f783fad2bdfb78224a818221fa24ba1 Author: boriskovar-m2ms Date: Tue Jan 24 15:10:11 2023 +0100 Update package.json just to trigger the build action commit e8e5657cc5f7beecf5813040210605b6cf410cef Author: boriskovar-m2ms Date: Tue Jan 24 14:04:56 2023 +0100 Update package.json just to trigger build commit 24dc912bfdae3bec9c52867f2d638754635cecbb Author: Boris Kovar Date: Tue Jan 24 12:49:58 2023 +0100 - sensitive data moved to .env file commit a98c51751368104300a872f116cc22acc09cec44 Author: Boris Kovar Date: Tue Jan 24 12:49:06 2023 +0100 - added .env to gitignore commit 13b4bed082612315afc948192fe758fb42edf63d Author: Boris Kovar Date: Tue Jan 24 12:47:56 2023 +0100 - mending an error commit 5b74eb4326389e11b923b560f6603586bfc3b87c Author: Boris Kovar Date: Wed Jan 18 09:52:19 2023 +0100 - checkpoint commit d4b88dfe5c525b7c471d97ac47d46f9d992bfa48 Author: Boris Kovar Date: Tue Jan 17 10:10:27 2023 +0100 - initial implementation #1020 commit 8c4ca1d022f2a5841d68dde70edd9f433c539b83 Author: boriskovar-m2ms Date: Mon Jan 16 11:35:37 2023 +0100 Update package.json just to trigger build action commit 436196bb65fe5eb44f38abc3bc18cf827f09c8d6 Author: boriskovar-m2ms Date: Fri Jan 13 10:47:51 2023 +0100 Update package.json just to trigger build action commit 0d6abaa08dc7a174d915d33e21a1667accd39423 Author: boriskovar-m2ms Date: Thu Jan 12 10:18:23 2023 +0100 Update package.json just to trigger build action commit d5905966cb9bf2994f93668911873108832d7578 Author: Boris Kovar Date: Wed Jan 11 11:02:25 2023 +0100 - forgot to reset debug constants commit df7057032baa70df6451b7faf0a232fa75a1e55b Author: Boris Kovar Date: Wed Jan 11 08:05:23 2023 +0100 - minor fix for upload_status commit 698d123634ded171f161c3bb9f27e4e1600730be Author: Boris Kovar Date: Tue Jan 10 15:42:30 2023 +0100 - minor fix for upload_status commit 89bb79b92d6cef9fb410259ee93ae7e11859239a Author: Boris Kovar Date: Tue Jan 10 15:26:03 2023 +0100 - upload_failed now taken into the account commit 3f9f3ea181ab267ee9c1f52b88a620c0620fa34b Author: boriskovar-m2ms Date: Tue Jan 10 13:35:25 2023 +0100 Update package.json - just to trigger build action commit e6fbd6d213418dfd9708e206da341e8e37e776c3 Author: boriskovar-m2ms Date: Tue Jan 10 11:54:17 2023 +0100 Update package.json just to trigger build action commit 2d0a5257e2308d3b3241ec63a61ea5896981dc5e Author: Boris Kovar Date: Fri Dec 23 13:01:20 2022 +0100 - updated README.md commit 0a36ae5cc0f40aaab45ced9837e242308d17b578 Merge: 6a7a0dda 782b84b5 Author: rsanchezgarc Date: Tue Dec 20 18:11:19 2022 +0000 Merge pull request #337 from m2ms/ms-2022-08-18-yellow-wo-970 Animate to new orientation matrix first commit 5504bd464e1d699833f258b994e344cb339cb234 Author: Boris Kovar Date: Tue Dec 20 08:06:06 2022 +0100 Squashed commit of the following: commit cec398dcf0a14f7e433b2baec849e29001358839 Author: Boris Kovar Date: Tue Dec 20 08:00:30 2022 +0100 - commit 885f08e18f7983723a0944bd90cec646c869ee89 Author: Boris Kovar Date: Fri Dec 16 13:18:38 2022 +0100 - bug fix in progress for #970 commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 6fa2432f7226be0d54f7ce608719c0d59863d367 Author: Boris Kovar Date: Mon Dec 19 10:09:59 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 782b84b50f1d66742a3ed491b91d4ecf379b2edd Merge: eaa4ccbd f07779ce Author: Boris Kovar Date: Mon Dec 19 10:08:49 2022 +0100 Merge branch 'ms-2022-08-18-yellow-wo-970' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow-wo-970 commit eaa4ccbdf4282a772a19badf68fc2c14579d9173 Author: Boris Kovar Date: Mon Dec 19 10:08:30 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 6a7a0dda77266978a5afdaf82a5e8f89f5aa0d4e Merge: 356e625e f07779ce Author: rsanchezgarc Date: Fri Dec 16 12:44:21 2022 +0000 Merge pull request #334 from m2ms/ms-2022-08-18-yellow-wo-970 Ms 2022 08 18 yellow wo 970 commit f07779ce30667465ea1aba424085e8978827641a Merge: 57336b82 dcc2c882 Author: boriskovar-m2ms Date: Fri Dec 16 13:24:09 2022 +0100 Merge branch 'master' into ms-2022-08-18-yellow-wo-970 commit 21b437e8dd24102aebe35302d8b1ef2d18c6c040 Author: Boris Kovar Date: Thu Dec 15 16:32:57 2022 +0100 Squashed commit of the following: commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 2be8ed349ffdffa3602a2a393b4019bb3115ba5f Merge: 8ac386cd 57336b82 Author: Boris Kovar Date: Wed Dec 14 06:28:30 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8ac386cd710d9b6bf65cccac8d5962e6f6d730a5 Author: Boris Kovar Date: Wed Dec 14 06:27:11 2022 +0100 Squashed commit of the following: commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 57336b825cb95aecb3dfff78ab571bb85e906073 Author: boriskovar-m2ms Date: Thu Dec 8 11:41:44 2022 +0100 Update package.json just to trigger action commit c6c3ed0b16414d528684d63befca6a01634683d0 Author: boriskovar-m2ms Date: Wed Dec 7 11:57:33 2022 +0100 Update package.json just to trigger action commit 614b01c80882557160777ba96abc92c2d328112e Author: boriskovar-m2ms Date: Wed Dec 7 09:38:38 2022 +0100 Update package.json just to trigger action commit c0d2b3858d074b33303eef48e42f11e7eefac474 Author: boriskovar-m2ms Date: Wed Dec 7 08:39:23 2022 +0100 Update package.json just to trigger action commit bbf6f91e8498586d666204c3493405c4ca4e7268 Author: boriskovar-m2ms Date: Wed Dec 7 08:31:30 2022 +0100 Update package.json just to trigger rebuild commit 5edd5c4c387405b5f30ee88b19f1f2a2e91d8022 Author: Boris Kovar Date: Mon Dec 5 08:28:17 2022 +0100 Squashed commit of the following: commit 8d6edcb01a41b4abdddf86e94fe754682fb17964 Author: Boris Kovar Date: Mon Dec 5 08:14:43 2022 +0100 - #1001 commit 8c52f55f808f5566f83e6068e3dbe76cf06860b0 Author: Boris Kovar Date: Thu Dec 1 09:10:59 2022 +0100 Squashed commit of the following: commit 91f3363f245ec336810dd27b9d34aaaa82512a8a Author: Boris Kovar Date: Thu Dec 1 09:08:03 2022 +0100 - implemented #1012 commit f8eb4067e0ece9d170e3405bebe21a689927442c Author: Boris Kovar Date: Tue Nov 29 10:24:56 2022 +0100 Squashed commit of the following: commit a5b8f281ebd05cc6be2163fc7124855f6cee8418 Author: Boris Kovar Date: Tue Nov 29 10:22:31 2022 +0100 - fixed #1013 commit db173bcdd76574055d5132ec3cd34012a727656d Author: Boris Kovar Date: Mon Nov 28 14:39:16 2022 +0100 Squashed commit of the following: commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit 68d1a2fbd2be5620cca635c662dc0278dd578fcb Author: Boris Kovar Date: Mon Nov 28 09:08:21 2022 +0100 Squashed commit of the following: commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 356e625e4a0d7cee6bf1bd3c3b1627b59375e88d Merge: 0530324b 7b7cbe99 Author: rsanchezgarc Date: Mon Nov 14 09:59:45 2022 +0000 Merge pull request #329 from m2ms/#977-ngl Fast switching between snapshots commit 7b7cbe99952000f6c550727e082cb920cafa144c Author: Boris Kovar Date: Tue Nov 8 10:04:33 2022 +0100 - #977 - fixed issue with ngl settings were not saved and restored commit d1abaa872675f8a748f7c573aa74d79cdf629a0c Author: Boris Kovar Date: Mon Nov 7 10:14:18 2022 +0100 Squashed commit of the following: commit 4a8a532f6ea217d2921ed5fab6b6705442ca682f Author: Boris Kovar Date: Thu Nov 3 08:01:05 2022 +0100 - fixed ngl view was not tracked commit 0530324b9faae6876d0b42c48ac4b26a9eaf3c26 Merge: 931a5aea 5746062a Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:51:39 2022 +0100 Merge pull request #325 from xchem/production Action doc tweaks commit 5746062aacabb5201feefed8ea09e3e34066a175 Merge: b0e75d17 dc2ff23d Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:50:50 2022 +0100 Merge pull request #324 from alanbchristie/production Action doc tweaks commit dc2ff23d773157c74f864931e06ccb0fd21cf335 Author: Alan Christie Date: Thu Oct 27 15:48:48 2022 +0100 Add doc for production workflow commit c5ee4068a880a85d4fc5ed164dbbd711e4c5d0ec Author: Alan Christie Date: Thu Oct 27 15:35:27 2022 +0100 Tweak action docs commit 931a5aea583997a80bab66d8099f743529f8d98f Merge: cb4246e7 b0e75d17 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:51:21 2022 +0100 Merge pull request #323 from xchem/production Production now triggers stack commit b0e75d174217c507b2db2f4d6329e4ed2315e887 Merge: cb4246e7 ac3297e4 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:50:08 2022 +0100 Merge pull request #322 from alanbchristie/production Production now triggers stack commit ac3297e47b5ce9ca5a9ca1386818a317bc8098f2 Author: Alan Christie Date: Thu Oct 27 12:49:11 2022 +0100 Production now triggers stack Fix for BE tag commit cb4246e7f7acde133a4ca2081c30115dd5c87f56 Merge: dcc2c882 dec6f785 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 11:15:06 2022 +0100 Merge pull request #321 from alanbchristie/production CI changes for new branch policy commit dec6f785663f6e3050262c5a4b4704109d2e446a Author: Alan Christie Date: Thu Oct 27 10:58:08 2022 +0100 Removed personal repo references commit 2147aa18af1211a32f55e228c1023491008204ac Author: Boris Kovar Date: Wed Oct 26 10:00:07 2022 +0200 - updated squonk project id for dev stacks commit b2bc6e79197baa4c7336822fca2bfbf54eded377 Author: Boris Kovar Date: Mon Oct 24 16:47:24 2022 +0200 - first real version of the final implementation of ticket #977 - also added functionality that only if user did something with the snapshot, only then user will be prompted if new snapshot (or current overridden) should be saved or not - note: in this current version undoing an action does not undo the 'dirty' status of the snapshot commit 204a86d7f8901b9d39cf6495e625c709d82a8c72 Author: Boris Kovar Date: Thu Oct 20 07:32:33 2022 +0200 - nearly complete issue #977 commit dcc2c8824378b69e118564a664b332456d5632e4 Author: boriskovar-m2ms Date: Thu Sep 29 12:48:42 2022 +0200 edited in correct squonk project id commit 725f6d5267d568afd34f29f22b0869458d759832 Author: boriskovar-m2ms Date: Thu Sep 29 12:47:31 2022 +0200 removed Upload button from Job popup (#320) * - initial commit * - checkpoint * - new backend * Update package.json bumped version to 0.10.109 * Update package.json bumped version to 0.10.111 * Update package.json version bumped to 0.10.112 * Update package.json bumped version to 0.10.113 * Update package.json bumped version to 0.10.114 * Update package.json bumped version to 0.10.115 * - added new back-end * Squashed commit of the following: commit 949573bd930afaa0171a728f05dafa08c2425341 Merge: deb0d1c3 74ea6613 Author: Boris Kovar Date: Thu Jul 14 06:56:52 2022 +0200 Merge branch '#885-bugfix' of https://github.com/m2ms/fragalysis-frontend into #885-bugfix commit deb0d1c31aa68fb38c1d1541aca6bd81410e515b Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit e2a00641039dd34b348ce2084eefd8f33ae04343 Author: Boris Kovar Date: Mon Jun 6 06:05:49 2022 +0200 Squashed commit of the following: -bumped version to 0.10.93 commit dfa24f68c4cb0e84ad37ac663ec08caadd2f3fbb Author: Anton Gasperak Date: Wed Jun 1 11:53:32 2022 +0200 #883 - Remove unused selection action commit 0ae63081e822a514443a7b6c6e1fb3826a8c6178 Author: Anton Gasperak Date: Wed Jun 1 11:43:17 2022 +0200 #883 - Remove countOfPendingVectorLoadRequests from selectionReducers with unused hook commit b884e0b59c5e9000422adbf6e6adf7b14847b51f Author: Anton Gasperak Date: Wed Jun 1 11:10:44 2022 +0200 #883 - Remove associatedDownloadTagName from selectionReducers commit ab825ccf3369af8fbaab9c8d25d68c5a1699d773 Author: Anton Gasperak Date: Wed Jun 1 10:54:57 2022 +0200 #883 - Remove displayedMoleculesInHitNav from selectionReducers commit 4103e3984bc9b3fbf2cc48bef3b9d65864a4814b Author: Anton Gasperak Date: Wed Jun 1 10:08:28 2022 +0200 #883 - Remove displayAllInNGLList from selectionReducers commit f3b3b10a879447705b2709b88d48b62fe50e14cc Author: Anton Gasperak Date: Wed Jun 1 09:59:23 2022 +0200 #883 - Remove listAllList from selectionReducers commit 02aa5955918abace2d5473e89bb9260ff10d7338 Author: Anton Gasperak Date: Wed Jun 1 09:40:29 2022 +0200 #883 - Move categoryList from selectionReducers to apiReducers commit d059ee8d4de0ddc34be64ef9c55a71c4f2bd96df Author: Anton Gasperak Date: Wed Jun 1 08:43:26 2022 +0200 #883 - Move tagList from selectionReducers to apiReducers commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 #885 - Add the possibility to recompile variables before job launching commit 74ea6613da0306f5251a440bdfdaa44f225ccb69 Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 #885 - Adjust and compile schema commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 #885 - Reuse the merged schema in JobVariablesDialog commit bd3ff2b3f22dada64afadd4df1685bcc46ab2d21 Author: Anton Gasperak Date: Fri Jun 3 08:36:34 2022 +0200 #885 - Add new job definition * updated fragmentstein job spec Squashed commit of the following: commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 #885 - Add the possibility to recompile variables before job launching commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 #885 - Adjust and compile schema commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 #885 - Reuse the merged schema in JobVariablesDialog commit bd3ff2b3f22dada64afadd4df1685bcc46ab2d21 Author: Anton Gasperak Date: Fri Jun 3 08:36:34 2022 +0200 #885 - Add new job definition * - changed default value for output file * Update package.json bumped version to 0.10.116 * - new backend test * Update package.json bumped version to 0.10.120 * Update package.json bumped version to 0.10.122 * - new version of the backend added * Squashed commit of the following: commit c6c605ed21996d470a36b0de0a51a4e145792884 Author: Boris Kovar Date: Thu Aug 4 09:25:18 2022 +0200 - fixed #949 commit 2118900c0f7b92aa3ff7b6a1aefd943ab506c287 Author: Boris Kovar Date: Wed Aug 3 15:42:41 2022 +0200 - fixed problem where there are no selected inputs for a job commit db6f6436af34cfead10d7e788bf4d9c3a9029294 Author: Boris Kovar Date: Wed Aug 3 08:47:55 2022 +0200 - fix… * Squashed commit of the following: commit e7075fd464984f7ca83c683594737ede8a2d6156 Author: RobertMatuska Date: Thu Aug 10 09:22:56 2023 +0200 #1124 fixed border color * Squashed commit of the following: commit 9047a700d7d206e2ab01fd6dff574162fc4483e3 Author: Boris Kovar Date: Thu Jun 15 09:53:13 2023 +0200 - implemented all the features for #944 commit 716eb0e7a8f11d34c8744cf20ad60ce3cbe41dd6 Author: Boris Kovar Date: Thu Jun 8 09:13:42 2023 +0200 - initial commit * - fixed new job * Squashed commit of the following: commit 5adc61adf29db66e7e09fd2d663c18d064305c33 Merge: a8c90f24 1aef079a Author: RobertMatuska Date: Thu Aug 10 15:31:40 2023 +0200 Merge branch '#1118' of https://github.com/m2ms/fragalysis-frontend into #1118 commit a8c90f245cf29df1cfee1b7053454cb7d0c0ad4a Author: RobertMatuska Date: Thu Aug 10 15:31:35 2023 +0200 #1118 fixed filter and sort bugs commit 1aef079a1728061be8c56f41967bf60666c79a17 Author: boriskovar-m2ms Date: Thu Aug 10 08:25:48 2023 +0200 Update package.json triggering build action commit 594ac1970c7099ecfb94cecc3707a6cc9ef2894f Merge: 5564d2ce de09cdc6 Author: RobertMatuska Date: Wed Aug 9 11:59:25 2023 +0200 Merge branch '#1106' into #1118 commit 5564d2ceaaea797542514f1a9fdfd8901591fb2b Author: RobertMatuska Date: Wed Aug 9 11:26:34 2023 +0200 #1118 change priority and fix bugs commit de09cdc6e9386ca3f6aea63fa373ef75938dec6d Merge: 4caeef7b 8b73ee22 Author: Boris Kovar Date: Tue Aug 8 11:38:09 2023 +0200 Merge branch '#1106' of https://github.com/m2ms/fragalysis-frontend into #1106 commit 4caeef7b2f6f9acbf617989b94e62030e6ed8052 Author: Boris Kovar Date: Tue Aug 8 11:37:40 2023 +0200 - updated table styling commit 8b73ee22d38fb5b93435c4c03fc537334adc3ebc Author: boriskovar-m2ms Date: Mon Aug 7 13:24:08 2023 +0200 Update package.json just to trigger build action commit d16130686039662cd7ebe0f9b6eeaadbe57d7d37 Author: Boris Kovar Date: Mon Aug 7 12:55:44 2023 +0200 - table is now autosized commit e867e77c40598a12fa10ca6ab526880274936752 Author: RobertMatuska Date: Mon Aug 7 09:03:11 2023 +0200 #1106 edited columns size # Conflicts: # js/components/projects/index.js # package.json * Squashed commit of the following: commit 0550be26180579a58c85c520b0930c44f4999011 Author: Boris Kovar Date: Tue Aug 15 08:46:33 2023 +0200 - fixed #1092 * Squashed commit of the following: commit 60528709e830d424c07d290a7daf65cfcf3d9b2c Author: Boris Kovar Date: Tue Aug 15 12:31:31 2023 +0200 - implemented #1129 commit ca88200ded3002c782589a8dccbc08a7156d3f54 Merge: b6c21b9f 5262a81c Author: boriskovar-m2ms Date: Tue Aug 15 12:56:46 2023 +0200 Merge branch 'staging' into stagingcandidate commit b6c21b9f74a0281bcf9883a7da07165bbbdc5695 Author: Boris Kovar Date: Tue Aug 15 12:32:55 2023 +0200 Squashed commit of the following: commit 60528709e830d424c07d290a7daf65cfcf3d9b2c Author: Boris Kovar Date: Tue Aug 15 12:31:31 2023 +0200 - implemented #1129 commit 86a1a7c9e26d899d34af4f6cdb85ceb19f207d0d Author: Boris Kovar Date: Tue Aug 15 09:49:39 2023 +0200 Squashed commit of the following: commit 0550be26180579a58c85c520b0930c44f4999011 Author: Boris Kovar Date: Tue Aug 15 08:46:33 2023 +0200 - fixed #1092 commit 193908be0a275ba73acfc03bc598d4fbfa250145 Author: RobertMatuska Date: Fri Aug 11 09:42:28 2023 +0200 #1108 restyled white space for LHS commit fcf418da068289847e2d7da1d72a19570a8832b0 Author: Boris Kovar Date: Fri Aug 11 09:19:38 2023 +0200 Squashed commit of the following: commit 5adc61adf29db66e7e09fd2d663c18d064305c33 Merge: a8c90f24 1aef079a Author: RobertMatuska Date: Thu Aug 10 15:31:40 2023 +0200 Merge branch '#1118' of https://github.com/m2ms/fragalysis-frontend into #1118 commit a8c90f245cf29df1cfee1b7053454cb7d0c0ad4a Author: RobertMatuska Date: Thu Aug 10 15:31:35 2023 +0200 #1118 fixed filter and sort bugs commit 1aef079a1728061be8c56f41967bf60666c79a17 Author: boriskovar-m2ms Date: Thu Aug 10 08:25:48 2023 +0200 Update package.json triggering build action commit 594ac1970c7099ecfb94cecc3707a6cc9ef2894f Merge: 5564d2ce de09cdc6 Author: RobertMatuska Date: Wed Aug 9 11:59:25 2023 +0200 Merge branch '#1106' into #1118 commit 5564d2ceaaea797542514f1a9fdfd8901591fb2b Author: RobertMatuska Date: Wed Aug 9 11:26:34 2023 +0200 #1118 change priority and fix bugs commit de09cdc6e9386ca3f6aea63fa373ef75938dec6d Merge: 4caeef7b 8b73ee22 Author: Boris Kovar Date: Tue Aug 8 11:38:09 2023 +0200 Merge branch '#1106' of https://github.com/m2ms/fragalysis-frontend into #1106 commit 4caeef7b2f6f9acbf617989b94e62030e6ed8052 Author: Boris Kovar Date: Tue Aug 8 11:37:40 2023 +0200 - updated table styling commit 8b73ee22d38fb5b93435c4c03fc537334adc3ebc Author: boriskovar-m2ms Date: Mon Aug 7 13:24:08 2023 +0200 Update package.json just to trigger build action commit d16130686039662cd7ebe0f9b6eeaadbe57d7d37 Author: Boris Kovar Date: Mon Aug 7 12:55:44 2023 +0200 - table is now autosized commit e867e77c40598a12fa10ca6ab526880274936752 Author: RobertMatuska Date: Mon Aug 7 09:03:11 2023 +0200 #1106 edited columns size # Conflicts: # js/components/projects/index.js # package.json commit 5262a81ca9a1b9c940e60c736924f88cbad4a8aa Merge: d9821b23 c74c7ae1 Author: Max Winokan <36866506+mwinokan@users.noreply.github.com> Date: Thu Aug 10 16:22:35 2023 +0100 Merge pull request #364 from xchem/m2ms-1046 Streamlined CI builds (less noisy) commit 0173fdf7f57a69f8f195c32db3f48cbecbb1642c Merge: 2a853766 d9821b23 Author: Max Winokan <36866506+mwinokan@users.noreply.github.com> Date: Thu Aug 10 14:30:16 2023 +0100 Merge pull request #366 from xchem/staging Promoting to production commit d9821b2329e98647eab02838114c22b993d10ebb Author: boriskovar-m2ms Date: Thu Aug 10 15:04:04 2023 +0200 Fixed problem with new job (#365) * Squashed commit of the following: commit d53d1c008f3db605dd4b1e5ae9dfe10302da28fb Merge: c924ce24 bc13c611 Author: Boris Kovar Date: Wed Aug 2 16:35:15 2023 +0200 Merge branch 'RedRelease20230525' of https://github.com/m2ms/fragalysis-frontend into RedRelease20230525 commit c924ce24af3190079baf7c3b7fc2cd1fb819e93e Author: Boris Kovar Date: Wed Aug 2 16:34:40 2023 +0200 - fixed overflow for target list commit bc13c6114bbf02d88bd6aa833c20c3acc6d8b685 Merge: 7b88603b 74ffba6f Author: boriskovar-m2ms Date: Wed Aug 2 16:03:35 2023 +0200 Merge branch 'staging' into RedRelease20230525 commit 7b88603bf0d93b60c6fa996a35b5afb21a3d8835 Author: RobertMatuska Date: Tue Aug 1 15:29:56 2023 +0200 #1112 fixed project list filter commit 6951206f2d9285ac2aa59f34c20cd2383735ba8f Author: RobertMatuska Date: Tue Aug 1 08:41:52 2023 +0200 #1112 fixed numb rows per page vs numb of projects commit 11df780229077611f93ab766c508c485d4bcb7b3 Author: RobertMatuska Date: Tue Aug 1 08:37:10 2023 +0200 #1112 fixed pagination numbers in dropdown commit 1252aa88178d9b745e32a5c20c4ca353049545f1 Author: Boris Kovar Date: Mon Jul 31 15:40:06 2023 +0200 - fixed overflow commit f2d8eac83d6685ba4bc8929754519f9b48730cb5 Author: Boris Kovar Date: Mon Jul 31 14:51:19 2023 +0200 - fixed problem from #1112 where page-ination controls were not visible commit 62227fbd35fb110dc9dec60342beb66ef2582762 Author: Boris Kovar Date: Mon Jul 31 13:51:34 2023 +0200 - fixed issue when implicit actions setSearchString was tracked which caused that user had to click undo twice after clicking on the dataset tab commit 3bb794549e6eda0c4cb43ceeeac1df152648ba0e Author: Boris Kovar Date: Mon Jul 31 13:33:30 2023 +0200 - fixed #1116 + whole bunch of other bugs related to preserving and restoring search (both LHS and RHS) string from snapshot commit f1d0db5f2161a14201b4e447317eeea640f80f06 Author: Boris Kovar Date: Mon Jul 31 11:01:21 2023 +0200 - fixed #1117 commit 1038f80e842e5df9490554d5244427402dd7d6b7 Author: Boris Kovar Date: Mon Jul 31 10:11:26 2023 +0200 - fixed issue #1113 commit 74ffba6f3fc623959595bc3a4aa57bf1af11d718 Author: boriskovar-m2ms Date: Thu Jul 27 16:18:53 2023 +0200 Redrelease20230525-firstBatch (#354) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging * - schema expansion test * Update package.json just to trigger build action * Update package.json to trigger build action * - add button to job table to copy snapshot associated with the job run * - fixed problem for 'add button to job table to copy snapshot associated with the job run' * added searchString to action and TimeLine * #576 restored searchString from snapshot for RHS * #576 edited time for search response * #576 restore search string for hit navigator * #576 Restore search for project history * #978 added new button and conditions for showing * #978 change modal background and position * #978 setted modal window position under buttons * #978 fixed onClick for close modal * #576 edited tag detail added toggle union/intersec * #576 added buttons to Tag Detail * #978 added new column and sort by columns * #978 edited sort and filter project list table * #978 edited filter and search data * #576 edit width count * Update package.json - just to trigger build action * - fixed instance when project is missing from session-project (which AFAIK should never happen though) * Update package.json - just to trigger build action * #978 filter for project list and other fix * #576 edited LHS height and Tag detail colors * #576 added "Select displayed button" * #978 edited save change for NGL * - semicolons? * -merge * Squashed commit of the following: commit 66118b5d4dfbddd50cdce5af77c857e90325a78b Author: Boris Kovar Date: Tue Jul 4 08:00:12 2023 +0200 - fixed #1073 commit ae8406cfdb405dce01d075de39754d2acd6cc55a Author: Boris Kovar Date: Wed Jun 7 08:26:20 2023 +0200 Squashed commit of the following: commit e42baf37a2503f3378c856e26e8d699bc71bd3ac Merge: d266f99b 949f4734 Author: boriskovar-m2ms Date: Wed Apr 26 11:17:58 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit d266f99bfbccd23d6a9951bdba71bf487554e9bc Author: Boris Kovar Date: Wed Apr 26 10:50:48 2023 +0200 - fixed problem for 'add button to job table to copy snapshot associated with the job run' commit 62784948247ed7f0521b10418b1b8a271e7062f0 Author: Boris Kovar Date: Wed Apr 26 09:43:11 2023 +0200 - add button to job table to copy snapshot associated with the job run commit 949f47340369a671516a7c6317f8f7e35ba86984 Author: boriskovar-m2ms Date: Mon Apr 24 14:47:39 2023 +0200 Ms 2022 08 18 yellow (#351) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging * - schema expansion test * Update package.json just to trigger build action * Update package.json to trigger build action commit f41cdb0d525e993a7a48c0dbb397618e0ea76bc9 Merge: eaadb729 8d437c3f Author: boriskovar-m2ms Date: Mon Apr 24 14:35:37 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit eaadb729f90441417c899cf4869e26a1b789bb42 Author: boriskovar-m2ms Date: Mon Apr 24 12:39:23 2023 +0200 Update package.json to trigger build action commit 1b46f37c6ac11d5c7e9a0a1ceff7b68dad785b27 Author: boriskovar-m2ms Date: Mon Apr 24 11:26:05 2023 +0200 Update package.json just to trigger build action commit 09007706e2ec26c6006d7d19a756129d093ac306 Author: Boris Kovar Date: Mon Apr 24 09:36:38 2023 +0200 - schema expansion test commit 8d437c3f6b735953eb07f06fec82bdfdd26d7e44 Author: boriskovar-m2ms Date: Tue Apr 11 17:00:05 2023 +0200 Ms 2022 08 18 yellow (#350) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging commit 7790dfbc261a302018423ce1a506eb33eb48d683 Merge: bf42cc20 45438127 Author: Boris Kovar Date: Tue Apr 11 16:57:36 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit bf42cc20b514c4b3708b606557cb576324f02a20 Author: Boris Kovar Date: Tue Apr 11 16:57:18 2023 +0200 - fixed bad merge from staging commit adc2f5b9e3fd8495c92b8089fb851ae3bc5a49fa Author: boriskovar-m2ms Date: Tue Apr 11 15:47:17 2023 +0200 Ms 2022 08 18 yellow (#349) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects commit 45438127c520d201677dd1b5c1fd876cdfb035e4 Merge: 73b5d4c7 dcbf19fd Author: boriskovar-m2ms Date: Tue Apr 11 15:46:11 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 73b5d4c7e705124ed5e1941226cae17ab5044ef6 Merge: b74587f0 1447b079 Author: Boris Kovar Date: Tue Apr 11 15:28:34 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit b74587f0bdd68af93e44692c6c41517ed36ad4b1 Author: Boris Kovar Date: Tue Apr 11 15:27:49 2023 +0200 - hopefully fixed problem with reloading older projects commit dcbf19fd11a4734d18714b154b7b6e577b0ccd69 Author: boriskovar-m2ms Date: Tue Apr 11 12:42:14 2023 +0200 Ms 2022 08 18 yellow (#348) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 1447b079e018d9ce1d67b96161be626b7d97a6bd Merge: b774ac60 d7b5e5c2 Author: boriskovar-m2ms Date: Tue Apr 11 12:41:03 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit b774ac6044bc97f38ef5b2e62a6eeea2a94e0dc5 Author: Boris Kovar Date: Tue Apr 11 12:05:53 2023 +0200 frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 56ce17ff1db67e6deb96d2e16c4c7ae4e0b6c39b Author: Boris Kovar Date: Thu Apr 6 14:20:00 2023 +0200 - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag commit d7b5e5c26dae7824d3c930fb263a02c592a2c042 Author: boriskovar-m2ms Date: Thu Apr 6 10:43:08 2023 +0200 Ms 2022 08 18 yellow (#347) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available commit 17e89cefe8264584ebe0fadc637a1fac542704ac Author: Boris Kovar Date: Thu Apr 6 10:23:27 2023 +0200 - can't go to squonk job execution page if the url is not available commit 16f0cbddafd994293e45573f3d6ebeeeab1e4b22 Author: boriskovar-m2ms Date: Thu Apr 6 09:11:52 2023 +0200 Minor fixes before the release (#346) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image commit c8b5f20dd521c7007f08531736541ca84b041a85 Merge: 8d500638 2cd48e04 Author: Boris Kovar Date: Wed Apr 5 14:35:17 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8d50063887bc2f6335550f15fe69cc93b17be30e Author: Boris Kovar Date: Wed Apr 5 14:34:49 2023 +0200 - new BE image commit 2cd48e0474f31fe9f0d0f4eb256cad32ed5516cd Merge: 0fddd791 b20adee8 Author: boriskovar-m2ms Date: Wed Apr 5 13:00:20 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 0fddd791812ce9e4093a784850c8e4c5698f3f18 Author: boriskovar-m2ms Date: Wed Apr 5 12:09:36 2023 +0200 Update package.json triggering the build action commit bed2dc1bf438a2f61b61fdd2d1b18753d1ef58be Author: Boris Kovar Date: Wed Apr 5 10:44:24 2023 +0200 - before the release fixes commit b10160928bff787161a140e4cffd8aa783a4c482 Merge: f6699d10 9f5f2b7c Author: Boris Kovar Date: Fri Mar 31 09:38:39 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit f6699d106af94bbba6be1494a0c83e0cf1a5b084 Author: Boris Kovar Date: Fri Mar 31 09:37:22 2023 +0200 - minor typo fix commit 9f5f2b7cad0ebb482d8069114d52bf65ca6c6531 Author: boriskovar-m2ms Date: Fri Mar 24 14:00:10 2023 +0100 Update package.json just to trigger build action commit 5a37013c71469f9433c36d956174b1efc1e698ab Author: boriskovar-m2ms Date: Fri Mar 24 12:43:27 2023 +0100 Update package.json to trigger build action commit b54cdaa4ea816719128c07939a14a99152a8e990 Merge: 5dfc38be d6d5216d Author: Boris Kovar Date: Fri Mar 24 11:36:29 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 5dfc38bef9b0a0fead21b824db58461c185f98fd Author: Boris Kovar Date: Fri Mar 24 11:35:57 2023 +0100 - updated build-dev.yaml commit d6d5216dce40de14910bde76b5f4fb8650bdbd9c Author: boriskovar-m2ms Date: Fri Mar 24 08:52:55 2023 +0100 Update package.json trigger build action commit 6bd9fcb0773fc3bbf5266ab9022d6e365dff9cfc Author: boriskovar-m2ms Date: Fri Mar 24 08:46:51 2023 +0100 Update package.json to trigger build action commit b20adee8140c7f46573eb5e7525e97427d23d4d4 Author: boriskovar-m2ms Date: Thu Mar 16 17:29:15 2023 +0100 Ms 2022 08 18 yellow (#345) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit 3a9a478d3bdbcb54802346efe2ec5e1f18242721 Merge: d777f117 4cb92f6c Author: boriskovar-m2ms Date: Thu Mar 16 10:50:04 2023 +0100 Merge branch 'staging' into ms-2022-08-18-yellow commit d777f117bbfab9a367ef8ad04c2fcf540cf19ef6 Author: Boris Kovar Date: Thu Mar 16 10:17:34 2023 +0100 - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit ae0cbdc8540aa440c776be3b84508c710a215d36 Author: Boris Kovar Date: Thu Mar 16 09:01:48 2023 +0100 - fixed bugs found in staging commit 4cb92f6ca3c986a087b840f9327e921ed17e1b4c Author: boriskovar-m2ms Date: Thu Mar 9 13:05:06 2023 +0100 Ms 2022 08 18 yellow (#344) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action commit bc13d845aa206aa7d8d151a8bb53f53335761084 Author: boriskovar-m2ms Date: Thu Mar 9 10:38:18 2023 +0100 Update package.json triggering build action commit 49d1ad57042d353f76c7368944601a8d64e44596 Author: boriskovar-m2ms Date: Thu Mar 9 10:32:30 2023 +0100 Update package.json to trigger build action commit fd0df1c021010f4f5e028090493464721b8b2600 Author: Boris Kovar Date: Thu Mar 9 09:11:44 2023 +0100 - added message when access to squonk is denied commit 622b635472e0ed7be1ae36062addd0f91d9ff6f4 Author: Boris Kovar Date: Wed Mar 8 14:35:57 2023 +0100 - fixed problem with id commit 74a1a62ca7a564d481be34c4301771ce7f5dd76a Author: Boris Kovar Date: Wed Mar 8 14:18:47 2023 +0100 - authorize user for viewing squonk job commit aa55bc41ee6a6fce4d8b146362e276265eed0af3 Author: Boris Kovar Date: Wed Mar 8 12:58:15 2023 +0100 - added more logs commit d97a512d75aa621be77ee69b547b21e1653386e1 Author: Boris Kovar Date: Wed Mar 8 12:19:18 2023 +0100 fixed problem with entries function commit 7e28e41d96e57998b979752d3651304bf36713c9 Author: Boris Kovar Date: Wed Mar 8 12:13:08 2023 +0100 - added debug logs commit f4becf9c94cf8c5eec225fde7b24c73131e0e338 Author: Boris Kovar Date: Wed Mar 8 11:29:23 2023 +0100 - implemented #890 commit bcd3ec01ddc68d3dd1dce78f1f3ca165e1633fd4 Author: Boris Kovar Date: Sun Mar 5 18:50:08 2023 +0100 - fixes because can't debug this locally commit 59779b6b80ec7e21af68b219a543a017aa837b14 Author: Boris Kovar Date: Sun Mar 5 18:29:05 2023 +0100 - trying to fix a bug with inputs commit 76ccc089efc43589bb381ea6589567dce538aa8b Author: Boris Kovar Date: Sun Mar 5 18:12:34 2023 +0100 - reworked show inputs in jobs table commit e862c726c81b0328cc9b7538d9820481b7d85cd8 Author: Boris Kovar Date: Sun Mar 5 16:46:29 2023 +0100 - added debug info commit 471d947b83f159bde413a32de06dbd10b9c4dfaf Author: Boris Kovar Date: Sun Mar 5 16:33:00 2023 +0100 - added debug info commit c4b11af95a56786493e13735ac92b1b1f766af79 Author: Boris Kovar Date: Sun Mar 5 16:13:41 2023 +0100 - added debug info commit 6adc86d4f95a362b38747e001f55bde2a104baff Author: Boris Kovar Date: Sun Mar 5 15:53:49 2023 +0100 - added debug info commit e42ed05162106109c927e80620d67b5af31b7ef1 Author: Boris Kovar Date: Sun Mar 5 15:34:10 2023 +0100 - added debug info commit 39034c54b97f4da301365c69d985640a66c75469 Author: Boris Kovar Date: Sun Mar 5 15:09:04 2023 +0100 - added debug info commit 9eee228b45b94479edfab5d6279d3e0ce4ccb8d1 Author: Boris Kovar Date: Sun Mar 5 14:48:45 2023 +0100 - added debug info commit 13a00cf2ba8f4ae13de4865096f9def349acd158 Merge: 0a36ae5c d0317f60 Author: rsanchezgarc Date: Tue Feb 21 20:43:31 2023 +0000 Merge pull request #341 from m2ms/ms-2022-08-18-yellow Ms 2022 08 18 yellow release commit d0317f607def3b6e1a5651554b338161fce4f040 Merge: 53164d21 8c4ca1d0 Author: Boris Kovar Date: Mon Feb 20 13:58:48 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 53164d21b23e7a918a772ced6292817b4306031e Author: Boris Kovar Date: Mon Feb 20 13:57:25 2023 +0100 Squashed commit of the following: commit 19b3910d84f9707b8047524cfe44dfa1f8696644 Author: Boris Kovar Date: Mon Feb 20 13:33:18 2023 +0100 - new dev BE commit af427c71d9499c975e12b314202bdb0f0ec13826 Author: boriskovar-m2ms Date: Fri Feb 17 08:44:14 2023 +0100 Update package.json just to trigger build action commit 4cb19eb371b0147dfc51b704a36dba842543d311 Author: boriskovar-m2ms Date: Thu Feb 16 09:09:27 2023 +0100 Update package.json just to trigger build action commit 7612967a111ec486f2072ca3ddd88330b4ad37c9 Author: boriskovar-m2ms Date: Wed Feb 15 14:01:32 2023 +0100 Update package.json just to trigger build action commit 4e8b27d9b65fe372e06df45bc720abb52f81dbe2 Author: Boris Kovar Date: Tue Feb 14 08:50:44 2023 +0100 - fixed direct links and direct download links commit c08da4bf71caf536e95423fb8b1e5d8ab01c60e7 Author: Boris Kovar Date: Thu Feb 9 14:02:18 2023 +0100 - fixed job name commit 4b9a491f0478849e268dc7b825ba358585cdb2ab Author: Boris Kovar Date: Thu Feb 9 13:28:20 2023 +0100 - added fragmenstein-combine-multi-scoring.json commit ca4f946d07074e87a74ac6a3d2272c1735343cb1 Author: Boris Kovar Date: Thu Feb 9 13:25:35 2023 +0100 - checkpoint commit b43373e1c228d9e46f4c831fc46269d614013e92 Author: Boris Kovar Date: Thu Feb 9 10:43:27 2023 +0100 - fixed problem where UI would crash if there was a problem during job file transfer of job launch commit 3618b10e2b77f4a7a173f38a8d8bbdc0a853805b Author: Boris Kovar Date: Thu Feb 9 09:54:36 2023 +0100 - fixed bad project capture from url commit 7d588895cebd0e363aa5d62b36770499364aef06 Merge: 11180a5c 4fc7f7bd Author: Boris Kovar Date: Wed Feb 8 09:27:51 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 11180a5c0142ea18624ae14ddaad16793fdcb435 Author: Boris Kovar Date: Wed Feb 8 09:26:31 2023 +0100 - prevent crash when there is a project associated with target which user is not authorized to see commit 4fc7f7bd2d0aae799099b29e256e3c0834e9576f Author: boriskovar-m2ms Date: Wed Feb 8 07:25:12 2023 +0100 Update package.json just to trigger build action commit 2b2665cfc609f621eb9bf505b9a86e6bd4fb3d35 Author: boriskovar-m2ms Date: Thu Feb 2 15:43:38 2023 +0100 Update package.json just to trigger the build action commit d0d429c473307ce2bfa825ad9e556084082accd8 Author: boriskovar-m2ms Date: Thu Feb 2 15:20:25 2023 +0100 Update package.json just to trigger the build action commit fcf377b863abf9110e1c0ce752b29bce073349cf Author: Boris Kovar Date: Thu Feb 2 14:51:17 2023 +0100 - fixed problem when job config windows closes on error commit c9e39f4da281f333c620811cf7ccfb6b8438cc1f Merge: 5a3d56bf 0f8e702a Author: Boris Kovar Date: Thu Feb 2 13:19:16 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 5a3d56bf87d9c8d8e6007dba5db8c1239dbf39a2 Author: Boris Kovar Date: Thu Feb 2 13:18:30 2023 +0100 - now sending id of the project and not target_access_string commit 0f8e702a023e2f786c5ba46eab2205f158a75480 Author: boriskovar-m2ms Date: Thu Feb 2 12:59:19 2023 +0100 Update package.json just to trigger build action commit 585076db67dc32b58083c184e1ca11a6dddc434b Author: Boris Kovar Date: Thu Feb 2 12:39:19 2023 +0100 - fixed problem when project pane was not showing up right after a project was created commit fa7fd759c30c3abf4e12b1c17af4107424993dc4 Author: Boris Kovar Date: Thu Feb 2 12:08:23 2023 +0100 - fix for missing project pane commit ba0a1fe55bd53f719d31d795d71877d81366cac9 Author: Boris Kovar Date: Thu Feb 2 09:05:50 2023 +0100 - version for job execution - broken UI commit 51555e1ba1eeb12e1eef340f108d7d3b595e6210 Merge: 51e97af1 a42cad71 Author: Boris Kovar Date: Wed Feb 1 13:58:27 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 51e97af1db45d3b4bb9b5d1fdd55a07991a9a19a Author: Boris Kovar Date: Wed Feb 1 13:57:49 2023 +0100 - partial implementation of #1020 commit a42cad7193b8c8f02c04378bba01f6f44114ec88 Author: boriskovar-m2ms Date: Thu Jan 26 08:34:01 2023 +0100 Update package.json just to trigger build action commit 96c0216e8b29169c9c1bf29471eafb5bddd24e5b Author: boriskovar-m2ms Date: Wed Jan 25 09:39:06 2023 +0100 Update package.json just to trigger build action commit c7de9cf16f783fad2bdfb78224a818221fa24ba1 Author: boriskovar-m2ms Date: Tue Jan 24 15:10:11 2023 +0100 Update package.json just to trigger the build action commit e8e5657cc5f7beecf5813040210605b6cf410cef Author: boriskovar-m2ms Date: Tue Jan 24 14:04:56 2023 +0100 Update package.json just to trigger build commit 24dc912bfdae3bec9c52867f2d638754635cecbb Author: Boris Kovar Date: Tue Jan 24 12:49:58 2023 +0100 - sensitive data moved to .env file commit a98c51751368104300a872f116cc22acc09cec44 Author: Boris Kovar Date: Tue Jan 24 12:49:06 2023 +0100 - added .env to gitignore commit 13b4bed082612315afc948192fe758fb42edf63d Author: Boris Kovar Date: Tue Jan 24 12:47:56 2023 +0100 - mending an error commit 5b74eb4326389e11b923b560f6603586bfc3b87c Author: Boris Kovar Date: Wed Jan 18 09:52:19 2023 +0100 - checkpoint commit d4b88dfe5c525b7c471d97ac47d46f9d992bfa48 Author: Boris Kovar Date: Tue Jan 17 10:10:27 2023 +0100 - initial implementation #1020 commit 8c4ca1d022f2a5841d68dde70edd9f433c539b83 Author: boriskovar-m2ms Date: Mon Jan 16 11:35:37 2023 +0100 Update package.json just to trigger build action commit 436196bb65fe5eb44f38abc3bc18cf827f09c8d6 Author: boriskovar-m2ms Date: Fri Jan 13 10:47:51 2023 +0100 Update package.json just to trigger build action commit 0d6abaa08dc7a174d915d33e21a1667accd39423 Author: boriskovar-m2ms Date: Thu Jan 12 10:18:23 2023 +0100 Update package.json just to trigger build action commit d5905966cb9bf2994f93668911873108832d7578 Author: Boris Kovar Date: Wed Jan 11 11:02:25 2023 +0100 - forgot to reset debug constants commit df7057032baa70df6451b7faf0a232fa75a1e55b Author: Boris Kovar Date: Wed Jan 11 08:05:23 2023 +0100 - minor fix for upload_status commit 698d123634ded171f161c3bb9f27e4e1600730be Author: Boris Kovar Date: Tue Jan 10 15:42:30 2023 +0100 - minor fix for upload_status commit 89bb79b92d6cef9fb410259ee93ae7e11859239a Author: Boris Kovar Date: Tue Jan 10 15:26:03 2023 +0100 - upload_failed now taken into the account commit 3f9f3ea181ab267ee9c1f52b88a620c0620fa34b Author: boriskovar-m2ms Date: Tue Jan 10 13:35:25 2023 +0100 Update package.json - just to trigger build action commit e6fbd6d213418dfd9708e206da341e8e37e776c3 Author: boriskovar-m2ms Date: Tue Jan 10 11:54:17 2023 +0100 Update package.json just to trigger build action commit 2d0a5257e2308d3b3241ec63a61ea5896981dc5e Author: Boris Kovar Date: Fri Dec 23 13:01:20 2022 +0100 - updated README.md commit 0a36ae5cc0f40aaab45ced9837e242308d17b578 Merge: 6a7a0dda 782b84b5 Author: rsanchezgarc Date: Tue Dec 20 18:11:19 2022 +0000 Merge pull request #337 from m2ms/ms-2022-08-18-yellow-wo-970 Animate to new orientation matrix first commit 5504bd464e1d699833f258b994e344cb339cb234 Author: Boris Kovar Date: Tue Dec 20 08:06:06 2022 +0100 Squashed commit of the following: commit cec398dcf0a14f7e433b2baec849e29001358839 Author: Boris Kovar Date: Tue Dec 20 08:00:30 2022 +0100 - commit 885f08e18f7983723a0944bd90cec646c869ee89 Author: Boris Kovar Date: Fri Dec 16 13:18:38 2022 +0100 - bug fix in progress for #970 commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 6fa2432f7226be0d54f7ce608719c0d59863d367 Author: Boris Kovar Date: Mon Dec 19 10:09:59 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 782b84b50f1d66742a3ed491b91d4ecf379b2edd Merge: eaa4ccbd f07779ce Author: Boris Kovar Date: Mon Dec 19 10:08:49 2022 +0100 Merge branch 'ms-2022-08-18-yellow-wo-970' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow-wo-970 commit eaa4ccbdf4282a772a19badf68fc2c14579d9173 Author: Boris Kovar Date: Mon Dec 19 10:08:30 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 6a7a0dda77266978a5afdaf82a5e8f89f5aa0d4e Merge: 356e625e f07779ce Author: rsanchezgarc Date: Fri Dec 16 12:44:21 2022 +0000 Merge pull request #334 from m2ms/ms-2022-08-18-yellow-wo-970 Ms 2022 08 18 yellow wo 970 commit f07779ce30667465ea1aba424085e8978827641a Merge: 57336b82 dcc2c882 Author: boriskovar-m2ms Date: Fri Dec 16 13:24:09 2022 +0100 Merge branch 'master' into ms-2022-08-18-yellow-wo-970 commit 21b437e8dd24102aebe35302d8b1ef2d18c6c040 Author: Boris Kovar Date: Thu Dec 15 16:32:57 2022 +0100 Squashed commit of the following: commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 2be8ed349ffdffa3602a2a393b4019bb3115ba5f Merge: 8ac386cd 57336b82 Author: Boris Kovar Date: Wed Dec 14 06:28:30 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8ac386cd710d9b6bf65cccac8d5962e6f6d730a5 Author: Boris Kovar Date: Wed Dec 14 06:27:11 2022 +0100 Squashed commit of the following: commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 57336b825cb95aecb3dfff78ab571bb85e906073 Author: boriskovar-m2ms Date: Thu Dec 8 11:41:44 2022 +0100 Update package.json just to trigger action commit c6c3ed0b16414d528684d63befca6a01634683d0 Author: boriskovar-m2ms Date: Wed Dec 7 11:57:33 2022 +0100 Update package.json just to trigger action commit 614b01c80882557160777ba96abc92c2d328112e Author: boriskovar-m2ms Date: Wed Dec 7 09:38:38 2022 +0100 Update package.json just to trigger action commit c0d2b3858d074b33303eef48e42f11e7eefac474 Author: boriskovar-m2ms Date: Wed Dec 7 08:39:23 2022 +0100 Update package.json just to trigger action commit bbf6f91e8498586d666204c3493405c4ca4e7268 Author: boriskovar-m2ms Date: Wed Dec 7 08:31:30 2022 +0100 Update package.json just to trigger rebuild commit 5edd5c4c387405b5f30ee88b19f1f2a2e91d8022 Author: Boris Kovar Date: Mon Dec 5 08:28:17 2022 +0100 Squashed commit of the following: commit 8d6edcb01a41b4abdddf86e94fe754682fb17964 Author: Boris Kovar Date: Mon Dec 5 08:14:43 2022 +0100 - #1001 commit 8c52f55f808f5566f83e6068e3dbe76cf06860b0 Author: Boris Kovar Date: Thu Dec 1 09:10:59 2022 +0100 Squashed commit of the following: commit 91f3363f245ec336810dd27b9d34aaaa82512a8a Author: Boris Kovar Date: Thu Dec 1 09:08:03 2022 +0100 - implemented #1012 commit f8eb4067e0ece9d170e3405bebe21a689927442c Author: Boris Kovar Date: Tue Nov 29 10:24:56 2022 +0100 Squashed commit of the following: commit a5b8f281ebd05cc6be2163fc7124855f6cee8418 Author: Boris Kovar Date: Tue Nov 29 10:22:31 2022 +0100 - fixed #1013 commit db173bcdd76574055d5132ec3cd34012a727656d Author: Boris Kovar Date: Mon Nov 28 14:39:16 2022 +0100 Squashed commit of the following: commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit 68d1a2fbd2be5620cca635c662dc0278dd578fcb Author: Boris Kovar Date: Mon Nov 28 09:08:21 2022 +0100 Squashed commit of the following: commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 356e625e4a0d7cee6bf1bd3c3b1627b59375e88d Merge: 0530324b 7b7cbe99 Author: rsanchezgarc Date: Mon Nov 14 09:59:45 2022 +0000 Merge pull request #329 from m2ms/#977-ngl Fast switching between snapshots commit 7b7cbe99952000f6c550727e082cb920cafa144c Author: Boris Kovar Date: Tue Nov 8 10:04:33 2022 +0100 - #977 - fixed issue with ngl settings were not saved and restored commit d1abaa872675f8a748f7c573aa74d79cdf629a0c Author: Boris Kovar Date: Mon Nov 7 10:14:18 2022 +0100 Squashed commit of the following: commit 4a8a532f6ea217d2921ed5fab6b6705442ca682f Author: Boris Kovar Date: Thu Nov 3 08:01:05 2022 +0100 - fixed ngl view was not tracked commit 0530324b9faae6876d0b42c48ac4b26a9eaf3c26 Merge: 931a5aea 5746062a Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:51:39 2022 +0100 Merge pull request #325 from xchem/production Action doc tweaks commit 5746062aacabb5201feefed8ea09e3e34066a175 Merge: b0e75d17 dc2ff23d Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:50:50 2022 +0100 Merge pull request #324 from alanbchristie/production Action doc tweaks commit dc2ff23d773157c74f864931e06ccb0fd21cf335 Author: Alan Christie Date: Thu Oct 27 15:48:48 2022 +0100 Add doc for production workflow commit c5ee4068a880a85d4fc5ed164dbbd711e4c5d0ec Author: Alan Christie Date: Thu Oct 27 15:35:27 2022 +0100 Tweak action docs commit 931a5aea583997a80bab66d8099f743529f8d98f Merge: cb4246e7 b0e75d17 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:51:21 2022 +0100 Merge pull request #323 from xchem/production Production now triggers stack commit b0e75d174217c507b2db2f4d6329e4ed2315e887 Merge: cb4246e7 ac3297e4 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:50:08 2022 +0100 Merge pull request #322 from alanbchristie/production Production now triggers stack commit ac3297e47b5ce9ca5a9ca1386818a317bc8098f2 Author: Alan Christie Date: Thu Oct 27 12:49:11 2022 +0100 Production now triggers stack Fix for BE tag commit cb4246e7f7acde133a4ca2081c30115dd5c87f56 Merge: dcc2c882 dec6f785 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 11:15:06 2022 +0100 Merge pull request #321 from alanbchristie/production CI changes for new branch policy commit dec6f785663f6e3050262c5a4b4704109d2e446a Author: Alan Christie Date: Thu Oct 27 10:58:08 2022 +0100 Removed personal repo references commit 2147aa18af1211a32f55e228c1023491008204ac Author: Boris Kovar Date: Wed Oct 26 10:00:07 2022 +0200 - updated squonk project id for dev stacks commit b2bc6e79197baa4c7336822fca2bfbf54eded377 Author: Boris Kovar Date: Mon Oct 24 16:47:24 2022 +0200 - first real version of the final implementation of ticket #977 - also added functionality that only if user did something with the snapshot, only then user will be prompted if new snapshot (or current overridden) should be saved or not - note: in this current version undoing an action does not undo the 'dirty' status of the snapshot commit 204a86d7f8901b9d39cf6495e625c709d82a8c72 Author: Boris Kovar Date: Thu Oct 20 07:32:33 2022 +0200 - nearly complete issue #977 commit dcc2c8824378b69e118564a664b332456d5632e4 Author: boriskovar-m2ms Date: Thu Sep 29 12:48:42 2022 +0200 edited in correct squonk project id commit 725f6d5267d568afd34f29f22b0869458d759832 Author: boriskovar-m2ms Date: Thu Sep 29 12:47:31 2022 +0200 removed Upload button from Job popup (#320) * - initial commit * - checkpoint * - new backend * Update package.json bumped version to 0.10.109 * Update package.json bumped version to 0.10.111 * Update package.json version bumped to 0.10.112 * Update package.json bumped version to 0.10.113 * Update package.json bumped version to 0.10.114 * Update package.json bumped version to 0.10.115 * - added new back-end * Squashed commit of the following: commit 949573bd930afaa0171a728f05dafa08c2425341 Merge: deb0d1c3 74ea6613 Author: Boris Kovar Date: Thu Jul 14 06:56:52 2022 +0200 Merge branch '#885-bugfix' of https://github.com/m2ms/fragalysis-frontend into #885-bugfix commit deb0d1c31aa68fb38c1d1541aca6bd81410e515b Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit e2a00641039dd34b348ce2084eefd8f33ae04343 Author: Boris Kovar Date: Mon Jun 6 06:05:49 2022 +0200 Squashed commit of the following: -bumped version to 0.10.93 commit dfa24f68c4cb0e84ad37ac663ec08caadd2f3fbb Author: Anton Gasperak Date: Wed Jun 1 11:53:32 2022 +0200 #883 - Remove unused selection action commit 0ae63081e822a514443a7b6c6e1fb3826a8c6178 Author: Anton Gasperak Date: Wed Jun 1 11:43:17 2022 +0200 #883 - Remove countOfPendingVectorLoadRequests from selectionReducers with unused hook commit b884e0b59c5e9000422adbf6e6adf7b14847b51f Author: Anton Gasperak Date: Wed Jun 1 11:10:44 2022 +0200 #883 - Remove associatedDownloadTagName from selectionReducers commit ab825ccf3369af8fbaab9c8d25d68c5a1699d773 Author: Anton Gasperak Date: Wed Jun 1 10:54:57 2022 +0200 #883 - Remove displayedMoleculesInHitNav from selectionReducers commit 4103e3984bc9b3fbf2cc48bef3b9d65864a4814b Author: Anton Gasperak Date: Wed Jun 1 10:08:28 2022 +0200 #883 - Remove displayAllInNGLList from selectionReducers commit f3b3b10a879447705b2709b88d48b62fe50e14cc Author: Anton Gasperak Date: Wed Jun 1 09:59:23 2022 +0200 #883 - Remove listAllList from selectionReducers commit 02aa5955918abace2d5473e89bb9260ff10d7338 Author: Anton Gasperak Date: Wed Jun 1 09:40:29 2022 +0200 #883 - Move categoryList from selectionReducers to apiReducers commit d059ee8d4de0ddc34be64ef9c55a71c4f2bd96df Author: Anton Gasperak Date: Wed Jun 1 08:43:26 2022 +0200 #883 - Move tagList from selectionReducers to apiReducers commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 #885 - Add the possibility to recompile variables before job launching commit 74ea6613da0306f5251a440bdfdaa44f225ccb69 Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 #885 - Adjust and compile schema commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 #885 - Reuse the merged schema in JobVariablesDialog commit bd3ff2b3f22dada64afadd4df1685bcc46ab2d21 Author: Anton Gasperak Date: Fri Jun 3 08:36:34 2022 +0200 #885 - Add new job definition * updated fragmentstein job spec Squashed commit of the following: commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 #885 - Add the possibility to recompile variables before job launching commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 #885 - Adjust and compile schema commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 #885 - Reuse the merged schema in JobVariable… * Squashed commit of the following: commit de09cdc6e9386ca3f6aea63fa373ef75938dec6d Merge: 4caeef7b 8b73ee22 Author: Boris Kovar Date: Tue Aug 8 11:38:09 2023 +0200 Merge branch '#1106' of https://github.com/m2ms/fragalysis-frontend into #1106 commit 4caeef7b2f6f9acbf617989b94e62030e6ed8052 Author: Boris Kovar Date: Tue Aug 8 11:37:40 2023 +0200 - updated table styling commit 8b73ee22d38fb5b93435c4c03fc537334adc3ebc Author: boriskovar-m2ms Date: Mon Aug 7 13:24:08 2023 +0200 Update package.json just to trigger build action commit d16130686039662cd7ebe0f9b6eeaadbe57d7d37 Author: Boris Kovar Date: Mon Aug 7 12:55:44 2023 +0200 - table is now autosized commit e867e77c40598a12fa10ca6ab526880274936752 Author: RobertMatuska Date: Mon Aug 7 09:03:11 2023 +0200 #1106 edited columns size commit 7b88603bf0d93b60c6fa996a35b5afb21a3d8835 Author: RobertMatuska Date: Tue Aug 1 15:29:56 2023 +0200 #1112 fixed project list filter commit 6951206f2d9285ac2aa59f34c20cd2383735ba8f Author: RobertMatuska Date: Tue Aug 1 08:41:52 2023 +0200 #1112 fixed numb rows per page vs numb of projects commit 11df780229077611f93ab766c508c485d4bcb7b3 Author: RobertMatuska Date: Tue Aug 1 08:37:10 2023 +0200 #1112 fixed pagination numbers in dropdown commit 1252aa88178d9b745e32a5c20c4ca353049545f1 Author: Boris Kovar Date: Mon Jul 31 15:40:06 2023 +0200 - fixed overflow commit f2d8eac83d6685ba4bc8929754519f9b48730cb5 Author: Boris Kovar Date: Mon Jul 31 14:51:19 2023 +0200 - fixed problem from #1112 where page-ination controls were not visible commit 62227fbd35fb110dc9dec60342beb66ef2582762 Author: Boris Kovar Date: Mon Jul 31 13:51:34 2023 +0200 - fixed issue when implicit actions setSearchString was tracked which caused that user had to click undo twice after clicking on the dataset tab commit 3bb794549e6eda0c4cb43ceeeac1df152648ba0e Author: Boris Kovar Date: Mon Jul 31 13:33:30 2023 +0200 - fixed #1116 + whole bunch of other bugs related to preserving and restoring search (both LHS and RHS) string from snapshot commit f1d0db5f2161a14201b4e447317eeea640f80f06 Author: Boris Kovar Date: Mon Jul 31 11:01:21 2023 +0200 - fixed #1117 commit 1038f80e842e5df9490554d5244427402dd7d6b7 Author: Boris Kovar Date: Mon Jul 31 10:11:26 2023 +0200 - fixed issue #1113 commit aff597978d59b4095f7e76be3ee834ffc5bc0873 Merge: 81a2e968 d7370794 Author: Boris Kovar Date: Thu Jul 27 16:10:24 2023 +0200 Merge branch 'RedRelease20230525' of https://github.com/m2ms/fragalysis-frontend into RedRelease20230525 commit 81a2e96813768ec718f50389bef30cbc4bc82aff Author: Boris Kovar Date: Thu Jul 27 16:09:42 2023 +0200 - navigation arrows highlighting commit d737079487147e02f1703f543d8264536e6c5f80 Merge: 899b7e36 48299e86 Author: boriskovar-m2ms Date: Thu Jul 27 14:47:09 2023 +0200 Merge branch 'staging' into RedRelease20230525 commit 899b7e36076b30af93e3fe6fdea0077b13737ff1 Author: Boris Kovar Date: Thu Jul 27 13:18:20 2023 +0200 - highlighted arrows commit 7991d5c18c24c6663fe2c5d8effcc7cd048951ac Author: Boris Kovar Date: Thu Jul 27 10:16:02 2023 +0200 - when creating project a default snapshot is created automatically commit 3bf735365696020858d5c2b718250c106578debf Author: Boris Kovar Date: Thu Jul 27 09:22:30 2023 +0200 Squashed commit of the following: commit 040d9bdbf30fb9dc239969916f108cb5056911c0 Author: RobertMatuska Date: Thu Jul 27 08:38:51 2023 +0200 #576 fixed design bug commit 3d18d6d017c3c2ab01a75a2aef1823e252a802c8 Author: Boris Kovar Date: Wed Jul 26 21:04:39 2023 +0200 - first bunch of fixes commit aa097721670867f85d5a789cd41a548bb57d16b7 Author: Boris Kovar Date: Wed Jul 26 17:36:34 2023 +0200 - minor fix to button color behavior commit a0f0933086ebeadb1d1e47879021121a49f3cde7 Author: Boris Kovar Date: Wed Jul 26 16:57:32 2023 +0200 - fixed select displayed hits button commit 6f200d2c86dfb14aad6ea3776842841766cfccfe Author: Boris Kovar Date: Wed Jul 26 13:32:39 2023 +0200 Squashed commit of the following: commit 66118b5d4dfbddd50cdce5af77c857e90325a78b Author: Boris Kovar Date: Tue Jul 4 08:00:12 2023 +0200 - fixed #1073 commit ae8406cfdb405dce01d075de39754d2acd6cc55a Author: Boris Kovar Date: Wed Jun 7 08:26:20 2023 +0200 Squashed commit of the following: commit e42baf37a2503f3378c856e26e8d699bc71bd3ac Merge: d266f99b 949f4734 Author: boriskovar-m2ms Date: Wed Apr 26 11:17:58 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit d266f99bfbccd23d6a9951bdba71bf487554e9bc Author: Boris Kovar Date: Wed Apr 26 10:50:48 2023 +0200 - fixed problem for 'add button to job table to copy snapshot associated with the job run' commit 62784948247ed7f0521b10418b1b8a271e7062f0 Author: Boris Kovar Date: Wed Apr 26 09:43:11 2023 +0200 - add button to job table to copy snapshot associated with the job run commit 949f47340369a671516a7c6317f8f7e35ba86984 Author: boriskovar-m2ms Date: Mon Apr 24 14:47:39 2023 +0200 Ms 2022 08 18 yellow (#351) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging * - schema expansion test * Update package.json just to trigger build action * Update package.json to trigger build action commit f41cdb0d525e993a7a48c0dbb397618e0ea76bc9 Merge: eaadb729 8d437c3f Author: boriskovar-m2ms Date: Mon Apr 24 14:35:37 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit eaadb729f90441417c899cf4869e26a1b789bb42 Author: boriskovar-m2ms Date: Mon Apr 24 12:39:23 2023 +0200 Update package.json to trigger build action commit 1b46f37c6ac11d5c7e9a0a1ceff7b68dad785b27 Author: boriskovar-m2ms Date: Mon Apr 24 11:26:05 2023 +0200 Update package.json just to trigger build action commit 09007706e2ec26c6006d7d19a756129d093ac306 Author: Boris Kovar Date: Mon Apr 24 09:36:38 2023 +0200 - schema expansion test commit 8d437c3f6b735953eb07f06fec82bdfdd26d7e44 Author: boriskovar-m2ms Date: Tue Apr 11 17:00:05 2023 +0200 Ms 2022 08 18 yellow (#350) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects * - fixed bad merge from staging commit 7790dfbc261a302018423ce1a506eb33eb48d683 Merge: bf42cc20 45438127 Author: Boris Kovar Date: Tue Apr 11 16:57:36 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit bf42cc20b514c4b3708b606557cb576324f02a20 Author: Boris Kovar Date: Tue Apr 11 16:57:18 2023 +0200 - fixed bad merge from staging commit adc2f5b9e3fd8495c92b8089fb851ae3bc5a49fa Author: boriskovar-m2ms Date: Tue Apr 11 15:47:17 2023 +0200 Ms 2022 08 18 yellow (#349) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot * - hopefully fixed problem with reloading older projects commit 45438127c520d201677dd1b5c1fd876cdfb035e4 Merge: 73b5d4c7 dcbf19fd Author: boriskovar-m2ms Date: Tue Apr 11 15:46:11 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 73b5d4c7e705124ed5e1941226cae17ab5044ef6 Merge: b74587f0 1447b079 Author: Boris Kovar Date: Tue Apr 11 15:28:34 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit b74587f0bdd68af93e44692c6c41517ed36ad4b1 Author: Boris Kovar Date: Tue Apr 11 15:27:49 2023 +0200 - hopefully fixed problem with reloading older projects commit dcbf19fd11a4734d18714b154b7b6e577b0ccd69 Author: boriskovar-m2ms Date: Tue Apr 11 12:42:14 2023 +0200 Ms 2022 08 18 yellow (#348) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available * - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag * frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 1447b079e018d9ce1d67b96161be626b7d97a6bd Merge: b774ac60 d7b5e5c2 Author: boriskovar-m2ms Date: Tue Apr 11 12:41:03 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit b774ac6044bc97f38ef5b2e62a6eeea2a94e0dc5 Author: Boris Kovar Date: Tue Apr 11 12:05:53 2023 +0200 frontend fixes before green release: - If the user is logged in and working on the session project the SHARE button will share current snapshot and not create a new snapshot commit 56ce17ff1db67e6deb96d2e16c4c7ae4e0b6c39b Author: Boris Kovar Date: Thu Apr 6 14:20:00 2023 +0200 - Add status to the job table - Revert the disabled buttons if I can't run the job for the target - Show the exception from squonk access when click OPEN IN SQUONK and show error messag commit d7b5e5c26dae7824d3c930fb263a02c592a2c042 Author: boriskovar-m2ms Date: Thu Apr 6 10:43:08 2023 +0200 Ms 2022 08 18 yellow (#347) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image * - can't go to squonk job execution page if the url is not available commit 17e89cefe8264584ebe0fadc637a1fac542704ac Author: Boris Kovar Date: Thu Apr 6 10:23:27 2023 +0200 - can't go to squonk job execution page if the url is not available commit 16f0cbddafd994293e45573f3d6ebeeeab1e4b22 Author: boriskovar-m2ms Date: Thu Apr 6 09:11:52 2023 +0200 Minor fixes before the release (#346) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms * Update package.json to trigger build action * Update package.json trigger build action * - updated build-dev.yaml * Update package.json to trigger build action * Update package.json just to trigger build action * - minor typo fix * - before the release fixes * Update package.json triggering the build action * - new BE image commit c8b5f20dd521c7007f08531736541ca84b041a85 Merge: 8d500638 2cd48e04 Author: Boris Kovar Date: Wed Apr 5 14:35:17 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8d50063887bc2f6335550f15fe69cc93b17be30e Author: Boris Kovar Date: Wed Apr 5 14:34:49 2023 +0200 - new BE image commit 2cd48e0474f31fe9f0d0f4eb256cad32ed5516cd Merge: 0fddd791 b20adee8 Author: boriskovar-m2ms Date: Wed Apr 5 13:00:20 2023 +0200 Merge branch 'staging' into ms-2022-08-18-yellow commit 0fddd791812ce9e4093a784850c8e4c5698f3f18 Author: boriskovar-m2ms Date: Wed Apr 5 12:09:36 2023 +0200 Update package.json triggering the build action commit bed2dc1bf438a2f61b61fdd2d1b18753d1ef58be Author: Boris Kovar Date: Wed Apr 5 10:44:24 2023 +0200 - before the release fixes commit b10160928bff787161a140e4cffd8aa783a4c482 Merge: f6699d10 9f5f2b7c Author: Boris Kovar Date: Fri Mar 31 09:38:39 2023 +0200 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit f6699d106af94bbba6be1494a0c83e0cf1a5b084 Author: Boris Kovar Date: Fri Mar 31 09:37:22 2023 +0200 - minor typo fix commit 9f5f2b7cad0ebb482d8069114d52bf65ca6c6531 Author: boriskovar-m2ms Date: Fri Mar 24 14:00:10 2023 +0100 Update package.json just to trigger build action commit 5a37013c71469f9433c36d956174b1efc1e698ab Author: boriskovar-m2ms Date: Fri Mar 24 12:43:27 2023 +0100 Update package.json to trigger build action commit b54cdaa4ea816719128c07939a14a99152a8e990 Merge: 5dfc38be d6d5216d Author: Boris Kovar Date: Fri Mar 24 11:36:29 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 5dfc38bef9b0a0fead21b824db58461c185f98fd Author: Boris Kovar Date: Fri Mar 24 11:35:57 2023 +0100 - updated build-dev.yaml commit d6d5216dce40de14910bde76b5f4fb8650bdbd9c Author: boriskovar-m2ms Date: Fri Mar 24 08:52:55 2023 +0100 Update package.json trigger build action commit 6bd9fcb0773fc3bbf5266ab9022d6e365dff9cfc Author: boriskovar-m2ms Date: Fri Mar 24 08:46:51 2023 +0100 Update package.json to trigger build action commit b20adee8140c7f46573eb5e7525e97427d23d4d4 Author: boriskovar-m2ms Date: Thu Mar 16 17:29:15 2023 +0100 Ms 2022 08 18 yellow (#345) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action * - fixed bugs found in staging * - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit 3a9a478d3bdbcb54802346efe2ec5e1f18242721 Merge: d777f117 4cb92f6c Author: boriskovar-m2ms Date: Thu Mar 16 10:50:04 2023 +0100 Merge branch 'staging' into ms-2022-08-18-yellow commit d777f117bbfab9a367ef8ad04c2fcf540cf19ef6 Author: Boris Kovar Date: Thu Mar 16 10:17:34 2023 +0100 - resolved build issue where Terser complained about unexpected token. Problem was inclusion of yup package which is used for validation of Formik forms commit ae0cbdc8540aa440c776be3b84508c710a215d36 Author: Boris Kovar Date: Thu Mar 16 09:01:48 2023 +0100 - fixed bugs found in staging commit 4cb92f6ca3c986a087b840f9327e921ed17e1b4c Author: boriskovar-m2ms Date: Thu Mar 9 13:05:06 2023 +0100 Ms 2022 08 18 yellow (#344) * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - added debug info * - reworked show inputs in jobs table * - trying to fix a bug with inputs * - fixes because can't debug this locally * - implemented #890 * - added debug logs * fixed problem with entries function * - added more logs * - authorize user for viewing squonk job * - fixed problem with id * - added message when access to squonk is denied * Update package.json to trigger build action * Update package.json triggering build action commit bc13d845aa206aa7d8d151a8bb53f53335761084 Author: boriskovar-m2ms Date: Thu Mar 9 10:38:18 2023 +0100 Update package.json triggering build action commit 49d1ad57042d353f76c7368944601a8d64e44596 Author: boriskovar-m2ms Date: Thu Mar 9 10:32:30 2023 +0100 Update package.json to trigger build action commit fd0df1c021010f4f5e028090493464721b8b2600 Author: Boris Kovar Date: Thu Mar 9 09:11:44 2023 +0100 - added message when access to squonk is denied commit 622b635472e0ed7be1ae36062addd0f91d9ff6f4 Author: Boris Kovar Date: Wed Mar 8 14:35:57 2023 +0100 - fixed problem with id commit 74a1a62ca7a564d481be34c4301771ce7f5dd76a Author: Boris Kovar Date: Wed Mar 8 14:18:47 2023 +0100 - authorize user for viewing squonk job commit aa55bc41ee6a6fce4d8b146362e276265eed0af3 Author: Boris Kovar Date: Wed Mar 8 12:58:15 2023 +0100 - added more logs commit d97a512d75aa621be77ee69b547b21e1653386e1 Author: Boris Kovar Date: Wed Mar 8 12:19:18 2023 +0100 fixed problem with entries function commit 7e28e41d96e57998b979752d3651304bf36713c9 Author: Boris Kovar Date: Wed Mar 8 12:13:08 2023 +0100 - added debug logs commit f4becf9c94cf8c5eec225fde7b24c73131e0e338 Author: Boris Kovar Date: Wed Mar 8 11:29:23 2023 +0100 - implemented #890 commit bcd3ec01ddc68d3dd1dce78f1f3ca165e1633fd4 Author: Boris Kovar Date: Sun Mar 5 18:50:08 2023 +0100 - fixes because can't debug this locally commit 59779b6b80ec7e21af68b219a543a017aa837b14 Author: Boris Kovar Date: Sun Mar 5 18:29:05 2023 +0100 - trying to fix a bug with inputs commit 76ccc089efc43589bb381ea6589567dce538aa8b Author: Boris Kovar Date: Sun Mar 5 18:12:34 2023 +0100 - reworked show inputs in jobs table commit e862c726c81b0328cc9b7538d9820481b7d85cd8 Author: Boris Kovar Date: Sun Mar 5 16:46:29 2023 +0100 - added debug info commit 471d947b83f159bde413a32de06dbd10b9c4dfaf Author: Boris Kovar Date: Sun Mar 5 16:33:00 2023 +0100 - added debug info commit c4b11af95a56786493e13735ac92b1b1f766af79 Author: Boris Kovar Date: Sun Mar 5 16:13:41 2023 +0100 - added debug info commit 6adc86d4f95a362b38747e001f55bde2a104baff Author: Boris Kovar Date: Sun Mar 5 15:53:49 2023 +0100 - added debug info commit e42ed05162106109c927e80620d67b5af31b7ef1 Author: Boris Kovar Date: Sun Mar 5 15:34:10 2023 +0100 - added debug info commit 39034c54b97f4da301365c69d985640a66c75469 Author: Boris Kovar Date: Sun Mar 5 15:09:04 2023 +0100 - added debug info commit 9eee228b45b94479edfab5d6279d3e0ce4ccb8d1 Author: Boris Kovar Date: Sun Mar 5 14:48:45 2023 +0100 - added debug info commit 13a00cf2ba8f4ae13de4865096f9def349acd158 Merge: 0a36ae5c d0317f60 Author: rsanchezgarc Date: Tue Feb 21 20:43:31 2023 +0000 Merge pull request #341 from m2ms/ms-2022-08-18-yellow Ms 2022 08 18 yellow release commit d0317f607def3b6e1a5651554b338161fce4f040 Merge: 53164d21 8c4ca1d0 Author: Boris Kovar Date: Mon Feb 20 13:58:48 2023 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 53164d21b23e7a918a772ced6292817b4306031e Author: Boris Kovar Date: Mon Feb 20 13:57:25 2023 +0100 Squashed commit of the following: commit 19b3910d84f9707b8047524cfe44dfa1f8696644 Author: Boris Kovar Date: Mon Feb 20 13:33:18 2023 +0100 - new dev BE commit af427c71d9499c975e12b314202bdb0f0ec13826 Author: boriskovar-m2ms Date: Fri Feb 17 08:44:14 2023 +0100 Update package.json just to trigger build action commit 4cb19eb371b0147dfc51b704a36dba842543d311 Author: boriskovar-m2ms Date: Thu Feb 16 09:09:27 2023 +0100 Update package.json just to trigger build action commit 7612967a111ec486f2072ca3ddd88330b4ad37c9 Author: boriskovar-m2ms Date: Wed Feb 15 14:01:32 2023 +0100 Update package.json just to trigger build action commit 4e8b27d9b65fe372e06df45bc720abb52f81dbe2 Author: Boris Kovar Date: Tue Feb 14 08:50:44 2023 +0100 - fixed direct links and direct download links commit c08da4bf71caf536e95423fb8b1e5d8ab01c60e7 Author: Boris Kovar Date: Thu Feb 9 14:02:18 2023 +0100 - fixed job name commit 4b9a491f0478849e268dc7b825ba358585cdb2ab Author: Boris Kovar Date: Thu Feb 9 13:28:20 2023 +0100 - added fragmenstein-combine-multi-scoring.json commit ca4f946d07074e87a74ac6a3d2272c1735343cb1 Author: Boris Kovar Date: Thu Feb 9 13:25:35 2023 +0100 - checkpoint commit b43373e1c228d9e46f4c831fc46269d614013e92 Author: Boris Kovar Date: Thu Feb 9 10:43:27 2023 +0100 - fixed problem where UI would crash if there was a problem during job file transfer of job launch commit 3618b10e2b77f4a7a173f38a8d8bbdc0a853805b Author: Boris Kovar Date: Thu Feb 9 09:54:36 2023 +0100 - fixed bad project capture from url commit 7d588895cebd0e363aa5d62b36770499364aef06 Merge: 11180a5c 4fc7f7bd Author: Boris Kovar Date: Wed Feb 8 09:27:51 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 11180a5c0142ea18624ae14ddaad16793fdcb435 Author: Boris Kovar Date: Wed Feb 8 09:26:31 2023 +0100 - prevent crash when there is a project associated with target which user is not authorized to see commit 4fc7f7bd2d0aae799099b29e256e3c0834e9576f Author: boriskovar-m2ms Date: Wed Feb 8 07:25:12 2023 +0100 Update package.json just to trigger build action commit 2b2665cfc609f621eb9bf505b9a86e6bd4fb3d35 Author: boriskovar-m2ms Date: Thu Feb 2 15:43:38 2023 +0100 Update package.json just to trigger the build action commit d0d429c473307ce2bfa825ad9e556084082accd8 Author: boriskovar-m2ms Date: Thu Feb 2 15:20:25 2023 +0100 Update package.json just to trigger the build action commit fcf377b863abf9110e1c0ce752b29bce073349cf Author: Boris Kovar Date: Thu Feb 2 14:51:17 2023 +0100 - fixed problem when job config windows closes on error commit c9e39f4da281f333c620811cf7ccfb6b8438cc1f Merge: 5a3d56bf 0f8e702a Author: Boris Kovar Date: Thu Feb 2 13:19:16 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 5a3d56bf87d9c8d8e6007dba5db8c1239dbf39a2 Author: Boris Kovar Date: Thu Feb 2 13:18:30 2023 +0100 - now sending id of the project and not target_access_string commit 0f8e702a023e2f786c5ba46eab2205f158a75480 Author: boriskovar-m2ms Date: Thu Feb 2 12:59:19 2023 +0100 Update package.json just to trigger build action commit 585076db67dc32b58083c184e1ca11a6dddc434b Author: Boris Kovar Date: Thu Feb 2 12:39:19 2023 +0100 - fixed problem when project pane was not showing up right after a project was created commit fa7fd759c30c3abf4e12b1c17af4107424993dc4 Author: Boris Kovar Date: Thu Feb 2 12:08:23 2023 +0100 - fix for missing project pane commit ba0a1fe55bd53f719d31d795d71877d81366cac9 Author: Boris Kovar Date: Thu Feb 2 09:05:50 2023 +0100 - version for job execution - broken UI commit 51555e1ba1eeb12e1eef340f108d7d3b595e6210 Merge: 51e97af1 a42cad71 Author: Boris Kovar Date: Wed Feb 1 13:58:27 2023 +0100 Merge branch '#1020' of https://github.com/m2ms/fragalysis-frontend into #1020 commit 51e97af1db45d3b4bb9b5d1fdd55a07991a9a19a Author: Boris Kovar Date: Wed Feb 1 13:57:49 2023 +0100 - partial implementation of #1020 commit a42cad7193b8c8f02c04378bba01f6f44114ec88 Author: boriskovar-m2ms Date: Thu Jan 26 08:34:01 2023 +0100 Update package.json just to trigger build action commit 96c0216e8b29169c9c1bf29471eafb5bddd24e5b Author: boriskovar-m2ms Date: Wed Jan 25 09:39:06 2023 +0100 Update package.json just to trigger build action commit c7de9cf16f783fad2bdfb78224a818221fa24ba1 Author: boriskovar-m2ms Date: Tue Jan 24 15:10:11 2023 +0100 Update package.json just to trigger the build action commit e8e5657cc5f7beecf5813040210605b6cf410cef Author: boriskovar-m2ms Date: Tue Jan 24 14:04:56 2023 +0100 Update package.json just to trigger build commit 24dc912bfdae3bec9c52867f2d638754635cecbb Author: Boris Kovar Date: Tue Jan 24 12:49:58 2023 +0100 - sensitive data moved to .env file commit a98c51751368104300a872f116cc22acc09cec44 Author: Boris Kovar Date: Tue Jan 24 12:49:06 2023 +0100 - added .env to gitignore commit 13b4bed082612315afc948192fe758fb42edf63d Author: Boris Kovar Date: Tue Jan 24 12:47:56 2023 +0100 - mending an error commit 5b74eb4326389e11b923b560f6603586bfc3b87c Author: Boris Kovar Date: Wed Jan 18 09:52:19 2023 +0100 - checkpoint commit d4b88dfe5c525b7c471d97ac47d46f9d992bfa48 Author: Boris Kovar Date: Tue Jan 17 10:10:27 2023 +0100 - initial implementation #1020 commit 8c4ca1d022f2a5841d68dde70edd9f433c539b83 Author: boriskovar-m2ms Date: Mon Jan 16 11:35:37 2023 +0100 Update package.json just to trigger build action commit 436196bb65fe5eb44f38abc3bc18cf827f09c8d6 Author: boriskovar-m2ms Date: Fri Jan 13 10:47:51 2023 +0100 Update package.json just to trigger build action commit 0d6abaa08dc7a174d915d33e21a1667accd39423 Author: boriskovar-m2ms Date: Thu Jan 12 10:18:23 2023 +0100 Update package.json just to trigger build action commit d5905966cb9bf2994f93668911873108832d7578 Author: Boris Kovar Date: Wed Jan 11 11:02:25 2023 +0100 - forgot to reset debug constants commit df7057032baa70df6451b7faf0a232fa75a1e55b Author: Boris Kovar Date: Wed Jan 11 08:05:23 2023 +0100 - minor fix for upload_status commit 698d123634ded171f161c3bb9f27e4e1600730be Author: Boris Kovar Date: Tue Jan 10 15:42:30 2023 +0100 - minor fix for upload_status commit 89bb79b92d6cef9fb410259ee93ae7e11859239a Author: Boris Kovar Date: Tue Jan 10 15:26:03 2023 +0100 - upload_failed now taken into the account commit 3f9f3ea181ab267ee9c1f52b88a620c0620fa34b Author: boriskovar-m2ms Date: Tue Jan 10 13:35:25 2023 +0100 Update package.json - just to trigger build action commit e6fbd6d213418dfd9708e206da341e8e37e776c3 Author: boriskovar-m2ms Date: Tue Jan 10 11:54:17 2023 +0100 Update package.json just to trigger build action commit 2d0a5257e2308d3b3241ec63a61ea5896981dc5e Author: Boris Kovar Date: Fri Dec 23 13:01:20 2022 +0100 - updated README.md commit 0a36ae5cc0f40aaab45ced9837e242308d17b578 Merge: 6a7a0dda 782b84b5 Author: rsanchezgarc Date: Tue Dec 20 18:11:19 2022 +0000 Merge pull request #337 from m2ms/ms-2022-08-18-yellow-wo-970 Animate to new orientation matrix first commit 5504bd464e1d699833f258b994e344cb339cb234 Author: Boris Kovar Date: Tue Dec 20 08:06:06 2022 +0100 Squashed commit of the following: commit cec398dcf0a14f7e433b2baec849e29001358839 Author: Boris Kovar Date: Tue Dec 20 08:00:30 2022 +0100 - commit 885f08e18f7983723a0944bd90cec646c869ee89 Author: Boris Kovar Date: Fri Dec 16 13:18:38 2022 +0100 - bug fix in progress for #970 commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 6fa2432f7226be0d54f7ce608719c0d59863d367 Author: Boris Kovar Date: Mon Dec 19 10:09:59 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 782b84b50f1d66742a3ed491b91d4ecf379b2edd Merge: eaa4ccbd f07779ce Author: Boris Kovar Date: Mon Dec 19 10:08:49 2022 +0100 Merge branch 'ms-2022-08-18-yellow-wo-970' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow-wo-970 commit eaa4ccbdf4282a772a19badf68fc2c14579d9173 Author: Boris Kovar Date: Mon Dec 19 10:08:30 2022 +0100 Squashed commit of the following: commit 553235691beedd110072226ff20b6b49a6aad1ee Author: Boris Kovar Date: Mon Dec 19 10:06:41 2022 +0100 - orient first then remove/add stuff commit 6a7a0dda77266978a5afdaf82a5e8f89f5aa0d4e Merge: 356e625e f07779ce Author: rsanchezgarc Date: Fri Dec 16 12:44:21 2022 +0000 Merge pull request #334 from m2ms/ms-2022-08-18-yellow-wo-970 Ms 2022 08 18 yellow wo 970 commit f07779ce30667465ea1aba424085e8978827641a Merge: 57336b82 dcc2c882 Author: boriskovar-m2ms Date: Fri Dec 16 13:24:09 2022 +0100 Merge branch 'master' into ms-2022-08-18-yellow-wo-970 commit 21b437e8dd24102aebe35302d8b1ef2d18c6c040 Author: Boris Kovar Date: Thu Dec 15 16:32:57 2022 +0100 Squashed commit of the following: commit 006af71cdff9eff68f3dc7d03404fe265ff841b8 Author: Boris Kovar Date: Thu Dec 15 16:30:41 2022 +0100 - now user can insert list of strings as an input for a job commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 2be8ed349ffdffa3602a2a393b4019bb3115ba5f Merge: 8ac386cd 57336b82 Author: Boris Kovar Date: Wed Dec 14 06:28:30 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8ac386cd710d9b6bf65cccac8d5962e6f6d730a5 Author: Boris Kovar Date: Wed Dec 14 06:27:11 2022 +0100 Squashed commit of the following: commit 15e97d0c57a2ab0c683077ea1f588db63645536f Author: Boris Kovar Date: Wed Dec 14 06:07:28 2022 +0100 - initial implementation of #970 commit 89010ea549ade47427b6454c3b92a37dff0c449b Author: Boris Kovar Date: Mon Dec 5 08:26:35 2022 +0100 - #1001 commit 57336b825cb95aecb3dfff78ab571bb85e906073 Author: boriskovar-m2ms Date: Thu Dec 8 11:41:44 2022 +0100 Update package.json just to trigger action commit c6c3ed0b16414d528684d63befca6a01634683d0 Author: boriskovar-m2ms Date: Wed Dec 7 11:57:33 2022 +0100 Update package.json just to trigger action commit 614b01c80882557160777ba96abc92c2d328112e Author: boriskovar-m2ms Date: Wed Dec 7 09:38:38 2022 +0100 Update package.json just to trigger action commit c0d2b3858d074b33303eef48e42f11e7eefac474 Author: boriskovar-m2ms Date: Wed Dec 7 08:39:23 2022 +0100 Update package.json just to trigger action commit bbf6f91e8498586d666204c3493405c4ca4e7268 Author: boriskovar-m2ms Date: Wed Dec 7 08:31:30 2022 +0100 Update package.json just to trigger rebuild commit 5edd5c4c387405b5f30ee88b19f1f2a2e91d8022 Author: Boris Kovar Date: Mon Dec 5 08:28:17 2022 +0100 Squashed commit of the following: commit 8d6edcb01a41b4abdddf86e94fe754682fb17964 Author: Boris Kovar Date: Mon Dec 5 08:14:43 2022 +0100 - #1001 commit 8c52f55f808f5566f83e6068e3dbe76cf06860b0 Author: Boris Kovar Date: Thu Dec 1 09:10:59 2022 +0100 Squashed commit of the following: commit 91f3363f245ec336810dd27b9d34aaaa82512a8a Author: Boris Kovar Date: Thu Dec 1 09:08:03 2022 +0100 - implemented #1012 commit f8eb4067e0ece9d170e3405bebe21a689927442c Author: Boris Kovar Date: Tue Nov 29 10:24:56 2022 +0100 Squashed commit of the following: commit a5b8f281ebd05cc6be2163fc7124855f6cee8418 Author: Boris Kovar Date: Tue Nov 29 10:22:31 2022 +0100 - fixed #1013 commit db173bcdd76574055d5132ec3cd34012a727656d Author: Boris Kovar Date: Mon Nov 28 14:39:16 2022 +0100 Squashed commit of the following: commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit c966f2e5a51059496bb8a653eedd54d781b7ec0a Merge: 8712fddb 87870aa1 Author: Boris Kovar Date: Mon Nov 28 13:40:54 2022 +0100 Merge branch 'ms-2022-08-18-yellow' of https://github.com/m2ms/fragalysis-frontend into ms-2022-08-18-yellow commit 8712fddb5830de27c1c5568d3ce8e3c4a7318523 Author: Boris Kovar Date: Mon Nov 28 13:39:15 2022 +0100 Squashed commit of the following: commit cb3969273bde4d917b38c56485a05b1be23cf9cd Author: Boris Kovar Date: Mon Nov 28 13:30:45 2022 +0100 - fixes for fast snapshot switching in ngl view after the dataset is deleted and compounds from dataset were used (i.e. were visible in some shape or form in the ngl view) commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 87870aa192d10344ae7eb384618ef137986862d0 Author: boriskovar-m2ms Date: Mon Nov 28 09:36:12 2022 +0100 Update package.json just to trigger build action commit 68d1a2fbd2be5620cca635c662dc0278dd578fcb Author: Boris Kovar Date: Mon Nov 28 09:08:21 2022 +0100 Squashed commit of the following: commit 0783429eaa6f18cf3c949c3f631d81e76edaa33c Author: Boris Kovar Date: Mon Nov 28 08:16:31 2022 +0100 - #876 seems to be done commit 356e625e4a0d7cee6bf1bd3c3b1627b59375e88d Merge: 0530324b 7b7cbe99 Author: rsanchezgarc Date: Mon Nov 14 09:59:45 2022 +0000 Merge pull request #329 from m2ms/#977-ngl Fast switching between snapshots commit 7b7cbe99952000f6c550727e082cb920cafa144c Author: Boris Kovar Date: Tue Nov 8 10:04:33 2022 +0100 - #977 - fixed issue with ngl settings were not saved and restored commit d1abaa872675f8a748f7c573aa74d79cdf629a0c Author: Boris Kovar Date: Mon Nov 7 10:14:18 2022 +0100 Squashed commit of the following: commit 4a8a532f6ea217d2921ed5fab6b6705442ca682f Author: Boris Kovar Date: Thu Nov 3 08:01:05 2022 +0100 - fixed ngl view was not tracked commit 0530324b9faae6876d0b42c48ac4b26a9eaf3c26 Merge: 931a5aea 5746062a Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:51:39 2022 +0100 Merge pull request #325 from xchem/production Action doc tweaks commit 5746062aacabb5201feefed8ea09e3e34066a175 Merge: b0e75d17 dc2ff23d Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 15:50:50 2022 +0100 Merge pull request #324 from alanbchristie/production Action doc tweaks commit dc2ff23d773157c74f864931e06ccb0fd21cf335 Author: Alan Christie Date: Thu Oct 27 15:48:48 2022 +0100 Add doc for production workflow commit c5ee4068a880a85d4fc5ed164dbbd711e4c5d0ec Author: Alan Christie Date: Thu Oct 27 15:35:27 2022 +0100 Tweak action docs commit 931a5aea583997a80bab66d8099f743529f8d98f Merge: cb4246e7 b0e75d17 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:51:21 2022 +0100 Merge pull request #323 from xchem/production Production now triggers stack commit b0e75d174217c507b2db2f4d6329e4ed2315e887 Merge: cb4246e7 ac3297e4 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 12:50:08 2022 +0100 Merge pull request #322 from alanbchristie/production Production now triggers stack commit ac3297e47b5ce9ca5a9ca1386818a317bc8098f2 Author: Alan Christie Date: Thu Oct 27 12:49:11 2022 +0100 Production now triggers stack Fix for BE tag commit cb4246e7f7acde133a4ca2081c30115dd5c87f56 Merge: dcc2c882 dec6f785 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Oct 27 11:15:06 2022 +0100 Merge pull request #321 from alanbchristie/production CI changes for new branch policy commit dec6f785663f6e3050262c5a4b4704109d2e446a Author: Alan Christie Date: Thu Oct 27 10:58:08 2022 +0100 Removed personal repo references commit 2147aa18af1211a32f55e228c1023491008204ac Author: Boris Kovar Date: Wed Oct 26 10:00:07 2022 +0200 - updated squonk project id for dev stacks commit b2bc6e79197baa4c7336822fca2bfbf54eded377 Author: Boris Kovar Date: Mon Oct 24 16:47:24 2022 +0200 - first real version of the final implementation of ticket #977 - also added functionality that only if user did something with the snapshot, only then user will be prompted if new snapshot (or current overridden) should be saved or not - note: in this current version undoing an action does not undo the 'dirty' status of the snapshot commit 204a86d7f8901b9d39cf6495e625c709d82a8c72 Author: Boris Kovar Date: Thu Oct 20 07:32:33 2022 +0200 - nearly complete issue #977 commit dcc2c8824378b69e118564a664b332456d5632e4 Author: boriskovar-m2ms Date: Thu Sep 29 12:48:42 2022 +0200 edited in correct squonk project id commit 725f6d5267d568afd34f29f22b0869458d759832 Author: boriskovar-m2ms Date: Thu Sep 29 12:47:31 2022 +0200 removed Upload button from Job popup (#320) * - initial commit * - checkpoint * - new backend * Update package.json bumped version to 0.10.109 * Update package.json bumped version to 0.10.111 * Update package.json version bumped to 0.10.112 * Update package.json bumped version to 0.10.113 * Update package.json bumped version to 0.10.114 * Update package.json bumped version to 0.10.115 * - added new back-end * Squashed commit of the following: commit 949573bd930afaa0171a728f05dafa08c2425341 Merge: deb0d1c3 74ea6613 Author: Boris Kovar Date: Thu Jul 14 06:56:52 2022 +0200 Merge branch '#885-bugfix' of https://github.com/m2ms/fragalysis-frontend into #885-bugfix commit deb0d1c31aa68fb38c1d1541aca6bd81410e515b Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit e2a00641039dd34b348ce2084eefd8f33ae04343 Author: Boris Kovar Date: Mon Jun 6 06:05:49 2022 +0200 Squashed commit of the following: -bumped version to 0.10.93 commit dfa24f68c4cb0e84ad37ac663ec08caadd2f3fbb Author: Anton Gasperak Date: Wed Jun 1 11:53:32 2022 +0200 #883 - Remove unused selection action commit 0ae63081e822a514443a7b6c6e1fb3826a8c6178 Author: Anton Gasperak Date: Wed Jun 1 11:43:17 2022 +0200 #883 - Remove countOfPendingVectorLoadRequests from selectionReducers with unused hook commit b884e0b59c5e9000422adbf6e6adf7b14847b51f Author: Anton Gasperak Date: Wed Jun 1 11:10:44 2022 +0200 #883 - Remove associatedDownloadTagName from selectionReducers commit ab825ccf3369af8fbaab9c8d25d68c5a1699d773 Author: Anton Gasperak Date: Wed Jun 1 10:54:57 2022 +0200 #883 - Remove displayedMoleculesInHitNav from selectionReducers commit 4103e3984bc9b3fbf2cc48bef3b9d65864a4814b Author: Anton Gasperak Date: Wed Jun 1 10:08:28 2022 +0200 #883 - Remove displayAllInNGLList from selectionReducers commit f3b3b10a879447705b2709b88d48b62fe50e14cc Author: Anton Gasperak Date: Wed Jun 1 09:59:23 2022 +0200 #883 - Remove listAllList from selectionReducers commit 02aa5955918abace2d5473e89bb9260ff10d7338 Author: Anton Gasperak Date: Wed Jun 1 09:40:29 2022 +0200 #883 - Move categoryList from selectionReducers to apiReducers commit d059ee8d4de0ddc34be64ef9c55a71c4f2bd96df Author: Anton Gasperak Date: Wed Jun 1 08:43:26 2022 +0200 #883 - Move tagList from selectionReducers to apiReducers commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 #885 - Add the possibility to recompile variables before job launching commit 74ea6613da0306f5251a440bdfdaa44f225ccb69 Author: Boris Kovar Date: Thu Jun 9 10:21:43 2022 +0200 - mics changes commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 #885 - Adjust and compile schema commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 #885 - Reuse the merged schema in JobVariablesDialog commit bd3ff2b3f22dada64afadd4df1685bcc46ab2d21 Author: Anton Gasperak Date: Fri Jun 3 08:36:34 2022 +0200 #885 - Add new job definition * updated fragmentstein job spec Squashed commit of the following: commit 1e6311eddebf515f11a42e86fe3a1db7572dcdba Author: Anton Gasperak Date: Mon Jul 11 14:42:22 2022 +0200 #885 - Add the possibility to recompile variables before job launching commit f98a7cac0c540cc9f9d52ec09814e86c80cee065 Author: Anton Gasperak Date: Mon Jun 6 12:28:04 2022 +0200 #885 - Adjust and compile schema commit d2e422992f95edb2a82435f03d8793f8c3e72bc1 Author: Anton Gasperak Date: Fri Jun 3 12:53:17 2022 +0200 #885 - Reuse the merged schema in JobVariablesDialog commit bd3ff2b3f22dada64afadd4df1685bcc46ab2d21 Author: Anton Gasperak Date: Fri Jun 3 08:36:34 2022 +0200 #885 - Add new job definition * - changed default value for output file * Update package.json bumped version to 0.10.116 * - new backend test * Update package.json bumped version to 0.10.120 * Update package.json bumped version to 0.10.122 * - new version of the backend added * Squashed commit of the following: commit c6c605ed21996d470a36b0de0a51a4e145792884 Author: Boris Kovar Date: Thu Aug 4 09:25:18 2022 +0200 - fixed #949 commit 2118900c0f7b92aa3ff7b6a1aefd943ab506c287 Author: Boris Kovar Date: Wed Aug 3 15:42:41 2022 +0200 - fixed problem where there are no selected inputs for a job commit db6f6436af34cfead10d7e788bf4d9c3a9029294 Author: Boris Kovar Date: Wed Aug 3 08:47:55 2022 +0200 - fix… * Squashed commit of the following: commit e7075fd464984f7ca83c683594737ede8a2d6156 Author: RobertMatuska Date: Thu Aug 10 09:22:56 2023 +0200 #1124 fixed border color * Squashed commit of the following: commit 9047a700d7d206e2ab01fd6dff574162fc4483e3 Author: Boris Kovar Date: Thu Jun 15 09:53:13 2023 +0200 - implemented all the features for #944 commit 716eb0e7a8f11d34c8744cf20ad60ce3cbe41dd6 Author: Boris Kovar Date: Thu Jun 8 09:13:42 2023 +0200 - initial commit * - fixed new job commit c74c7ae129e1a70ebd4c25d8b8425632a4bb648c Author: Alan Christie Date: Thu Aug 10 13:30:44 2023 +0100 ci: Streamlined builds (less noisy) Staging builds now use latest bacxkend (rather than stable). Production changes no longer trigger stack builds, it simply runs yarn. Updated to latest GitHub action virsions. commit 2a853766d24a73e7fb39633b7611c6433e33029d Merge: e58b8fc3 17fa84e0 Author: Max Winokan <36866506+mwinokan@users.noreply.github.com> Date: Wed Aug 9 12:58:46 2023 +0100 Merge pull request #359 from xchem/staging #1106 fixed style of the table (#358) commit e58b8fc3f0e069c785b77dd6e47de8538a9f8631 Merge: db83ee34 056243c4 Author: Max Winokan <36866506+mwinokan@users.noreply.github.com> Date: Fri Aug 4 14:19:39 2023 +0100 Merge pull request #357 from xchem/staging Red release commit db83ee3470b5089290103a7ad8339ffd0c49ed54 Merge: 907db8de 48299e86 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Tue May 16 10:29:39 2023 +0100 Merge pull request #353 from xchem/staging Green Release commit 907db8de8ad55d0c3a1d97c4b659743df220dc75 Merge: c10018dc 0a36ae5c Author: rsanchezgarc Date: Wed Jan 11 21:37:43 2023 +0000 Merge pull request #339 from xchem/staging Smooth transition between snapshots commit c10018dc77757aa3d91bcac95170f32258951982 Merge: 5874d0a7 6a7a0dda Author: rsanchezgarc Date: Fri Dec 16 12:51:12 2022 +0000 Merge pull request #335 from xchem/staging Moving to production MS 2022-08-18 commit 5874d0a7580395b38d7234bd843696c11fbbf8ed Merge: 5746062a 7e684408 Author: Alan B. Christie <29806285+alanbchristie@users.noreply.github.com> Date: Thu Nov 3 14:46:30 2022 +0000 Merge pull request #326 from alanbchristie/production Potential fix for FE_BRANCH when tagged commit 7e68440848ee5b5dc1c113da8fe7dd7120e907bd Author: Alan Christie Date: Thu Nov 3 14:19:52 2022 +0000 Better workflow variables (FE_BRANCH) commit 3e5696bf94e00812570ad167a6954d1ba9f138e7 Author: Alan Christie Date: Thu Nov 3 14:14:21 2022 +0000 Fix for fe_branch workflow variable --- .github/workflows/build-staging.yaml | 16 +- js/components/datasets/datasetMoleculeList.js | 110 ++++-- .../datasetMoleculeView.js | 215 +++++++++-- .../datasets/lockVisibleCompoundsDialog.js | 159 ++++---- js/components/datasets/redux/actions.js | 10 + js/components/datasets/redux/constants.js | 5 +- .../datasets/redux/dispatchActions.js | 168 +++++++- js/components/datasets/redux/reducer.js | 13 +- .../datasets/selectedCompoundsList.js | 358 ++++++++++++++++-- js/components/datasets/useScrollToCompound.js | 58 +++ js/components/datasets/useScrollToSelected.js | 27 +- js/components/preview/Preview.js | 2 +- js/components/preview/ResizableLayout.js | 45 ++- .../preview/compounds/compoundList.js | 54 ++- .../compounds/redux/dispatchActions.js | 2 +- .../preview/compounds/redux/reducer.js | 25 +- .../preview/molecule/moleculeList.js | 4 +- .../molecule/moleculeView/moleculeView.js | 162 ++++++-- .../preview/tags/details/tagDetails.js | 337 ++++++++++------- .../preview/tags/details/tagGridRows.js | 38 ++ js/components/preview/tags/modal/tagEditor.js | 59 ++- js/components/preview/tags/tagCategory.js | 45 ++- .../preview/tags/tagCategoryGridView.js | 117 ++++++ ...CategoryView.js => tagCategoryListView.js} | 7 +- js/components/preview/tags/tagView.js | 114 +++--- js/reducers/selection/actions.js | 21 +- js/reducers/selection/constants.js | 8 +- js/reducers/selection/selectionReducers.js | 9 + 28 files changed, 1728 insertions(+), 460 deletions(-) create mode 100644 js/components/datasets/useScrollToCompound.js create mode 100644 js/components/preview/tags/details/tagGridRows.js create mode 100644 js/components/preview/tags/tagCategoryGridView.js rename js/components/preview/tags/{tagCategoryView.js => tagCategoryListView.js} (95%) diff --git a/.github/workflows/build-staging.yaml b/.github/workflows/build-staging.yaml index 0ba30e560..2d816ef55 100644 --- a/.github/workflows/build-staging.yaml +++ b/.github/workflows/build-staging.yaml @@ -84,12 +84,6 @@ jobs: echo set-output name=BE_NAMESPACE::${BE_NAMESPACE} echo ::set-output name=BE_NAMESPACE::${BE_NAMESPACE} - # FE_BRANCH - FE_BRANCH="${{ env.FE_BRANCH }}" - if [ -n "${{ secrets.FE_BRANCH }}" ]; then FE_BRANCH="${{ secrets.FE_BRANCH }}"; fi - echo set-output name=FE_BRANCH::${FE_BRANCH} - echo ::set-output name=FE_BRANCH::${FE_BRANCH} - # FE_NAMESPACE FE_NAMESPACE="${{ env.FE_NAMESPACE }}" if [ -n "${{ secrets.FE_NAMESPACE }}" ]; then FE_NAMESPACE="${{ secrets.FE_NAMESPACE }}"; fi @@ -114,6 +108,14 @@ jobs: echo set-output name=STACK_NAMESPACE::${STACK_NAMESPACE} echo ::set-output name=STACK_NAMESPACE::${STACK_NAMESPACE} + # What branch/tag are we using? + # FE_BRANCH, or tag if used or a secret if no tag? + TAG="${{ env.FE_BRANCH }}" + if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then TAG="${{ env.GITHUB_REF_SLUG }}"; + elif [ -n "${{ secrets.FE_BRANCH }}" ]; then TAG="${{ secrets.FE_BRANCH }}"; fi + echo set-output name=tag::${TAG} + echo ::set-output name=tag::${TAG} + # Do we trigger downstream, i.e. is TRIGGER_DOWNSTREAM 'yes'? echo set-output name=trigger::${{ env.TRIGGER_DOWNSTREAM == 'yes' }} echo ::set-output name=trigger::${{ env.TRIGGER_DOWNSTREAM == 'yes' }} @@ -143,7 +145,7 @@ jobs: be_namespace=${{ steps.vars.outputs.BE_NAMESPACE }} be_image_tag=${{ steps.vars.outputs.BE_IMAGE_TAG }} fe_namespace=${{ steps.vars.outputs.FE_NAMESPACE }} - fe_branch=${{ steps.vars.outputs.FE_BRANCH }} + fe_branch=${{ steps.vars.outputs.tag }} stack_namespace=${{ steps.vars.outputs.STACK_NAMESPACE }} ci-user: ${{ secrets.STACK_USER }} ci-user-token: ${{ secrets.STACK_USER_TOKEN }} diff --git a/js/components/datasets/datasetMoleculeList.js b/js/components/datasets/datasetMoleculeList.js index 529aa3418..e3931ba7a 100644 --- a/js/components/datasets/datasetMoleculeList.js +++ b/js/components/datasets/datasetMoleculeList.js @@ -13,7 +13,8 @@ import { ButtonGroup, TextField, Checkbox, - InputAdornment + InputAdornment, + setRef } from '@material-ui/core'; import React, { useState, useEffect, memo, useRef, useContext, useCallback, useMemo } from 'react'; import { useDispatch, useSelector, shallowEqual } from 'react-redux'; @@ -210,13 +211,24 @@ const useStyles = makeStyles(theme => ({ color: theme.palette.primary.main, fontStyle: 'italic' }, + arrowsHighlight: { + borderColor: theme.palette.primary.main, + border: 'solid 2px', + backgroundColor: theme.palette.primary.main + }, arrow: { - width: 12, - height: 15 + width: 20, + height: 25, + color: 'white', + stroke: 'white', + strokeWidth: 2 + }, + iconButton: { + padding: 0 }, invisArrow: { - width: 12, - height: 15, + width: 20, + height: 25, visibility: 'hidden' }, arrows: { @@ -241,11 +253,19 @@ const useStyles = makeStyles(theme => ({ backgroundColor: compoundsColors.apricot.color }, textField: { - // marginLeft: theme.spacing(1), + marginLeft: theme.spacing(0.5), // marginRight: theme.spacing(1), - width: 70, + width: 90, + borderRadius: 10, + '& .MuiFormLabel-root': { paddingLeft: theme.spacing(1) + }, + '& .MuiInput-underline:before': { + borderBottom: '0px solid' + }, + '& .MuiInput-underline:after': { + borderBottom: '0px solid' } }, selectedInput: { @@ -260,7 +280,8 @@ const useStyles = makeStyles(theme => ({ }, editClassNameIconSelected: { padding: '0px', - color: theme.palette.primary.main + // color: theme.palette.primary.main + color: 'red' } })); @@ -328,7 +349,7 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { const compoundsToBuyList = useSelector(state => state.datasetsReducers.compoundsToBuyDatasetMap[datasetID]); - const { addMoleculeViewRef, setScrollToMoleculeId } = useScrollToSelected( + const { addMoleculeViewRef, setScrollToMoleculeId, getNode } = useScrollToSelected( datasetID, moleculesPerPage, setCurrentPage @@ -365,6 +386,14 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { [compoundsColors.apricot.key]: apricotInput }; + const inputRefs = { + [compoundsColors.blue.key]: useRef(), + [compoundsColors.red.key]: useRef(), + [compoundsColors.green.key]: useRef(), + [compoundsColors.purple.key]: useRef(), + [compoundsColors.apricot.key]: useRef() + }; + const compoundColors = useSelector(state => state.datasetsReducers.compoundColorByDataset[datasetID]) ?? {}; const isSelectedTypeOn = typeList => { @@ -683,6 +712,7 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { if (firstItem && nextItem) { const moleculeTitleNext = nextItem && nextItem.name; + const node = getNode(nextItem.id); setScrollToMoleculeId(nextItem.id); let dataValue = { @@ -694,6 +724,10 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { }; dispatch(setCrossReferenceCompoundName(moleculeTitleNext)); + + if (node) { + setSelectedMoleculeRef(node); + } dispatch( moveDatasetMoleculeUpDown(stage, datasetID, firstItem, datasetID, nextItem, dataValue, ARROW_TYPE.DOWN) ); @@ -713,7 +747,7 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { if (firstItem && prevItem) { const moleculeTitlePrev = prevItem && prevItem.name; - + const node = getNode(prevItem.id); setScrollToMoleculeId(prevItem.id); let dataValue = { @@ -725,6 +759,9 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { }; dispatch(setCrossReferenceCompoundName(moleculeTitlePrev)); + if (node) { + setSelectedMoleculeRef(node); + } dispatch(moveDatasetMoleculeUpDown(stage, datasetID, firstItem, datasetID, prevItem, dataValue, ARROW_TYPE.UP)); } } @@ -820,34 +857,41 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { {Object.keys(compoundsColors).map(item => ( <> - - dispatch(onChangeCompoundClassCheckbox(e))} - checked={currentCompoundClass === item} - > - + endAdornment: ( + dispatch(onStartEditColorClassName(e))} + onClick={e => { + dispatch(onStartEditColorClassName(e)); + inputRefs[item].current.focus(); + inputRefs[item].current.select(); + }} > + ), + startAdornment: ( + + dispatch(onChangeCompoundClassCheckbox(e))} + checked={currentCompoundClass === item} + > + ) }} + inputRef={inputRefs[item]} autoComplete="off" id={`${item}`} key={`CLASS_${item}`} @@ -857,7 +901,6 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { classes[item], currentCompoundClass === item && classes.selectedInput )} - label={compoundsColors[item].text} onChange={e => dispatch(onChangeCompoundClassValue(e))} onKeyDown={e => dispatch(onKeyDownCompoundClass(e))} // onClick={e => dispatch(onClickCompoundClass(e))} @@ -958,23 +1001,35 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { - + - + @@ -1062,6 +1117,7 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { disableP={locked && groupDatasetsNglControlButtonsDisabledState.protein} disableC={locked && groupDatasetsNglControlButtonsDisabledState.complex} dragDropEnabled + getNode={getNode} /> ); })} diff --git a/js/components/datasets/datasetMoleculeView/datasetMoleculeView.js b/js/components/datasets/datasetMoleculeView/datasetMoleculeView.js index 94eb0bbeb..9fd292851 100644 --- a/js/components/datasets/datasetMoleculeView/datasetMoleculeView.js +++ b/js/components/datasets/datasetMoleculeView/datasetMoleculeView.js @@ -5,7 +5,13 @@ import React, { memo, useEffect, useState, useRef, useContext, forwardRef } from 'react'; import { useDispatch, useSelector, shallowEqual } from 'react-redux'; import { Grid, Button, makeStyles, Tooltip, IconButton } from '@material-ui/core'; -import { ClearOutlined, CheckOutlined, Assignment, AssignmentTurnedIn } from '@material-ui/icons'; +import { + ClearOutlined, + CheckOutlined, + Assignment, + AssignmentTurnedIn, + KeyboardReturnOutlined +} from '@material-ui/icons'; import SVGInline from 'react-svg-inline'; import classNames from 'classnames'; import { VIEWS, ARROW_TYPE } from '../../../constants/constants'; @@ -28,7 +34,12 @@ import { getFirstUnlockedCompoundBefore, isDatasetCompoundIterrable, isDatasetCompoundLocked, - getAllVisibleButNotLockedCompounds + getAllVisibleButNotLockedCompounds, + getAllVisibleButNotLockedSelectedCompounds, + isCompoundLocked, + getFirstUnlockedSelectedCompoundAfter, + moveSelectedDatasetMoleculeUpDown, + getFirstUnlockedSelectedCompoundBefore } from '../redux/dispatchActions'; import { isAnyInspirationTurnedOn, getFilteredDatasetMoleculeList } from '../redux/selectors'; @@ -357,7 +368,8 @@ const DatasetMoleculeView = memo( disableP, disableC, inSelectedCompoundsList = false, - colorButtonsEnabled = true + colorButtonsEnabled = true, + getNode }, outsideRef ) => { @@ -382,6 +394,8 @@ const DatasetMoleculeView = memo( const currentCompoundClass = useSelector(state => state.previewReducers.compounds.currentCompoundClass); + const selectedCompounds = useSelector(state => state.datasetsReducers.selectedCompounds); + const disableMoleculeNglControlButtons = useSelector(state => state.datasetsReducers.disableDatasetsNglControlButtons[datasetID]?.[currentID]) || {}; @@ -398,6 +412,9 @@ const DatasetMoleculeView = memo( const isSurfaceOn = S; const askLockCompoundsQuestion = useSelector(state => state.datasetsReducers.askLockCompoundsQuestion); + const askLockSelectedCompoundsQuestion = useSelector( + state => state.datasetsReducers.askLockSelectedCompoundsQuestion + ); const isLockVisibleCompoundsDialogOpenLocal = useSelector( state => state.datasetsReducers.isLockVisibleCompoundsDialogOpenLocal @@ -414,7 +431,8 @@ const DatasetMoleculeView = memo( const hasAllValuesOn = isLigandOn && isProteinOn && isComplexOn; const hasSomeValuesOn = !hasAllValuesOn && (isLigandOn || isProteinOn || isComplexOn || isSurfaceOn); - let areArrowsVisible = (isLigandOn || isProteinOn || isComplexOn || isSurfaceOn) && !isLocked; + let areArrowsVisible = + (isLigandOn || isProteinOn || isComplexOn || isSurfaceOn) && !isLocked && !isCompoundFromVectorSelector(data); if (arrowsHidden) { areArrowsVisible = false; @@ -643,20 +661,29 @@ const DatasetMoleculeView = memo( } }; - const handleClickOnDownArrow = async event => { - const unlockedVisibleCompounds = dispatch(getAllVisibleButNotLockedCompounds(datasetID, currentID)); - if (unlockedVisibleCompounds?.length > 0 && askLockCompoundsQuestion) { + const moveDownSelectedCompound = anchorEl => { + //check if there are unlocked but visible compounds in the selected compounds list + const unlockedVisibleCompounds = dispatch(getAllVisibleButNotLockedSelectedCompounds(datasetID, currentID)); + if (unlockedVisibleCompounds?.length > 0 && askLockSelectedCompoundsQuestion) { dispatch(setCmpForLocalLockVisibleCompoundsDialog(data)); - setLockCompoundsDialogAnchorE1(event.currentTarget); + setLockCompoundsDialogAnchorE1(anchorEl); dispatch(setIsOpenLockVisibleCompoundsDialogLocal(true)); } else { - const refNext = ref.current.nextSibling; + let refNext = ref.current.nextSibling; scrollToElement(refNext); let nextItem = (nextItemData.hasOwnProperty('molecule') && nextItemData.molecule) || nextItemData; - const nextDatasetID = (nextItemData.hasOwnProperty('datasetID') && nextItemData.datasetID) || datasetID; - if (dispatch(isDatasetCompoundLocked(nextDatasetID, nextItem.id))) { - nextItem = dispatch(getFirstUnlockedCompoundAfter(nextDatasetID, nextItem.id)); + let nextDatasetID = (nextItemData.hasOwnProperty('datasetID') && nextItemData.datasetID) || datasetID; + if (dispatch(isCompoundLocked(nextDatasetID, nextItem)) || isCompoundFromVectorSelector(nextItem)) { + const unlockedCmp = dispatch(getFirstUnlockedSelectedCompoundAfter(nextDatasetID, nextItem.id)); + if (!unlockedCmp) { + return; + } + nextItem = unlockedCmp.molecule; + nextDatasetID = unlockedCmp.datasetID; + } + if (getNode) { + refNext = getNode(nextItem.id); } const moleculeTitleNext = nextItem && nextItem.name; @@ -668,29 +695,82 @@ const DatasetMoleculeView = memo( } dispatch( - moveDatasetMoleculeUpDown(stage, datasetID, data, nextDatasetID, nextItem, dataValue, ARROW_TYPE.DOWN) + moveSelectedDatasetMoleculeUpDown( + stage, + datasetID, + data, + nextDatasetID, + nextItem, + dataValue, + ARROW_TYPE.DOWN + ) ); } }; - const handleClickOnUpArrow = async event => { - const unlockedVisibleCompounds = dispatch(getAllVisibleButNotLockedCompounds(datasetID, currentID)); - if (unlockedVisibleCompounds?.length > 0 && askLockCompoundsQuestion) { + const handleClickOnDownArrow = async event => { + if (inSelectedCompoundsList) { + moveDownSelectedCompound(event.currentTarget); + } else { + const unlockedVisibleCompounds = dispatch(getAllVisibleButNotLockedCompounds(datasetID, currentID)); + if (unlockedVisibleCompounds?.length > 0 && askLockCompoundsQuestion) { + dispatch(setCmpForLocalLockVisibleCompoundsDialog(data)); + setLockCompoundsDialogAnchorE1(event.currentTarget); + dispatch(setIsOpenLockVisibleCompoundsDialogLocal(true)); + } else { + let refNext = ref.current.nextSibling; + scrollToElement(refNext); + + let nextItem = (nextItemData.hasOwnProperty('molecule') && nextItemData.molecule) || nextItemData; + const nextDatasetID = (nextItemData.hasOwnProperty('datasetID') && nextItemData.datasetID) || datasetID; + if (dispatch(isDatasetCompoundLocked(nextDatasetID, nextItem.id))) { + nextItem = dispatch(getFirstUnlockedCompoundAfter(nextDatasetID, nextItem.id)); + } + if (getNode) { + refNext = getNode(nextItem.id); + } + const moleculeTitleNext = nextItem && nextItem.name; + + let dataValue = { colourToggle, isLigandOn, isProteinOn, isComplexOn, isSurfaceOn }; + + dispatch(setCrossReferenceCompoundName(moleculeTitleNext)); + if (setRef && ref.current) { + setRef(refNext); + } + + dispatch( + moveDatasetMoleculeUpDown(stage, datasetID, data, nextDatasetID, nextItem, dataValue, ARROW_TYPE.DOWN) + ); + } + } + }; + + const moveUpSelectedCompound = anchorEl => { + const unlockedVisibleCompounds = dispatch(getAllVisibleButNotLockedSelectedCompounds(datasetID, currentID)); + if (unlockedVisibleCompounds?.length > 0 && askLockSelectedCompoundsQuestion) { dispatch(setCmpForLocalLockVisibleCompoundsDialog(data)); - setLockCompoundsDialogAnchorE1(event.currentTarget); + setLockCompoundsDialogAnchorE1(anchorEl); dispatch(setIsOpenLockVisibleCompoundsDialogLocal(true)); } else { - const refPrevious = ref.current.previousSibling; + let refPrevious = ref.current.previousSibling; scrollToElement(refPrevious); let previousItem = (previousItemData.hasOwnProperty('molecule') && previousItemData.molecule) || previousItemData; - const previousDatasetID = + let previousDatasetID = (previousItemData.hasOwnProperty('datasetID') && previousItemData.datasetID) || datasetID; - if (dispatch(isDatasetCompoundLocked(previousDatasetID, previousItem.id))) { - previousItem = dispatch(getFirstUnlockedCompoundBefore(previousDatasetID, previousItem.id)); + if (dispatch(isCompoundLocked(previousDatasetID, previousItem))) { + const unlockedCmp = dispatch(getFirstUnlockedSelectedCompoundBefore(previousDatasetID, previousItem.id)); + if (!unlockedCmp) { + return; + } + previousItem = unlockedCmp.molecule; + previousDatasetID = unlockedCmp.datasetID; + } + if (getNode) { + refPrevious = getNode(previousItem.id); } - const moleculeTitlePrev = previousItem && previousItem.name; + const moleculeTitlePrev = previousItem && previousDatasetID.name; let dataValue = { colourToggle, isLigandOn, isProteinOn, isComplexOn, isSurfaceOn }; @@ -700,11 +780,66 @@ const DatasetMoleculeView = memo( } dispatch( - moveDatasetMoleculeUpDown(stage, datasetID, data, previousDatasetID, previousItem, dataValue, ARROW_TYPE.UP) + moveSelectedDatasetMoleculeUpDown( + stage, + datasetID, + data, + previousDatasetID, + previousItem, + dataValue, + ARROW_TYPE.UP + ) ); } }; + const handleClickOnUpArrow = async event => { + if (inSelectedCompoundsList) { + moveUpSelectedCompound(event.currentTarget); + } else { + const unlockedVisibleCompounds = dispatch(getAllVisibleButNotLockedCompounds(datasetID, currentID)); + if (unlockedVisibleCompounds?.length > 0 && askLockCompoundsQuestion) { + dispatch(setCmpForLocalLockVisibleCompoundsDialog(data)); + setLockCompoundsDialogAnchorE1(event.currentTarget); + dispatch(setIsOpenLockVisibleCompoundsDialogLocal(true)); + } else { + let refPrevious = ref.current.previousSibling; + scrollToElement(refPrevious); + + let previousItem = + (previousItemData.hasOwnProperty('molecule') && previousItemData.molecule) || previousItemData; + const previousDatasetID = + (previousItemData.hasOwnProperty('datasetID') && previousItemData.datasetID) || datasetID; + if (dispatch(isDatasetCompoundLocked(previousDatasetID, previousItem.id))) { + previousItem = dispatch(getFirstUnlockedCompoundBefore(previousDatasetID, previousItem.id)); + } + if (getNode) { + refPrevious = getNode(previousItem.id); + } + const moleculeTitlePrev = previousItem && previousItem.name; + + let dataValue = { colourToggle, isLigandOn, isProteinOn, isComplexOn, isSurfaceOn }; + + dispatch(setCrossReferenceCompoundName(moleculeTitlePrev)); + if (setRef && ref.current) { + setRef(refPrevious); + } + + dispatch( + moveDatasetMoleculeUpDown( + stage, + datasetID, + data, + previousDatasetID, + previousItem, + dataValue, + ARROW_TYPE.UP + ) + ); + } + } + }; + const moleculeTitle = data && data.name; const datasetTitle = datasets?.find(item => `${item.id}` === `${datasetID}`)?.title; @@ -744,26 +879,30 @@ const DatasetMoleculeView = memo( anchorEl={lockCompoundsDialogAnchorE1} datasetId={datasetID} currentCmp={data} + isSelectedCompounds={inSelectedCompoundsList} /> )} {/*Site number*/} - { - const result = e.target.checked; - if (result) { - dispatch(appendCompoundToSelectedCompoundsByDataset(datasetID, currentID, moleculeTitle)); - } else { - dispatch(removeCompoundFromSelectedCompoundsByDataset(datasetID, currentID, moleculeTitle)); - dispatch(deselectVectorCompound(data)); - } - }} - /> + {!isCompoundFromVectorSelector(data) && ( + { + const result = e.target.checked; + if (result) { + dispatch(appendCompoundToSelectedCompoundsByDataset(datasetID, currentID, moleculeTitle)); + } else { + dispatch(removeCompoundFromSelectedCompoundsByDataset(datasetID, currentID, moleculeTitle)); + dispatch(deselectVectorCompound(data)); + } + }} + /> + )} {index + 1}. diff --git a/js/components/datasets/lockVisibleCompoundsDialog.js b/js/components/datasets/lockVisibleCompoundsDialog.js index 5cf01b898..af986d62e 100644 --- a/js/components/datasets/lockVisibleCompoundsDialog.js +++ b/js/components/datasets/lockVisibleCompoundsDialog.js @@ -5,10 +5,16 @@ import { Close } from '@material-ui/icons'; import { useDispatch } from 'react-redux'; import { setAskLockCompoundsQuestion, + setAskLockSelectedCompoundsQuestion, setIsOpenLockVisibleCompoundsDialogGlobal, setIsOpenLockVisibleCompoundsDialogLocal } from './redux/actions'; -import { getAllVisibleButNotLockedCompounds, lockCompounds } from './redux/dispatchActions'; +import { + getAllVisibleButNotLockedCompounds, + getAllVisibleButNotLockedSelectedCompounds, + lockCompounds, + lockSelectedCompounds +} from './redux/dispatchActions'; const useStyles = makeStyles(theme => ({ paper: { @@ -27,76 +33,99 @@ const useStyles = makeStyles(theme => ({ } })); -export const LockVisibleCompoundsDialog = forwardRef(({ open = false, anchorEl, datasetId, currentCmp }, ref) => { - const id = open ? 'simple-popover-lock-visible-compounds' : undefined; - const classes = useStyles(); - const dispatch = useDispatch(); +export const LockVisibleCompoundsDialog = forwardRef( + ({ open = false, anchorEl, datasetId, currentCmp, isSelectedCompounds = false }, ref) => { + const id = open ? 'simple-popover-lock-visible-compounds' : undefined; + const classes = useStyles(); + const dispatch = useDispatch(); - const handleYesClick = () => { - if (currentCmp) { - let cmpsToLock = dispatch(getAllVisibleButNotLockedCompounds(datasetId)); - if (cmpsToLock && cmpsToLock.length > 0) { - dispatch(lockCompounds(datasetId, cmpsToLock, currentCmp.id)); - } - } else { - let cmpsToLock = dispatch(getAllVisibleButNotLockedCompounds(datasetId)); - //we need to skip first element if we came here from global arrows - const firstCmpId = cmpsToLock[0]; - if (cmpsToLock && cmpsToLock.length > 0) { - dispatch(lockCompounds(datasetId, cmpsToLock, firstCmpId)); + const handleYesClick = () => { + if (!isSelectedCompounds) { + if (currentCmp) { + let cmpsToLock = dispatch(getAllVisibleButNotLockedCompounds(datasetId)); + if (cmpsToLock && cmpsToLock.length > 0) { + dispatch(lockCompounds(datasetId, cmpsToLock, currentCmp.id)); + } + } else { + let cmpsToLock = dispatch(getAllVisibleButNotLockedCompounds(datasetId)); + //we need to skip first element if we came here from global arrows + if (cmpsToLock && cmpsToLock.length > 0) { + const firstCmpId = cmpsToLock[0]; + dispatch(lockCompounds(datasetId, cmpsToLock, firstCmpId)); + } + } + } else { + if (currentCmp) { + let cmpsToLock = dispatch(getAllVisibleButNotLockedSelectedCompounds()); + if (cmpsToLock && cmpsToLock.length > 0) { + dispatch(lockSelectedCompounds(cmpsToLock, currentCmp.id)); + } + } else { + let cmpsToLock = dispatch(getAllVisibleButNotLockedSelectedCompounds()); + if (cmpsToLock && cmpsToLock.length > 0) { + const firstCmpId = cmpsToLock[0]; + dispatch(lockSelectedCompounds(cmpsToLock, firstCmpId)); + } + } } - } - dispatch(setIsOpenLockVisibleCompoundsDialogLocal(false)); - dispatch(setIsOpenLockVisibleCompoundsDialogGlobal(false)); - }; + dispatch(setIsOpenLockVisibleCompoundsDialogLocal(false)); + dispatch(setIsOpenLockVisibleCompoundsDialogGlobal(false)); + }; - const handleNoClick = () => { - dispatch(setAskLockCompoundsQuestion(false)); - dispatch(setIsOpenLockVisibleCompoundsDialogLocal(false)); - dispatch(setIsOpenLockVisibleCompoundsDialogGlobal(false)); - }; + const handleNoClick = () => { + if (!isSelectedCompounds) { + dispatch(setAskLockCompoundsQuestion(false)); + } else { + dispatch(setAskLockSelectedCompoundsQuestion(false)); + } + dispatch(setIsOpenLockVisibleCompoundsDialogLocal(false)); + dispatch(setIsOpenLockVisibleCompoundsDialogGlobal(false)); + }; - return ( - - - { - dispatch(setIsOpenLockVisibleCompoundsDialogLocal(false)); - dispatch(setIsOpenLockVisibleCompoundsDialogGlobal(false)); - }} - > - - - - ]} - > - - - Do you want to lock visible compounds? Otherwise they will disapear from the view. - - + return ( + + + { + dispatch(setIsOpenLockVisibleCompoundsDialogLocal(false)); + dispatch(setIsOpenLockVisibleCompoundsDialogGlobal(false)); + }} + > + + + + ]} + > + - + + Do you want to lock visible compounds? Otherwise they will disapear from the view. + - - + + + + + + + - - - - ); -}); + + + ); + } +); diff --git a/js/components/datasets/redux/actions.js b/js/components/datasets/redux/actions.js index fdf803108..08329a9f8 100644 --- a/js/components/datasets/redux/actions.js +++ b/js/components/datasets/redux/actions.js @@ -537,3 +537,13 @@ export const setEditedColorGroup = colorGroup => ({ type: constants.SET_EDITED_COLOR_GROUP, colorGroup: colorGroup }); + +export const setSelectedCompoundsList = compoundsList => ({ + type: constants.SET_SELECTED_COMPOUNDS_LIST, + compoundsList: compoundsList +}); + +export const setAskLockSelectedCompoundsQuestion = askLockCompoundsQuestion => ({ + type: constants.SET_ASK_LOCK_SELECTED_COMPOUNDS_QUESTION, + askLockCompoundsQuestion: askLockCompoundsQuestion +}); diff --git a/js/components/datasets/redux/constants.js b/js/components/datasets/redux/constants.js index f3cefcc80..40e44c20d 100644 --- a/js/components/datasets/redux/constants.js +++ b/js/components/datasets/redux/constants.js @@ -104,7 +104,10 @@ export const constants = { SET_IS_OPEN_LOCK_VISIBLE_COMPOUNDS_DIALOG_LOCAL: prefix + 'SET_IS_OPEN_LOCK_VISIBLE_COMPOUNDS_DIALOG_LOCAL', SET_CMP_FOR_LOCAL_LOCK_VISIBLE_COMPOUNDS_DIALOG: prefix + 'SET_CMP_FOR_LOCAL_LOCK_VISIBLE_COMPOUNDS_DIALOG', SET_ASK_LOCK_COMPOUNDS_QUESTION: prefix + 'SET_ASK_LOCK_COMPOUNDS_QUESTION', - SET_EDITED_COLOR_GROUP: prefix + 'SET_EDITED_COLOR_GROUP' + SET_EDITED_COLOR_GROUP: prefix + 'SET_EDITED_COLOR_GROUP', + + SET_SELECTED_COMPOUNDS_LIST: prefix + 'SET_SELECTED_COMPOUNDS_LIST', + SET_ASK_LOCK_SELECTED_COMPOUNDS_QUESTION: prefix + 'SET_ASK_LOCK_SELECTED_COMPOUNDS_QUESTION' }; export const COUNT_OF_VISIBLE_SCORES = 7; diff --git a/js/components/datasets/redux/dispatchActions.js b/js/components/datasets/redux/dispatchActions.js index 0536ad581..18b209d84 100644 --- a/js/components/datasets/redux/dispatchActions.js +++ b/js/components/datasets/redux/dispatchActions.js @@ -73,6 +73,8 @@ import { getRepresentationsByType } from '../../nglView/generatingObjects'; import { selectAllMoleculeList } from '../../preview/molecule/redux/selectors'; import { getCompoundById } from '../../../reducers/tracking/dispatchActionsSwitchSnapshot'; import { getRandomColor } from '../../preview/molecule/utils/color'; +import { BreakfastDiningOutlined } from '@mui/icons-material'; +import { isCompoundFromVectorSelector } from '../../preview/compounds/redux/dispatchActions'; export const initializeDatasetFilter = datasetID => (dispatch, getState) => { const state = getState(); @@ -544,7 +546,7 @@ export const autoHideDatasetDialogsOnScroll = ({ inspirationDialogRef, crossRefe currentBoundingClientRectInspiration.y !== 0 ) { if ( - currentBoundingClientRectInspiration.top < scrollBarBoundingClientRect.top || + Math.round(currentBoundingClientRectInspiration.top) < Math.round(scrollBarBoundingClientRect.top) || Math.abs(scrollBarBoundingClientRect.bottom - currentBoundingClientRectInspiration.top) < 42 ) { dispatch(setIsOpenInspirationDialog(false)); @@ -558,7 +560,7 @@ export const autoHideDatasetDialogsOnScroll = ({ inspirationDialogRef, crossRefe currentBoundingClientRectCrossReference.y !== 0 ) { if ( - currentBoundingClientRectCrossReference.top < scrollBarBoundingClientRect.top || + Math.round(currentBoundingClientRectCrossReference.top) < Math.round(scrollBarBoundingClientRect.top) || Math.abs(scrollBarBoundingClientRect.bottom - currentBoundingClientRectCrossReference.top) < 42 ) { dispatch(resetCrossReferenceDialog()); @@ -732,11 +734,26 @@ const moveSelectedDatasetMoleculeInspirationsSettings = (data, newItemData, stag ); }; +export const lockSelectedCompounds = (selectedCompounds, skipCmpId = 0) => (dispatch, getState) => { + let filteredCompounds = [...selectedCompounds]; + if (skipCmpId) { + filteredCompounds = selectedCompounds.filter(item => item.molecule.id !== skipCmpId); + } + + filteredCompounds?.forEach(item => { + const datasetID = item.datasetID; + const molecule = item.molecule; + const moleculeID = molecule.id; + const moleculeName = molecule.name; + dispatch(appendCompoundToSelectedCompoundsByDataset(datasetID, moleculeID, moleculeName)); + }); +}; + export const lockCompounds = (datasetID, compoundIds, skipCmpId = 0) => (dispatch, getState) => { const state = getState(); const compounds = state.datasetsReducers.moleculeLists[datasetID]; - let filteredCompounds = []; + let filteredCompounds = [...compoundIds]; if (skipCmpId) { filteredCompounds = compoundIds.filter(item => item !== skipCmpId); } @@ -761,6 +778,56 @@ const mergeCompoundIdsList = (compoundIdsList, subList) => { return result; }; +export const isCompoundLocked = (datasetID, compound) => (dispatch, getState) => { + const state = getState(); + const lockedCompounds = state.datasetsReducers.selectedCompoundsByDataset[datasetID] || []; + return lockedCompounds.includes(compound.id); +}; + +export const getAllVisibleButNotLockedSelectedCompounds = (skipDatasetID = '', skipCmpId = 0) => ( + dispatch, + getState +) => { + let result = []; + + const state = getState(); + const selectedCompounds = state.datasetsReducers.selectedCompounds || []; + + selectedCompounds.forEach(item => { + const datasetID = item.datasetID; + const molecule = item.molecule; + if (datasetID !== skipDatasetID || skipCmpId !== molecule.id) { + const isLocked = dispatch(isCompoundLocked(datasetID, molecule)); + if (!isLocked) { + let isVisible = dispatch(isCompoundVisible(datasetID, molecule.id)); + // isVisible |= state.datasetsReducers.ligandLists[datasetID].includes(molecule.id); + // isVisible |= state.datasetsReducers.proteinLists[datasetID].includes(molecule.id); + // isVisible |= state.datasetsReducers.complexLists[datasetID].includes(molecule.id); + // isVisible |= state.datasetsReducers.surfaceLists[datasetID].includes(molecule.id); + + if (isVisible) { + result.push(item); + } + } + } + }); + + return result; +}; + +export const isCompoundVisible = (datasetID, compoundId) => (dispatch, getState) => { + let isVisible = false; + + const state = getState(); + + isVisible |= state.datasetsReducers.ligandLists[datasetID]?.includes(compoundId); + isVisible |= state.datasetsReducers.proteinLists[datasetID]?.includes(compoundId); + isVisible |= state.datasetsReducers.complexLists[datasetID]?.includes(compoundId); + isVisible |= state.datasetsReducers.surfaceLists[datasetID]?.includes(compoundId); + + return isVisible; +}; + export const getAllVisibleButNotLockedCompounds = (datasetID, skipCmpId = 0) => (dispatch, getState) => { let result = []; @@ -821,6 +888,52 @@ export const getFirstUnlockedCompoundAfter = (datasetID, compoundID) => (dispatc return firstUnlockedCompound; }; +export const getFirstUnlockedSelectedCompoundAfter = (datasetID, compoundID) => (dispatch, getState) => { + const state = getState(); + + const compounds = state.datasetsReducers.selectedCompounds; + const currentItemIndex = compounds.findIndex(item => item.datasetID === datasetID && item.molecule.id === compoundID); + + let firstUnlockedCompound = null; + for (let i = currentItemIndex + 1; i < compounds.length; i++) { + const compound = compounds[i]; + if ( + !dispatch(isCompoundLocked(compound.datasetID, compound.molecule)) && + !isCompoundFromVectorSelector(compound.molecule) + ) { + firstUnlockedCompound = compound; + break; + } else { + continue; + } + } + + return firstUnlockedCompound; +}; + +export const getFirstUnlockedSelectedCompoundBefore = (datasetID, compoundID) => (dispatch, getState) => { + const state = getState(); + + const compounds = state.datasetsReducers.selectedCompounds; + const currentItemIndex = compounds.findIndex(item => item.datasetID === datasetID && item.molecule.id === compoundID); + + let firstUnlockedCompound = null; + for (let i = currentItemIndex - 1; i >= 0; i--) { + const compound = compounds[i]; + if ( + !dispatch(isCompoundLocked(compound.datasetID, compound.molecule)) && + !isCompoundFromVectorSelector(compound.molecule) + ) { + firstUnlockedCompound = compound; + break; + } else { + continue; + } + } + + return firstUnlockedCompound; +}; + export const getFirstUnlockedCompoundBefore = (datasetID, compoundID) => (dispatch, getState) => { const state = getState(); @@ -836,6 +949,53 @@ export const getFirstUnlockedCompoundBefore = (datasetID, compoundID) => (dispat return firstUnlockedCompound; }; +export const moveSelectedDatasetMoleculeUpDown = ( + stage, + datasetID, + item, + newItemDatasetID, + newItem, + data, + direction +) => async (dispatch, getState) => { + const state = getState(); + const allInspirations = state.datasetsReducers.allInspirations; + const objectsInView = state.nglReducers.objectsInView; + const selectedCompounds = state.datasetsReducers.selectedCompounds; + let lockedCompounds = {}; + selectedCompounds.forEach(item => { + if (dispatch(isCompoundLocked(item.datasetID, item.molecule))) { + if (lockedCompounds.hasOwnProperty(item.datasetID)) { + lockedCompounds[item.datasetID].push(item.molecule.id); + } else { + lockedCompounds[item.datasetID] = [item.molecule.id]; + } + } + }); + + //also skip next item + if (lockedCompounds.hasOwnProperty(newItemDatasetID)) { + lockedCompounds[newItemDatasetID].push(newItem.id); + } else { + lockedCompounds[newItemDatasetID] = [newItem.id]; + } + const dataValue = { ...data, objectsInView }; + + // ???? + // dispatch(setArrowUpDown(datasetID, item, newItem, direction, dataValue)); + + const inspirations = getInspirationsForMol(allInspirations, datasetID, newItem.id); + dispatch(setInspirationMoleculeDataList(inspirations)); + dispatch(clearCompoundView(newItem, datasetID, stage, true)); + await Promise.all([ + dispatch(moveSelectedMoleculeSettings(stage, item, newItem, newItemDatasetID, datasetID, dataValue, true)), + dispatch(moveSelectedDatasetMoleculeInspirationsSettings(item, newItem, stage, true)) + ]); + + dispatch(removeSelectedDatasetMolecules(stage, true, { ...lockedCompounds })); + dispatch(removeSelectedTypesOfDatasetInspirations([newItem], stage, true, datasetID)); +}; + /** * Performance optimization for datasetMoleculeView. Gets objectsInView and passes it to further dispatch requests. * It wouldnt do anything else in moleculeView. Also this chains the above 3 methods which were before passed to @@ -849,7 +1009,7 @@ export const moveDatasetMoleculeUpDown = (stage, datasetID, item, newItemDataset const state = getState(); const allInspirations = state.datasetsReducers.allInspirations; const objectsInView = state.nglReducers.objectsInView; - const lockedCompounds = state.datasetsReducers.selectedCompoundsByDataset[datasetID] ?? []; + let lockedCompounds = state.datasetsReducers.selectedCompoundsByDataset[datasetID] ?? []; const dataValue = { ...data, objectsInView }; diff --git a/js/components/datasets/redux/reducer.js b/js/components/datasets/redux/reducer.js index 290561220..3733ead65 100644 --- a/js/components/datasets/redux/reducer.js +++ b/js/components/datasets/redux/reducer.js @@ -50,6 +50,8 @@ export const INITIAL_STATE = { selectedCompoundsByDataset: {}, // map of $datasetID and its list of moleculeID compoundColorByDataset: {}, // map of $datasetID and its list of moleculeID + selectedCompounds: [], // list of selected compounds + selectedColorsInFilter: { [compoundsColors.blue.key]: compoundsColors.blue.key, [compoundsColors.red.key]: compoundsColors.red.key, @@ -76,7 +78,8 @@ export const INITIAL_STATE = { isLockVisibleCompoundsDialogOpenLocal: false, cmpForLocalLockVisibleCompoundsDialog: null, askLockCompoundsQuestion: true, - editedColorGroup: null + editedColorGroup: null, + askLockSelectedCompoundsQuestion: true }; /** @@ -645,6 +648,14 @@ export const datasetsReducers = (state = INITIAL_STATE, action = {}) => { return { ...state, askLockCompoundsQuestion: action.askLockCompoundsQuestion }; } + case constants.SET_ASK_LOCK_SELECTED_COMPOUNDS_QUESTION: { + return { ...state, askLockSelectedCompoundsQuestion: action.askLockCompoundsQuestion }; + } + + case constants.SET_SELECTED_COMPOUNDS_LIST: { + return { ...state, selectedCompounds: action.compoundsList }; + } + case constants.RESET_DATASETS_STATE_ON_SNAPSHOT_CHANGE: { const { datasets, diff --git a/js/components/datasets/selectedCompoundsList.js b/js/components/datasets/selectedCompoundsList.js index 15d10e3a6..7a529e923 100644 --- a/js/components/datasets/selectedCompoundsList.js +++ b/js/components/datasets/selectedCompoundsList.js @@ -1,4 +1,4 @@ -import React, { memo, useContext, useEffect, useRef, useState } from 'react'; +import React, { memo, useContext, useEffect, useMemo, useRef, useState } from 'react'; import { Panel } from '../common/Surfaces/Panel'; import { CircularProgress, @@ -11,7 +11,7 @@ import { InputAdornment, IconButton } from '@material-ui/core'; -import { CloudDownload, Edit } from '@material-ui/icons'; +import { ArrowDownward, ArrowUpward, CloudDownload, Edit } from '@material-ui/icons'; import { useDispatch, useSelector } from 'react-redux'; import { getMoleculesObjectIDListOfCompoundsToBuy, @@ -23,9 +23,22 @@ import { import InfiniteScroll from 'react-infinite-scroller'; import DatasetMoleculeView from './datasetMoleculeView'; import { InspirationDialog } from './inspirationDialog'; -import { setIsOpenInspirationDialog } from './redux/actions'; +import { + setCrossReferenceCompoundName, + setIsOpenInspirationDialog, + setIsOpenLockVisibleCompoundsDialogGlobal, + setSelectedCompoundsList +} from './redux/actions'; import { CrossReferenceDialog } from './crossReferenceDialog'; -import { autoHideDatasetDialogsOnScroll, resetCrossReferenceDialog } from './redux/dispatchActions'; +import { + autoHideDatasetDialogsOnScroll, + getAllVisibleButNotLockedSelectedCompounds, + isCompoundLocked, + isCompoundVisible, + moveDatasetMoleculeUpDown, + moveSelectedDatasetMoleculeUpDown, + resetCrossReferenceDialog +} from './redux/dispatchActions'; import { NglContext } from '../nglView/nglProvider'; import FileSaver from 'file-saver'; import JSZip from 'jszip'; @@ -48,6 +61,14 @@ import { HTML5Backend } from 'react-dnd-html5-backend'; import { compoundsColors } from '../preview/compounds/redux/constants'; import classNames from 'classnames'; import { fabClasses } from '@mui/material'; +import { is } from 'date-fns/locale'; +import { LockVisibleCompoundsDialog } from './lockVisibleCompoundsDialog'; +import { BreakfastDiningOutlined } from '@mui/icons-material'; +import { getRandomColor } from '../preview/molecule/utils/color'; +import { ARROW_TYPE, VIEWS } from '../../constants/constants'; +import { useScrollToCompound } from './useScrollToCompound'; +import useDisableNglControlButtons from '../preview/molecule/useDisableNglControlButtons'; +import useDisableDatasetNglControlButtons from './useDisableDatasetNglControlButtons'; const useStyles = makeStyles(theme => ({ container: { @@ -84,11 +105,19 @@ const useStyles = makeStyles(theme => ({ backgroundColor: compoundsColors.apricot.color }, textField: { - // marginLeft: theme.spacing(1), + marginLeft: theme.spacing(0.5), // marginRight: theme.spacing(1), - width: 70, + width: 90, + borderRadius: 10, + '& .MuiFormLabel-root': { paddingLeft: theme.spacing(1) + }, + '& .MuiInput-underline:before': { + borderBottom: '0px solid' + }, + '& .MuiInput-underline:after': { + borderBottom: '0px solid' } }, selectedInput: { @@ -103,7 +132,34 @@ const useStyles = makeStyles(theme => ({ }, editClassNameIconSelected: { padding: '0px', - color: theme.palette.primary.main + color: 'red' + }, + arrowsHighlight: { + borderColor: theme.palette.primary.main, + border: 'solid 2px', + backgroundColor: theme.palette.primary.main + }, + arrow: { + width: 20, + height: 25, + color: 'white', + stroke: 'white', + strokeWidth: 2 + }, + iconButton: { + padding: 0, + marginTop: '2px' + }, + invisArrow: { + width: 20, + height: 25, + visibility: 'hidden' + }, + arrows: { + height: '100%', + border: 'solid 1px', + borderColor: theme.palette.background.divider, + borderStyle: 'solid solid solid solid' } })); @@ -151,8 +207,26 @@ export const SelectedCompoundList = memo(() => { selectedMolecules = [...selectedMolecules, ...molsOfDataset.filter(mol => datasetCmpsToBuy?.includes(mol.id))]; }); + const { addMoleculeViewRef, setScrollToMoleculeId, getNode } = useScrollToCompound(); + const currentCompoundClass = useSelector(state => state.previewReducers.compounds.currentCompoundClass); + // const groupDatasetsNglControlButtonsDisabledState = useDisableDatasetNglControlButtons( + // lockedMolecules.map(cid => ({ datasetID, molecule: getCompoundForId(cid) })) + // ); + + const askLockSelectedCompoundsQuestion = useSelector( + state => state.datasetsReducers.askLockSelectedCompoundsQuestion + ); + + const lockVisibleCompoundsDialogRef = useRef(); + const isLockVisibleCompoundsDialogOpenGlobal = useSelector( + state => state.datasetsReducers.isLockVisibleCompoundsDialogOpenGlobal + ); + + const { getNglView } = useContext(NglContext); + const stage = getNglView(VIEWS.MAJOR_VIEW) && getNglView(VIEWS.MAJOR_VIEW).stage; + const blueInput = useSelector(state => state.previewReducers.compounds[compoundsColors.blue.key]); const redInput = useSelector(state => state.previewReducers.compounds[compoundsColors.red.key]); const greenInput = useSelector(state => state.previewReducers.compounds[compoundsColors.green.key]); @@ -167,10 +241,54 @@ export const SelectedCompoundList = memo(() => { [compoundsColors.apricot.key]: apricotInput }; + const inputRefs = { + [compoundsColors.blue.key]: useRef(), + [compoundsColors.red.key]: useRef(), + [compoundsColors.green.key]: useRef(), + [compoundsColors.purple.key]: useRef(), + [compoundsColors.apricot.key]: useRef() + }; + const compoundColors = useSelector(state => state.datasetsReducers.compoundColorByDataset); const colorFilterSettings = useSelector(state => state.datasetsReducers.selectedColorsInFilter); + const [lockCompoundsDialogAnchorE1, setLockCompoundsDialogAnchorE1] = useState(null); + + //we need to add also lists to dependancy array because isCompoundVisible depends on them + useEffect(() => { + dispatch(setSelectedCompoundsList(moleculesObjectIDListOfCompoundsToBuy)); + }, [moleculesObjectIDListOfCompoundsToBuy, dispatch]); + + let areArrowsVisible = useMemo(() => { + let result = false; + if (moleculesObjectIDListOfCompoundsToBuy) { + for (let i = 0; i < moleculesObjectIDListOfCompoundsToBuy.length; i++) { + const cmp = moleculesObjectIDListOfCompoundsToBuy[i]; + const dataset = cmp.datasetID; + const molecule = cmp.molecule; + const isVisible = dispatch(isCompoundVisible(dataset, molecule.id)); + if (isVisible) { + result = true; + break; + } + } + } + return result; + }, [dispatch, moleculesObjectIDListOfCompoundsToBuy, ligandList, proteinList, complexList, surfaceList]); + // if (!moleculesObjectIDListOfCompoundsToBuy) { + // for (let i = 0; i < moleculesObjectIDListOfCompoundsToBuy.length; i++) { + // const cmp = moleculesObjectIDListOfCompoundsToBuy[i]; + // const dataset = cmp.datasetID; + // const molecule = cmp.molecule; + // const isVisible = dispatch(isCompoundVisible(dataset, molecule.id)); + // if (isVisible) { + // areArrowsVisible = true; + // break; + // } + // } + // } + useEffect(() => { return () => { dispatch(setIsOpenInspirationDialog(false)); @@ -444,6 +562,142 @@ export const SelectedCompoundList = memo(() => { FileSaver.saveAs(zipBlob, 'selectedCompounds.zip'); }; + const getFirstItemForIterationStart = () => { + let result = null; + for (let i = 0; i < moleculesObjectIDListOfCompoundsToBuy.length; i++) { + const cmp = moleculesObjectIDListOfCompoundsToBuy[i]; + if (!dispatch(isCompoundLocked(cmp.datasetID, cmp.molecule)) && !isCompoundFromVectorSelector(cmp.molecule)) { + const isVisible = dispatch(isCompoundVisible(cmp.datasetID, cmp.molecule.id)); + if (isVisible) { + result = cmp; + break; + } + } + } + + return result; + }; + + const getNextItemForIteration = currentItem => { + let result = null; + + const currentItemIndex = moleculesObjectIDListOfCompoundsToBuy.findIndex( + cmp => cmp.molecule.id === currentItem.molecule.id && cmp.datasetID === currentItem.datasetID + ); + for (let i = currentItemIndex + 1; i < moleculesObjectIDListOfCompoundsToBuy.length; i++) { + const cmp = moleculesObjectIDListOfCompoundsToBuy[i]; + if (!dispatch(isCompoundLocked(cmp.datasetID, cmp.molecule)) && !isCompoundFromVectorSelector(cmp.molecule)) { + result = cmp; + break; + } + } + + return result; + }; + + const getPrevItemForIteration = currentItem => { + let result = null; + + const currentItemIndex = moleculesObjectIDListOfCompoundsToBuy.findIndex( + cmp => cmp.molecule.id === currentItem.molecule.id && cmp.datasetID === currentItem.datasetID + ); + for (let i = currentItemIndex - 1; i >= 0; i--) { + const cmp = moleculesObjectIDListOfCompoundsToBuy[i]; + if (!dispatch(isCompoundLocked(cmp.datasetID, cmp.molecule)) && !isCompoundFromVectorSelector(cmp.molecule)) { + result = cmp; + break; + } + } + + return result; + }; + + const handleClickOnDownArrow = async event => { + const unlockedVisibleCompounds = dispatch(getAllVisibleButNotLockedSelectedCompounds()); + //one unlocked compound is what we want because it designate where the iteration will start + if (unlockedVisibleCompounds?.length > 1 && askLockSelectedCompoundsQuestion) { + setLockCompoundsDialogAnchorE1(event.currentTarget); + dispatch(setIsOpenLockVisibleCompoundsDialogGlobal(true)); + } else { + const firstItem = getFirstItemForIterationStart(); + const nextItem = getNextItemForIteration(firstItem); + + if (firstItem && nextItem) { + const moleculeTitleNext = nextItem && nextItem.molecule?.name; + const node = getNode(nextItem.molecule?.id); + setScrollToMoleculeId(nextItem.molecule?.id); + + let dataValue = { + colourToggle: getRandomColor(firstItem.molecule), + isLigandOn: ligandList.includes(firstItem.molecule?.id), + isProteinOn: proteinList.includes(firstItem.molecule?.id), + isComplexOn: complexList.includes(firstItem.molecule?.id), + isSurfaceOn: surfaceList.includes(firstItem.molecule?.id) + }; + + dispatch(setCrossReferenceCompoundName(moleculeTitleNext)); + + if (node) { + setSelectedMoleculeRef(node); + } + dispatch( + moveSelectedDatasetMoleculeUpDown( + stage, + firstItem.datasetID, + firstItem.molecule, + nextItem.datasetID, + nextItem.molecule, + dataValue, + ARROW_TYPE.DOWN + ) + ); + } + } + }; + + const handleClickOnUpArrow = async event => { + const unlockedVisibleCompounds = dispatch(getAllVisibleButNotLockedSelectedCompounds()); + //one unlocked compound is what we want because it designate where the iteration will start + if (unlockedVisibleCompounds?.length > 1 && askLockSelectedCompoundsQuestion) { + setLockCompoundsDialogAnchorE1(event.currentTarget); + dispatch(setIsOpenLockVisibleCompoundsDialogGlobal(true)); + } else { + const firstItem = getFirstItemForIterationStart(); + const prevItem = getPrevItemForIteration(firstItem); + + if (firstItem && prevItem) { + const moleculeTitleNext = prevItem && prevItem.molecule?.name; + const node = getNode(prevItem.molecule?.id); + setScrollToMoleculeId(prevItem.molecule?.id); + + let dataValue = { + colourToggle: getRandomColor(firstItem.molecule), + isLigandOn: ligandList.includes(firstItem.molecule?.id), + isProteinOn: proteinList.includes(firstItem.molecule?.id), + isComplexOn: complexList.includes(firstItem.molecule?.id), + isSurfaceOn: surfaceList.includes(firstItem.molecule?.id) + }; + + dispatch(setCrossReferenceCompoundName(moleculeTitleNext)); + + if (node) { + setSelectedMoleculeRef(node); + } + dispatch( + moveSelectedDatasetMoleculeUpDown( + stage, + firstItem.datasetID, + firstItem.molecule, + prevItem.datasetID, + prevItem.molecule, + dataValue, + ARROW_TYPE.UP + ) + ); + } + } + }; + return ( { ref={inspirationDialogRef} /> )} + {askLockSelectedCompoundsQuestion && isLockVisibleCompoundsDialogOpenGlobal && ( + + )} {isOpenCrossReferenceDialog && ( )} - + {/* Selection */} {Object.keys(compoundsColors).map(item => ( <> - - dispatch(onClickFilterClassCheckBox(e))} - checked={colorFilterSettings.hasOwnProperty(item)} - > - + endAdornment: ( + dispatch(onStartEditColorClassName(e))} + onClick={e => { + dispatch(onStartEditColorClassName(e)); + inputRefs[item].current.focus(); + inputRefs[item].current.select(); + }} > + ), + startAdornment: ( + + dispatch(onClickFilterClassCheckBox(e))} + checked={colorFilterSettings.hasOwnProperty(item)} + > + ) }} autoComplete="off" + inputRef={inputRefs[item]} id={`${item}`} key={`CLASS_${item}`} variant="standard" @@ -519,7 +788,6 @@ export const SelectedCompoundList = memo(() => { classes[item], colorFilterSettings.hasOwnProperty(item) && classes.selectedInput )} - label={compoundsColors[item].text} onChange={e => dispatch(onChangeCompoundClassValue(e))} onKeyDown={e => dispatch(onKeyDownCompoundClass(e))} // onKeyDown={e => dispatch(onKeyDownFilterClass(e))} @@ -530,6 +798,44 @@ export const SelectedCompoundList = memo(() => { ))} + + + + + + + + + + + + + + {currentMolecules.length > 0 && ( @@ -593,6 +899,8 @@ export const SelectedCompoundList = memo(() => { } } } + + const isLocked = dispatch(isCompoundLocked(data.datasetID, data.molecule)); // } return ( isVisible && ( @@ -603,7 +911,8 @@ export const SelectedCompoundList = memo(() => { imageWidth={imgWidth} data={data.molecule} datasetID={data.datasetID} - setRef={setSelectedMoleculeRef} + // setRef={setSelectedMoleculeRef} + ref={addMoleculeViewRef} showCrossReferenceModal previousItemData={index > 0 && array[index - 1]} nextItemData={index < array?.length && array[index + 1]} @@ -612,12 +921,15 @@ export const SelectedCompoundList = memo(() => { C={complexList.includes(data.molecule.id)} S={surfaceList.includes(data.molecule.id)} V={false} - arrowsHidden + arrowsHidden={false} dragDropEnabled shoppingCartColors={shoppingCartColors} isAddedToShoppingCart={isAddedToShoppingCart} inSelectedCompoundsList colorButtonsEnabled={areColorButtonsEnabled} + isLocked={isLocked} + setRef={setSelectedMoleculeRef} + getNode={getNode} /> ) ); diff --git a/js/components/datasets/useScrollToCompound.js b/js/components/datasets/useScrollToCompound.js new file mode 100644 index 000000000..da333b329 --- /dev/null +++ b/js/components/datasets/useScrollToCompound.js @@ -0,0 +1,58 @@ +import { useCallback, useEffect, useState } from 'react'; + +export const useScrollToCompound = () => { + const [moleculeViewRefs, setMoleculeViewRefs] = useState({}); + const [scrollToMoleculeId, setScrollToMoleculeId] = useState(null); + + useEffect(() => { + if (scrollToMoleculeId !== null) { + const node = moleculeViewRefs[scrollToMoleculeId]; + if (node) { + setScrollToMoleculeId(null); + if (!elementIsVisibleInViewport(node)) { + setTimeout(() => { + node.scrollIntoView(); + }); + } + } + } + }, [moleculeViewRefs, scrollToMoleculeId]); + + const elementIsVisibleInViewport = (el, partiallyVisible = false) => { + const { top, left, bottom, right } = el.getBoundingClientRect(); + const { innerHeight, innerWidth } = window; + return partiallyVisible + ? ((top > 0 && top < innerHeight) || (bottom > 0 && bottom < innerHeight)) && + ((left > 0 && left < innerWidth) || (right > 0 && right < innerWidth)) + : top >= 0 && left >= 0 && bottom <= innerHeight && right <= innerWidth; + }; + + // Used to attach the ref of DOM nodes. + // const addMoleculeViewRef = useCallback((moleculeId, node) => { + // if (moleculeId && node) { + // setMoleculeViewRefs(prevRefs => ({ + // ...prevRefs, + // [moleculeId]: node + // })); + // } + // }, []); + + const addMoleculeViewRef = useCallback((moleculeId, node) => { + setMoleculeViewRefs(prevRefs => { + if (prevRefs.hasOwnProperty(moleculeId)) return prevRefs; + return { + ...prevRefs, + [moleculeId]: node + }; + }); + }, []); + + const getNode = useCallback( + molId => { + return moleculeViewRefs[molId]; + }, + [moleculeViewRefs] + ); + + return { addMoleculeViewRef, setScrollToMoleculeId, getNode }; +}; diff --git a/js/components/datasets/useScrollToSelected.js b/js/components/datasets/useScrollToSelected.js index e5c1db38d..e1c796277 100644 --- a/js/components/datasets/useScrollToSelected.js +++ b/js/components/datasets/useScrollToSelected.js @@ -97,12 +97,29 @@ export const useScrollToSelected = (datasetID, moleculesPerPage, setCurrentPage) }; // Used to attach the ref of DOM nodes. + // const addMoleculeViewRef = useCallback((moleculeId, node) => { + // setMoleculeViewRefs(prevRefs => ({ + // ...prevRefs, + // [moleculeId]: node + // })); + // }, []); + const addMoleculeViewRef = useCallback((moleculeId, node) => { - setMoleculeViewRefs(prevRefs => ({ - ...prevRefs, - [moleculeId]: node - })); + setMoleculeViewRefs(prevRefs => { + if (prevRefs.hasOwnProperty(moleculeId)) return prevRefs; + return { + ...prevRefs, + [moleculeId]: node + }; + }); }, []); - return { addMoleculeViewRef, setScrollToMoleculeId }; + const getNode = useCallback( + molId => { + return moleculeViewRefs[molId]; + }, + [moleculeViewRefs] + ); + + return { addMoleculeViewRef, setScrollToMoleculeId, getNode }; }; diff --git a/js/components/preview/Preview.js b/js/components/preview/Preview.js index a6d6d1f8e..27083a829 100644 --- a/js/components/preview/Preview.js +++ b/js/components/preview/Preview.js @@ -57,7 +57,7 @@ const useStyles = makeStyles(theme => ({ gap: theme.spacing(), flexWrap: 'wrap', height: '100%', - overflow: 'auto' + overflow: 'hidden' }, controls: { width: '100%' diff --git a/js/components/preview/ResizableLayout.js b/js/components/preview/ResizableLayout.js index 5be28829d..06a2e35f9 100644 --- a/js/components/preview/ResizableLayout.js +++ b/js/components/preview/ResizableLayout.js @@ -1,7 +1,7 @@ import { makeStyles } from '@material-ui/core'; import { clamp } from 'lodash'; import React, { useCallback, useEffect, useState } from 'react'; -import { useSelector } from 'react-redux'; +import { useSelector, useDispatch } from 'react-redux'; import { OutPortal } from 'react-reverse-portal'; import HitNavigator from './molecule/hitNavigator'; import { ProjectHistoryPanel } from './projectHistoryPanel'; @@ -10,6 +10,7 @@ import { RHS } from './rhs'; import TagDetails from './tags/details/tagDetails'; import TagSelector from './tags/tagSelector'; import { ViewerControls } from './viewerControls'; +import { setResizableLayout } from '../../reducers/selection/actions'; const useStyles = makeStyles(theme => ({ root: { @@ -32,13 +33,15 @@ const useStyles = makeStyles(theme => ({ })); const sideWidth = 500; -let panelHeight = 200; +let panelHeight = 0; let totalTagDetailHeight = 200; const resizerSize = 20; let screenHeight = 0; +let tagDetails = 100; export const ResizableLayout = ({ gridRef, hideProjects, showHistory, onShowHistoryChange, nglPortal }) => { const classes = useStyles(); + const dispatch = useDispatch(); const sidesOpen = useSelector(state => state.previewReducers.viewerControls.sidesOpen); @@ -48,8 +51,28 @@ export const ResizableLayout = ({ gridRef, hideProjects, showHistory, onShowHist const preTagList = useSelector(state => state.apiReducers.tagList); const [tagDetailsHeight, setTagDetailsHeight] = useState(); const [hitNavigatorHeight, setHitNavigatorHeight] = useState(panelHeight * 2); + const tagDetailView = useSelector(state => state.selectionReducers.tagDetailView); - totalTagDetailHeight = (preTagList.length*15) + 40; + const tags = useSelector(state => state.apiReducers.tagList); + const tagsLength = tags.length; + + if (tagDetailView) { + totalTagDetailHeight = (preTagList.length / 2) * 15 + 30; + } else { + if (preTagList.length < 10) { + totalTagDetailHeight = preTagList.length * 15 + 45; + } else { + totalTagDetailHeight = preTagList.length * 15 + 55; + } + } + + if (tagsLength > 7 && tagsLength < 11) { + tagDetails = 110 + } + if (tagsLength > 11 && tagsLength < 15) { + tagDetails = 130 + } + useEffect(() => { if (sidesOpen.LHS) { @@ -129,6 +152,7 @@ export const ResizableLayout = ({ gridRef, hideProjects, showHistory, onShowHist const onTagDetailsResize = useCallback( (_, y) => { + dispatch(setResizableLayout(true)) setTagDetailsHeight(() => { const gridRect = gridRef.current?.elementRef.current.firstChild.getBoundingClientRect(); @@ -172,15 +196,20 @@ export const ResizableLayout = ({ gridRef, hideProjects, showHistory, onShowHist - { - /* hide section Hit List Filter(LHS) - task #576 + {/* hide section Hit List Filter(LHS) - task #576
- */ - } -
+ */} +
diff --git a/js/components/preview/compounds/compoundList.js b/js/components/preview/compounds/compoundList.js index f28e29df6..7177b990d 100644 --- a/js/components/preview/compounds/compoundList.js +++ b/js/components/preview/compounds/compoundList.js @@ -36,11 +36,19 @@ import classNames from 'classnames'; const useStyles = makeStyles(theme => ({ textField: { - // marginLeft: theme.spacing(1), + marginLeft: theme.spacing(0.5), // marginRight: theme.spacing(1), - width: 70, + width: 90, + borderRadius: 10, + '& .MuiFormLabel-root': { paddingLeft: theme.spacing(1) + }, + '& .MuiInput-underline:before': { + borderBottom: '0px solid' + }, + '& .MuiInput-underline:after': { + borderBottom: '0px solid' } }, selectedInput: { @@ -86,7 +94,7 @@ const useStyles = makeStyles(theme => ({ }, editClassNameIconSelected: { padding: '0px', - color: theme.palette.primary.main + color: 'red' } })); @@ -113,6 +121,14 @@ export const CompoundList = memo(() => { [compoundsColors.apricot.key]: apricotInput }; + const inputRefs = { + [compoundsColors.blue.key]: useRef(), + [compoundsColors.red.key]: useRef(), + [compoundsColors.green.key]: useRef(), + [compoundsColors.purple.key]: useRef(), + [compoundsColors.apricot.key]: useRef() + }; + const currentCompoundClass = useSelector(state => state.previewReducers.compounds.currentCompoundClass); const canLoadMoreCompounds = useSelector(state => getCanLoadMoreCompounds(state)); const currentVector = useSelector(state => state.selectionReducers.currentVector); @@ -131,35 +147,42 @@ export const CompoundList = memo(() => { {Object.keys(compoundsColors).map(item => ( <> - - dispatch(onChangeCompoundClassCheckbox(e))} - checked={currentCompoundClass === item} - > - + endAdornment: ( + dispatch(onStartEditColorClassName(e))} + onClick={e => { + dispatch(onStartEditColorClassName(e)); + inputRefs[item].current.focus(); + inputRefs[item].current.select(); + }} > + ), + startAdornment: ( + + dispatch(onChangeCompoundClassCheckbox(e))} + checked={currentCompoundClass === item} + > + ) }} autoComplete="off" + inputRef={inputRefs[item]} id={`${item}`} key={`CLASS_${item}`} variant="standard" @@ -168,7 +191,6 @@ export const CompoundList = memo(() => { classes[item], currentCompoundClass === item && classes.selectedInput )} - label={compoundsColors[item].text} onChange={e => dispatch(onChangeCompoundClassValue(e))} onKeyDown={e => dispatch(onKeyDownCompoundClass(e))} onClick={e => dispatch(onClickCompoundClass(e))} diff --git a/js/components/preview/compounds/redux/dispatchActions.js b/js/components/preview/compounds/redux/dispatchActions.js index ce02a4f22..461d5f408 100644 --- a/js/components/preview/compounds/redux/dispatchActions.js +++ b/js/components/preview/compounds/redux/dispatchActions.js @@ -299,7 +299,7 @@ export const prepareFakeFilterData = () => (dispatch, getState) => { }; export const isCompoundFromVectorSelector = data => { - if (data['index'] !== undefined) { + if (data && data['index'] !== undefined) { return true; } else { return false; diff --git a/js/components/preview/compounds/redux/reducer.js b/js/components/preview/compounds/redux/reducer.js index d37121b06..4a3490939 100644 --- a/js/components/preview/compounds/redux/reducer.js +++ b/js/components/preview/compounds/redux/reducer.js @@ -8,15 +8,16 @@ const defaultSelectedCmpdsClass = { [compoundsColors.apricot.key]: [] }; -const defaultCompoundsClasses = { - [compoundsColors.blue.key]: undefined, - [compoundsColors.red.key]: undefined, - [compoundsColors.green.key]: undefined, - [compoundsColors.purple.key]: undefined, - [compoundsColors.apricot.key]: undefined +const defaultCmpdsValues = { + [compoundsColors.blue.key]: compoundsColors.blue.key, + [compoundsColors.red.key]: compoundsColors.red.key, + [compoundsColors.green.key]: compoundsColors.green.key, + [compoundsColors.purple.key]: compoundsColors.purple.key, + [compoundsColors.apricot.key]: compoundsColors.apricot.key }; export const INITIAL_STATE = { + ...defaultCmpdsValues, currentPage: -1, compoundsPerPage: 20, /* currentCompounds: [{ @@ -27,7 +28,7 @@ export const INITIAL_STATE = { }] */ currentCompounds: [], currentCompoundClass: compoundsColors.blue.key, - ...defaultCompoundsClasses, + // ...defaultCompoundsClasses, selectedCompoundsClass: defaultSelectedCmpdsClass, highlightedCompoundId: null, showedCompoundList: [], @@ -50,7 +51,7 @@ export const RESET_STATE = { }] */ currentCompounds: [], currentCompoundClass: compoundsColors.blue.key, - ...defaultCompoundsClasses, + ...defaultCmpdsValues, selectedCompoundsClass: defaultSelectedCmpdsClass, highlightedCompoundId: null, showedCompoundList: [], @@ -92,7 +93,7 @@ export const compounds = (state = INITIAL_STATE, action = {}) => { }); case constants.RESET_COMPOUND_CLASSES: - return Object.assign({}, state, { ...defaultCompoundsClasses }); + return Object.assign({}, state, { ...defaultCmpdsValues }); case constants.SET_HIGHLIGHTED_COMPOUND_ID: return Object.assign({}, state, { highlightedCompoundId: action.payload }); @@ -155,9 +156,9 @@ export const compounds = (state = INITIAL_STATE, action = {}) => { return Object.assign({}, state, { selectedCompoundsClass: defaultSelectedCmpdsClass }); - - case constants.SET_SELECTED_COMPOUNDS: - return {...state, allSelectedCompounds: action.payload}; + + case constants.SET_SELECTED_COMPOUNDS: + return { ...state, allSelectedCompounds: action.payload }; case constants.RELOAD_REDUCER: return Object.assign({}, state, { ...action.payload }); diff --git a/js/components/preview/molecule/moleculeList.js b/js/components/preview/molecule/moleculeList.js index 467717b00..7d2934acb 100644 --- a/js/components/preview/molecule/moleculeList.js +++ b/js/components/preview/molecule/moleculeList.js @@ -72,7 +72,7 @@ import { extractTargetFromURLParam } from '../utils'; const useStyles = makeStyles(theme => ({ container: { minHeight: '100px', - height: '99%', + height: '100%', width: 'inherit', color: theme.palette.black }, @@ -93,7 +93,7 @@ const useStyles = makeStyles(theme => ({ }, gridItemList: { overflow: 'auto', - height: `calc(100% - ${theme.spacing(6)}px - ${theme.spacing(2)}px)` + height: `calc(99% - ${theme.spacing(6)}px - ${theme.spacing(2)}px)` }, centered: { display: 'flex', diff --git a/js/components/preview/molecule/moleculeView/moleculeView.js b/js/components/preview/molecule/moleculeView/moleculeView.js index f809b74a4..57e79e980 100644 --- a/js/components/preview/molecule/moleculeView/moleculeView.js +++ b/js/components/preview/molecule/moleculeView/moleculeView.js @@ -48,9 +48,10 @@ import { MOL_TYPE } from '../redux/constants'; import { DensityMapsModal } from '../modals/densityMapsModal'; import { getRandomColor } from '../utils/color'; import { getAllTagsForMol } from '../../tags/utils/tagUtils'; -import TagView from '../../tags/tagView'; import MoleculeSelectCheckbox from './moleculeSelectCheckbox'; import useClipboard from 'react-use-clipboard'; +import Popover from '@mui/material/Popover'; +import Typography from '@mui/material/Typography'; const useStyles = makeStyles(theme => ({ container: { @@ -224,9 +225,33 @@ const useStyles = makeStyles(theme => ({ backgroundColor: theme.palette.white }, imageActions: { + position: 'absolute', + top: 0, + left: 0 + }, + imageTagActions: { position: 'absolute', top: 0, right: 0 + }, + tagPopover: { + height: '15px', + width: '55px', + padding: '0px', + fontSize: '10px', + backgroundColor: '#e0e0e0', + borderRadius: '7px', + textAlign: 'center', + opacity: '0.40' + }, + popover: { + paddingLeft: '5px', + fontSize: '10px', + borderRadius: '7px', + border: '0px black solid', + paddingRight: '5px', + minWidth: '55px', + textAlign: 'center' } })); @@ -324,9 +349,12 @@ const MoleculeView = memo( const [densityModalOpen, setDensityModalOpen] = useState(false); const [moleculeTooltipOpen, setMoleculeTooltipOpen] = useState(false); - const [tagEditorTooltipOpen, setTagEditorTooltipOpen] = useState(false); + const [tagPopoverOpen, setTagPopoverOpen] = useState(null); + const moleculeImgRef = useRef(null); + const open = tagPopoverOpen; + let proteinData = data?.proteinData; const getDataForTagsTooltip = () => { @@ -334,15 +362,115 @@ const MoleculeView = memo( return assignedTags; }; - const generateTooltip = () => { + const handlePopoverOpen = event => { + setTagPopoverOpen(event.currentTarget); + }; + + const handlePopoverClose = () => { + setTagPopoverOpen(null); + }; + + const generateTagPopover = () => { const data = getDataForTagsTooltip(); - return ( - - {data.map((t, idx) => ( - /*{t}*/ - - ))} - + + const modifiedObjects = data.map(obj => { + if (obj.tag.length > 8) { + return { ...obj, tag: obj.tag.slice(0, 8) + '...' }; + } + return obj; + }); + + const firstThreeTags = modifiedObjects.slice(0, 3); + + return modifiedObjects.length > 0 ? ( +
+ + { + <> + {firstThreeTags.length > 0 ? ( +
+ {firstThreeTags[0].tag} +
+ ) : ( + '' + )} + {firstThreeTags.length > 1 ? ( +
+ {firstThreeTags[1].tag} +
+ ) : ( + '' + )} + {firstThreeTags.length > 2 ? ( +
+ {firstThreeTags[2].tag} +
+ ) : ( + '' + )} + + } + + + {data.map(t => ( +
+ {t.tag} +
+ ))} + +
+ ) : ( +
); }; @@ -863,18 +991,7 @@ const MoleculeView = memo( {svg_image}
{(moleculeTooltipOpen || isTagEditorInvokedByMolecule) && ( - { - setTagEditorTooltipOpen(true); - }} - onClose={() => { - setTagEditorTooltipOpen(false); - }} - placement={'left'} - > + )}
+
{generateTagPopover()}
 ({ display: 'flex', flexDirection: 'column', overflow: 'auto', - height: '90%', + height: '100%', width: '100%', marginTop: -theme.spacing(), justifyContent: 'space-between', @@ -63,7 +65,7 @@ const useStyles = makeStyles(theme => ({ gap: 1 }, columnLabel: { - display: 'flex', + display: 'flex' }, dateLabel: { gridColumn: '6' @@ -75,10 +77,14 @@ const useStyles = makeStyles(theme => ({ columnTitle: { fontSize: theme.typography.pxToRem(13) }, + columnTitleGrid: { + fontSize: theme.typography.pxToRem(13), + position: "center" + }, tagModeSwitch: { - width: 132, // Should be adjusted if a label for the switch changes + width: 32, // Should be adjusted if a label for the switch changes // justify: 'flex-end', - marginRight: '110px', + marginRight: '90px', marginLeft: '1px' }, headerContainer: { @@ -108,7 +114,7 @@ const useStyles = makeStyles(theme => ({ }, '&:disabled': { borderRadius: 0, - borderColor: '#FFFFFF', + borderColor: '#FFFFFF' } }, contColButtonSelected: { @@ -126,7 +132,7 @@ const useStyles = makeStyles(theme => ({ backgroundColor: theme.palette.primary.main // color: theme.palette.black } - }, + } })); /** @@ -143,6 +149,9 @@ const TagDetails = memo(() => { const tagMode = useSelector(state => state.selectionReducers.tagFilteringMode); const displayAllMolecules = useSelector(state => state.selectionReducers.displayAllMolecules); const displayUntaggedMolecules = useSelector(state => state.selectionReducers.displayUntaggedMolecules); + const tagDetailView = useSelector(state => state.selectionReducers.tagDetailView); + const resizableLayout = useSelector(state => state.selectionReducers.resizableLayout); + const [tagList, setTagList] = useState([]); const [selectAll, setSelectAll] = useState(true); @@ -260,6 +269,10 @@ const TagDetails = memo(() => { dispatch(setTagFilteringMode(!tagMode)); }; + const viewModeSwitched = () => { + dispatch(setTagDetailView(!tagDetailView)); + }; + const TagModeSwitch = withStyles({ // '& .MuiFormControlLabel-root': { // marginLeft: '0px', @@ -311,43 +324,58 @@ const TagDetails = memo(() => { dispatch ])} headerActions={[ - - - - + + + - - - - + > + + } + label={tagMode ? 'Intersection' : 'Union'} + /> + + + + } + label={tagDetailView ? 'Grid' : 'List'} + /> + + + + + - ]} - > -
- - - - - - - - -
+ + +
-
- {/* tag name */} -
- - Tag name - - handleHeaderSort('name')}> - - {[1, 2].includes(sortSwitch - offsetName) ? ( - sortSwitch % offsetName < 2 ? ( - + {tagDetailView ? ( + <> +
+ {/* START grid view */} + {/* tag name */} +
+ + Tag name + + handleHeaderSort('name')}> + + {[1, 2].includes(sortSwitch - offsetName) ? ( + sortSwitch % offsetName < 2 ? ( + + ) : ( + + ) ) : ( - - ) - ) : ( - - )} - - -
+ + )} + + +
+
+ + + {filteredTagList && + filteredTagList.map((tag, idx) => { + return ( + + + + ); + })} + + + ) : ( +
+ {/* tag name */} +
+ + Tag name + + handleHeaderSort('name')}> + + {[1, 2].includes(sortSwitch - offsetName) ? ( + sortSwitch % offsetName < 2 ? ( + + ) : ( + + ) + ) : ( + + )} + + +
- {/* category */} -
- - Category - - handleHeaderSort('category')}> - - {[1, 2].includes(sortSwitch - offsetCategory) ? ( - sortSwitch % offsetCategory < 2 ? ( - + {/* category */} +
+ + Category + + handleHeaderSort('category')}> + + {[1, 2].includes(sortSwitch - offsetCategory) ? ( + sortSwitch % offsetCategory < 2 ? ( + + ) : ( + + ) ) : ( - - ) - ) : ( - - )} - - -
+ + )} + + +
- {/* creator */} -
- - Creator - - handleHeaderSort('creator')}> - - {[1, 2].includes(sortSwitch - offsetCreator) ? ( - sortSwitch % offsetCreator < 2 ? ( - + {/* creator */} +
+ + Creator + + handleHeaderSort('creator')}> + + {[1, 2].includes(sortSwitch - offsetCreator) ? ( + sortSwitch % offsetCreator < 2 ? ( + + ) : ( + + ) ) : ( - - ) - ) : ( - - )} - - -
+ + )} + + +
- {/* date */} -
- - Date - - handleHeaderSort('date')}> - - {[1, 2].includes(sortSwitch - offsetDate) ? ( - sortSwitch % offsetDate < 2 ? ( - + {/* date */} +
+ + Date + + handleHeaderSort('date')}> + + {[1, 2].includes(sortSwitch - offsetDate) ? ( + sortSwitch % offsetDate < 2 ? ( + + ) : ( + + ) ) : ( - - ) - ) : ( - - )} - - -
-
+ + )} + + +
+
- {filteredTagList && - filteredTagList.map((tag, idx) => { - return ( - - ); - })} + {filteredTagList && + filteredTagList.map((tag, idx) => { + return ( + + ); + })} +
+ )} +
+
-
); diff --git a/js/components/preview/tags/details/tagGridRows.js b/js/components/preview/tags/details/tagGridRows.js new file mode 100644 index 000000000..a152df8d0 --- /dev/null +++ b/js/components/preview/tags/details/tagGridRows.js @@ -0,0 +1,38 @@ +import React, { memo, useState, useEffect } from 'react'; +import { useDispatch, useSelector } from 'react-redux'; +import TagView from '../tagView'; +import { removeSelectedTag, addSelectedTag } from '../redux/dispatchActions'; + +/** + * TagGridRows represents a Grid view for tags + */ +const TagGridRows = memo(({ tag }) => { + const dispatch = useDispatch(); + const selectedTagList = useSelector(state => state.selectionReducers.selectedTagList); + + const handleTagClick = (selected, tag) => { + if (selected) { + dispatch(removeSelectedTag(tag)); + } else { + dispatch(addSelectedTag(tag)); + } + }; + + return ( + <> + {/* TagView Chip */} + i.id === tag.id)} + handleClick={handleTagClick} + // disabled={!DJANGO_CONTEXT.pk} + disabled={false} + isEdit={true} + isTagEditor={true} + > + + ); +}); + +export default TagGridRows; diff --git a/js/components/preview/tags/modal/tagEditor.js b/js/components/preview/tags/modal/tagEditor.js index f4a411ab9..ed949bead 100644 --- a/js/components/preview/tags/modal/tagEditor.js +++ b/js/components/preview/tags/modal/tagEditor.js @@ -1,11 +1,11 @@ import React, { forwardRef, memo, useState } from 'react'; -import { Grid, Popper, IconButton, Tooltip, makeStyles } from '@material-ui/core'; +import { Grid, Popper, IconButton, Tooltip, makeStyles, FormControlLabel, Switch } from '@material-ui/core'; import { Panel } from '../../../common'; import { Close } from '@material-ui/icons'; import { useDispatch, useSelector } from 'react-redux'; import { updateMoleculeInMolLists, updateMoleculeTag } from '../../../../reducers/api/actions'; import { getMoleculeForId } from '../redux/dispatchActions'; -import { setMoleculeForTagEdit, setIsTagGlobalEdit } from '../../../../reducers/selection/actions'; +import { setMoleculeForTagEdit, setIsTagGlobalEdit, setAssignTagView } from '../../../../reducers/selection/actions'; import { updateExistingTag } from '../api/tagsApi'; import { DJANGO_CONTEXT } from '../../../../utils/djangoContext'; import { @@ -16,16 +16,20 @@ import { } from '../utils/tagUtils'; import TagCategory from '../tagCategory'; import { TaggingInProgressModal } from './taggingInProgressModal'; +import { withStyles } from '@material-ui/core/styles'; +import { blue } from '@material-ui/core/colors'; const useStyles = makeStyles(theme => ({ paper: { - height: 343, - overflowY: 'hidden' + maxHeight: 343, + height: 'auto', + overflowY: 'auto' }, content: { overflowY: 'auto', overflowX: 'hidden', - height: 300 + height: 'auto', + maxHeight: 300 }, contColButton: { minWidth: 'fit-content', @@ -95,6 +99,11 @@ const useStyles = makeStyles(theme => ({ '& .MuiInput-underline:after': { borderBottomColor: 'inherit' } + }, + tagModeSwitch: { + width: 32, // Should be adjusted if a label for the switch changes + marginRight: '100px', + marginLeft: '1px' } })); @@ -116,9 +125,10 @@ export const TagEditor = memo( moleculesToEditIds.push(molId); } const moleculesToEdit = moleculesToEditIds.map(id => dispatch(getMoleculeForId(id))); - moleculeTags = moleculeTags.sort(compareTagsAsc); + const assignTagView = useSelector(state => state.selectionReducers.assignTagView); + const handleCloseModal = () => { if (open) { dispatch(setOpenDialog(false)); @@ -201,6 +211,24 @@ export const TagEditor = memo( setTaggingInProgress(false); }; + const viewModeSwitched = () => { + dispatch(setAssignTagView(!assignTagView)); + }; + + const TagModeSwitch = withStyles({ + switchBase: { + color: blue[300], + '&$checked': { + color: blue[500] + }, + '&$checked + $track': { + backgroundColor: blue[500] + } + }, + checked: {}, + track: {} + })(Switch); + return ( + + } + label={assignTagView ? 'Grid' : 'List'} + /> + , ({ category: { - display: 'flex' + display: '-webkit-box' } })); @@ -18,6 +19,8 @@ const TagCategory = memo(({ tagClickCallback, disabled = false }) => { let tagList = useSelector(state => state.apiReducers.tagList); tagList = tagList.sort(compareTagsAsc); + const assignTagView = useSelector(state => state.selectionReducers.assignTagView); + const siteCategory = categoryList.find(c => c.category === CATEGORY_TYPE.SITE); const seriesCategory = categoryList.find(c => c.category === CATEGORY_TYPE.SERIES); const forumCategory = categoryList.find(c => c.category === CATEGORY_TYPE.FORUM); @@ -32,19 +35,31 @@ const TagCategory = memo(({ tagClickCallback, disabled = false }) => { return ( <> - - - - - - - - - - - - - + {assignTagView === false || assignTagView === undefined ? ( + <> + + + + + + + + + + + + + + ) : ( + <> + + + + + + + + )} ); }); diff --git a/js/components/preview/tags/tagCategoryGridView.js b/js/components/preview/tags/tagCategoryGridView.js new file mode 100644 index 000000000..2cf188bc1 --- /dev/null +++ b/js/components/preview/tags/tagCategoryGridView.js @@ -0,0 +1,117 @@ +import React, { memo } from 'react'; +import { Grid, makeStyles, Typography } from '@material-ui/core'; +import { useDispatch } from 'react-redux'; +import { useSelector } from 'react-redux'; +import TagView from './tagView'; +import { removeSelectedTag, addSelectedTag, getMoleculeForId } from './redux/dispatchActions'; +import { getAllTagsForMol } from './utils/tagUtils'; + +const useStyles = makeStyles(theme => ({ + divContainer: { + flexDirection: 'column', + display: 'flex', + height: '100%', + width: '100%', + textAlign: 'left', + gap: 1 + }, + categoryItem: { + paddingRight: theme.spacing(1), + textAlign: 'left' + }, + headerItemTitle: { + fontSize: theme.typography.pxToRem(13) + } +})); + +/** + * TagCategoryView has two ways of behavior depending if clickCallback is defined or not: + * -if is- behaves as Assign tag element and assignes tags to hits + * -if is NOT- behaves as Hit filter element and filters hits in Hit navigator + */ +const TagCategoryGridView = memo(({ name, tags, specialTags, clickCallback, disabled = false }) => { + const classes = useStyles(); + const selectedTagList = useSelector(state => state.selectionReducers.selectedTagList); + const dispatch = useDispatch(); + + const tagList = useSelector(state => state.apiReducers.tagList); + const isTagGlobalEdit = useSelector(state => state.selectionReducers.isGlobalEdit); + const molId = useSelector(state => state.selectionReducers.molForTagEdit); + let moleculesToEditIds = useSelector(state => state.selectionReducers.moleculesToEdit); + if (!isTagGlobalEdit) { + moleculesToEditIds = []; + moleculesToEditIds.push(molId); + } + const moleculesToEdit = + moleculesToEditIds && + moleculesToEditIds.length > 0 && + !(moleculesToEditIds.length === 1 && moleculesToEditIds[0] === null) + ? moleculesToEditIds.map(id => dispatch(getMoleculeForId(id))) + : []; + + const handleTagClick = (selected, tag, allTags) => { + if (clickCallback !== undefined) { + clickCallback(selected, tag); + } else { + if (selected) { + dispatch(removeSelectedTag(tag)); + } else { + dispatch(addSelectedTag(tag)); + } + } + }; + + const isTagSelected = tag => { + let result = false; + let partiallySelected = false; + for (let i = 0; i < moleculesToEdit.length; i++) { + const m = moleculesToEdit[i]; + const tagsForMol = getAllTagsForMol(m, tagList); + if (tagsForMol && tagsForMol.some(t => t.id === tag.id)) { + result = true; + // break; + } else { + partiallySelected = true; + } + } + return { isSelected: result, isPartiallySelected: partiallySelected }; + }; + + return ( + <> + + {name && ( + + + {name} + + + )} + + {(tags || specialTags) && ( + + {tags && + tags.map((tag, idx) => { + let selected = selectedTagList.some(i => i.id === tag.id); + let tagSelected = isTagSelected(tag); + return ( + + + + ); + })} + + )} + + + ); +}); + +export default TagCategoryGridView; diff --git a/js/components/preview/tags/tagCategoryView.js b/js/components/preview/tags/tagCategoryListView.js similarity index 95% rename from js/components/preview/tags/tagCategoryView.js rename to js/components/preview/tags/tagCategoryListView.js index e0e43dc55..c030926d1 100644 --- a/js/components/preview/tags/tagCategoryView.js +++ b/js/components/preview/tags/tagCategoryListView.js @@ -19,9 +19,6 @@ const useStyles = makeStyles(theme => ({ paddingRight: theme.spacing(1), textAlign: 'left' }, - headerItem: { - paddingLeft: theme.spacing(2) - }, headerItemTitle: { fontSize: theme.typography.pxToRem(13) } @@ -32,7 +29,7 @@ const useStyles = makeStyles(theme => ({ * -if is- behaves as Assign tag element and assignes tags to hits * -if is NOT- behaves as Hit filter element and filters hits in Hit navigator */ -const TagCategoryView = memo(({ name, tags, specialTags, clickCallback, disabled = false }) => { +const TagCategoryListView = memo(({ name, tags, specialTags, clickCallback, disabled = false }) => { const classes = useStyles(); const selectedTagList = useSelector(state => state.selectionReducers.selectedTagList); const dispatch = useDispatch(); @@ -115,4 +112,4 @@ const TagCategoryView = memo(({ name, tags, specialTags, clickCallback, disabled ); }); -export default TagCategoryView; +export default TagCategoryListView; diff --git a/js/components/preview/tags/tagView.js b/js/components/preview/tags/tagView.js index 8acddb214..f1dc3a323 100644 --- a/js/components/preview/tags/tagView.js +++ b/js/components/preview/tags/tagView.js @@ -1,7 +1,7 @@ import React, { memo, useState } from 'react'; import { Grid, makeStyles, Chip, Tooltip, Avatar } from '@material-ui/core'; import { Edit, Check } from '@material-ui/icons'; -import { useDispatch } from 'react-redux'; +import { useDispatch, useSelector } from 'react-redux'; import { getFontColorByBackgroundColor } from '../../../utils/colors'; import { TagEditModal } from './modal/tagEditModal'; import classNames from 'classnames'; @@ -22,7 +22,7 @@ const useStyles = makeStyles(theme => ({ flexDirection: 'row', justifyContent: 'flex-start', borderRadius: '7px', - lineHeight: '1.1', + //lineHeight: '0', textAlign: 'center', '& .MuiChip-labelSmall': { overflowWrap: 'anywhere', @@ -32,7 +32,9 @@ const useStyles = makeStyles(theme => ({ paddingRight: '2px', fontWeight: '400', fontStyle: 'normal', - letterSpacing: '0.144px' + letterSpacing: '0.144px', + width: 'inherit', + textAlign: 'left' }, '& .MuiChip-deleteIcon': { display: 'none', @@ -58,9 +60,9 @@ const useStyles = makeStyles(theme => ({ margin: '0 !important', padding: '0 !important', '& .MuiChip-labelSmall': { - textAlign: 'left !important' + //textAlign: 'left !important' }, - width: '200px' + width: '160px' }, chipSelected: { '& .MuiChip-iconSmall': { @@ -94,35 +96,41 @@ const TagView = memo( isTagEditor = false, partiallySelected = false }) => { - const tagData = tag; + const originalTagData = tag; const classes = useStyles(); const dispatch = useDispatch(); const [tagEditModalOpen, setTagEditModalOpen] = useState(false); - // console.log(`Tag: ${tagData.tag}`); - // console.log(`tagColor: ${tagColor}`); + const tagDetailView = useSelector(state => state.selectionReducers.tagDetailView); + + let tagData = []; + if (originalTagData.tag.length > 26) { + tagData = { ...originalTagData, tag: originalTagData.tag.slice(0, 26) + '...' }; + } else { + tagData = originalTagData; + } + const bgColor = tagData.colour || '#e0e0e0'; - // console.log(`bgColor: ${bgColor}`); const color = getFontColorByBackgroundColor(bgColor); - // console.log(`font color: ${color}`); + const style = isTagEditor - ? { backgroundColor: bgColor, color: color } + ? { + backgroundColor: bgColor, + color: color, + width: tagDetailView === true ? '160px' : '200px' + } : selected - ? { backgroundColor: bgColor, color: color } - : { backgroundColor: 'white', color: 'black', borderColor: bgColor }; - // console.log(`style: ${style}`); - - // console.log('-------------------------------'); - const isTagDisabled = false; - - const determineDisabled = () => { - // let result = false; - // if (isEdit && disabled) { - // result = true; - // } - // return result; - return disabled; - }; + ? { + backgroundColor: bgColor, + color: color, + width: '160px' + } + : { + backgroundColor: 'white', + color: 'black', + borderColor: bgColor, + width: '160px' + }; const handleDelete = () => { if (editable) { @@ -155,7 +163,7 @@ const TagView = memo( className: `${classes.chip} ${selected && !isSpecialTag ? classes.chipSelected : null} ${ classes.tagDetailsChip }`, - label: tagData.tag, + label: tagDetailView === true ? tagData.tag : originalTagData.tag, clickable: true, color: bgColor, style: style, @@ -163,13 +171,7 @@ const TagView = memo( handleClick && handleClick(selected, tag, allTags); }, deleteIcon: getDeleteIcon(), - onDelete: getDeleteAction(), - disabled: determineDisabled(), - icon: ( - - - - ) + onDelete: getDeleteAction() }; } else { return { @@ -177,43 +179,23 @@ const TagView = memo( className: `${classes.chip} ${selected && !isSpecialTag ? classes.chipSelected : null} ${ classes.tagDetailsChip }`, - label: tagData.tag, + label: tagDetailView === true ? tagData.tag : originalTagData.tag, clickable: true, color: bgColor, - style: { backgroundColor: 'white', border: '1px solid rgba(0, 0, 0, 0.23)', borderColor: bgColor }, + style: { + backgroundColor: 'white', + border: '1px solid rgba(0, 0, 0, 0.23)', + borderColor: bgColor, + width: tagDetailView === true ? '160px' : '200px' + }, onClick: () => { handleClick && handleClick(selected, tag, allTags); }, deleteIcon: getDeleteIcon(), - onDelete: getDeleteAction(), - disabled: determineDisabled() + onDelete: getDeleteAction() }; } - - return { - size: 'small', - className: `${classes.chip} ${selected && !isSpecialTag ? classes.chipSelected : null} ${ - classes.tagDetailsChip - }`, - label: tagData.tag, - clickable: true, - color: bgColor, - borderColor: bgColor, - style: style, - onClick: () => { - handleClick && handleClick(selected, tag, allTags); - }, - deleteIcon: getDeleteIcon(), - onDelete: getDeleteAction(), - disabled: determineDisabled(), - icon: ( - - - - ) - }; } - // If in Hit List Filter if (selected) { return { @@ -228,8 +210,7 @@ const TagView = memo( handleClick && handleClick(selected, tag, allTags); }, deleteIcon: getDeleteIcon(), - onDelete: getDeleteAction(), - disabled: determineDisabled() + onDelete: getDeleteAction() }; } @@ -246,15 +227,14 @@ const TagView = memo( handleClick && handleClick(selected, tag, allTags); }, deleteIcon: getDeleteIcon(), - onDelete: getDeleteAction(), - disabled: determineDisabled() + onDelete: getDeleteAction() }; }; return ( <> - + diff --git a/js/reducers/selection/actions.js b/js/reducers/selection/actions.js index 977588e0d..bb8ab4901 100644 --- a/js/reducers/selection/actions.js +++ b/js/reducers/selection/actions.js @@ -486,4 +486,23 @@ export const setNextXMolecules = nextXMolecules => { type: constants.SET_NEXT_X_MOLECULES, nextXMolecules: nextXMolecules }; -}; \ No newline at end of file +}; + +export const setTagDetailView = tagDetailView => { + return { + type: constants.SET_TAG_DETAIL_VIEW, + payload: tagDetailView + }; +}; + +export const setResizableLayout = projects => ({ + type: constants.SET_RESIZABLE_LAYOUT, + payload: projects +}); + +export const setAssignTagView = assignTagView => { + return { + type: constants.SET_ASSIGN_TAGS_VIEW, + payload: assignTagView + }; +}; diff --git a/js/reducers/selection/constants.js b/js/reducers/selection/constants.js index 4d3be5f14..4a7b6a6d7 100644 --- a/js/reducers/selection/constants.js +++ b/js/reducers/selection/constants.js @@ -76,7 +76,13 @@ export const constants = { SET_DISPLAY_UNTAGGED_MOLECULES: prefix + 'SET_DISPLAY_UNTAGGED_MOLECULES', SET_SELECT_ALL_MOLECULES: prefix + 'SET_SELECT_ALL_MOLECULES', SET_UNSELECT_ALL_MOLECULES: prefix + 'SET_UNSELECT_ALL_MOLECULES', - SET_NEXT_X_MOLECULES: prefix + 'SET_NEXT_X_MOLECULES' + SET_NEXT_X_MOLECULES: prefix + 'SET_NEXT_X_MOLECULES', + + SET_ASSIGN_TAGS_VIEW: prefix + 'SET_ASSIGN_TAGS_VIEW', + + SET_TAG_DETAIL_VIEW: prefix + 'SET_TAG_DETAIL_VIEW', + + SET_RESIZABLE_LAYOUT: prefix + 'SET_RESIZABLE_LAYOUT' }; export const PREDEFINED_FILTERS = { diff --git a/js/reducers/selection/selectionReducers.js b/js/reducers/selection/selectionReducers.js index 297b01ef7..6af29f86c 100644 --- a/js/reducers/selection/selectionReducers.js +++ b/js/reducers/selection/selectionReducers.js @@ -437,6 +437,15 @@ export function selectionReducers(state = INITIAL_STATE, action = {}) { case constants.SET_NEXT_X_MOLECULES: return { ...state, nextXMolecules: action.nextXMolecules }; + case constants.SET_ASSIGN_TAGS_VIEW: + return { ...state, assignTagView: action.payload }; + + case constants.SET_TAG_DETAIL_VIEW: + return { ...state, tagDetailView: action.payload }; + + case constants.SET_RESIZABLE_LAYOUT: + return Object.assign({}, state, { resizableLayout: action.payload }); + // Cases like: @@redux/INIT default: return state;