scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
10350 commits 70 branches 179 tags 165 MiB
Commit graph

8020 commits

Author SHA1 Message Date
Oleksii Kriuchykhin b35c283cc5 Fix permissions check for steps completion in the API [SCI-6275] 2021-11-17 21:25:31 +01:00
artoscinote 6b6a49428c
Add additional info to API project_user_assignments type error [SCI-6273] (#3674) 
* Add additional info to API project_user_assignments type error [SCI-6273]

* Generalize user_assignments api controllers [SCI-6237]
 2021-11-17 16:28:02 +01:00
aignatov-bio 2a135ac120
Fix repository archive title [SCI-6267] (#3671) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-17 14:53:04 +01:00
aignatov-bio 57de414284
Fix user assignment for team import [SCI-6242] (#3675) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-17 13:33:29 +01:00
artoscinote 2e84418304
Add create/destroy endpoints to connections API, add tests [SCI-6087] (#3563) 2021-11-17 12:11:22 +01:00
aignatov-bio 4b79ba209d
Remove visibility condition from projects scope [SCI-6188] (#3667) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-17 10:16:54 +01:00
Alex Kriuchykhin 8609b84131
Merge pull request #3669 from okriuchykhin/ok_SCI_6270 
Fix seeds to work with new UserRoles, fix Templates creation job [SCI-6270]
 2021-11-17 09:59:30 +01:00
Anton c00a7b7b8f Update bmt filters default state [SCI-6090] 2021-11-16 15:14:00 +01:00
aignatov-bio 06788bfeb6
Update CSS for BMT filters [SCI-6084] (#3652) 
* Update css for bmt filters [SCI-6084]

* Create shared component for dropdown [SCI-6084]

Co-authored-by: Anton <anton@scinote.net>
 2021-11-16 14:46:08 +01:00
aignatov-bio 27d6453527
After clear filters not reload table [SCI-6101][SCI-6102] (#3661) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-16 14:12:57 +01:00
artoscinote d08882e7f2
Style and copy fix [SCI-6272] (#3670) 2021-11-16 11:25:47 +01:00
artoscinote 0749fbdf7b
Regenerate user assignments when moving task workflow [SCI-6262] (#3668) 2021-11-16 11:10:15 +01:00
Oleksii Kriuchykhin 2e92500a73 Fix seeds to work with new UserRoles, fix Templates creation job [SCI-6270] 2021-11-15 21:36:06 +01:00
artoscinote 22623c821d
Fixed creating public projects on API, added missing translations [SCI-6167] (#3666) 2021-11-15 15:36:38 +01:00
aignatov-bio 8f9ab4f6c3
Refactor permissions breadcrumbs for users [SCI-6260] (#3665) 
* Refactor permissions breadcrumbs for users [SCI-6260]

* Change creator assignments to automatically [SCI-6260]

Co-authored-by: Anton <anton@scinote.net>
 2021-11-15 15:02:22 +01:00
artoscinote 945fd31538
Move modal copy and design fix [SCI-6248] (#3663) 2021-11-15 12:50:50 +01:00
artoscinote 4ce0c53d36
Implemented reset role functionality [SCI-6261] (#3662) 
* Implemented reset role functionality [SCI-6261]

* Linter fixes [SCI-6261]
 2021-11-15 11:12:31 +01:00
artoscinote a6c61c2b4e
Fixed permission issues when moving experiment [SCI-6257] (#3655) 
* Fixed permission issues when moving experiment [SCI-6257]

* Copy fixes [SCI-6248]

* Use canaid helper instead of permission_granted [SCI-6257]

* Fixes [SCI-6257]
 2021-11-12 12:59:49 +01:00
Alex Kriuchykhin 1c3a2aa0a7
Fix permissions checks in recent work service [SCI-6253] (#3654) 2021-11-12 11:13:43 +01:00
Alex Kriuchykhin b73cd5c31e
Allow admins to change own roles on projects [SCI-6250] (#3653) 2021-11-12 11:13:30 +01:00
artoscinote 740413fb3a
Stop role update propagation at manually assigned resources [SCI-6259] (#3659) 2021-11-12 11:12:06 +01:00
Alex Kriuchykhin ba96bd497c
Merge pull request #3658 from okriuchykhin/ok_SCI_6254 
Fix activities for assigning to experiments and tasks [SCI-6254]
 2021-11-12 10:11:55 +01:00
aignatov-bio 9dc7b31cbd
Hide checkbox if user doesnt have restore permission [SCI-6258] (#3657) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-12 10:04:26 +01:00
Oleksii Kriuchykhin f73f9dd2c1 Fix activities for assigning to experiments and tasks [SCI-6254] 2021-11-11 21:30:30 +01:00
aignatov-bio 50e93fed4e
Remove load from file button from bioeddie [SCI-6091] (#3656) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-11 14:07:27 +01:00
Alex Kriuchykhin eb8de58c97
Allow team admins to manage users on projects [SCI-6250] (#3650) 2021-11-10 14:47:05 +01:00
artoscinote 9181be22c8
Also delete user_my_modules when deleting MyModule assignments [SCI-6252] (#3651) 2021-11-10 14:45:24 +01:00
Martin Artnik 9e7eee5f2c Fixed to use .update! [SCI-6128] 2021-11-10 11:55:38 +01:00
Martin Artnik 68362bcb9c Fix experiment move service [SCI-6128] 2021-11-10 11:46:48 +01:00
artoscinote 9f92cfab1a
Fixed access modal styling issues [SCI-6241] (#3646) 
* Fixed access modal styling issues [SCI-6241]

* Refactor user access list to use flex [SCI-6241]

* Linter fixes [SCI-6241]
 2021-11-10 11:40:41 +01:00
artoscinote 0eacb91bed
Renamed 'group_user_role', fixed public project migration [SCI-6234] (#3642) 
* Renamed 'group_user_role', fixed public project migration [SCI-6234]

* Moved public project update inside loop [SCI-6234]
 2021-11-10 09:52:37 +01:00
aignatov-bio dfa79c6996
Fix duplicate requests for project user manage modal [SCI-6249] (#3647) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 16:16:10 +01:00
aignatov-bio 3372b679da
Change role assigning role on object creation [SCI-6247] (#3645) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 16:10:43 +01:00
aignatov-bio 3862e780ee
Fix error on experiments page after role update [SCI-6245] (#3644) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 16:10:20 +01:00
artoscinote 083efd77fd
Generalize user role propagation job [SCI-6246] (#3649) 2021-11-09 16:09:12 +01:00
Alex Kriuchykhin 9a967cfe40
Fix user removal from the team [SCI-6201] (#3637) 2021-11-09 09:35:36 +01:00
artoscinote dcdd9ece13
Fixed docx report image generation [SCI-6203] (#3639) 
* Fixed docx report image generation [SCI-6203]

* Added error logging for docx image render error [SCI-6203]
 2021-11-09 09:35:02 +01:00
aignatov-bio c8fd0dce51
Add permission checks for bmt filters [SCI-6099] (#3622) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 09:28:51 +01:00
aignatov-bio d3e178e5a2
Small CSS fixes for permissions [SCI-6207] (#3638) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 09:26:22 +01:00
Alex Kriuchykhin 542d432581
Merge pull request #3625 from aignatov-bio/ai-sci-6085-add-scrollbar-to-filters-dropdown 
Add scrollbars to filters dropdown [SCI-6085]
 2021-11-08 21:03:01 +01:00
Alex Kriuchykhin f11a4701d0
Merge pull request #3629 from artoscinote/ma_SCI_6193 
Added optional webhook secret key [SCI-6193]
 2021-11-08 21:00:40 +01:00
Alex Kriuchykhin 7d92e3c8e0
Merge pull request #3641 from artoscinote/ma_SCI_6239 
Fixed removal of user from team [SCI-6239]
 2021-11-08 20:56:59 +01:00
Martin Artnik 81e7b80bae Fixed removal of user from team [SCI-6239] 2021-11-08 16:06:28 +01:00
Alex Kriuchykhin 0a8af99368
Merge pull request #3627 from okriuchykhin/ok_SCI_6184 
Add support of Okta SSO provider [SCI-6184]
 2021-11-08 15:01:16 +01:00
artoscinote 3e3e2cc24e
Revert "Implement experiment and task access removal" [SCI-6218] (#3635) 
* Revert "Implement experiment and task access removal [SCI-6156] (#3614)"

This reverts commit 2abefd78e6.

* Rename assign to module activity to designate to my module [SCI-6218]
 2021-11-05 15:44:14 +01:00
aignatov-bio b0c031e4e3
Fix duplicate assignment modals (#3636) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-05 15:42:59 +01:00
artoscinote e3d08db6de
Fixed viewable projects scope in reports controller [SCI-6200] (#3634) 2021-11-05 14:31:05 +01:00
artoscinote ba5403ab5e
Fixed activities service for singular relations (asset/result) [SCI-6204] (#3633) 2021-11-04 14:20:51 +01:00
artoscinote 33190e4582
Fixed typo in project overview service [SCI-6199] (#3632) 2021-11-04 14:20:42 +01:00
aignatov-bio 5081e90fd6
Close access grant modal after submit [SCI-6205] (#3631) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-04 13:31:58 +01:00
aignatov-bio 1ef9ea2cbb
Fix roles permission and helper [SCI-6198][SCI-6181] (#3630) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-04 13:29:34 +01:00
Martin Artnik 3406cd9235 Added optional webhook secret key [SCI-6193] 2021-11-03 15:04:13 +01:00
Martin Artnik 2f56e25346 Close saved filters dropdown on outclick [SCI-6086] 2021-11-02 16:23:08 +01:00
Oleksii Kriuchykhin 47b8347ce6 Add support of Okta SSO provider [SCI-6184] 2021-11-02 16:19:56 +01:00
Anton f7d1541e01 Add scrollbars to filters dropdown [SCI-6085] 2021-11-02 12:18:00 +01:00
aignatov-bio 6dea5f17ff
Fix bioEddie initialization [SCI-6196] (#3624) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-02 10:26:01 +01:00
Oleksii Kriuchykhin a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
aignatov-bio 3ec49ec1a3
Fix helpers for designated users (#3621) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-29 12:49:38 +02:00
artoscinote 1bb30b2c49
Also move activities when moving experiment to another project [SCI-6047] (#3535) 
* Also move activities when moving experiment to another project [SCI-6047]

* Changed update to update! [SCI-6047]
 2021-10-28 16:35:47 +02:00
artoscinote 2abefd78e6
Implement experiment and task access removal [SCI-6156] (#3614) 2021-10-28 16:32:05 +02:00
artoscinote 6f2d883706
Added permissions specs for API, minor changes to permissions [SCI-6152] (#3609) 2021-10-28 14:48:28 +02:00
Alex Kriuchykhin 047f47a46a
Merge pull request #3617 from aignatov-bio/ai-sci-6181-update-permissions-on-task 
Small fixes on task permissions [SCI-6181]
 2021-10-28 14:46:57 +02:00
Alex Kriuchykhin 17a4afc6fa
Merge pull request #3607 from okriuchykhin/ok_SCI_6142 
Change the assets URL returned by API to pre-signed url [SCI-6142]
 2021-10-28 14:32:47 +02:00
Alex Kriuchykhin f8e433a0ca
Merge branch 'features/new_permissions' into ok_SCI_6151 2021-10-28 14:31:47 +02:00
aignatov-bio 992d3bffa3
small permissions interface updates [SCI-6145] (#3620) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-28 13:58:31 +02:00
Alex Kriuchykhin 1bde37db78
Merge branch 'develop' into ok_SCI_5579 2021-10-28 13:26:27 +02:00
Oleksii Kriuchykhin b1b7dbb8ef Improve code style [SCI-6151] 2021-10-28 12:58:42 +02:00
artoscinote fc866640be
Improved/removed annoying reloads when managing user access [SCI-6170] (#3618) 2021-10-28 12:49:26 +02:00
Oleksii Kriuchykhin 2fb71aa312 Add API endpoint for Cloning Experiments [SCI-6088] 2021-10-28 12:28:46 +02:00
artoscinote 98be1ae0ff
Added link to task access to task screen [SCI-6157] (#3615) 2021-10-28 10:45:34 +02:00
aignatov-bio 9e3d64bbb6
Fix projects list in clone experiment dropdowns [SCI-6139] (#3592) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-27 13:55:49 +02:00
aignatov-bio 22034089a6
Update experiment move service [SCI-6149] (#3599) 
* Update experiment move service [SCI-6149]

* Move permission check to helper [SCI-6149]

Co-authored-by: Anton <anton@scinote.net>
 2021-10-27 13:48:52 +02:00
Anton 5d517fc2b8 Small fixes on task permissions [SCI-6181] 2021-10-27 11:41:47 +02:00
aignatov-bio d4756be38a
Fix typo on users manage list [SCI-5021] (#3613) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 16:02:24 +02:00
aignatov-bio 7d6136435d
Change my_module owner after copy [SCI-6176] (#3611) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 12:06:35 +02:00
aignatov-bio 1a05c3a40c
Update canvas task cards [SCI-5021] (#3608) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 12:06:26 +02:00
Alex Kriuchykhin f6a30cac6c
Merge pull request #3593 from okriuchykhin/ok_SCI_6134 
Change Dashboard::RecentWorkService to use new user roles [SCI-6134]
 2021-10-26 11:43:54 +02:00
aignatov-bio aa4b765407
Update assign/unassign rows to task [SCI-6150] (#3604) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 11:41:08 +02:00
aignatov-bio edb09dd099
Update copy experiment permission checks [SCI-6147] (#3598) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 11:40:54 +02:00
artoscinote 80b5018337
Change designated users permission check [SCI-6177] (#3610) 2021-10-26 11:29:57 +02:00
Alex Kriuchykhin ac176f6c9e
Merge pull request #3596 from okriuchykhin/ok_SCI_6113 
Add user roles to team importer/exporter [SCI-6113]
 2021-10-25 14:06:17 +02:00
Oleksii Kriuchykhin 38b107b336 Change the assets URL returned by API to pre-signed url [SCI-6142] 2021-10-22 13:48:06 +02:00
Oleksii Kriuchykhin 2051ea5360 Update the search to abide the permissions [SCI-6151] 2021-10-22 11:43:20 +02:00
Alex Kriuchykhin bd9b12b377
Merge pull request #3603 from artoscinote/ma_SCI_6169 
Fixed updating user assignment in MyModuleMember [SCI-6169]
 2021-10-22 10:05:19 +02:00
Alex Kriuchykhin 7819cfb280
Merge pull request #3602 from artoscinote/ma_SCI_6159 
Enabled experiment dropdown for viewers to view ID and members [SCI-6159
 2021-10-22 10:04:40 +02:00
artoscinote 0c8614c9ac
Remove caching from user access modals [SCI-6163] (#3600) 2021-10-22 10:03:52 +02:00
Martin Artnik 6249465b34 Fixed updating user assignment in MyModuleMember [SCI-6169] 2021-10-21 15:51:17 +02:00
Martin Artnik f43457012c Enabled experiment dropdown for viewers to view ID and members [SCI-6159 2021-10-20 16:59:33 +02:00
artoscinote 35eb7bffdd
Fixed to use correct users relation in access modals [SCI-6164] (#3601) 2021-10-20 15:49:03 +02:00
artoscinote 3746332c30
Fixed cached user lists when changing assignments [SCI-6137] (#3597) 
Fixed cache invalidation for assignables, current_user missing in cache keys [SCI-6137]
 2021-10-19 16:00:52 +02:00
Oleksii Kriuchykhin b10a6c8b7d Add user roles to team importer/exporter [SCI-6113] 2021-10-14 13:21:36 +02:00
artoscinote c63090da8c
Fixed scopes and added permission checks to quick create services [SCI-6135] (#3584) 2021-10-14 13:13:29 +02:00
Anton 451eb97657 Fix bio eddie iframe loading [SCI-6001] 2021-10-14 13:10:11 +02:00
Zmago Devetak 4a4c344a3a
Task UX: Update assigning a Task to user(s) (#3429) 
* add dynmic select for user assignment on task

* update the user assignment so it looks like tags picker

* fix code style

* Code style fixes [SCI-5871]

* Code style fixes [SCI-5871]

* Destroy and search action fixes [SCI-5871]

Co-authored-by: Martin Artnik <martin@scinote.net>
 2021-10-14 11:49:27 +02:00
aignatov-bio 69a3c5f5ec
Fix results comments permission helper [SCI-6146] (#3594) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-14 11:48:09 +02:00
Alex Kriuchykhin ed27197f83
Merge pull request #3590 from okriuchykhin/ok_SCI_6124 
Fix user removal from a team [SCI-6124]
 2021-10-13 15:08:58 +02:00
Oleksii Kriuchykhin bc806f0c86 Change Dashboard::RecentWorkService to use new user roles [SCI-6134] 2021-10-13 14:12:24 +02:00
Martin Artnik 6ea34adb22 Fixed designated users relation 2021-10-13 13:39:28 +02:00
artoscinote 5bda5acebc
Fixed the rule for moving experiment [SCI-6128] (#3587) 2021-10-13 13:32:11 +02:00
artoscinote 25abee536c
Default to viewer role in new project modal [SCI-6131] (#3586) 2021-10-13 10:10:34 +02:00
artoscinote 92fab5dd4f
Update usage of user_my_modules [SCI-6121] (#3585) 2021-10-13 10:10:14 +02:00
aignatov-bio 328f1cfe4d
Add blank tasks to canvas [SCI-6133] (#3588) 2021-10-13 10:08:39 +02:00
artoscinote 462f8ffc47
Fixed unassigned user methods, order by name [SCI-6104] (#3589) 2021-10-13 09:50:06 +02:00
Oleksii Kriuchykhin d6cc800679 Fix user removal from a team [SCI-6124] 2021-10-12 17:00:03 +02:00
artoscinote 3c2275476f
Order experiments by name on move workflow modal [SCI-6048] (#3562) 2021-10-11 10:19:59 +02:00
artoscinote 362658021e
Permission typo fixes [SCI-6120] (#3582) 2021-10-11 10:19:16 +02:00
aignatov-bio 4705d09a96
Small permission fixes for controllers [SCI-6132] (#3581) 2021-10-08 12:43:26 +02:00
Martin Artnik c438b9a4e1 Fix duplicate public project assignments 2021-10-06 13:28:51 +02:00
artoscinote 0fe6cd66e5
Fix permission migration, fix assignable scope [SCI-6127] (#3580) 2021-10-05 13:45:52 +02:00
artoscinote 6fbb22922a
Fix project user assignment [SCI_5925] (#3577) 2021-10-05 13:45:34 +02:00
aignatov-bio c85f5187f3
Fix duplicarte results in activities filters [SCI-5948] (#3579) 2021-10-05 13:45:09 +02:00
artoscinote a18839f529
Automatically assign team admins as project owners [SCI_6119] (#3575) 2021-10-04 15:47:28 +02:00
aignatov-bio d594778fa8
Add project comment manage own permission [SCI-6115] (#3574) 2021-10-04 15:43:50 +02:00
aignatov-bio 116c09cd8a
Update users selection for notifications [SCI-6110] (#3573) 2021-10-04 15:43:28 +02:00
aignatov-bio 982aaf887c
Fix duplicate objects on dashboard [SCI-5948] (#3576) 2021-10-04 15:41:35 +02:00
artoscinote 75d6a17cb7
Fix ProjectOverviewService and automatic project assignment [SCI_6117] (#3572) 2021-10-04 11:20:47 +02:00
aignatov-bio 34b0aec5b7
Update permission checks for reports [SCI-6105] (#3570) 2021-10-01 14:25:52 +02:00
aignatov-bio 3eb2c98cce
Update render permission for smart annotation [SCI-6112] (#3571) 2021-10-01 14:23:29 +02:00
artoscinote 63923f0e63
Skip inaccessible elements when generating reports [SCI-6109] (#3569) 2021-10-01 14:18:40 +02:00
Martin Artnik 4f4ab05740 Fix project search in quick start controller [SCI-5915] 2021-10-01 12:20:51 +02:00
Martin Artnik 1d20258a2e Fix typo [SCI-5924] 2021-10-01 12:20:51 +02:00
Alex Kriuchykhin 1233c9bc74
Add missing permission helper for folder deletion [SCI-6114] (#3568) 2021-10-01 10:47:32 +02:00
Oleksii Kriuchykhin d21dd191a6 Confirm the invitation when user is invited and lands in with SSO [SCI-6055] 2021-09-30 17:06:45 +02:00
Martin Artnik bf96f71531 Fix comment edit method [SCI_6054] 2021-09-30 14:12:12 +02:00
aignatov-bio dba6ed8515 Use default repository table state [SCI-6089] 2021-09-30 13:30:17 +02:00
artoscinote f68d724202
Rework experiment permissions [SCI-6054] (#3538) 
* Rework experiment permissions [SCI-6054]
 2021-09-30 11:32:11 +02:00
aignatov-bio a93f2889b7 Fix 2fa redirecting [SCI-6103] 2021-09-28 12:34:41 +02:00
aignatov-bio c248e87adb
Add permissions checks for results controllers [SCI-6071] (#3555) 
* Add permission tests for results controller [SCI-6071]

* Update results controllers with new permissions [SCI-6071]

* Small fixes to results controllers [SCI-6071]

* Update result permission helpers [SCI-6071]
 2021-09-24 13:11:41 +02:00
Alex Kriuchykhin 313eaf7276
Merge pull request #3539 from aignatov-bio/ai-sci-6050-fix-sidebar-navigation-for-archived-task 
Fix sidebar navigation for archived task [SCI-6050]
 2021-09-24 11:47:59 +02:00
Martin Artnik 49b9ee37cc Merge branch 'develop' into features/bmt-search 2021-09-24 11:01:27 +02:00
Oleksii Kriuchykhin f806a56cac Update existing roles with new permissions/abilities [SCI-6076] 2021-09-24 10:29:24 +02:00
Oleksii Kriuchykhin 607b7f76cf Update/implement permission checks in the my_modules_controller and my_modules_status_flow_controller [SCI-6061][SCI-6063] 2021-09-24 10:23:28 +02:00
aignatov-bio 4472eb1023
Fix docx preview render [SCI-6035] (#3559) 2021-09-24 10:01:55 +02:00
Alex Kriuchykhin 51e7f7668a
Merge pull request #3556 from okriuchykhin/ok_SCI_6062 
Update/implement permission checks in the _my_modules_tags_controller [SCI-6062]
 2021-09-23 17:23:22 +02:00
aignatov-bio 60b261feb8 Small fixes [SCI-6050] 2021-09-23 12:31:40 +02:00
artoscinote e57f5f8e26
Merge pull request #3551 from aignatov-bio/ai-sci-6065-update-my-module-comments-controller-permission 
Update permissions for my_module_comments controller [SCI-6065]
 2021-09-23 11:47:13 +02:00
aignatov-bio 6206f8a6e9 Update permissions for my_module_comments controller [SCI-6065] 2021-09-22 12:11:36 +02:00
Oleksii Kriuchykhin 5fb163c09a Update/implement permission checks in the _my_modules_tags_ controller [SCI-6062] 2021-09-21 16:21:55 +02:00
Miha Mencin 519dbe8fe9
Merge pull request #3554 from biosistemika/master 
Sept. hotfix
 2021-09-21 10:19:48 +02:00
aignatov-bio 78098f2d8c Add permission check for results download 2021-09-20 14:33:42 +02:00
aignatov-bio 250a018a4c Add permissions tests for my_module_repositories and my_module_repository_snapshots [SCI-6064] 2021-09-20 12:19:28 +02:00
Alex Kriuchykhin 0db9bf46ff
Merge pull request #3528 from okriuchykhin/ok_SCI_6036 
Prevent creation of duplicated repository cells [SCI-6036]
 2021-09-17 16:37:48 +02:00
artoscinote 895509a26c
Merge pull request #3543 from artoscinote/ma_SCI_6056 
Reworked MyModule permissions [SCI-6056]
 2021-09-17 15:19:01 +02:00
aignatov-bio a99f9db520
Small CSS fixes [SCI-6017][SCI-6019] (#3548) 2021-09-17 14:15:01 +02:00
aignatov-bio 857ce2d90f
Fix title for archived folders [SCI-6049] (#3541) 2021-09-17 14:12:53 +02:00
Martin Artnik 04413c6cc6 Make permission names consistent with spreadsheet [SCI-6056] 2021-09-17 10:41:28 +02:00
Oleksii Kriuchykhin 61d4a96a3f Update/implement permission checks in the experiments controller [SCI-6057] 2021-09-16 09:55:59 +02:00
artoscinote 95946499a5
Merge pull request #3544 from artoscinote/ma_SCI_5590 
Fixed HTML ampersand display issue [SCI-5590]
 2021-09-16 09:44:46 +02:00
Oleksii Kriuchykhin 0762323337 Update/implement permission checks in the project related controllers [SCI-6042] 2021-09-15 14:39:47 +02:00
Martin Artnik 534ab25e5d Sort experiments alphabetically in move task modal [SCI-6048] 2021-09-14 15:11:47 +02:00
Martin Artnik 77aa4a8534 Fixed HTML ampersand display issue [SCI-5590] 2021-09-14 14:42:18 +02:00
Alex Kriuchykhin 41e41f790b
Merge pull request #3531 from aignatov-bio/ai-sci-6034-change-printing-status-modal-logic 
Change printing status modal logic [SCI-6034]
 2021-09-14 11:17:17 +02:00
Alex Kriuchykhin 8a1454ddea
Merge pull request #3517 from artoscinote/ma_SCI_6013 
Experiment dropdown layout fixes [SCI-6013]
 2021-09-14 11:16:16 +02:00
Martin Artnik e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +02:00
Alex Kriuchykhin 3ca593d7f9
Merge pull request #3513 from okriuchykhin/ok_SCI_5663 
Allow project management to it's creator if project has no assigned users [SCI-5663]
 2021-09-14 11:08:25 +02:00
Alex Kriuchykhin 809941d8d1
Merge pull request #3518 from okriuchykhin/ok_SCI_5848 
Add error message in report in case of file preview generation failure [SCI-5848]
 2021-09-14 11:08:03 +02:00
aignatov-bio 6a1223c498 Fix sidebar navigation for archived task [SCI-6050] 2021-09-10 12:05:40 +02:00
aignatov-bio 3036a38bfd
Fix rspec tests [SCI-6044] (#3537) 2021-09-09 15:41:42 +02:00
Oleksii Kriuchykhin e8e1ee3011 Prevent creation of duplicated repository cells [SCI-6036] 2021-09-09 14:24:35 +02:00
Alex Kriuchykhin a93ca08db3
Merge pull request #3532 from okriuchykhin/ok_SCI_6010 
Fix BMT base URL path in requests [SCI-6010]
 2021-09-07 16:30:21 +02:00
Oleksii Kriuchykhin 7041cc19af Fix BMT base URL path in requests [SCI-6010] 2021-09-07 16:28:14 +02:00
Martin Artnik 8c864c65e5 Fix syntax error 2021-09-07 13:27:32 +02:00
aignatov-bio 6484dfe630 Change printing status modal logic [SCI-6034] 2021-09-07 12:28:11 +02:00
Alex Kriuchykhin 268b8d6bf1
Merge pull request #3530 from artoscinote/ma_SCI_6041 
Update project permission helpers [SCI-6041]
 2021-09-07 12:28:00 +02:00
Alex Kriuchykhin fdbeedd5e6
Merge pull request #3520 from okriuchykhin/ok_SCI_5920 
Allow project viewing for team admins [SCI-5920]
 2021-09-07 12:19:17 +02:00
Oleksii Kriuchykhin 3cab5751e7 Add rake task for creation and syncing structure of BMT inventory [SCI-6010] 2021-09-07 12:17:09 +02:00
Martin Artnik 975a8910a8 Updated project permission helpers [SCI-6041] 2021-09-07 11:27:52 +02:00
Martin Artnik ade1385392 Merge branch 'develop' into features/bmt-search 2021-09-06 10:51:04 +02:00
Martin Artnik 7e6ca3be8a Merge branch 'develop' into features/new_permissions 2021-09-06 10:33:32 +02:00
aignatov-bio ccc2964aff
Add error message on empty BioEddie save [SCI-5993] (#3526) 2021-09-06 10:13:30 +02:00
Martin Artnik 206ba3d79c Reworked how search error works with repository table [SCI-5961] 2021-09-06 10:12:10 +02:00
Martin Artnik ca6dfa2541 Display dropdown item info border using CSS [SCI-6013] 2021-09-02 12:58:25 +02:00
Martin Artnik 35e815449d Experiment dropdown layout fixes [SCI-6013] 2021-09-02 12:42:06 +02:00
Martin Artnik 3a70aadea4 Added specific html class to printer settings section [SCI-6039] 2021-09-02 09:52:52 +02:00
artoscinote 35874d6a93
Merge pull request #3521 from artoscinote/ma_SCI_6022 
Fix barcode scanning in modals [SCI-6022]
 2021-08-31 14:37:39 +02:00
Martin Artnik 73241e87bb Fix barcode scanning in modals [SCI-6022] 2021-08-31 14:37:02 +02:00
Oleksii Kriuchykhin f591bac3b1 Allow project viewing for team admins [SCI-5920] 2021-08-31 14:21:02 +02:00
artoscinote 19a499b613
Merge pull request #3519 from artoscinote/ma_SCI_6022 
Made barcode search globally available [SCI-6022]
 2021-08-30 15:39:20 +02:00
Alex Kriuchykhin a63f047ae7
Merge pull request #3512 from okriuchykhin/ok_SCI_6031 
Add configuration variable for webhooks, disable by default [SCI-6031]
 2021-08-30 15:35:38 +02:00
Martin Artnik 6d92af4b2f Made barcode search globally available [SCI-6022] 2021-08-30 14:41:31 +02:00
Oleksii Kriuchykhin b32477a933 Add error message in report in case of file preview generation failure [SCI-5848] 2021-08-30 14:18:31 +02:00
Miha Mencin 50d33896e3
Merge pull request #3480 from artoscinote/ma_SCI_5963 
Downcase all user emails, downcase when finding user [SCI-5963]
 2021-08-30 13:00:12 +02:00
Martin Artnik 5f21e3296e Added error message on search failure [SCI-5961] 2021-08-30 12:02:02 +02:00
Martin Artnik e08b406185 Added additionalDataFilter [SCI-6026] 2021-08-30 10:49:15 +02:00
Martin Artnik 896f0ce1e3 Implemented applying BMT filters [SCI-5980] 2021-08-30 10:49:15 +02:00
aignatov-bio b269f3f612 Add saved filters backend [SCI-5977] (#3509) 
* Add saved filters backend [SCI-5977]

* Rework filter saving [SCI-5977]

Co-authored-by: Martin Artnik <martin@scinote.net>
 2021-08-30 10:49:15 +02:00
artoscinote ef0e45be04 Implemented frontend for BMT-type repository [SCI-5991] (#3503) 
* Implemented frontend for BMT-type repository [SCI-5991]

* Refactor repository view, fix column reordering [SCI-5991]

* Remove type mapping for default columns in column management [SCI-5991]

* Repository table partial fix, remove non-relevant migration [SCI-5991]
 2021-08-30 10:49:15 +02:00
aignatov-bio 90d4a5f7d1 Add save bmt filters front end [SCI-5962] (#3505) 2021-08-30 10:49:15 +02:00
Oleksii Kriuchykhin d4ef2b1bd4 Add BMT inventory model [SCI-6009] 2021-08-30 10:49:15 +02:00
Martin Artnik a872ea8a47 CSS fixes [SCI-5956] 2021-08-30 10:49:15 +02:00
Martin Artnik 9a87bad740 Implement filters and JSON building [SCI-5956] 2021-08-30 10:49:15 +02:00
Oleksii Kriuchykhin 0b74f34de7 Add external IDs to repositories [SCI-5990] 2021-08-30 10:49:14 +02:00
aignatov-bio 958ee92db7 Add BMT filters interactions [SCI-5955] (#3478) 
* Add BMT filters interactions [SCI-5955]

* Small fixes [SCI-5955]
 2021-08-30 10:49:14 +02:00
aignatov-bio 1929959038 Add dropdown for btm filters [SCI-5953] (#3469) 2021-08-30 10:49:14 +02:00
artoscinote afc74b6b8f
Merge pull request #3500 from artoscinote/ma_SCI_6014 
Added edit activities on asset deletion [SCI-6014]
 2021-08-30 10:00:58 +02:00
Oleksii Kriuchykhin 4665743d02 Allow project management to it's creator if project has no assigned users [SCI-5663] 2021-08-26 16:56:21 +02:00
Martin Artnik 1b26a4f65a Added access token to protocols.io requests [SCI-5968] 2021-08-26 15:26:35 +02:00
Oleksii Kriuchykhin d67f7691a1 Add configuration variable for webhooks, disable by default [SCI-6031] 2021-08-26 14:08:15 +02:00
artoscinote 295d27f0d7
Added option to override default OTP drift time [SCI-6027] (#3507) 2021-08-25 14:02:25 +02:00
Martin Artnik 56fa07aa21 Moved max item name length to constant [SCI-6025] 2021-08-24 10:19:30 +02:00
Martin Artnik 289095ecbc Amended label template, truncate item name before print [SCI_6025] 2021-08-24 09:52:29 +02:00
aignatov-bio 7621deeb2a
Small label printers fixes [SCI-6021][SCI-6024] (#3502) 2021-08-23 13:58:16 +02:00
Martin Artnik b46df537d5 Added edit activities on asset deletion [SCI-6014] 2021-08-20 14:45:33 +02:00
aignatov-bio 546b108bd2
Fix webhooks page for user without teams [SCI-6016] (#3498) 2021-08-20 13:14:24 +02:00
artoscinote 5856778e69
Merge pull request #3494 from aignatov-bio/ai-sci-6018-fix-edit-icon-for-bioeddie 
Add edit bio eddie button to asset card [SCI-6018]
 2021-08-20 11:06:17 +02:00
artoscinote c89384cf3c
Merge pull request #3495 from aignatov-bio/ai-sci-6015-clear-errors-on-new-webhook 
Clear errors on cancel new webhook form [SCI-6015]
 2021-08-20 11:05:44 +02:00
artoscinote c977decd8a
Merge pull request #3496 from aignatov-bio/ai-sci-5950-fix-webhook-position-in-menu 
Fix webhook sidebar position and fix texting in inventory [SCI-5950]
 2021-08-20 11:05:15 +02:00
aignatov-bio dc192ddbfb Fix webhook sidebar position and fix texting in invnetory [SCI-5950] 2021-08-19 14:23:53 +02:00
aignatov-bio 1b44d49983 Clear errors on cancel new webhook form [SCI-6015] 2021-08-19 13:42:42 +02:00
aignatov-bio 5ed4d9e65e Add edit bio eddie button to asset card [SCI-6018] 2021-08-19 13:28:35 +02:00
aignatov-bio bbb6cd226b
Add permission check for webhooks sidebar button [SCI-6016] (#3493) 2021-08-19 12:04:52 +02:00
aignatov-bio a61446acf5
Add close button to label printer modal [SCI-6000] (#3492) 2021-08-19 12:04:41 +02:00
Alex Kriuchykhin 5fa3fa4601
Merge pull request #3491 from okriuchykhin/ok_SCI_5983 
Add timestamps to API serializers, allow inclusion of comments [SCI-5983]
 2021-08-19 10:43:02 +02:00
artoscinote 80dfb04976
Merge pull request #3485 from okriuchykhin/ok_SCI_6002 
Fix permission checks in reports controller [SCI-6002]
 2021-08-18 15:27:49 +02:00
Martin Artnik 403bce6f5f Fixed creating notifications when users are inactive [SCI-5938] 2021-08-18 10:45:29 +02:00
Oleksii Kriuchykhin 33d37d048e Add timestamps to API serializers, allow inclusion of comments [SCI-5983] 2021-08-18 10:00:01 +02:00
aignatov-bio 6e1d51e2f3
Fix bioeddie errors in console [SCI-5989] (#3487) 2021-08-16 18:29:55 +02:00
artoscinote 6f0a65f02f
Merge pull request #3484 from artoscinote/ma_SCI_5999 
Rework molecule registration activities [SCI-5999]
 2021-08-16 14:33:24 +02:00
Martin Artnik 5cc966e11e Remove delete molecule activities [SCI-5999] 2021-08-16 13:58:54 +02:00
aignatov-bio 852d2cc03c
CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486) 
* CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970]

* Small fixes [SCI-5972]
 2021-08-16 10:51:46 +02:00
Oleksii Kriuchykhin 2daacdf62c Fix permission checks in reports controller [SCI-6002] 2021-08-13 16:32:02 +02:00
Martin Artnik 56576960b0 Rework molecule registration activities [SCI-5999] 2021-08-13 15:15:45 +02:00
artoscinote 12bb44147c
Merge pull request #3482 from artoscinote/ma_SCI_5984 
Optimize how printing jobs and statuses work [SCI-5984]
 2021-08-13 09:25:42 +02:00
Martin Artnik 1d3e0db904 Optimize how printing jobs and statuses work [SCI-5984] 2021-08-12 16:57:25 +02:00
aignatov-bio 87416470f1
Fix empty state for bioEddie [SCI-5987] (#3481) 2021-08-12 15:20:21 +02:00
Martin Artnik 1db06b46f7 Fixed for assets that belong to protocol step [SCI-5996] 2021-08-12 13:45:38 +02:00
artoscinote a65d8ad365
Merge pull request #3477 from artoscinote/ma_SCI_5985 
Fixed handling deletion for asset activity display [SCI-5985]
 2021-08-12 12:23:23 +02:00
Martin Artnik c3fef50d3e Fixed handling deletion for asset activity display [SCI-5985] 2021-08-12 12:18:12 +02:00
artoscinote ad179298fc
Merge pull request #3476 from artoscinote/ma_SCI_5985 
Fixed registering bioeddie molecule on step [SCI-5985]
 2021-08-11 14:12:38 +02:00
Martin Artnik 143e491016 Fixed registering bioeddie molecule on step [SCI-5985] 2021-08-11 14:10:05 +02:00
artoscinote 67330ab27f
Merge pull request #3475 from artoscinote/ma_SCI_5979 
Fix disabled refresh printers button [SCI-5979]
 2021-08-11 13:22:51 +02:00
Martin Artnik 5d5f406e9a Downcase all user emails, downcase when finding user [SCI-5963] 2021-08-11 13:18:58 +02:00
Martin Artnik 9a8a9c7b34 Fix disabled refresh printers button [SCI-5979] 2021-08-11 12:23:18 +02:00
artoscinote 1fc9027d1a
Merge pull request #3466 from aignatov-bio/ai-sci-5964-cancel-changes-after-exit-webhook-edit-mode 
Cancel changes after exit webhook edit mode [SCI-5964]
 2021-08-11 12:14:12 +02:00
aignatov-bio 5eb2c4a28b
Fix image extension in empty printers modal [SCI-5971] (#3470) 2021-08-11 11:43:16 +02:00
Martin Artnik 861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +02:00
Martin Artnik 8f3f39f7c7 Fixed handling of activity subject parents when matching activity filters [SCI-5973] 2021-08-06 13:43:30 +02:00
aignatov-bio cfa7937f88 Cancel changes after exit webhook edit mode [SCI-5964] 2021-08-05 12:44:01 +02:00
Martin Artnik 024f9117e6 fix failing specs 2021-08-03 14:16:22 +02:00
Martin Artnik 57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
artoscinote f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration 
Features/bioeddie integration
 2021-08-03 13:32:53 +02:00
artoscinote f24207588c
Merge pull request #3463 from biosistemika/features/webhooks 
Features/webhooks
 2021-08-03 13:32:12 +02:00
artoscinote c41247a5fd
Merge pull request #3439 from artoscinote/ma_SCI_5879 
Implement Save & Register molecule [SCI-5879]
 2021-08-03 12:15:46 +02:00
Martin Artnik 13ddff89a8 Fixed Asset relation handling in activities [ma_SCI_5789] 2021-08-03 09:59:06 +02:00
Martin Artnik a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
artoscinote fe43017ba4
Merge pull request #3445 from artoscinote/ma_SCI_5898 
Fixed UX issues in user invites modal [SCI-5898]
 2021-08-02 15:58:16 +02:00
Martin Artnik a19f109e65 Add printer description [SCI-5942] 2021-08-02 15:50:26 +02:00
Martin Artnik ae174b276a Code review fixes and error handling improvements [SCI-5942] 2021-08-02 15:42:53 +02:00
Martin Artnik 123e415a4f Print status backend + FE integration [SCI-5942] 2021-08-02 15:42:53 +02:00
aignatov-bio 43571b5692
Print labels changes [SCI-5943] (#3461) 2021-08-02 15:38:37 +02:00