Commit graph

1986 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
9885dc0f29 Update protocols migration for linked protocols [SCI-6931] 2023-03-27 11:39:09 +02: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
b1cce70cc6 Preven removing last user manager for protocols/projects [SCI-8131] 2023-03-24 13:32:38 +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
Oleksii Kriuchykhin
f2c8f67791 Improve error handling in protocol archive/restore actions [SCI-8177] 2023-03-23 15:32: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
Oleksii Kriuchykhin
7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +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
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
aignatov-bio
9a3b056d32
Fix access modal for protocol [SCI-8063] (#5128) 2023-03-14 14:49:11 +01:00
Alex Kriuchykhin
d285a0a9db
Preserve old protocol types for backward compatibility, fix protocol draft user permissions [SCI-8083] (#5123) 2023-03-13 09:55:53 +01:00
Anton
ca5f61a0e2 Add all team members through access modal [SCI-8063] 2023-03-09 14:13:01 +01:00
Alex Kriuchykhin
87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
Martin Artnik
69dbc036de Display ID of original protocol in linked protocol info [SCI-8106] 2023-03-08 15:48:03 +01:00
Alex Kriuchykhin
f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
Alex Kriuchykhin
8956d72f12
Switch to showing of total sum of all versions in protocols table [SCI-8066] (#5082) 2023-03-07 09:58:36 +01:00
artoscinote
b2cf5548f6
Merge pull request #5071 from artoscinote/ma_SCI_8060
Ensure user assignments stay in sync with protocol versions [SCI-8060]
2023-03-06 16:12:05 +01:00
Martin Artnik
cfcb80f642 Fix assignment sync to new protocol drafts and deletion [SCI-8060] 2023-03-06 16:06:38 +01:00
ajugo
9379d9a175
Fix load protocol to task [SCI-8072] (#5070) 2023-03-06 10:53:01 +01:00
aignatov-bio
d99957d8a1
Merge branch 'features/protocol_versioning' into ai-sci-8021-fix-modifier-name-for-drafts 2023-03-03 20:50:46 +01:00
Anton
b4b5b70331 Fix draft creation [SCI-8075] 2023-03-03 15:51:36 +01:00
Martin Artnik
73ed75a73a Ensure user assignments stay in sync with protocol versions [SCI-8060] 2023-03-03 13:20:15 +01:00
Alex Kriuchykhin
4fb18a8018
Fix save as draft action [SCI-8068] (#5066) 2023-03-02 16:10:28 +01:00
ajugo
ed90c912f6
Add description to cloned protocol template from protocol [SCI-8053] (#5063) 2023-03-02 15:35:18 +01:00
aignatov-bio
25644ab5a3
Fix version number for draft created from old versions [SCI-8023] (#5040) 2023-03-02 14:34:14 +01:00
ajugo
3bdc8feaee
Fix protocol name field editability [SCI-8033] (#5053) 2023-03-02 13:50:47 +01:00
Alex Kriuchykhin
420b07440d
Fix inventory copying for shared inventories [SCI-7998] (#5025) 2023-03-01 17:22:53 +01:00
Anton
4eab2c25f3 Save last_modified_by on protocol update [SCI-8021] 2023-03-01 15:19:34 +01:00
Alex Kriuchykhin
9908b31d11
Fix protocols datatable [SCI-7984] (#5046) 2023-03-01 15:04:53 +01:00
ajugo
b24c823597
Add linked_at to the Protocols [SCI-7964] (#5042)
* Add linked_at to the Protocols [SCI-7964]

* Add activity subject_type constrain for migration query [SCI-7964]
2023-03-01 11:33:32 +01:00
Andrej
64da4c5368 Fix connected device model for request without device id [SCI-7972] 2023-02-28 16:42:56 +01:00
Anton
6c7a0d85c2 Fix protocol public assignments [SCI-8019] 2023-02-28 15:15:55 +01:00
ajugo
96cf2f1d38
Update protocol templates update action on task [SCI-7903] (#5009)
* Update protocol templates update action on task [SCI-7903]

* Simplify logic for update from parent [SCI-7903]
2023-02-28 14:17:34 +01:00
artoscinote
e88b84000b
Merge pull request #5021 from artoscinote/ma_SCI_7978
Protocol permission modal changes [SCI-7978]
2023-02-27 13:34:32 +01:00
Anton
9abc8489a6 Propagate archived/flag to versions [SCI-8004] 2023-02-27 11:12:40 +01:00
ajugo
95d04d11d2
Fix validation for multiple parent protocols for drafts [SCI-7994] (#5020)
* Fix validation for multiple parent protocols for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]
2023-02-24 17:56:51 +01:00
Martin Artnik
7357782144 Protocol validation fix [SCI-7978] 2023-02-24 17:28:36 +01:00
Anton
60cda9b6f2 Fix version number for draft [SCI-7989] 2023-02-24 15:32:10 +01:00
Alex Kriuchykhin
b2ab467440
Improve loading time of current tasks widget [SCI-7999] (#5022)
* Improve loading time of current tasks widget [SCI-7999]

* Improve speed of objects search for smart annotations editor [SCI-7999]
2023-02-24 13:30:55 +01:00
Anton
dd27b13537 Fix protocol name validation [SCI-8003] 2023-02-24 10:15:23 +01:00
Martin Artnik
c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +01:00
Martin Artnik
b0fc97a549 Fix assignable for top level assignables [SCI-7978] 2023-02-22 15:37:39 +01:00
Anton
826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
Anton
a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
ajugo
166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +01:00
ajugo
2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
aignatov-bio
c92faeb48c
Merge pull request #4987 from aignatov-bio/ai-sci-7948-fix-cell-allignment-step-tables
Add step table metadata during import/export and copy [SCI-7948]
2023-02-18 08:44:37 +01:00
artoscinote
e5139b4bd2
Merge pull request #4986 from artoscinote/ma_SCI_7940
Improve file extension detection for pasted images [SCI-7940]
2023-02-17 14:59:34 +01:00
artoscinote
6400745b0c
Merge pull request #4984 from artoscinote/ma_SCI_7937
Fix table of contents, add image download tooltip [SCI-7937]
2023-02-17 14:59:01 +01:00
Anton
df8579d52f Add step table metadata during import/export and copy [SCI-7948] 2023-02-17 14:50:45 +01:00
Martin Artnik
cfdcffc85a Improve file extension detection for pasted images [SCI-7940] 2023-02-17 12:14:08 +01:00
Martin Artnik
43f6a8e66f Fix table of contents, add image download tooltip [SCI-7937] 2023-02-17 10:36:47 +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
Alex Kriuchykhin
7f8f723cbe
Fix handling of ISS in Azure configuration, fix linked accounts page [SCI-7923] (#4974) 2023-02-14 16:50:15 +01:00
Anton
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
Alex Kriuchykhin
b71f360261
Add visibility and default public user role fields to protocols [SCI-7819] (#4963) 2023-02-13 16:18:26 +01:00
Martin Artnik
8d434c7be4 Fix base64 image extraction for non-saved models [SCI-7918] 2023-02-13 16:03:58 +01:00
Anton
dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
Martin Artnik
f880ea46ce Add connected device logging [SCI-7632] 2023-02-13 11:32:18 +01:00
Anton
b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
Martin Artnik
ae7fce446b Don't touch steps when commenting [SCI-7584] 2023-02-02 16:28:23 +01:00
Alex Kriuchykhin
dadb2fdf06
Merge pull request #4909 from okriuchykhin/ok_SCI_7816
Fix date time inventories reminder processing [SCI-7816]
2023-02-01 16:26:54 +01:00
Oleksii Kriuchykhin
fa96a9a939 Fix date time inventories reminder processing [SCI-7816] 2023-01-30 17:07:27 +01:00
Alex Kriuchykhin
02da980ab8
Fix task protocol editing with empty description [SCI-7823] (#4897) 2023-01-27 14:15:09 +01:00
Alex Kriuchykhin
00d99ee296
Fix user assigning to teams with existing team sharing records [SCI-7720] (#4879) 2023-01-24 15:47:53 +01:00
Martin Artnik
0a768fbfa3 Fix pasting same image multiple times [SCI-7803] 2023-01-24 11:52:20 +01:00
aignatov-bio
a72de2800f
Merge pull request #4871 from aignatov-bio/ai-sci-7619-refactor-access-modals-pet
Refactor access modals P/E/T [SCI-7619]
2023-01-24 10:14:40 +01:00
artoscinote
d319f9bf89
Fix copying multiple TinyMCE images [SCI-7803] (#4875) 2023-01-24 10:11:52 +01:00
Alex Kriuchykhin
b3267d7934
Fix multiple inventory reminders issues [SCI-7805][SCI-7808][SCI-7809] (#4876) 2023-01-24 09:36:13 +01:00
Anton
37eb902b25 Refactor access modals P/E/T [SCI-7619] 2023-01-22 22:23:18 +01:00
Alex Kriuchykhin
7f3999fa4f
Add protocol published versions modal [SCI-7519] (#4725) 2023-01-20 14:29:25 +01:00
G-Chubinidze
913cd26e70
Update of sharing options to all teams is not saved [SCI-7421] (#4852)
* Update of sharing options to all teams is not saved
2023-01-20 14:14:34 +01:00
Martin Artnik
fb4cbad4e8 Add tinymce image permission checks [SCI-7788] 2023-01-20 10:45:56 +01:00
Martin Artnik
6bddd6c716 Fix text result creation [SCI-7778] 2023-01-19 08:58:05 +01:00
Alex Kriuchykhin
1ac86b8188
Merge pull request #4832 from okriuchykhin/ok_SCI_7638
Improve loading speed of inventory table [SCI-7638]
2023-01-18 11:39:52 +01:00
Oleksii Kriuchykhin
e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +01:00
Alex Kriuchykhin
f455b8fb32
Merge pull request #4784 from okriuchykhin/ok_SCI_7703
Improve handling of db locks [SCI-7703]
2023-01-18 10:24:52 +01:00
Oleksii Kriuchykhin
3a85cdde0a Improve handling of db locks [SCI-7703] 2023-01-17 17:30:20 +01:00
Martin Artnik
5f7976ce0e Fix copying and pasting TinyMCE images [SCI-7774] 2023-01-17 14:32:25 +01:00
Martin Artnik
76025a4883 Properly assign team to tinymce asset when extracting base64 images [SCI-5098] 2023-01-17 10:49:08 +01:00
Martin Artnik
db76272602 Fix extraction of TinyMCE images [SCI-5098] 2023-01-16 16:35:36 +01:00
Martin Artnik
7cb639524b Fix parsing of RTE images [SCI-5098] 2023-01-16 16:07:14 +01:00
Martin Artnik
a043bf2cd3 Fix tinymce images for blank texts [SCI-5098] 2023-01-16 12:00:00 +01:00
Martin Artnik
a513951a7c Fix legacy tinymce step issues [SCI-5098] 2023-01-16 10:58:37 +01:00
artoscinote
80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6
Features/tiny mce 6
2023-01-13 13:53:03 +01:00
Martin Artnik
4df203bd13 Fix touching of protocol when changes happen [SCI-7584] 2023-01-12 16:18:31 +01:00
Martin Artnik
662b9174fa Extract pasted base64 images from RTE texts [SCI-5098] 2023-01-12 13:24:31 +01:00
ajugo
67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] (#4798)
* Fix experiment view loading [SCI-7662]

* Fix experiment view loading [SCI-7662]
2023-01-12 11:31:04 +01:00
ajugo
99d190f0d6
Fix tiny_mce image duplication [SCI-7727] (#4788) 2023-01-10 11:18:56 +01:00
ajugo
ef8b8344fd
Saving selected experiment view [SCI-7662] (#4779) 2023-01-10 11:08:49 +01:00
ajugo
92e044dfd3
Fix locked task duplication [SCI-7682] (#4773) 2023-01-09 09:52:34 +01:00
artoscinote
710a97a50e
Merge pull request #4751 from artoscinote/ma_SCI_7596
Don't touch result when comment is created [SCI-7596]
2023-01-04 13:14:07 +01:00
Martin Artnik
7460cc5b82 Don't touch result when comment is created [SCI-7596] 2023-01-04 12:55:32 +01:00
Martin Artnik
15543d5222 Do not touch protocol if step or checklist is checked [SCI-7584] 2023-01-04 12:33:11 +01:00
aignatov-bio
eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic 2023-01-04 10:08:38 +01:00
Anton
9c488d5a0c Add new access user modal [SCI-7518] 2023-01-03 14:43:03 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Anton
d1a68adb22 Add access modal for protocols [SCI-7518] 2022-12-22 13:27:46 +01:00