scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-29 03:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
10394 commits 69 branches 179 tags 165 MiB
Commit graph

2435 commits

Author SHA1 Message Date
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
zmagoD c1d98f421d update scenarios and UI logic to handle project page reload after modal close 2021-05-02 11:22:59 +02:00
zmagoD 11e5662c47 add fe logic for disable/enable fields 2021-04-30 13:26:06 +02:00
aignatov-bio 86854b015d Add third template to reports [SCI-5618] 2021-04-29 15:21:58 +02:00
zmagoD 8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +02:00
aignatov-bio 7c75f170d0
Add repositories settings to report wizard [SCI-5648] (#3269) 
* Add repositories settings to report wizard [SCI-5648]

* Move repositories from report settings to content [SCI-5648]
 2021-04-28 09:54:00 +02:00
zmagoD c136d953d0 create form object for role assigment, create helper object for project member, added new user_projects modal 2021-04-24 18:43:28 +02:00
Oleksii Kriuchykhin a67cc619ec Add additional custom fields for reports [SCI-5609] 2021-04-20 13:57:09 +02:00
aignatov-bio d18a54c874
Update create and update action for reports controller [SCI-5641] (#3260) 
Update create and update action [SCI-5641]
 2021-04-20 13:35:40 +02:00
zmagoD 04ef7a4478 add show and edit permissions modal 2021-04-18 17:19:16 +02:00
zmagoD 3333241c9a add CTA for project members modal SCI-5645 2021-04-18 12:23:29 +02:00
Miha Mencin f95e9402bd
Merge pull request #3258 from okriuchykhin/ok_SCI_5613 
Fix save report PDF to Inventory [SCI-5613]
 2021-04-15 09:30:04 +02:00
Alex Kriuchykhin 80827ce761
Merge pull request #3257 from biosistemika/SCI-5623-add-external-id-to-user 
SCI-5623 add external id to user
 2021-04-14 16:15:43 +02:00
Oleksii Kriuchykhin f13f3691b1 Fix blob permissions check to support multiple attachments [SCI-5613] 2021-04-14 16:07:01 +02:00
Oleksii Kriuchykhin fe8f006f6e Fix save report PDF to Inventory [SCI-5613] 2021-04-14 16:06:59 +02:00
Oleksii Kriuchykhin 0a9a656313 Add flash message and notification for generated reports [SCI-5552] 2021-04-14 15:45:51 +02:00
Oleksii Kriuchykhin a2a0aabb62 Implement pooling for Report document creation status [SCI-5557] 2021-04-14 15:16:08 +02:00