Commit graph

2952 commits

Author SHA1 Message Date
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
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
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
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
Anton
da36b7268f Clean old protocol code [SCI-8154] 2023-03-16 14:37:19 +01:00
Alex Kriuchykhin
b0251435e5
Improve escaping of special characters in flash messages [SCI-8137] (#5144) 2023-03-15 15:56:47 +01:00
aignatov-bio
44823da268
Fix escaping for dropdown options and keywords escaping [SCI-8137] (#5145) 2023-03-15 12:55:28 +01:00
Alex Kriuchykhin
00c63b280e
Fix displaying of escaped fields [SCI-8137] (#5141) 2023-03-15 11:14:52 +01:00
aignatov-bio
336cf4d855
Fix PET permission propagation [SCI-8132] (#5139) 2023-03-14 18:48:06 +01:00
aignatov-bio
9a3b056d32
Fix access modal for protocol [SCI-8063] (#5128) 2023-03-14 14:49:11 +01:00
Giga Chubinidze
67539b15de Protocol permissions - button display [SCI-8058] 2023-03-14 12:12:54 +04:00
Alex Kriuchykhin
d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
Anton
ca5f61a0e2 Add all team members through access modal [SCI-8063] 2023-03-09 14:13:01 +01:00
artoscinote
66ec451d5e
Merge pull request #5096 from artoscinote/ma_SCI_8093
Add draft created activity [SCI-8093]
2023-03-08 10:49:45 +01:00
artoscinote
b8c5323fdc
Merge pull request #5094 from artoscinote/ma_SCI_8038
PET access modal fixes [SCI-8038]
2023-03-08 10:49:30 +01:00
Martin Artnik
e4e8997cc1 Add draft created activity [SCI-8093] 2023-03-07 14:45:52 +01:00
Alex Kriuchykhin
bee0fa2de9
Fix protocols re-assigning when removing user from a team [SCI-8034] (#5069) 2023-03-07 14:15:49 +01:00
Martin Artnik
22c039fc77 PET access modal fixes [SCI-8038] 2023-03-07 14:04:05 +01:00
Alex Kriuchykhin
f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
ajugo
6471dbed5b
Fix missing team at the StepTable creation [SCI-8036] (#5090) 2023-03-07 11:26:57 +01:00
aignatov-bio
e090bdf443
Merge pull request #5089 from aignatov-bio/ai-sci-8004-fix-archive-restore-propagation
Fix archive/restore propagation [SCI-8004]
2023-03-07 10:59:24 +01:00
artoscinote
5407943bfd
Merge pull request #5083 from artoscinote/ma_SCI_8039
Protocol/general user assignment changes and fixes [SCI-8039][SCI-8037]
2023-03-07 10:55:37 +01:00
aignatov-bio
e7afc70cab
Merge pull request #5086 from aignatov-bio/ai-sci-8003-fix-wording-for-same-protocol-name
Fix protocol creation error message [SCI-8003]
2023-03-07 10:48:12 +01:00
Anton
55dca41434 Fix archive/restore propagation [SCI-8004] 2023-03-07 10:44:44 +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
Anton
ca76c78a23 Fix protocol creation error message [SCI-8003] 2023-03-06 19:31:45 +01:00
Martin Artnik
2f29477e02 Protocol/general user assignment changes and fixes [SCI-8039] 2023-03-06 16:43:46 +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
aignatov-bio
da31883ac3
Add error handling to actions in protocol controller [SCI-8073] (#5074) 2023-03-03 15:33:08 +01:00
Alex Kriuchykhin
4fb18a8018
Fix save as draft action [SCI-8068] (#5066) 2023-03-02 16:10:28 +01:00
artoscinote
a43bd9d7f9
Merge pull request #5065 from artoscinote/ma_SCI_8059
Fix display of unauthorized error on protocol page [SCI-8059]
2023-03-02 15:46:10 +01:00
Martin Artnik
72831cd015 Fix display of unauthorized error on protocol page [SCI-8059] 2023-03-02 15:05:50 +01:00
ajugo
3bdc8feaee
Fix protocol name field editability [SCI-8033] (#5053) 2023-03-02 13:50:47 +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
Anton
6c7a0d85c2 Fix protocol public assignments [SCI-8019] 2023-02-28 15:15:55 +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
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
Martin Artnik
219814ec06 Change protocol clone to support bulk in future [SCI-7990] 2023-02-28 13:11:49 +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
ajugo
0328a32e09
Update import/export for protocol templates [SCI-7986] (#5032) 2023-02-27 13:22:01 +01:00
Alex Kriuchykhin
5de5d64be5
Update external protocol importer backend in order to work with new protocol versioning [SCI-7829] (#5017) 2023-02-27 10:37:51 +01:00
Giga Chubinidze
4d30e28112 Search by team does not work [SCI-7763] 2023-02-27 03:32:06 +04:00
Martin Artnik
89459ae21a Protocol group assignment fixes [SCI-7978] 2023-02-24 17:24:25 +01:00
aignatov-bio
5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +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
Martin Artnik
c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +01:00
Anton
826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
Anton
f7d7113239 Add new protocol activities [SCI-7717] 2023-02-22 10:46:24 +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
4515ab0a65
Fix expire_in method for unauthenticated user [SCI-7943] (#4983) 2023-02-20 10:14:46 +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
Alex Kriuchykhin
ed76fac640
Speed up loading of current tasks widget [SCI-7885] (#4982) 2023-02-16 13:57:17 +01:00
Anton
a4e622b903 Update export action in protocol repository [SCI-7901] 2023-02-16 11:39:54 +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
ajugo
cb332f163f
Update the Load protocol template to task modal [SCI-7591] (#4870)
* Update the Load protocol template to task modal [SCI-7591]

* Update the Load protocol template to task modal [SCI-7591]

* Load last protocol version from repository to task [SCI-7591]

* Fix find_by for load_table [SCI-7591]
2023-02-14 13:19:24 +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
743d901310 Add published view for protocol [SCI-7617] 2023-02-13 10:41:30 +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
15d1efa408
Merge pull request #4894 from okriuchykhin/ok_SCI_7718
Add permission for protocol draft management [SCI-7718]
2023-02-09 11:34:22 +01:00
artoscinote
77b4a557f1
Merge pull request #4881 from artoscinote/ma_SCI_7631
Throw error when authenticating with revoked tokens [SCI-7631]
2023-02-07 13:39:03 +01:00
Anton
94f8d139a1 Fix experiments sidebar sorting [SCI-7894] 2023-02-07 13:35:00 +01:00
artoscinote
88cc8e3df4
Amend token revocation check method name [SCI-7631] 2023-02-07 11:05:48 +01:00
artoscinote
db75d1cb34
Merge pull request #4938 from sboursen-scinote/sb_SCI-7831
No warning message on modal, when importing existing protocol from protocols.io into My Protocols [SCI-7831]
2023-02-06 16:59:08 +01:00
aignatov-bio
bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata
Save handson table metadata [SCI-7834]
2023-02-06 14:24:51 +01:00
Anton
3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
sboursen-scinote
93851b8c90 Fix code style issues [SCI-7831] 2023-02-06 13:49:34 +01:00
sboursen-scinote
9023e8d1d4 Standarize the returned json when the request is not succesful [SCI-7831] 2023-02-06 13:31:11 +01:00
artoscinote
d9beafd9a7
Merge pull request #4903 from sboursen-scinote/sb_SCI-7676
CSS: error messages at moving experiment [SCI-7676]
2023-02-06 11:12:45 +01:00
Giga Chubinidze
b06b5c4d1f Check what's up with user_my_modules_controller#index_old action, and remove/rename it [SCI-7848] 2023-02-05 23:27:22 +04:00
Alex Kriuchykhin
15ac306244
Fix user auto linking with Azure AD [SCI-7764] (#4924) 2023-02-02 13:27:49 +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
e887e7c82b Merge branch 'develop' into features/sso-improvements 2023-02-01 16:08:56 +01:00
Alex Kriuchykhin
94806047c0
Make SSO feature switchable [SCI-7764] (#4916) 2023-02-01 15:43:20 +01:00
artoscinote
c88e63f8d9
Merge pull request #4893 from G-Chubinidze/gc_SCI_7813
Lost sorting selection on experiment table view [SCI-7813]
2023-02-01 09:30:27 +01:00
Alex Kriuchykhin
e1c4aa9469
Move Okta and Azure AD configurations to application settings [SCI-7609] (#4732) 2023-01-31 11:55:31 +01:00
Oleksii Kriuchykhin
fa96a9a939 Fix date time inventories reminder processing [SCI-7816] 2023-01-30 17:07:27 +01:00
sboursen-scinote
42eae72d2a Update the layout of the move-experiment-modal when there are errors [SCI-7676] 2023-01-30 12:00:33 +01:00
Alex Kriuchykhin
e7c61d6fd9
Fix smart annotation inventory items flyout, case with no available inventories [SCI-7824] (#4898) 2023-01-27 14:16:52 +01:00
Oleksii Kriuchykhin
6ac64aaf34 Add permission for protocol draft management [SCI-7718] 2023-01-26 15:41:41 +01:00
Giga Chubinidze
1fbce23788 Lost sorting selection on experiment table view [SCI-7813] 2023-01-26 17:00:03 +04:00
Anton
466c25175f Add manage actions to version modal [SCI-7520] 2023-01-26 12:39:11 +01:00
Alex Kriuchykhin
7e1d1ffd99
Fix editing of existing reports [SCI-7817] (#4886)
Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
2023-01-25 15:41:59 +01:00
Martin Artnik
8345f4ac5d Throw error when authenticating with revoked tokens [SCI-7631] 2023-01-24 15:57:59 +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
Anton
00b792b1bb UX changes for permission modal [SCI-7619] 2023-01-23 16:01:40 +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
aignatov-bio
296ea04b62
Merge pull request #4734 from aignatov-bio/ai-sci-7518-manage-access-modal
Add access modal for protocols [SCI-7518]
2023-01-18 14:27:46 +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
aignatov-bio
5cbaf83067
Merge pull request #4845 from aignatov-bio/ai-sci-7758-fix-user-designation-on-creation
Fix user designation on task creation [SCI-7758]
2023-01-17 15:12:46 +01:00
aignatov-bio
8a4599bed1
Merge pull request #4831 from aignatov-bio/ai-sci-7722-fix-new-task-modal-error-handling
Fix error handling new task modal and completed task duplication [SCI-7722][SCI-7730]
2023-01-17 13:34:13 +01:00
Anton
3b6590b8c7 Fix user designation on task creation [SCI-7758] 2023-01-17 13:33:04 +01:00
Anton
3eb18a7cf4 Fix error handling new task modal and completed task duplication[SCI-7722][SCI-7730] 2023-01-16 13:03:25 +01:00
Anton
e48657768d Hide assigned users for user without permissions [SCI-7758] 2023-01-16 11:28:47 +01:00
ajugo
56fb8a4efa
Fix hoover tooltip for company logo [SCI-7766] (#4827) 2023-01-16 10:23:34 +01:00
sboursen-scinote
622e937ca3 Remove redundant activerecord query methodes and rename the reconnnect function [SCI-7732] 2023-01-13 17:14:00 +01:00
sboursen-scinote
d55e7d256a Fix ruby style issues 2023-01-13 12:57:35 +01:00
sboursen-scinote
5d6905564e Merge branch 'develop' into sb_SCI_7732 2023-01-13 12:49:47 +01:00
sboursen-scinote
b37a8d1c18 Fix connection is lost after a connected task is archived [SCI-7732] 2023-01-13 12:48:36 +01:00
ajugo
8303265361
Fix switching between experiment views [SCI-7756] (#4813) 2023-01-13 10:15:48 +01:00
aignatov-bio
9216ca2809
Merge pull request #4811 from aignatov-bio/ai-sci-7722-add-new-task-modal-improvments
Experiment table - add new task modal improvements [SCI-7722]
2023-01-13 10:13:22 +01:00
Anton
7930091abb Experiment table - add new task modal improvments [SCI-7722] 2023-01-12 13:48:49 +01:00
ajugo
7f64b22a3a
Fix task duplication for experiment table view for User role [SCI-7731] (#4803)
* Fix task duplication for experiment table view for User role [SCI-7731]

* Move created_by for clone batch [SCI-7731]
2023-01-12 13:29:44 +01:00
aignatov-bio
abaf8d9e07
Merge pull request #4806 from aignatov-bio/ai-sci-7746-fix-due-date-ordering
Experiment table improve due date sorting [SCI-7746][SCI-7704]
2023-01-12 12:58:18 +01:00
ajugo
224fb5b742
Fix moving of experiment [SCI-7734] (#4802) 2023-01-12 12:10:06 +01:00
ajugo
c0554009d7
Fix redirection path for experiment duplication [SCI-7682] (#4800) 2023-01-12 12:08:37 +01:00
aignatov-bio
826aa614e3
Fix task duplication on experiment table [SCI-7730] (#4794) 2023-01-12 12:07:12 +01:00
Anton
3dff1b8a8c Experiment table improve due date sorting [SCI-7746][SCI-7704] 2023-01-12 11:57:48 +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
Anton
e38c45314b Update sidebar along with experiment table [SCI-7704] 2023-01-10 13:45:15 +01:00
artoscinote
288c255c44
Merge pull request #4776 from artoscinote/ma_SCI_7653
Fix display of archived tasks [SCI-7653]
2023-01-10 11:56:48 +01:00
ajugo
ef8b8344fd
Saving selected experiment view [SCI-7662] (#4779) 2023-01-10 11:08:49 +01:00
aignatov-bio
1feaa5fb71
Merge pull request #4777 from aignatov-bio/ai-sci-7699-experiment-table-css-fixes
Fix small css issues [SCI-7699][SCI-7694][SCI-7678]
2023-01-10 10:39:22 +01:00
Alex Kriuchykhin
6c313f86ac
Merge pull request #4680 from okriuchykhin/ok_SCI_7455
Add API endpoint for retrieving a list of users [SCI-7455]
2023-01-10 10:21:23 +01:00
Anton
85eaf7c246 Fix small css issues [SCI-7699][SCI-7694][SCI-7678] 2023-01-09 12:33:59 +01:00
Martin Artnik
2edbd2fb74 Fix display of archived tasks [SCI-7653] 2023-01-09 11:40:45 +01:00
ajugo
83ba9d40dc
Refresh canvas navigator after moved tasks [SCI-7661] (#4774) 2023-01-09 09:53:03 +01:00
ajugo
92e044dfd3
Fix locked task duplication [SCI-7682] (#4773) 2023-01-09 09:52:34 +01:00
Oleksii Kriuchykhin
b29aeab67a Add API endpoint for retrieving a list of users [SCI-7455] 2023-01-06 16:33:00 +01:00
aignatov-bio
fbc1247e5b
Merge pull request #4765 from aignatov-bio/ai-sci-7700-fix-canvas-navigator-on-task-duplication
Refresh experiment workflow image on task duplication [SCI-7700]
2023-01-06 11:24:59 +01:00
Anton
46acb5ff3c Refresh experiment workflow image on task duplication [SCI-7700] 2023-01-06 11:11:39 +01:00
Anton
a8f6076b73 Fix new task canvas position [SCI-7694] 2023-01-06 11:02:56 +01:00
ajugo
32e9329bcc
Fix user assign modal in experiment archived table view [SCI-7654] (#4742) 2023-01-05 12:00:12 +01:00
Martin Artnik
d466db1658 Fix display of tasks table in archived experiments [SCI-7653] 2023-01-04 11:56:25 +01:00
Anton
ba98075690 Add protocols filters front end [SCI-7517] 2023-01-04 10:34:49 +01:00
aignatov-bio
eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic 2023-01-04 10:08:38 +01:00
aignatov-bio
fa881253b6
Merge pull request #4672 from aignatov-bio/ai-sci-7531-fix-cross-team-redirections
Add missed notifications to steps and fix notification for protocol repository [SCI-7531]
2023-01-04 10:07:36 +01:00
aignatov-bio
6af72a28ee
Merge pull request #4715 from aignatov-bio/ai-sci-7559-add-step-text-notification
Add new step text notification [SCI-7559]
2023-01-04 10:06:57 +01:00
Alex Kriuchykhin
53a2ea6df7
Merge pull request #4649 from okriuchykhin/ok_SCI_7505
Improve activity records creation in controllers [SCI-7505]
2023-01-03 15:16:00 +01:00
Anton
9c488d5a0c Add new access user modal [SCI-7518] 2023-01-03 14:43:03 +01:00
Andrej
e9ddb80443 Remove session redirection [SCI-7612] 2022-12-23 10:40:07 +01:00
Anton
031ba603fc Update tags selection [SCI-7645] 2022-12-22 17:39:51 +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
aignatov-bio
5528686d7b
Merge pull request #4661 from aignatov-bio/ai-sci-7424-update-cheklist-table-name-copy
Add suffix for checklist and table duplication [SCI-7424]
2022-12-22 09:58:12 +01:00
aignatov-bio
7437af540b
Merge pull request #4701 from okriuchykhin/ok_SCI_7516
Add versions and access columns to protocols table, update protocol model [SCI-7516]
2022-12-21 13:03:38 +01:00
Andrej
41362f300e Implement 2fa screen after sign in [SCI-7612] 2022-12-21 11:59:25 +01:00
aignatov-bio
e3036d923b
Merge pull request #4686 from G-Chubinidze/gc_SCI_7496
The View flyout in the Archived tasks view [SCI-7496]
2022-12-20 15:19:58 +01:00
G-Chubinidze
f463664885
Merge pull request #4724 from G-Chubinidze/gc_SCI_7449
FE | BE Add new task modal field for Tags [SCI-7449]
2022-12-20 15:50:15 +04:00
Giga Chubinidze
377872dda3 hound code cleanup 2022-12-20 10:37:40 +04:00