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

2651 commits

Author SHA1 Message Date
aignatov-bio 0cfedb2155
Add datetime reminders to columns modal [SCI-6556] (#3934) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-18 14:40:09 +01:00
ajugo d1610fba53
Low stock flyout reminders [SCI-6502] (#3932) 
* Display low stock flyout reminder [SCI-6502]

* Display low stock flyout reminder [SCI-6502]

* Adapt showing stock reminders for every bell icon click [SCI-6502]

* Correct hound error [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix hound [SCI-6502]

* Remove not needed line [SCI-6502]

* Add reminder template [SCI-6502]

* Add clearing messages [SCI-6502]
 2022-03-15 10:24:35 +01:00
Anton 8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
artoscinote 35dfa15e57
Implement hidden repository cell reminders [SCI-6504] (#3933) 2022-03-11 12:38:45 +01:00
ajugo 959b86b40c
Task inventory activity for assigned item consumption [SCI-6453] (#3830) 
* Add task inventory activity [SCI-6453]
 2022-03-09 18:43:38 +01:00
aignatov-bio 10743921d4
Add reminders to stock modal [SCI-6557] (#3917) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:19:15 +01:00
artoscinote d577fcc824
Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) 
* Implement basic logic for Date/DateTime/Stock reminders [SCI-6554]

* Implement bell icon [SCI-6500]

* Refactor reminder cells scope [SCI-6554]
 2022-03-09 14:13:48 +01:00
aignatov-bio 7f7bf0533a
Fix tests [SCI-6486] (#3913) 
* Fix tests [SCI-6486]

* Fix rspec tests [SCI-6486]

Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:12:16 +01:00
artoscinote 20ef08907a
Stock column fixes [SCI-6455] (#3878) 
* Fix issues with stock column management [SCI-6455]

* Refactor stock column in datatables [SCI-6455]
 2022-03-08 14:52:45 +01:00
artoscinote 732977b80d
Fix fetching available repository rows [SCI-6601] (#3920) 2022-03-07 17:12:41 +01:00
Alex Kriuchykhin 32d005f480
Fix step deletion for API [SCI-6561] (#3914) 2022-03-03 10:00:44 +01:00
Alex Kriuchykhin bd47893947
Add inventory archiving to the API [SCI-5584] (#3885) 2022-02-28 10:33:43 +01:00
artoscinote 3df030b29e
Fix date/time filter loading and overwriting [SCI-6582] (#3898) 
* Fix filter overwrite [SCI-6582]

* Fix date/time filter loading [SCI-6582]

* Fix time/time range filter loading [SCI-6582]

* Code style fixes [SCI-6582]
 2022-02-25 15:27:31 +01:00
Alex Kriuchykhin 6b51b8a35c
Fix handling of date values in repositories [SCI-6551] (#3877) 2022-02-21 12:08:35 +01:00
Alex Kriuchykhin 0ce6f43cbf
Fix inventory table custom error messages [SCI-6532] (#3855) 2022-02-15 14:37:26 +01:00
ajugo ba4e6476b7
Change subject of Repository (#3838) 2022-02-14 10:37:58 +01:00
aignatov-bio 97898fef7a
Add error handling for saving filters [SCI-6488] (#3835) 
* Add error handling for saving filters [SCI-6488]

* Refactor and clean up filter element validations [SCI-6488]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
 2022-02-11 13:32:27 +01:00
Alex Kriuchykhin 79c32e30ad
Add support of repository snapshots to assigned items section [SCI-6439] (#3828) 2022-02-11 10:46:19 +01:00
artoscinote bc5822de7b
Added error messges for missing search columns/values [SCI-6483] (#3824) 
* Added error messges for missing search columns/values [SCI-6483]
 2022-02-11 10:24:29 +01:00
aignatov-bio 1efe3ddd37
Add stock consumption to pdf and docx [SCI-6460] (#3816) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-11 10:09:52 +01:00
artoscinote cdbf1f5fa0
Implement stock management activities [SCI-6452] (#3810) 
* Implement stock management activities [SCI-6452]

* PR code fixes [SCI-6452]
 2022-02-02 10:33:02 +01:00
aignatov-bio 0d6b2ad4b4
Add searchable list for advanced filters [SCI-6466] (#3808) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-01 14:39:04 +01:00
Alex Kriuchykhin fd92fed38f
Fix saving of advanced filters for shared repositories [SCI-6478] (#3811) 2022-02-01 09:59:31 +01:00
Martin Artnik b22fde2334 Handle stock management in full table views [SCI-6440] 2022-01-28 17:53:56 +01:00
Oleksii Kriuchykhin dd5f8c2793 Add stock management columns to snapshots [SCI-6448] 2022-01-28 13:19:37 +01:00
aignatov-bio 2c88843924
Task stock consumption modal[SCI-6444][SCI-6445] (#3798) 
Add main logic for consumption on task [SCI-6444]

Co-authored-by: Anton <anton@scinote.net>
 2022-01-28 11:10:56 +01:00
Oleksii Kriuchykhin 6d877e6bf7 Fix repository users list and filtering by row name [SCI-6457] 2022-01-27 22:50:04 +01:00
aignatov-bio 60859fec4e
Fix filtering for checklists, dropdown and status [SCI-6465] (#3802) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-27 14:01:09 +01:00
Martin Artnik 8a9be0cc3c Fix list of assigned tasks in assigned dropdown [SCI-6456] 2022-01-27 12:59:52 +01:00
artoscinote d779f352a7
Merge pull request #3796 from biosistemika/features/repository-filters 
Features/repository filters
 2022-01-26 10:36:30 +01:00
Oleksii Kriuchykhin 9f3b77ed15 Finalyze repository filter elements management backend [SCI-6396] 2022-01-26 10:12:46 +01:00
Alex Kriuchykhin a03e3e350b
Merge pull request #3763 from okriuchykhin/ok_SCI_6263 
Fix user invitation with emails surrounded by spaces [SCI-6263]
 2022-01-25 12:57:55 +01:00
Alex Kriuchykhin b0c3a33500
Merge pull request #3762 from okriuchykhin/ok_SCI_5584 
Add handling of archiving/restoring inventory items to API [SCI-5584]
 2022-01-25 12:57:22 +01:00
Martin Artnik abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00
artoscinote 95a36b6870
Implemented stock management modal [SCI-6417] (#3788) 
* Implement inventory stock management modal [SCI-6417]

* Add generalized validation mechanic, some bugfixes [SCI-6417]

* Fix permission check and method name in RepositoryStockValue [SCI-6417]
 2022-01-20 12:44:57 +01:00
aignatov-bio 01f1b5bd10
Add stock column type (#3786) 
* Add stock column type

* Create new stock column [SCI-6410]

* Small fixed for stock column [SCI-6410]

* Add stock column validations [SCI-6410]

Co-authored-by: Anton <anton@scinote.net>
 2022-01-18 13:17:05 +01:00
aignatov-bio 3e85cc0b4a
Add UI for saving filters [SCI-6231] (#3768) 
* Add UI for saving filters [SCI-6231]

* Fix ajax for deleting filters [6231]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
 2022-01-12 14:39:42 +01:00
artoscinote 3f87d250ce
Implement saving repository filters [SCI-6230] (#3748) 
* Implement saving repository filters [SCI-6230]

* Remove unnecessary logging [SCI-6230]

* Refactor filter saving [SCI-6230]

* Remove unnecessary files, linter fixes [SCI_6230]
 2022-01-05 15:02:09 +01:00
Oleksii Kriuchykhin a952e46e97 Fix user invitation with emails surrounded by spaces [SCI-6263] 2022-01-04 23:40:08 +01:00
Oleksii Kriuchykhin 200c282683 Add handling of archiving/restoring inventory items to API [SCI-5584] 2022-01-04 21:05:59 +01:00
aignatov-bio 997fbb80d3
Add snapshots to label printing [SCI-6328] (#3760) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-04 14:12:35 +01:00
Alex Kriuchykhin 7c4143249e
Improve speed of assigned modules popout [SCI-6350] (#3754) 2022-01-04 10:18:08 +01:00
Alex Kriuchykhin 93492c6dc4
Merge pull request #3747 from aignatov-bio/ai-sci-6338-not-all-projects-in-dropdown-for-taks-create 
Change permissions for dashboard quick start modal [SCI-6338]
 2022-01-04 10:07:39 +01:00
aignatov-bio 75f7e67602
Fix task navigation for archived experiments [SCI-6333] (#3753) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-03 10:48:17 +01:00
Anton 3de3da9ecc Change permissions for dashboard quick start modal [SCI-6338] 2022-01-03 10:32:05 +01:00
aignatov-bio 7bcf7a7943
Fix conflicts and update localizations [SCI-6227] (#3733) 
Co-authored-by: Anton <anton@scinote.net>
 2021-12-15 15:16:12 +01:00
Alex Kriuchykhin 0be7a363d7
Merge pull request #3740 from okriuchykhin/ok_SCI_6375 
Fix duplicated projects in the drop down on the new reports page [SCI-6375]
 2021-12-13 17:07:58 +01:00
Oleksii Kriuchykhin f4e2727af1 Fix duplicated projects in the drop down on the new reports page [SCI-6375] 2021-12-13 17:02:36 +01:00
Miha Mencin 381be79f10
Merge pull request #3736 from okriuchykhin/ok_SCI_6348 
Improve performance of repository cells index in the API [SCI-6348]
 2021-12-13 15:44:33 +01:00
Alex Kriuchykhin 37b21f1b62
Merge pull request #3715 from okriuchykhin/ok_SCI_6209 
Add models and controller for repository table filters [SCI-6209]
 2021-12-10 15:45:08 +01:00
Oleksii Kriuchykhin 153d1309b7 Improve performance of repository cells index in the API [SCI-6348] 2021-12-10 14:28:05 +01:00
Anton 21a8785b60 Update query for search tags [SCI-6344] 2021-12-10 14:21:51 +01:00
aignatov-bio c7af5b322b
Add drodown filter [SCI-6224] (#3728) 
Co-authored-by: Anton <anton@scinote.net>
 2021-12-07 20:49:48 +01:00
aignatov-bio 00f30b8d6c
Add assigned tasks filters [SCI-6221] (#3726) 
* Add endpoint for repository tasks [SCI-6221]

* Add assigned tasks filter [SCI-6221]

Co-authored-by: Anton <anton@scinote.net>
 2021-12-07 15:28:20 +01:00
Oleksii Kriuchykhin 30031e2f07 Fix user removal from a team [SCI-6323] 2021-12-06 14:24:59 +01:00
Oleksii Kriuchykhin a8ad7ef826 Add models and controller for repository table filters [SCI-6209] 2021-12-02 14:25:23 +01:00
artoscinote 19a91fce66
Fix protocol layout issue [SCI-6312] (#3712) 2021-12-01 16:23:46 +01:00
artoscinote 78ab094bf2
Implement public user grouping, deletion and updates to manually assigned [SCI-6228] (#3701) 
* Implement public user grouping, deletion and updates to manually assigned [SCI-6228]

* PR fixes [SCI-6228]

* Permission check improvement [SCI-6228]
 2021-12-01 16:23:24 +01:00
Alex Kriuchykhin 62d4d8e36e
Merge pull request #3567 from okriuchykhin/ok_SCI_6055 
Confirm the invitation when user is invited and lands in with SSO [SCI-6055]
 2021-12-01 13:19:58 +01:00
aignatov-bio 850b164724
Update error handling for experiment move [SCI-6293] (#3703) 
Co-authored-by: Anton <anton@scinote.net>
 2021-12-01 11:24:01 +01:00
artoscinote 9937d1d913
Add print feature to protocols [SCI-6028] (#3700) 
* Add print feature to protocols [SCI-6028]

* Close tab after closing print dialog [SCI-6028]

* CSS linter fixes [SCI-6028]
 2021-12-01 11:16:45 +01:00
Anton 1b3307eb56 Fix moving for locked tasks [SCI-6298] 2021-11-24 10:56:25 +01:00
Oleksii Kriuchykhin a1c4d06e3e Add endpoint for fetching column data including connected items [SCI-6208] 2021-11-22 22:48:36 +01:00
Anton a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
artoscinote 5a7d285264
Fix due/start date label render [SCI-6288] (#3690) 2021-11-22 11:18:05 +01:00
artoscinote 4fb9f8836d
Fix my_modules_controller typo [SCI-6278] (#3688) 2021-11-22 09:49:44 +01:00
artoscinote 774ffa60d0
Fix creating new users on projects for team admins [SCI-6273] (#3685) 2021-11-19 13:58:54 +01:00
artoscinote 9b06a24288
Added granular task permissions, permission check fixes [SCI-6278] (#3683) 2021-11-19 13:24:57 +01:00
artoscinote 2d6521db42
Fix delete connection in API [SCI-6087] (#3684) 2021-11-19 13:24:29 +01:00
artoscinote ee8cb033fa
Fix keys in connection serializer, fix destroy method [SCI-6087] (#3677) 2021-11-18 16:10:07 +01:00
Alex Kriuchykhin ebfd2f7924
Merge pull request #3682 from okriuchykhin/ok_SCI_6088 
Add API endpoint for Cloning Experiments [SCI-6088]
 2021-11-18 15:26:19 +01:00
Alex Kriuchykhin 2104bc489a
Merge pull request #3678 from okriuchykhin/ok_SCI_6275 
Fix permissions check for steps completion in the API [SCI-6275]
 2021-11-18 14:11:03 +01:00
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
artoscinote 2e84418304
Add create/destroy endpoints to connections API, add tests [SCI-6087] (#3563) 2021-11-17 12:11:22 +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
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 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
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 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
artoscinote e3d08db6de
Fixed viewable projects scope in reports controller [SCI-6200] (#3634) 2021-11-05 14:31:05 +01:00
Martin Artnik 3406cd9235 Added optional webhook secret key [SCI-6193] 2021-11-03 15:04:13 +01:00
Oleksii Kriuchykhin 47b8347ce6 Add support of Okta SSO provider [SCI-6184] 2021-11-02 16:19:56 +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 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 1bde37db78
Merge branch 'develop' into ok_SCI_5579 2021-10-28 13:26:27 +02:00
Oleksii Kriuchykhin 2fb71aa312 Add API endpoint for Cloning Experiments [SCI-6088] 2021-10-28 12:28:46 +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
Anton 5d517fc2b8 Small fixes on task permissions [SCI-6181] 2021-10-27 11:41:47 +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
artoscinote 80b5018337
Change designated users permission check [SCI-6177] (#3610) 2021-10-26 11:29:57 +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
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
artoscinote 92fab5dd4f
Update usage of user_my_modules [SCI-6121] (#3585) 2021-10-13 10:10:14 +02:00
artoscinote 462f8ffc47
Fixed unassigned user methods, order by name [SCI-6104] (#3589) 2021-10-13 09:50:06 +02:00
aignatov-bio 4705d09a96
Small permission fixes for controllers [SCI-6132] (#3581) 2021-10-08 12:43:26 +02:00
aignatov-bio c85f5187f3
Fix duplicarte results in activities filters [SCI-5948] (#3579) 2021-10-05 13:45:09 +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
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
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 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
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
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
Martin Artnik e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +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
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
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 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
Oleksii Kriuchykhin 0b74f34de7 Add external IDs to repositories [SCI-5990] 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
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
Martin Artnik b46df537d5 Added edit activities on asset deletion [SCI-6014] 2021-08-20 14:45:33 +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
Oleksii Kriuchykhin 33d37d048e Add timestamps to API serializers, allow inclusion of comments [SCI-5983] 2021-08-18 10:00:01 +02:00
Martin Artnik 5cc966e11e Remove delete molecule activities [SCI-5999] 2021-08-16 13:58:54 +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
Martin Artnik 1db06b46f7 Fixed for assets that belong to protocol step [SCI-5996] 2021-08-12 13:45:38 +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 861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +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 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 a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +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
Martin Artnik 0f417f9730 Merge branch 'develop' into features/barcodes 2021-07-29 13:32:17 +02:00
artoscinote 3649e2fbe0
Merge pull request #3457 from artoscinote/ma_SCI_5903 
Added print job queue system, job status endpoint [SCI-5903]
 2021-07-29 13:06:34 +02:00
aignatov-bio 02408ae885
Add printing status modal [SCI-5910] (#3454) 2021-07-29 12:24:46 +02:00
Martin Artnik 67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00
aignatov-bio a54f36a486
Add empty state for barcode printers [SCI-5935] (#3455) 2021-07-28 11:12:46 +02:00
Martin Artnik e57132dbd0 Added print job queue system, job status endpoint [SCI-5903] 2021-07-27 15:26:18 +02:00
artoscinote 46a9388d8d
Merge pull request #3451 from artoscinote/ma_SCI_5911 
Implemented printer management [SCI-5911]
 2021-07-27 13:19:13 +02:00
aignatov-bio d373c174ee
Add print label button to repository toolbar (#3453) 2021-07-27 12:34:13 +02:00
Martin Artnik 110ddd872e Added placeholder FLUICS printer setup 2021-07-23 14:56:21 +02:00
Martin Artnik b32b207f3d Added FLUICS API client [SCI-5939] 2021-07-23 13:52:28 +02:00
Oleksii Kriuchykhin c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
Martin Artnik 04b94d504d Moved activity logging to controller [SCI-5879] 2021-07-22 09:52:04 +02:00
aignatov-bio d4f974ac64
Add inline editing for folder name [SCI-5896] (#3430) 2021-07-21 21:33:13 +02:00
aignatov-bio be777a8919
Add barcodes to repository item card [SCI-5883][SCI-5884] (#3447) 
* Add barcodes to repository item card [SCI-5883][SCI-5884]

* Fix markup [SCI-5883]
 2021-07-21 21:32:42 +02:00
aignatov-bio f2e5dc8b2f
Add printers to addon page [SCI-5904][SCI-5931] (#3450) 
* Add printers to addon page [SCI-5904]

* Fix markup
 2021-07-21 13:48:38 +02:00
Alex Kriuchykhin dfa2a7775d
Merge pull request #3422 from okriuchykhin/ok_SCI_5847 
Fix repository cell joining and preloading [SCI-5847]
 2021-07-21 13:18:21 +02:00
Oleksii Kriuchykhin b69ed98e13 Add biomolecular toolkit license endpoint [SCI-5844] 2021-07-21 13:16:27 +02:00
Alex Kriuchykhin e881bf32ae
Merge pull request #3414 from okriuchykhin/ok_SCI_5843 
Add biomolecular toolkit API proxying endpoint [SCI-5843]
 2021-07-21 13:14:04 +02:00
artoscinote 888131a465
Merge branch 'features/bioeddie-integration' into ma_SCI_5879 2021-07-20 09:48:13 +02:00
aignatov-bio 53456988ba
Add bioEddie activities and user licenses [SCI-5845][SCI-5842] (#3411) 
* Add bio eddie licens to users [SCI-5845]

* Add activities for BioEddie [SCI-5842]
 2021-07-19 21:33:28 +02:00
Oleksii Kriuchykhin 1c8b32dffc Add biomolecular toolkit API proxying endpoint [SCI-5843] 2021-07-16 15:58:40 +02:00
Martin Artnik 96a5b97bdb Implement Save & Register molecule [SCI-5879] 2021-07-15 12:37:04 +02:00
Martin Artnik ff0ac9f497 Fix free invite users modal [SCI-5900] 2021-07-13 15:51:05 +02:00
Martin Artnik 3cb395db15 Use where_attributes like in team search [SCI-5099] 2021-07-09 10:49:11 +02:00
Martin Artnik fb040bee07 Fix styling, functionality issues with invite users modal [SCI-5099] 2021-07-08 16:10:20 +02:00
Oleksii Kriuchykhin 549fc8e5a0 Fix repository cell joining and preloading [SCI-5847] 2021-07-07 17:43:51 +02:00
Oleksii Kriuchykhin d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
artoscinote 52946d18e0
Merge pull request #3416 from artoscinote/ma_SCI_5099 
Rework the team invite modal functionality on members page [SCI-5099]
 2021-07-05 12:41:04 +02:00
Martin Artnik 5f528fcdb5 Rework the team invite modal functionality on members page [SCI-5099] 2021-07-05 12:39:54 +02:00
aignatov-bio bef57eacac Add missed activtiy for tag removing [SCI-5568] 2021-06-30 13:34:02 +02:00
artoscinote 9804e1bd28
Merge pull request #3400 from artoscinote/ma_SCI_5701 
Reworked task view sidebar [SCI-5701]
 2021-06-29 11:26:56 +02:00
zmagoD 9c812e84bd setup logic to group assign all team members and handle the unassignments logic 2021-06-27 13:22:19 +02:00
aignatov-bio 786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391) 
* Add backend for bioeddie [SCI-5654]

* Add modal for bioeddie [SCI-5654]

* Add bio eddie editor to steps and results [SCI-5654]

* Fix markup and code styling
 2021-06-23 19:48:44 +02:00
Martin Artnik c6c5f75262 Remove unncessary newline 2021-06-22 14:53:03 +02:00
zmagoD ad10befcc4 add new manage access permission to PET levels 2021-06-19 17:17:57 +02:00
Martin Artnik b6588c2334 Reworked task view sidebar [SCI-5701] 2021-06-18 16:52:19 +02:00
Oleksii Kriuchykhin bb458abec6 Remove old reports code [SCI-5650] 2021-06-18 10:40:00 +02:00
Oleksii Kriuchykhin 1e3197875c Fix repositories selection in report wizard and deleted repositories handling [SCI-5831] 2021-06-17 16:23:27 +02:00
Martin Artnik 47071e23a1 Added specs for webhooks 2021-06-17 14:54:30 +02:00
Alex Kriuchykhin b73972dbbf
Merge pull request #3389 from artoscinote/ma_SCI_5819 
Set scinote template if missing when generating reports [SCI-5819]
 2021-06-16 12:27:02 +02:00
aignatov-bio 7313b5fa16
Add archived and deleted repositories to reports [SCI-5781] (#3387) 
* Add archived and deleted repositories to reports [SCI-5781]

* Small markup fix [SCI-5781]
 2021-06-16 10:56:08 +02:00
Martin Artnik 2427086372 Set scinote template if missing when generating reports [SCI-5819] 2021-06-15 12:54:48 +02:00
Miha Mencin 60c309e1cd
Merge pull request #3375 from artoscinote/ma_SCI_5787 
Fix changing report project, fix typo [SCI-5787]
 2021-06-09 13:43:23 +02:00
aignatov-bio afe2a19c88
Add webhooks management [SCI-5767] (#3376) 
* Add webhooks managment [SCI-5767]

* Markup fixes [SCI-5676]
 2021-06-09 12:53:11 +02:00
Martin Artnik 6d98b7eb2b Fix changing report project, fix typo [SCI-5787] 2021-06-08 15:07:00 +02:00
Oleksii Kriuchykhin 86fcda3c09 Fix date formatting for the API [SCI-5785] 2021-06-07 10:34:58 +02:00
zmagoD 784e43e328 create user_assignments for all child objects when the user is attached to the project 2021-06-06 09:54:47 +02:00
aignatov-bio 9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
zmagoD 3d79dd32ad update endpoint type 2021-05-31 21:48:18 +02:00
aignatov-bio 3c7592657c Add activity filters [SCI-5765] 2021-05-31 13:39:10 +02:00
zmagoD debff7bc85 fix code style 2021-05-29 19:25:46 +02:00
zmagoD 28cb7ee81d add user roles enpoint and update scenarios 2021-05-29 15:28:10 +02:00
Alex Kriuchykhin 967ec1fdbf
Merge pull request #3349 from aignatov-bio/ai-sci-5758-small-report-wizard-fixes 
Small report wizard fixes [SCI-5758]
 2021-05-27 14:28:21 +02:00
Oleksii Kriuchykhin 7a5c7e0526 Fix reports docx job arguments [SCI-5763] 2021-05-26 14:34:58 +02:00
aignatov-bio f586865696 Small report wizard fixes [SCI-5758] 2021-05-25 13:14:57 +02:00
zmagoD 7e6789200a fix new API endpoints and add test cases 2021-05-23 17:31:02 +02:00
zmagoD 300c1521fd add new API endpoints and fix/update ExperimentMember and MyModuleMember modules 2021-05-22 18:36:30 +02:00
zmagoD be94cb09c2 fix code style 2021-05-22 14:41:56 +02:00
Oleksii Kriuchykhin 64ce35c8da Refactor DOCX report generator [SCI-5735] 2021-05-21 16:40:38 +02:00
Oleksii Kriuchykhin 29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Miha Mencin 6142c2d89d
Merge pull request #3336 from aignatov-bio/ai-sci-5740-default-template-selection 
Add default template selection [SCI-5740]
 2021-05-20 15:11:33 +02:00
Oleksii Kriuchykhin 7bfde7dc1e Render report element children container only if children are present [SCI-5739] 2021-05-20 14:16:39 +02:00
aignatov-bio 1b56190116 Add default template selection [SCI-5740] 2021-05-20 13:18:57 +02:00
aignatov-bio c961b493fc
Small fixes in reports templates [SCI-5723] (#3327) 
* Small fixes in reports templates [SCI-5723]

* Update template name validation [SCI-5723]
 2021-05-18 15:19:51 +02:00
aignatov-bio e8b115ca7a Change results sorting [SCI-5727] 2021-05-17 15:17:32 +02:00
Miha Mencin d952edd389
Merge pull request #3316 from okriuchykhin/ok_SCI_5702 
Add generation error states to reports [SCI-5702]
 2021-05-17 10:16:06 +02:00
zmagoD c23c01c01c remove user projects enpoints, fix the role name display 2021-05-16 12:03:16 +02:00
Oleksii Kriuchykhin a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +02:00
aignatov-bio 44a17dc014 Fix ordering tasks in report and wizard [SCI-5706] 2021-05-11 09:40:51 +02:00
zmagoD 5ee38966a0 Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui 2021-05-11 08:36:39 +02:00
Miha Mencin 56a6c0825d
Merge pull request #3296 from okriuchykhin/ok_SCI_5699 
Improve handling of selected inventories in reports [SCI-5699]
 2021-05-10 10:48:09 +02:00
Miha Mencin b4b7783cd3
Merge pull request #3301 from okriuchykhin/ok_SCI_5691 
Hide empty projects in reports editor [SCI-5691]
 2021-05-10 10:47:23 +02:00
Miha Mencin 4886a78be9
Merge pull request #3297 from okriuchykhin/ok_SCI_5694 
Add flash messages for report generation [SCI-5694]
 2021-05-10 10:46:49 +02:00
zmagoD d145dd6d36 add my module assigments modals 2021-05-09 16:59:10 +02:00
zmagoD ac91d9c2c4 add assign user permission to experiment level 2021-05-08 18:06:07 +02:00
Oleksii Kriuchykhin b056eb797f Hide empty projects in reports editor [SCI-5691] 2021-05-07 18:28:13 +02:00
Oleksii Kriuchykhin e4d852b9f5 Fix report PDF generation job params [SCI-5708] 2021-05-07 17:00:34 +02:00
Oleksii Kriuchykhin 06109889c5 Add flash messages for report generation [SCI-5694] 2021-05-07 16:23:35 +02:00
Oleksii Kriuchykhin 62b919cd8f Improve handling of selected inventories in reports [SCI-5699] 2021-05-07 14:55:01 +02:00
Alex Kriuchykhin 7bc6abd9bb
Merge pull request #3290 from okriuchykhin/ok_SCI_5614 
Improve report saving performance and error handling [SCI-5614]
 2021-05-07 11:51:57 +02:00
Alex Kriuchykhin eb773d94c5
Merge pull request #3294 from okriuchykhin/ok_SCI_5619 
Add default settings to existing reports [SCI-5619][SCI-5672]
 2021-05-07 11:38:41 +02:00
Alex Kriuchykhin 7a256838c1
Merge pull request #3292 from aignatov-bio/ai-sci-5638-add-missing-activities-for-new-reports 
Add new activities to reports [SCI-5638]
 2021-05-07 11:26:21 +02:00
Oleksii Kriuchykhin b67f2a21f5 Add default settings to existing reports [SCI-5619][SCI-5672] 2021-05-06 17:33:58 +02:00
aignatov-bio 2fc5bd2521
Fix report processing state after create and update [SCI-5678] (#3276) 2021-05-06 14:22:02 +02:00
aignatov-bio bb5f985630 Add new activities to reports [SCI-5638] 2021-05-06 14:03:45 +02:00
Oleksii Kriuchykhin c0ef2eef3c Improve report saving performance and error handling [SCI-5614] 2021-05-06 10:53:40 +02:00
miha 36788db816 SCI-5698 Make the decision to redirect to 2fa more readable 2021-05-06 08:14:39 +02:00
miha f23ff73610 SCI-5693 skip 2fa if bypass is set 2021-05-05 17:29:21 +02:00
miha 136f0cd17f SCI-5693 refactor of 2fa procedure 2021-05-04 20:51:34 +02:00
Oleksii Kriuchykhin a307a16033 Fix handsontable assets inclusion in report templates [SCI-5692] 2021-05-04 16:05:19 +02:00
zmagoD 47cb1b31dc fix code style 2021-05-02 11:36:10 +02:00