Commit graph

11089 commits

Author SHA1 Message Date
wandji 207b302a03
Set margin for module protocol task content [SCI-9018] (#6044) 2023-08-23 15:59:11 +02:00
ajugo 63f0f5a307
Disable adding step_files for protocol parser [SCI-8993] (#5990) 2023-08-23 15:44:27 +02:00
Ivan Kljun 39ed4b1b92 Hide Cancel/Save btns after click at Share task modal [SCI-9008] 2023-08-23 14:20:24 +02:00
wandji 71bcc78243
Verify sequence asset preview for non-editable role and add css class [SCI-8967] (#6012)
* Verify sequence asset preview for non-editable user role and add css class [SCI-8967]

* Add safe navigation operator when checking gene sequence blob meta asset_type [SCI-9867]
2023-08-23 13:12:46 +02:00
Alex Kriuchykhin b08a94ced6
Remove What's new section from user preferences section [SCI-9098] (#6046) 2023-08-23 13:12:06 +02:00
artoscinote e03920affd
Merge branch 'develop' into ma_SCI_8462 2023-08-23 11:21:32 +02:00
Martin Artnik 7abfa97224 Fix project public role picker [SCI-9084] 2023-08-23 11:00:58 +02:00
artoscinote e4ad77f00f
Merge pull request #6043 from G-Chubinidze/gc_SCI_7976
Fixed gray background on tinymce crop button [SCI-7976]
2023-08-22 16:35:59 +02:00
Giga Chubinidze 74c1691ae6 Fixed gray background on tinymce crop button 2023-08-22 18:33:09 +04:00
artoscinote f60243e424
Merge pull request #6041 from ivanscinote/SCI-9007-update-colors
Fix 'Not started' status button at missing locations [SCI-9007]
2023-08-22 15:19:05 +02:00
ivanscinote c8bc4bef01
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737] (#5866)
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737]
2023-08-22 14:59:34 +02:00
Ivan Kljun 28adb4956d Add 'Not started' btn to other views 2023-08-22 14:30:49 +02:00
wandji 196b6628ae
Add task protocol activities for gene sequence asset actions [SCI-8965] (#6013) 2023-08-22 14:24:43 +02:00
ajugo 9de4d455a5
Merge pull request #6018 from wandji20/wb-SCI-9078
Hide welcome modal after initial page load shareable links [SCI-9078]
2023-08-22 14:10:57 +02:00
artoscinote 8ba9b2df6a
Merge pull request #6038 from artoscinote/ma_SCI_9084
Fix visibility checkbox for project edit modal [SCI-9084]
2023-08-22 12:25:34 +02:00
wandji20 87f7a74e02 Use shareable link uuid for setting session storage value [SCI-9078] 2023-08-22 11:21:05 +01:00
Martin Artnik 75bad0e8bc Fix visibility checkbox for project edit modal [SCI-9084] 2023-08-22 12:05:32 +02:00
wandji20 d46e80ba9b Hide welcome modal using sessionStorage after first page load of shared link [SCI-9078] 2023-08-22 10:59:02 +01:00
artoscinote ea3984776c
Merge pull request #6037 from artoscinote/ma_SCI_9084
Fix edit project modal [SCI-9084]
2023-08-22 11:06:14 +02:00
Martin Artnik 82f490b445 Fix edit project modal [SCI-9084] 2023-08-22 11:04:34 +02:00
Andrej 29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
Andrej 35ecd064d2 Fix tinymce help plugin language inclusion [SCI-9086] 2023-08-22 10:24:45 +02:00
Soufiane 6bce3b40df
FIX: Shared task fails to load sometimes [SCI-9052] (#6027) 2023-08-21 16:47:18 +02:00
wandji 1d051aeb0f
Fix CSS UI issues for shareable links task sharing [SCI-9080] (#6031)
* Fix css UI issues for shareable links task sharing [SCI-9080]
2023-08-21 16:07:38 +02:00
artoscinote 2e55181510
Merge pull request #6033 from artoscinote/ma_SCI_8994
Fix issues with repository columns [SCI-8994][SCI-8846]
2023-08-21 16:07:00 +02:00
Martin Artnik 5312ddbff6 Fix issues with repository columns [SCI-8994][SCI-8846] 2023-08-21 15:59:17 +02:00
Anton 0161277380 Fix bootstrap in report [SCI-9085] 2023-08-21 15:26:58 +02:00
artoscinote 8f24e90ee4
Merge pull request #6030 from wandji20/wb-SCI-9074
Fix css issue protocol template author edit [SCI-9074]
2023-08-21 12:58:23 +02:00
artoscinote 6f5ef60ab1
Merge pull request #5733 from G-Chubinidze/gc_SCI_8727
Project card permission with not assigned team admin [SCI-8727]
2023-08-21 12:19:28 +02:00
G-Chubinidze afdfec5f71
Update projects_service.rb 2023-08-21 14:13:00 +04:00
Giga Chubinidze a391e6e6e1 changed loop 2023-08-21 14:08:17 +04:00
artoscinote d8da463dc2
Merge pull request #5956 from ivanscinote/SCI-9008-share-task-modal
Move blur event to whole modal at Share task [SCI-9008]
2023-08-21 12:04:54 +02:00
wandji20 b41b0b04f0 Fix css issue protocol template author edit [SCI-9074] 2023-08-21 11:01:07 +01:00
artoscinote 00167e30b0
Merge pull request #6029 from artoscinote/ma_SCI_8422
Fix filtering of template tags [SCI-8422]
2023-08-21 11:56:28 +02:00
Ivan Kljun 5902ee28e1 Remove blur event function as it is redundant 2023-08-21 11:52:57 +02:00
Martin Artnik fc18c76efd Fix filtering of template tags [SCI-8422] 2023-08-21 11:44:01 +02:00
ajugo 95e6006c6a
Merge pull request #6026 from rekonder/aj_SCI_9077
Fix scrolling of the shareable links layout [SCI-9077]
2023-08-21 11:36:44 +02:00
aignatov-bio 58eaaf98b9
Merge pull request #6028 from aignatov-bio/ai-sci-8536-fix-long-task-names
Fix long task names [SCI-8536]
2023-08-21 11:18:53 +02:00
Anton d135c86f70 Fix long task names [SCI-8536] 2023-08-21 11:17:09 +02:00
artoscinote de61c37a4e
Merge pull request #5706 from wandji20/wb-SCI-8559
Fix CSS Issues[SCI-8559]
2023-08-21 11:05:38 +02:00
Andrej ef4d360be8 Fix scrolling of the shareable links layout [SCI-9077] 2023-08-21 10:38:54 +02:00
wandji20 5e6138fa18 Replace unecessary margin value with tailwind value [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20 0ae44eb3a7 Use default tailwind size for task assigned protocol description [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20 7c07befd3e Fix CSS issues in protocols, and quick start(new task) [SCI-9018] 2023-08-21 09:27:28 +01:00
aignatov-bio 33476403a5
Merge pull request #6025 from aignatov-bio/ai-sci-9085-fix-report-css
Fix report css [SCI-9085]
2023-08-21 10:12:31 +02:00
Anton ded0ac1b9f Fix report css [SCI-9085] 2023-08-21 09:54:35 +02:00
Ivan Kljun 022c2ee9de Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal 2023-08-21 09:53:28 +02:00
Ivan Kljun 0553b5b0dc Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal 2023-08-21 09:32:59 +02:00
sboursen-scinote ca35ad0122 Fix shared task view issues [SCI-9076]
- Fix task header effects when selected
2023-08-21 09:15:46 +02:00
Giga Chubinidze 3c588709be changed logic 2023-08-21 06:48:08 +04:00
artoscinote 3f754710ac
Merge pull request #6021 from ivanscinote/SCI-9007-update-colors
Add .btn-not-started to task status flow modal [SCI-9007]
2023-08-18 17:37:48 +02:00
Ivan Kljun f71c54dd74 Add .btn-not-started to task status flow modal [SCI-9007] 2023-08-18 17:21:26 +02:00
ajugo 6de239547e
Merge pull request #6020 from sboursen-scinote/sb_SCI-9019
Table header not visible after creating a project/folder [SCI-9019]
2023-08-18 16:34:15 +02:00
sboursen-scinote 2dc82c9ed9 Show table header in folder when creating the first project [SCI-9019] 2023-08-18 16:26:53 +02:00
Alex Kriuchykhin e3c23bd474
Merge pull request #6016 from sboursen-scinote/sb_SCI-9059
Fix PDF report generation error [SCI-9059]
2023-08-18 11:37:30 +02:00
Anton 37e1c46152 Hide result title in docx [SCI-9062] 2023-08-18 11:35:24 +02:00
sboursen-scinote 4d7fa93c06 Fix PDF report generation error [SCI-9059] 2023-08-18 11:23:49 +02:00
ajugo dcdbfefa91
Merge pull request #6011 from sboursen-scinote/sb_SCI-9066
Fix small css issues [SCI-9066]
2023-08-18 11:17:34 +02:00
Alex Kriuchykhin e9e15f015b
Merge pull request #6015 from okriuchykhin/ok_SCI_9079
Fix move experiment modal form submission [SCI-9079]
2023-08-18 11:13:10 +02:00
Oleksii Kriuchykhin c76fca0ab3 Fix move experiment modal form submission [SCI-9079] 2023-08-18 10:55:21 +02:00
Ivan Kljun 6918b3c568 Merge with develop and fix conflict [SCI-8928] 2023-08-18 10:54:07 +02:00
artoscinote 20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications
Remove system notifications [SCI-8807]
2023-08-18 10:28:05 +02:00
artoscinote 45791a764f
Merge pull request #6014 from wandji20/wb-SCI-9057
Fix bug in new result table event delegation [SCI-9057]
2023-08-18 10:13:36 +02:00
artoscinote 664819a7fc
Merge pull request #6008 from ivanscinote/SCI-9007-update-colors
Update status and shared buttons design to Amanda [SCI-9007]
2023-08-18 10:12:26 +02:00
artoscinote 35c0de4cef
Merge pull request #5882 from G-Chubinidze/gc_SCI_8933
Fixed Inventory Calendar Header [SCI-8933]
2023-08-18 10:07:32 +02:00
artoscinote c28b54c43b
Merge pull request #5937 from G-Chubinidze/gc_SCI_5605
Some icons have the checkboard pattern applied to the background [SCI-5605]
2023-08-18 10:04:06 +02:00
wandji20 cf3cb707fd Fix bug in new result table event delegation [SCI-9057] 2023-08-18 07:16:01 +01:00
sboursen-scinote a38158c788 Fix small css issues [SCI-9066] 2023-08-17 22:23:46 +02:00
Alex Kriuchykhin 67042ce254
Merge pull request #6003 from okriuchykhin/ok_SCI_9028
Show only default label templates when feature is disabled [SCI-9028]
2023-08-17 16:50:00 +02:00
ajugo 813347dcf0
Merge pull request #6000 from rekonder/aj_SCI_8948
Create new sequence attachment on task protocol step [SCI-8948]
2023-08-17 15:57:23 +02:00
artoscinote 2cc49ec6b5
Merge pull request #6005 from wandji20/wb-SCI-9003
Fix CSS style issues [SCI-9003]
2023-08-17 15:48:07 +02:00
Soufiane 4f1ea84489
Add the promotion screen for Sequence editor (OVE) [SCI-8968] (#6007) 2023-08-17 15:39:32 +02:00
Ivan Kljun e3f111debc Remove whitespace 2023-08-17 15:31:04 +02:00
Ivan Kljun b96dc345dd Apply hound linter suggestions 2023-08-17 15:29:22 +02:00
ajugo dd80b4019b
Merge pull request #5942 from sboursen-scinote/sb_SCI-8987
Fix micro-interactions for shareable links modals [SCI-8987]
2023-08-17 15:28:43 +02:00
sboursen-scinote ef9368d2cb Fix micro-interactions for shareable links modals [SCI-8987] 2023-08-17 15:22:16 +02:00
Ivan Kljun 400c1cb303 Update status and shared buttons design to Amanda [SCI-9007] 2023-08-17 15:18:46 +02:00
ajugo 032655f4e7
Merge pull request #6002 from rekonder/aj_SCI_8986
Show toast message on successful copy [SCI-8986]
2023-08-17 15:14:05 +02:00
Alex Kriuchykhin d81e2a0e47
Merge pull request #5995 from aignatov-bio/ai-sci-9062-hide-result-title-if-results-not-selected
Hide results title if results not selected [SCI-9062]
2023-08-17 14:58:21 +02:00
Anton 622a8766bb Hide results title if results not selected [SCI-9062] 2023-08-17 14:51:40 +02:00
Alex Kriuchykhin fd1b7885f4
Merge pull request #6006 from rekonder/aj_SCI_9064
Add checks for metadata on protocol import [SCI-9064]
2023-08-17 14:31:09 +02:00
Andrej b07432a444 Add checks for metadata on protocol import [SCI-9064] 2023-08-17 14:20:44 +02:00
wandji20 4a3f8146e3 Fix CSS style issues [wb-SCI-9003] 2023-08-17 13:11:58 +01:00
Alex Kriuchykhin c356018965
Merge pull request #5918 from sboursen-scinote/sb_SCI-8981
Share button is disabled for locked and archived tasks [SCI-8981]
2023-08-17 14:10:09 +02:00
Oleksii Kriuchykhin 14e49956f7 Show only default label templates when feature is disabled [SCI-9028] 2023-08-17 13:44:22 +02:00
Andrej 9a09fbc8ce Show toast message on successful copy [SCI-8986] 2023-08-17 11:21:53 +02:00
Oleksii Kriuchykhin 450f5df8ea Allow export of archived inventories [SCI-9060] 2023-08-17 11:20:26 +02:00
Andrej 6e8dda64b2 Create new sequence attachment on task protocol step [SCI-8948] 2023-08-17 09:38:44 +02:00
artoscinote 0082b858ec
Merge pull request #5983 from sboursen-scinote/sb_SCI-9042
Add space after (A) in shareable links layout [SCI-9042]
2023-08-17 09:00:01 +02:00
sboursen-scinote ffa6e8bc51 Add space after (A) in shareable links layout [SCI-9042] 2023-08-16 21:10:10 +02:00
wandji20 25e6cbdbd8 Move inline JavaScript inclusion for new and edit result table to result_tables.js [SCI-9057] 2023-08-16 17:08:25 +01:00
sboursen-scinote d631098d9a Fix multiple issues with edit sequence on task protocol [SCI-8966]
- Fix edit button label and icon
- Fix preview modal for gene-sequence
2023-08-16 17:01:43 +02:00
Alex Kriuchykhin 975a197716
Merge pull request #5987 from ivanscinote/SCI-9034-shared-task-issues
Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]
2023-08-16 15:34:57 +02:00
Alex Kriuchykhin 5eea990881
Merge pull request #5980 from wandji20/wb-SCI-9058
Move new and edit result asset inline Javascript to result_asset.js  [SCI-9058]
2023-08-16 15:34:21 +02:00
Ivan Kljun 1ea77b4ac8 Apply hound linter suggestions 2023-08-16 15:28:28 +02:00
Ivan Kljun 843cbb06da Fix trigger load and error event in active_storage_previews 2023-08-16 15:27:09 +02:00
Alex Kriuchykhin 66a72dff5f
Merge pull request #5989 from okriuchykhin/ok_SCI_8817_v2
Improve handling of responses from protocols parser [SCI-8817]
2023-08-16 14:52:56 +02:00
Alex Kriuchykhin 0c304ec80c
Merge pull request #5994 from okriuchykhin/ok_SCI_9053_v2
Fix calls of user assignment propagation jobs with optional assigned_by [SCI-9053]
2023-08-16 14:51:46 +02:00
wandji20 ebcb784149 Move result asset new and edit event handler to result asset and delete files [SCI-9058] 2023-08-16 13:50:40 +01:00
Oleksii Kriuchykhin 5e29523c61 Fix calls of user assignment propagation jobs with optional assigned_by [SCI-9053] 2023-08-16 14:34:42 +02:00
Anton 1d21b40479 Fix long project and task names in report [SCI-9061] 2023-08-16 14:16:54 +02:00
Anton 005779b3d3 Fix long project and task names in report [SCI-9061] 2023-08-16 14:12:47 +02:00
Oleksii Kriuchykhin 2ab559be97 Improve handling of responses from protocols parser [SCI-8817] 2023-08-16 13:26:41 +02:00
artoscinote 0062108996
Merge pull request #5984 from wandji20/wb-SCI-9043
Fix inventory item CSS and set nonce shared file preview inline JavaScript [SCI-9043]
2023-08-16 11:17:47 +02:00
artoscinote 92d2850800
Merge pull request #5985 from G-Chubinidze/gc_SCI_8725
Reports table: changed minimum width to accommodate shrunk screen [SCI-8725]
2023-08-16 11:17:15 +02:00
wandji20 ad65de20ce Add space in curly braces for edit result asset form html property [SCI-9058] 2023-08-16 10:06:06 +01:00
Ivan Kljun 860a8efda7 Add moment.js to application.js.erb 2023-08-16 10:52:36 +02:00
Ivan Kljun 1880723c8c Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034] 2023-08-16 10:49:34 +02:00
Martin Artnik 8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
artoscinote 083bd4b1e2
Merge pull request #5827 from aignatov-bio/ai-sci-8843-fix-notification-infinite-scroll
Fix infinite scroll for notifications [SCI-8843]
2023-08-16 10:27:07 +02:00
ajugo 689f699d83
Merge pull request #5974 from sboursen-scinote/sb_SCI-8997
Update Scinote logo in multiple pages [SCI-8997]
2023-08-16 10:26:50 +02:00
sboursen-scinote dc27620d00 Make share button independent of task status flow or archived state [SCI-8981] 2023-08-16 10:22:55 +02:00
artoscinote b2b4c30ee2
Merge pull request #5978 from artoscinote/ma_SCI_8846
Repository table fixes [SCI-8846]
2023-08-16 10:17:45 +02:00
artoscinote 61f9acb9fa
Merge pull request #5981 from wandji20/wb-SCI-9057
Set nonce for new and edit result table inline Javascript  [SCI-9057]
2023-08-16 09:51:40 +02:00
ajugo f3fe21db5e
Merge pull request #5976 from sboursen-scinote/sb_SCI-9055
Update font weights on shared tasks page [SCI-9055]
2023-08-16 09:50:37 +02:00
Giga Chubinidze 55235969a7 changed minimum width to accomodate screen shrink 2023-08-16 10:22:20 +04:00
wandji20 b9e391e781 Fix inventory item CSS abd set nonce shared file preview inline JavaScript [SCI-9043] 2023-08-15 14:28:53 +01:00
sboursen-scinote dcaf55eeb2 Fix icon position for form password fields [SCI-9020] 2023-08-15 09:54:00 +02:00
wandji20 6d8e4670f1 Set nonce for new and edit result table inline javascript [SCI-9057] 2023-08-14 17:09:08 +01:00
wandji20 3fc5ac36b0 Set nonce for new and edit result asset inline javascript and fix image preview after editing [SCI-9058] 2023-08-14 16:48:00 +01:00
Martin Artnik 0471859545 Repository table fixes [SCI-8846] 2023-08-11 15:47:18 +02:00
Oleksii Kriuchykhin 5332cbc788 Pass user by id instead of serialized object for deleyed jobs [SCI-9053] 2023-08-11 15:31:29 +02:00
sboursen-scinote 68d65222a6 Update the font weights on shared tasks page [SCI-9055] 2023-08-11 15:00:17 +02:00
sboursen-scinote 4d6adace9f Update Scinote logo in multiple pages [SCI-8997]
- In public error pages.
- In sign_in_halt.
2023-08-11 14:19:24 +02:00
Alex Kriuchykhin acb1a034a8
Fix assets inclusion in sign_in_halt layout [SCI-9044] (#5973) 2023-08-11 13:52:30 +02:00
Alex Kriuchykhin a3bc894df8
Fix repository creation modal [SCI-9045] (#5971) 2023-08-11 13:44:26 +02:00
wandji f8a3640c4c
Move snapshot of deleted inventories to the bottom of inventory list in report wizard [SCI-8487] (#5972) 2023-08-11 13:37:26 +02:00
artoscinote a5f14a8333
Merge pull request #5970 from wandji20/wb-SCI-9003
Fix Css issues [SCI-9003]
2023-08-11 13:13:51 +02:00
wandji20 e27c6174b4 Move unnecessary jquery style update to teams.scss stylesheet [SCI-9003] 2023-08-11 12:11:22 +01:00
artoscinote e401ff308b
Merge pull request #5968 from sboursen-scinote/sb_SCI-9020
Fix multiple CSS issues [SCI-9020]
2023-08-11 11:49:03 +02:00
wandji20 52fc7eb0e8 Fix Css issues [SCI-9003] 2023-08-11 10:45:51 +01:00
Anton a46674b3a3 Fix small bootstrap issues [SCI-9051] 2023-08-11 11:34:11 +02:00
sboursen-scinote 55e73dbfe9 Fix multiple CSS issues [SCI-9020] 2023-08-11 11:28:55 +02:00
ivanscinote e9ac5bed82
Fix rendering team table [SCI-9039] (#5967)
* Fix rendering team table [SCI-9039]

* Remove unused def_delegator
2023-08-11 10:52:47 +02:00
artoscinote 8a72c4ca02
Merge pull request #5966 from G-Chubinidze/gc_SCI_9001
Smart annotation modal- inventories are out of modal [SCI-9001]
2023-08-11 10:21:11 +02:00
Giga Chubinidze 26eba7da64 Smart annotation modal- inventories are out of modal [SCI-9001] 2023-08-10 22:41:39 +04:00
Giga Chubinidze 348d467d02 Non team owner user does not have access to archive inventory [SCI-8955] 2023-08-10 22:26:45 +04:00
Alex Kriuchykhin a4ea995027
Revert to using intermediate jquery_bundle file [SCI-9031] (#5962) 2023-08-10 17:19:28 +02:00
Alex Kriuchykhin c6a545d8b3
Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961) 2023-08-10 16:25:04 +02:00
aignatov-bio acab34679d
Merge pull request #5960 from aignatov-bio/ai-test-jquery-pr
Restore bootstrap overrides
2023-08-10 14:43:12 +02:00
Anton 3c0ccc730f Restore bootstrap overrides 2023-08-10 14:36:06 +02:00
artoscinote c8d11306fc
Merge pull request #5958 from sboursen-scinote/sb_SCI-9042
Update shared task title [SCI-9042]
2023-08-10 13:31:24 +02:00
artoscinote c1a408f0c5
Merge pull request #5954 from ivanscinote/SCI-9039-viewing-team-page
Remove bootstrap_form_tag [SCI-9039]
2023-08-10 13:30:59 +02:00
sboursen-scinote 17ecdeeaf6 Update shared task title [SCI-9042]
- Add (A) prefix to archived tasks.
- Truncate long task names.
2023-08-10 13:13:17 +02:00
Martin Artnik 52eca4eba1 Require jQuery from node_modules 2023-08-10 12:11:22 +02:00
Ivan Kljun 949da66414 Move blur event to whole modal at Share task [SCI-9008] 2023-08-10 11:58:35 +02:00
artoscinote 2db8badc57
Merge pull request #5955 from artoscinote/ma_SCI_8946
Fix glitchy dropdowns on Safari [SCI-8946]
2023-08-10 11:47:54 +02:00
Martin Artnik 4d4eebd78e Fix glitchy dropdowns on Safari [SCI-8946] 2023-08-10 11:46:31 +02:00
Ivan Kljun f9e5821361 Replace bootstrap_form_tag with form_with at _destroy_modal.html.erb [SCI-9039] 2023-08-10 11:16:43 +02:00
artoscinote d1ea9f30cf
Merge pull request #5953 from artoscinote/ma_SCI_9005
Add missing datatables css [SCI-9005]
2023-08-10 10:53:53 +02:00