Commit graph

9974 commits

Author SHA1 Message Date
artoscinote bd02b71efe
Merge pull request #5157 from sboursen-scinote/sb_SCI-7670
Pressing Enter button cancels adding of a image on task result [SCI-7670]
2023-04-05 15:27:22 +02:00
artoscinote a1cebecdcd
Merge pull request #5037 from G-Chubinidze/gc_SCI_7673
Add office file to task step - reload file option shows plain html page [SCI-7673]
2023-04-05 15:26:18 +02:00
artoscinote 0f8c73771a
Merge pull request #5001 from sboursen-scinote/sb_SCI-7783
CSS - inventory [SCI-7783]
2023-04-05 15:24:18 +02:00
artoscinote 47b7d1a1ca
Merge pull request #4999 from G-Chubinidze/gc_SCI_7935
Rearrange of checklist items does not work after pasting several items at once [SCI-7935]
2023-04-05 15:23:03 +02:00
Soufiane 4985c2eb88
Added Published on & Published by to Protocol details screen [SCI-8193] (#5239)
Added Published on & Published by to Protocol details screen [SCI-8193]
2023-04-05 15:08:31 +02:00
G-Chubinidze 045220c657
Wrong error message for too long office file name [SCI-7949] (#5155)
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-04-05 13:56:25 +02:00
Martin Artnik 1e464d7861 Remove unused assignment clone method [SCI-8263] 2023-04-04 15:39:10 +02:00
artoscinote df21102215
Merge pull request #5254 from artoscinote/ma_SCI_8263
Clear user assignments when duplicating protocol [SCI-8263]
2023-04-04 15:23:15 +02:00
Martin Artnik e26ed3d852 Clear user assignments when duplicating protocol [SCI-8263] 2023-04-04 14:09:52 +02:00
artoscinote 42a6f258a4
Merge pull request #5252 from okriuchykhin/ok_SCI_8199
Fix TinyMCE issue in project export, small fixes for protocols [SCI-8199]
2023-04-04 14:02:59 +02:00
aignatov-bio a17a893daf
TinyMCE after image parsing strip description [SCI-8258] (#5253) 2023-04-04 13:52:35 +02:00
Oleksii Kriuchykhin a70d8dea74 Fix TinyMCE issue in project export, small fixes for protocols [SCI-8199] 2023-04-04 13:42:20 +02:00
Soufiane 1a1956e163
Change wording for access management to cover project and templates (EDIT 2) [SCI-8231] (#5251)
* Use I18n [SCI-8231]

* Consolidate the message translations [SCI-8231]
2023-04-04 11:55:00 +02:00
Alex Kriuchykhin ed9f3d49d4
Merge pull request #5248 from artoscinote/ma_SCI_8259
Properly copy visibility and public assignments when cloning protocol [SCI-8259]
2023-04-04 11:31:21 +02:00
artoscinote 96785ae24d
Merge pull request #5250 from sboursen-scinote/sb_SCI-8231
Change wording for access management to cover project and templates (EDIT)  [SCI-8231]
2023-04-04 11:25:53 +02:00
ajugo cd2a1be9e0
Fix linked protocol without linked_at [SCI-8255] (#5249) 2023-04-04 11:25:02 +02:00
Martin Artnik ec0657b7b9 Properly copy visibility and public assignments when cloning protocol [SCI-8259] 2023-04-04 11:20:38 +02:00
sboursen-scinote 28b7be3779 Fix Hound [SCI-8231] 2023-04-04 11:16:37 +02:00
sboursen-scinote 7ad447d4f2 Change the wording when count is 0 [SCI-8231] 2023-04-04 11:06:38 +02:00
Oleksii Kriuchykhin c937122b2f Transfer protocol linked_at timestamp when cloning tasks [SCI-8256] 2023-04-04 10:42:52 +02:00
Giga Chubinidze eb7ff9a5ff Change of color and hover effect of x - action button for closing the modals [SCI-8140] 2023-04-03 19:32:22 +04:00
Martin Artnik 79b4f0d03d Add display of validation errors to TinyMCE [SCI-8246] 2023-04-03 15:34:59 +02:00
artoscinote 0922e8793b
Merge pull request #5241 from artoscinote/ma_SCI_8221
Enable TinyMCE menu bar on mobile [SCI-8221]
2023-04-03 13:15:16 +02:00
Alex Kriuchykhin bed256cd37
Merge pull request #5231 from artoscinote/ma_SCI_8131
Handle removal of last owner public group [SCI-8131]
2023-04-03 13:02:38 +02:00
Martin Artnik 2eb4c2fd9d Enable TinyMCE menu bar on mobile [SCI-8221] 2023-04-03 12:49:04 +02:00
Martin Artnik 132593c854 Prevent removal of last manually assigned user manager [SCI-8131] 2023-04-03 11:46:32 +02:00
sboursen-scinote ec0fe7cfd7 Fix Hound [SCI-8087] 2023-04-03 07:12:25 +02:00
sboursen-scinote d40fa5972c Remove old implementation in projects and experiments [SCI-8087] 2023-04-02 19:11:25 +02:00
sboursen-scinote 6d34ea41d2 Style the new breadcrumbs [SCI-8087] 2023-04-02 18:42:21 +02:00
sboursen-scinote 8ae354b180 Merge branch 'features/navigation-refactor' into sb_SCI-8087 2023-04-02 17:33:23 +02:00
Anton 0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Alex Kriuchykhin b14f27d951
Merge pull request #5235 from sboursen-scinote/sb_SCI-8227
Duplicated task with linked protocol loses template loaded... [SCI-8227]
2023-03-31 17:49:47 +02:00
sboursen-scinote a1c1b6e5a7 Refactor the solution [SCI-8227]
Co-Author okriuchykhin <oleksii@scinote.net>
2023-03-31 17:39:17 +02:00
sboursen-scinote aa75782766 Fix hound [SCI-8227] 2023-03-31 16:56:12 +02:00
sboursen-scinote 021913d6a8 Fix hound [SCI-8227] 2023-03-31 16:54:52 +02:00
sboursen-scinote 9b8db8befd FIX: Duplicated task with linked protocol loses template loaded timestamp [SCI-8227] 2023-03-31 16:49:40 +02:00
Giga Chubinidze 3fc2afde3c Label '(Draft)' in front of the protocol template name [SCI-8211] 2023-03-31 18:30:26 +04:00
ajugo a2e6dc7444
Fix missing protocol template name in activity for create [SCI-8242] (#5233)
* Fix missing protocol template name in acitvity for create [SCI-8242]

* Rename @new variable into @new_protocol [SCI-8242]
2023-03-31 14:48:23 +02:00
Anton ec96fb134f Merge branch 'ai-sci-7926-add-tailwind-and-new-buttons-design' of github.com:aignatov-bio/scinote-web into ai-sci-7926-add-tailwind-and-new-buttons-design 2023-03-31 14:09:01 +02:00
ajugo 562577e960
Add flash message for removing all users [SCI-8238] (#5232) 2023-03-31 12:14:26 +02:00
artoscinote 6b408c355d
Merge pull request #5230 from G-Chubinidze/gc_SCI_8102
CSS: flickering issues on Protocol templates [SCI-8102]
2023-03-31 11:46:47 +02:00
Giga Chubinidze 4a31b27852 added minimum z index on protocols table 2023-03-31 13:42:42 +04:00
ajugo f535bc1fa0
Fix protocol counter on my statistics [SCI-8240] (#5228) 2023-03-31 10:01:58 +02:00
sboursen-scinote 501279372c Style the breadcrumbs [SCI-8087] 2023-03-30 21:56:38 +02:00
sboursen-scinote 31b979cde9 Add prefix for archived elements [SCI-8087] 2023-03-30 21:22:33 +02:00
sboursen-scinote 42687547cf Refactor the implementation in projects and experiements [SCI-8087] 2023-03-30 19:13:15 +02:00
Giga Chubinidze 890b113de5 CSS: flickering issues on Protocol templates [SCI-8102] 2023-03-30 21:11:28 +04:00
sboursen-scinote b43d14f549 Implement layout breadcrumbs for Protocols and Label templates [SCI-8087] 2023-03-30 19:07:18 +02:00
sboursen-scinote 95797ab8dd Implement layout breadcrumbs for Inventories [SCI-8087] 2023-03-30 18:42:27 +02:00
Giga Chubinidze 57d951a690 Change title for publishing draft [SCI-8232] 2023-03-30 20:30:49 +04:00
sboursen-scinote eda4f140ee Implement layout breadcrumbs for Experiments and Tasks [SCI-8087] 2023-03-30 17:01:47 +02:00
sboursen-scinote 6cf3782339 Implement layout breadcrumbs for Projects and project folders [SCI-8087] 2023-03-30 16:29:21 +02:00
ajugo e1cf9775fd
Add new activites for all team members [SCI-8224] (#5227) 2023-03-30 16:04:57 +02:00
Anton ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
Martin Artnik d86a93919b Handle deleted protocol activities [SCI-8228] 2023-03-29 16:20:53 +02:00
Oleksii Kriuchykhin 89a45d2b14 Merge branch 'hotfix/1.26.6.4' into develop 2023-03-29 10:39:51 +02:00
artoscinote be4f008f09
Merge pull request #5224 from sboursen-scinote/sb_SCI-7607-fix2
Fix clear button style in dashboard filter [SCI-7607]
2023-03-29 10:37:10 +02:00
sboursen-scinote 226a89e8bf Fix clear button style in dashboard filter [SCI-7607] 2023-03-29 10:34:13 +02:00
artoscinote 3173b9f96e
Merge pull request #5216 from artoscinote/ma_SCI_8202
Fix print for linked protocols [SCI-8202]
2023-03-29 09:58:49 +02:00
sboursen-scinote 2dfcb56748 Fix dropdown direction in modals [SCI-8134] 2023-03-28 17:19:37 +02:00
Martin Artnik 6412a65d7e Fix new protocol default role, fix reload of protocol access modal [SCI-8217] 2023-03-28 16:22:38 +02:00
Oleksii Kriuchykhin ee7abc2912 Fix step table renaming [SCI-8216] 2023-03-28 16:03:45 +02:00
Anton 4a5e0de54f Fix css for task protocol [SCI-8214] 2023-03-28 14:53:47 +02:00
Anton babb46baa7 Update webpacker to version 5.4.4 [SCI-7926] 2023-03-28 14:00:28 +02:00
Oleksii Kriuchykhin 0beb64511d Fix saving of big tables on steps [SCI-8216] 2023-03-28 13:29:02 +02:00
Martin Artnik e819c730e7 Fix print for linked protocols [SCI-8202] 2023-03-28 12:08:55 +02:00
Martin Artnik f48350c6ea Properly handle repository snapshots in reports [SCI-8212] 2023-03-28 10:37:24 +02:00
ajugo c0977799f3
Fix recent works for protocol [SCI-8204] (#5211) 2023-03-27 16:00:40 +02:00
ajugo 0ff5cdf9a8
Fix CSS for pdf/docx preview and some minor CSS fixes [SCI-8198] (#5204) 2023-03-27 15:31:27 +02:00
ajugo 26879f200d
Fix CSS for protocol versioning modal [SCI-8194] (#5197) 2023-03-27 13:28:00 +02:00
artoscinote b9b785c122
Merge pull request #5208 from artoscinote/ma_SCI_8196
Fix search for new access grant [SCI-8196]
2023-03-27 13:14:38 +02:00
Alex Kriuchykhin f5b43f248f
Merge pull request #5205 from artoscinote/ma_SCI_8200
Update public user assignments on public role change [SCI-8200]
2023-03-27 13:13:09 +02:00
Alex Kriuchykhin 3d8717e994
Merge pull request #5186 from okriuchykhin/ok_SCI_8177
Improve error handling in protocol archive/restore actions [SCI-8177]
2023-03-27 13:11:11 +02:00
Martin Artnik efcda1e057 Update public user assignments on public role change [SCI-8200] 2023-03-27 13:11:00 +02:00
Martin Artnik cb21b9f29b Fix search for new access grant [SCI-8196] 2023-03-27 12:46:14 +02:00
Alex Kriuchykhin 2bcb9d0639
Merge pull request #5207 from artoscinote/ma_SCI_8131
Add error flash when assignment update fails [SCI-8131]
2023-03-27 12:43:40 +02:00
Martin Artnik 9904c7aae3 Add error flash when assignment update fails [SCI-8131] 2023-03-27 12:38:01 +02:00
Alex Kriuchykhin f99326507d
Merge pull request #5202 from aignatov-bio/ai-sci-8195-fix-error-in-protocol-global-search
Fix link in protocol global search [SCI-8195]
2023-03-27 11:47:04 +02:00
Alex Kriuchykhin 69445f26e8
Merge pull request #5203 from okriuchykhin/ok_SCI_6931
Update protocols migration for linked protocols [SCI-6931]
2023-03-27 11:45:43 +02:00
Oleksii Kriuchykhin 9885dc0f29 Update protocols migration for linked protocols [SCI-6931] 2023-03-27 11:39:09 +02:00
Giga Chubinidze 0358e113eb Add new colors to our variables in CSS [SCI-8169] 2023-03-27 13:35:01 +04:00
artoscinote 5c1a5b5dc7
Merge pull request #5201 from sboursen-scinote/sb_SCI-7607-fix
Add border to cancel button [SCI-7607]
2023-03-27 11:18:27 +02:00
artoscinote ba57617384
Merge pull request #5195 from artoscinote/ma_SCI_8188
Revert global modal changes [SCI-8188]
2023-03-27 11:15:46 +02:00
sboursen-scinote e4d5732967 Add border to cancel button [SCI-7607] 2023-03-27 11:14:54 +02:00
Anton 2883b17467 Fix link in protocol global search [SCI-8195] 2023-03-27 10:50:09 +02:00
Anton 1177eaae5b Add general notifiacitons flyout [SCI-8017] 2023-03-25 17:34:26 +01:00
sboursen-scinote 107d602521 Fix pixel perfect alignment in dropdown [SCI-8032] 2023-03-25 03:01:45 +01:00
Alex Kriuchykhin 678d51692e
Merge pull request #5194 from artoscinote/ma_SCI_8131
Prevent removing/changing role for last user with user manage permission on protocol [SCI-8131]
2023-03-24 13:58:57 +01:00
Martin Artnik 27713bbd8a Revert global modal changes [SCI-8188] 2023-03-24 13:47:40 +01:00
Martin Artnik ed469b8e11 Remove manage users permission from team admin [SCI-8131] 2023-03-24 13:32:46 +01:00
Martin Artnik b1cce70cc6 Preven removing last user manager for protocols/projects [SCI-8131] 2023-03-24 13:32:38 +01:00
aignatov-bio d8083b84b6
Merge pull request #5184 from aignatov-bio/ai-sci-8185-css-fixes
Fix tables css [SCI-8185]
2023-03-24 13:14:38 +01:00
Alex Kriuchykhin e7bd133895
Merge pull request #5191 from aignatov-bio/ai-sci-8160-update-front-end-permission-for-version-comment
Update front end permission check for version comment [SCI-8160]
2023-03-24 13:14:03 +01:00
Anton 9818e41353 Update front end permission check for version comment [SCI-8160] 2023-03-24 13:11:14 +01:00
aignatov-bio 09a217baca
Merge pull request #5193 from aignatov-bio/ai-sci-8190-fix-protocol-screen-css
Protocol screen css fixes [SCI-8190]
2023-03-24 13:04:00 +01:00
Anton 0b560f5b05 Protocol screen css fixes [SCI-8190] 2023-03-24 12:01:47 +01:00
ajugo 2734c86ef5
Show/hide duplicate button on team permission change in protocol template repository [SCI-8150] (#5190) 2023-03-24 11:52:48 +01:00
artoscinote 00191e41de
Merge pull request #5192 from scinote-eln/features/token-revocation
Features/token revocation
2023-03-24 11:13:38 +01:00
Alex Kriuchykhin 5016034189
Merge pull request #5187 from artoscinote/ma_SCI_8182
Fix issues with protocol assignments and published attributes [SCI-8182]
2023-03-24 11:05:12 +01:00
Martin Artnik 2ddbc0ed90 Fix protocol migration/assignment issues [SCI-8182] 2023-03-24 10:58:43 +01:00
sboursen-scinote 245b4bc5b0 Fix the slight move [SCI-7663] 2023-03-23 17:57:47 +01:00
Oleksii Kriuchykhin f2c8f67791 Improve error handling in protocol archive/restore actions [SCI-8177] 2023-03-23 15:32:22 +01:00
ajugo e065098082
Fix protocol templates rows selection flickering [SCI-8105] (#5185)
* Fix protocol templates rows selection flickering [SCI-8105]

* Fix double initialization of row selection [SCI-8105]
2023-03-23 13:40:21 +01:00
Oleksii Kriuchykhin 7ef2f68078 Merge branch 'hotfix/1.26.6.3' into develop 2023-03-23 13:26:12 +01:00
aignatov-bio 172068dbf7
Merge pull request #5182 from G-Chubinidze/gc_SCI_8128
Update sidebar interactions [SCI-8128]
2023-03-23 13:08:34 +01:00
Anton 4edad3f41c Fix tables css [SCI-8185] 2023-03-23 13:05:37 +01:00
ajugo 4c42748e40
Add protocolsIO import preview [SCI-8187] (#5183) 2023-03-23 12:18:30 +01:00
Giga Chubinidze 24da5a8a11 Update sidebar interactions [SCI-8128] 2023-03-23 12:54:14 +04:00
Alex Kriuchykhin 72186e8e8d
Merge pull request #5178 from okriuchykhin/ok_SCI_7919
Check permissions on current user during PDF report generation [SCI-7919]
2023-03-22 16:39:30 +01:00
Anton 854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Anton e626c53f78 PET and Protocol tabls fixes [SCI-8176][SCI-8180][SCI-8181] 2023-03-22 13:47:59 +01:00
Oleksii Kriuchykhin 3443a6fb85 Fix create step comments permissions [SCI-8174] 2023-03-22 12:52:08 +01:00
ajugo fe37699ba5
Add switch for connected devices [SCI-8112] (#5179) 2023-03-22 12:15:01 +01:00
aignatov-bio 0044726425
Merge branch 'develop' into ai-sci-8155-css-fixes-for-version-modal 2023-03-22 11:32:49 +01:00
Oleksii Kriuchykhin ba5afe0e6b Check permissions on current user during PDF report generation [SCI-7919] 2023-03-22 10:51:45 +01:00
artoscinote 4750d61b77
Merge pull request #5177 from scinote-eln/revert-5029-gc_SCI_7763
Revert "Search by team does not work [SCI-7763]"
2023-03-22 10:24:32 +01:00
G-Chubinidze 44cc9d1c90
Revert "Search by team does not work [SCI-7763]" 2023-03-22 13:22:05 +04:00
G-Chubinidze a1c611ab1e
Revert "Archived experiments UI improvements [SCI-8086]" 2023-03-22 13:21:08 +04:00
ajugo 8eb04c50c2
Add removing connected device [SCI-8146] (#5174) 2023-03-21 16:44:24 +01:00
Alex Kriuchykhin b3889de17b
Merge pull request #5171 from okriuchykhin/ok_SCI_8145
Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157]
2023-03-21 16:40:22 +01:00
Oleksii Kriuchykhin cf599a8277 Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157] 2023-03-21 16:25:02 +01:00
artoscinote 44098ece5d
Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]" 2023-03-21 15:26:06 +01:00
artoscinote e2dc2e31ee
Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]" 2023-03-21 15:24:40 +01:00
artoscinote a43c941b50
Merge pull request #5170 from G-Chubinidze/gc_SCI_8147
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
2023-03-21 15:18:37 +01:00
artoscinote 634b4145fd
Merge pull request #5169 from G-Chubinidze/gc_SCI_8098
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
2023-03-21 15:17:55 +01:00
artoscinote 397e4aeebe
Merge pull request #4935 from G-Chubinidze/gc_SCI_7848
user_my_modules_controller#index_old action updates [SCI-7848]
2023-03-21 11:41:38 +01:00
Giga Chubinidze 8e942379ff changed assignee to designated_users 2023-03-21 14:29:23 +04:00
Giga Chubinidze 9dcd2f1500 Cursor position improvements, focused fields - part 2 [SCI-8147] 2023-03-21 13:17:44 +04:00
Giga Chubinidze b7490ebcca Cursor position improvements, focused fields - part 1 [SCI-8098 2023-03-21 11:14:44 +04:00
Oleksii Kriuchykhin 7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Andrej 8bf9e2425b Fix docx table generator if metadata are nil [SCI-8165] 2023-03-20 14:12:44 +01:00
Alex Kriuchykhin 0bfd7ee9c2
Merge pull request #5165 from aignatov-bio/ai-sci-8160-fix-version-revision
Fix permission for draft revision comment [SCI-8160]
2023-03-20 14:03:50 +01:00
Andrej 64441f791f Fix check for nil row [SCI-8165] 2023-03-20 11:59:20 +01:00
Anton a684ff2656 CSS fixes for version modal [SCI-8155] 2023-03-20 11:46:01 +01:00
Andrej 8d7d2a4539 Merge branch 'hotfix/1.26.6.2' of https://github.com/biosistemika/scinote-web into aj_SCI_8165 2023-03-20 11:16:33 +01:00
Andrej c84adfdecc Fix docx report generation with broken metadate [SCI-8165] 2023-03-20 11:14:27 +01:00
Anton 12f1456e4f Fix permission for draft revision comment [SCI-8160] 2023-03-17 14:40:19 +01:00
Oleksii Kriuchykhin b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
G-Chubinidze 06eeb3b27f
FE manage devices (table view) + revoking the device [SCI-7633] (#4920)
* FE manage devices (table view) + revoking the device [SCI-7633]

* revocation code optimisation

* hound fixes

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-03-17 13:44:41 +01:00
ajugo cedbd8de20
Fix access modal view for users without manage permissions [SCI-8139] (#5148) 2023-03-17 11:30:51 +01:00
aignatov-bio 5844fce23e
Merge pull request #5156 from aignatov-bio/ai-sci-8154-cleanup-old-protocol-code
Clean old protocol code [SCI-8154]
2023-03-17 11:26:41 +01:00
Alex Kriuchykhin 05c4a1c4f0
Add missing sanitization helper to projects access controller [SCI-8158] (#5162) 2023-03-17 11:25:36 +01:00
Anton 248b6b6581 Remove additional code 2023-03-17 11:11:59 +01:00
Alex Kriuchykhin 4dd5cb5de4
Adapt global search for new protocol versioning [SCI-8080] (#5158) 2023-03-17 10:43:50 +01:00
Anton da36b7268f Clean old protocol code [SCI-8154] 2023-03-16 14:37:19 +01:00
sboursen-scinote 0526bfaae1 Fix the result asset cancel behavior when clicking enter [SCI-7670] 2023-03-16 14:19:24 +01:00
aignatov-bio 33c880149c
Add new general account [SCI-7963] (#5127) 2023-03-16 12:54:24 +01:00
Anton 5a242021e3 Fix handson table metadata issue [SCI-8138] 2023-03-16 12:02:20 +01:00
Soufiane bc900cd26d
Merge branch 'features/protocol_versioning' into sb_SCI-8108 2023-03-16 09:20:36 +01:00
sboursen-scinote d49a992dd4 Fix styles when protocol is published [SCI-8108] 2023-03-16 09:15:22 +01:00