Commit graph

470 commits

Author SHA1 Message Date
ajugo
43f571c154
Enable Manage access for archived protocols [SCI-8453] (#5411) 2023-05-16 13:25:33 +02:00
ajugo
c6f5219043
Display all protocol templates for team admin [SCI-8379] (#5391) 2023-05-16 10:29:00 +02:00
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Anton
5ec202e2c4 Update protocol top toolbar [SCI-8386] 2023-05-09 14:59:43 +02:00
Soufiane
1b34de37ef
CSP and inline js refactor [SCI-8118][SCI-8119] (#5206)
CSP and inline js refactor [SCI-8118][SCI-8119]
2023-05-03 11:31:17 +02:00
artoscinote
103ce8e70d
Merge pull request #5331 from scinote-eln/develop
Merge develop
2023-04-20 13:31:46 +02:00
Anton
e8b952f4fd Revert "Revert "Improve breadcrumbs implementation [SCI-8087]""
This reverts commit 78d41d10a6.
2023-04-19 10:53:39 +02:00
sboursen-scinote
b8b33fe480 Update configuration after protocol.io changed default page_id to 0 [SCI-8286] 2023-04-18 12:43:56 +02:00
aignatov-bio
3ad5b779c4
Merge pull request #5298 from aignatov-bio/ai-sci-8289-css-fixes-for-navigator
Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309]
2023-04-13 14:59:39 +02:00
Anton
caf21959bd Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309] 2023-04-13 14:54:03 +02:00
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor
Features/navigation refactor
2023-04-13 13:59:25 +02:00
aignatov-bio
78d41d10a6
Revert "Improve breadcrumbs implementation [SCI-8087]" 2023-04-12 14:04:20 +02:00
Soufiane
0f8918e9f6
Revision notes written in version modal are not seen/saved [SCI-8279] (#5272)
* Load latest protocol version comment in publish modal [SCI-8279]

* Check publish permission before updating the draft comment [SCI-8279]
2023-04-11 12:50:14 +02:00
sboursen-scinote
55be84cda7 Remove missed old breadcrumbs [SCI-8087] 2023-04-05 16:29:37 +02:00
Anton
0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Giga Chubinidze
3fc2afde3c Label '(Draft)' in front of the protocol template name [SCI-8211] 2023-03-31 18:30:26 +04:00
Anton
ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +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
Martin Artnik
6412a65d7e Fix new protocol default role, fix reload of protocol access modal [SCI-8217] 2023-03-28 16:22:38 +02:00
Martin Artnik
e819c730e7 Fix print for linked protocols [SCI-8202] 2023-03-28 12:08:55 +02:00
ajugo
26879f200d
Fix CSS for protocol versioning modal [SCI-8194] (#5197) 2023-03-27 13:28:00 +02: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
Anton
0b560f5b05 Protocol screen css fixes [SCI-8190] 2023-03-24 12:01:47 +01:00
ajugo
4c42748e40
Add protocolsIO import preview [SCI-8187] (#5183) 2023-03-23 12:18:30 +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
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
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
Anton
a684ff2656 CSS fixes for version modal [SCI-8155] 2023-03-20 11:46:01 +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
Anton
da36b7268f Clean old protocol code [SCI-8154] 2023-03-16 14:37:19 +01:00
sboursen-scinote
c6bb9850ea Merge feature/protocol_versioning into sb_SCI-8007 [SCI-8007] 2023-03-15 09:24:45 +01:00
G-Chubinidze
7881ffbd3d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-14 17:07:52 +04:00
Giga Chubinidze
67539b15de Protocol permissions - button display [SCI-8058] 2023-03-14 12:12:54 +04:00
Giga Chubinidze
0ffe9b619c Protocol templates table - linked tasks modal [SCI-7630] 2023-03-13 18:19:28 +04:00
Giga Chubinidze
b59f922143 CSS: Pixel-perfect issues for Protocol templates [SCI-8100] 2023-03-13 14:25:04 +04:00
sboursen-scinote
d2ceeb9662 Use I18n [SCI-8007] 2023-03-12 14:10:07 +01:00
Alex Kriuchykhin
cb1c49762a
Revert "Protocol permissions - button display [SCI-8058]" (#5121) 2023-03-10 11:45:32 +01:00
sboursen-scinote
e9bdd218fa Sanitize te user_names_with_roles [SCI-8007] 2023-03-10 09:46:45 +01:00
sboursen-scinote
c4bdbdec9a Merge branch 'features/protocol_versioning' into sb_SCI-8007 2023-03-09 16:35:36 +01:00
Soufiane
9b444cd8fb
Merge pull request #5110 from sboursen-scinote/sb_SCI-8045
CSS bugs for "Protocol templates" [SCI-8045]
2023-03-09 16:30:46 +01:00
sboursen-scinote
a419943e4e Merge 'protocol_versioning' into sb_SCI-8045 2023-03-09 16:29:40 +01:00
G-Chubinidze
f6ee2e821c
Merge pull request #5107 from G-Chubinidze/gc_SCI_8058
Protocol permissions - button display [SCI-8058]
2023-03-09 19:02:42 +04:00
aignatov-bio
376aa26ac5
Clear name on protocol create modal open [SCI-8003] (#5113) 2023-03-09 15:57:05 +01:00
G-Chubinidze
32d1c2cf6d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-08 21:15:36 +04:00
Giga Chubinidze
553c644811 Protocol permissions - button display [SCI-8058] 2023-03-08 21:12:29 +04:00
sboursen-scinote
b3f7c41548 Update the filter dropDown globaly [SCI-8007] 2023-03-08 16:25:10 +01:00
sboursen-scinote
4ec15ede61 Implement the linked_children dropdown and update the modal [SCI-8007] 2023-03-08 15:15:41 +01:00
ajugo
86092e08fb
Remove not needed user roles on protocol access modals [SCI-8031] (#5098) 2023-03-08 12:10:36 +01:00
sboursen-scinote
a25a49a051 Merge branch 'features/protocol_versioning' into sb_SCI-8007 2023-03-08 11:36:22 +01:00
Martin Artnik
6cc78790b0 Fix title for archived protocols table [SCI-8092] 2023-03-07 14:55:11 +01:00
Soufiane
f22f00f856
Merge pull request #5067 from sboursen-scinote/sb_SCI-8032
Old buttons at importing protocols.io protocol [SCI-8032]
2023-03-07 14:13:02 +01:00
aignatov-bio
ce36a2565b
Merge pull request #5092 from aignatov-bio/ai-sci-8077-add-empty-state-for-protocol-actions-toolbar
Add empty state for protocol actions toolbar [SCI-8077]
2023-03-07 14:09:18 +01:00
G-Chubinidze
3cd4d9f760
Merge pull request #5077 from G-Chubinidze/gc_SCI_7954
Archived protocol template navigation, icon, button [SCI-7954]
2023-03-07 15:51:51 +04:00
Soufiane
1d80118393
Merge pull request #5035 from sboursen-scinote/sb_SCI-7996
Fix protocols repository table CSS [SCI-7996]
2023-03-07 12:50:10 +01:00
Anton
ece09ee9a5 Add empty state for protocol actions toolbar [SCI-8077] 2023-03-07 11:44:03 +01:00
sboursen-scinote
6a885d4023 Fix avatars and tooltip in access column [SCI-8007] 2023-03-07 11:02:03 +01:00
sboursen-scinote
3612780606 Fix wrong icon [SCI-8007] 2023-03-07 07:07:51 +01:00
Giga Chubinidze
4a02a130f0 Archived protocol template navigation, icon, button [SCI-7954] 2023-03-06 23:44:47 +04:00
sboursen-scinote
34f324f7ca Update the sort component [SCI-8045] 2023-03-06 12:00:53 +01:00
sboursen-scinote
443ee4350c Fix protocol repository sidebar on archived view [SCI-8030] 2023-03-03 14:11:40 +01:00
sboursen-scinote
80b3863efa Render protocol-preview-modal independently on protocolio-modal [SCI-8032] 2023-03-03 09:02:17 +01:00
Alex Kriuchykhin
4fb18a8018
Fix save as draft action [SCI-8068] (#5066) 2023-03-02 16:10:28 +01:00
ajugo
72cf844c3e
Fix protocol version modification info text [SCI-8061] (#5064) 2023-03-02 15:35:02 +01:00
Alex Kriuchykhin
9908b31d11
Fix protocols datatable [SCI-7984] (#5046) 2023-03-01 15:04:53 +01:00
ajugo
976ddca672
Disable save as draft if draft exists [SCI-8025] (#5049) 2023-03-01 14:41:41 +01:00
artoscinote
4a65a9e55e
Merge pull request #4949 from sboursen-scinote/sb_SCI-7237
Improve the print functionality for protocol [SCI-7237]
2023-03-01 12:48:39 +01:00
ajugo
e317ca0134
Fix deleting draft for the first time [SCI-8022] (#5048) 2023-03-01 12:02:00 +01:00
Anton
beb5f67508 Fix version modal 2023-03-01 11:44:22 +01:00
sboursen-scinote
88610d6b38 Add a small code refactor [SCI-7996] 2023-02-28 16:11:11 +01:00
artoscinote
fab7d9c3d6
Merge pull request #5038 from artoscinote/ma_SCI_7990
Fix protocol duplication in table [SCI-7990]
2023-02-28 14:28:08 +01:00
Martin Artnik
a3ffb38d2b Refactor cloning feature to better prepare for bulk clone [SCI-7990] 2023-02-28 14:22:02 +01:00
Martin Artnik
b311f91bec Fix check for save as draft in version modal [SCI-7992] 2023-02-28 13:54:44 +01:00
Martin Artnik
7bf857a179 Fix permission checks for protocols [SCI-7992] 2023-02-28 13:48:29 +01:00
ajugo
0328a32e09
Update import/export for protocol templates [SCI-7986] (#5032) 2023-02-27 13:22:01 +01:00
Giga Chubinidze
59078e923b Show delete button only for drafts [SCI-7997] 2023-02-27 16:00:35 +04:00
sboursen-scinote
af48cede1f Update protocol repository default view styles [SCI-7996] 2023-02-27 09:58:28 +01:00
aignatov-bio
ced0da6dbc
Merge pull request #5026 from aignatov-bio/ai-sci-7989-fix-version-number-for-draft
Fix version number for draft [SCI-7989]
2023-02-24 17:52:37 +01:00
aignatov-bio
5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +01:00
Anton
60cda9b6f2 Fix version number for draft [SCI-7989] 2023-02-24 15:32:10 +01:00
Anton
826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
ajugo
0be0aa7629
Implement filters for protocol template datatable [SCI-7605] (#4918)
Implement filters for protocol template datatable [SCI-7605]
2023-02-21 14:57:43 +01:00
Anton
a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
Anton
c775a92914 Update protocolsIo front-end [SCI-7715] 2023-02-21 11:06:54 +01:00
ajugo
2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
ajugo
9a57071d7a
Update restore action for protocol templates [SCI-7634] (#4969)
* Update restore action for protocol templetes [SCI-7634]

* Move protocol table reload to methond [SCI-7634]
2023-02-16 18:03:11 +01:00
Anton
a4e622b903 Update export action in protocol repository [SCI-7901] 2023-02-16 11:39:54 +01:00
ajugo
7e48ce70c9
Add handson table metadata to print protocol [SCI-7914] (#4957) 2023-02-14 11:15:42 +01:00
Anton
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
Anton
dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
Anton
3902310463 Update protocol view screen [SCI-7590] 2023-02-13 09:52:30 +01:00
Anton
b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
aignatov-bio
23e50cf710
Merge pull request #4882 from aignatov-bio/ai-sci-7608-update-archive-view-for-protoco-templates
Add archive view for protocols template [SCI-7608]
2023-02-09 11:40:47 +01:00
Anton
1a0b28c74e Add archive view for protocols template 2023-02-09 11:38:27 +01:00
sboursen-scinote
befb2edfcf Strip trailling carriage and newlines in TinyMCE text [SCI-7237] 2023-02-07 15:44:53 +01:00
aignatov-bio
193ff7bc46
Merge pull request #4891 from aignatov-bio/ai-sci-7520-implement-version-modals-interactions
Add manage actions to version modal [SCI-7520]
2023-02-07 13:38:33 +01:00
ajugo
d66dc98300
Update print protocol modal [SCI-7830] (#4932) 2023-02-06 14:23:56 +01:00
aignatov-bio
8ad21fea35
Finalize access managment for protocol [SCI-7677] (#4853) 2023-01-31 10:34:32 +01:00
Anton
466c25175f Add manage actions to version modal [SCI-7520] 2023-01-26 12:39:11 +01:00