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
14768 commits 70 branches 179 tags 165 MiB
Commit graph

3254 commits

Author SHA1 Message Date
Anton 3057ddd4cb Fix file name for result orderable 2023-08-23 11:36:53 +02:00
wandji 196b6628ae
Add task protocol activities for gene sequence asset actions [SCI-8965] (#6013) 2023-08-22 14:24:43 +02:00
Anton e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Andrej 29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
Anton 2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
artoscinote 20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications 
Remove system notifications [SCI-8807]
 2023-08-18 10:28:05 +02:00
Martin Artnik 23a8872e11 Add some basic result component layout [SCI-8959] 2023-08-17 16:32:42 +02:00
ajugo 813347dcf0
Merge pull request #6000 from rekonder/aj_SCI_8948 
Create new sequence attachment on task protocol step [SCI-8948]
 2023-08-17 15:57:23 +02:00
Soufiane 4f1ea84489
Add the promotion screen for Sequence editor (OVE) [SCI-8968] (#6007) 2023-08-17 15:39:32 +02:00
Oleksii Kriuchykhin 14e49956f7 Show only default label templates when feature is disabled [SCI-9028] 2023-08-17 13:44:22 +02:00
Andrej 6e8dda64b2 Create new sequence attachment on task protocol step [SCI-8948] 2023-08-17 09:38:44 +02:00
Anton ea299919e3 Fix results api [SCI-9012] 2023-08-16 11:45:37 +02:00
Martin Artnik 8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
Oleksii Kriuchykhin 5332cbc788 Pass user by id instead of serialized object for deleyed jobs [SCI-9053] 2023-08-11 15:31:29 +02:00
Anton 6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
wandji f8a3640c4c
Move snapshot of deleted inventories to the bottom of inventory list in report wizard [SCI-8487] (#5972) 2023-08-11 13:37:26 +02:00
Anton f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
Martin Artnik 16dbd48ad3 Merge branch 'develop' into features/september-release 2023-08-10 13:21:27 +02:00
ajugo 5157f86b56
Merge pull request #5952 from ivanscinote/SCI-9025-show-label-preview 
Allow zpl_preview Access Regardless of Label Template ENV Status [SCI-9025]
 2023-08-10 09:54:08 +02:00
Andrej 104a9d5c17 Implemented trial period for open vector editor [SCI-8962] 2023-08-10 08:58:49 +02:00
Ivan Kljun 0b4afdd9ad Enable showing Label preview even if Label template is disabled [SCI-9025] 2023-08-09 17:01:30 +02:00
Martin Artnik a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
wandji20 02115cf967 Wrap timestamp filter params in the filter attribute [SCI-8738-updated] 2023-08-09 08:25:01 +01:00
Anton 758b28261d Merge branch 'develop' into features/september-release 2023-08-07 16:30:28 +02:00
Martin Artnik 11fb166a0c Migration fix, additional endpoints, cleanup [SCI-8947] 2023-08-07 16:09:15 +02:00
Martin Artnik 633abf69c0 Basic results toolbar implementation [SCI-8952] 2023-08-07 16:09:15 +02:00
Martin Artnik fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
wandji 8546d451d3 Add result_orderable_elements_controller and update activities [SCI-8882] (#5880) 2023-08-07 16:08:06 +02:00
Anton 5aa01716ef Fix bundling for deleted files 2023-08-07 15:42:13 +02:00
Anton 7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +02:00
Alex Kriuchykhin dacc6b48aa
Merge pull request #5924 from scinote-eln/features/protocol-parsing 
Merge features/protocol-parsing to develop
 2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin 6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00
aignatov-bio be4bd7f038
Merge pull request #5922 from scinote-eln/features/remove-front-end-gems 
Features/remove front end gems
 2023-08-07 11:31:12 +02:00
Anton 89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +02:00
ajugo 6f76e86171
Implement results tab for shareable task link [SCI-8753] (#5910) 
* Implement results tab for shareable task link [SCI-8753]
 2023-08-07 10:45:52 +02:00
Anton 937bc60542 Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release 2023-08-07 10:37:20 +02:00
Anton 89d7241f60 Merge branch 'develop' into features/september-release 2023-08-07 10:35:15 +02:00
ajugo 9a55889264
Merge pull request #5919 from okriuchykhin/ok_SCI_8974 
Fix file URL generation on shared task page [SCI-8974]
 2023-08-07 08:56:05 +02:00
Oleksii Kriuchykhin c61a075818 Fix file URL generation on shared task page [SCI-8974] 2023-08-04 15:09:59 +02:00
Alex Kriuchykhin b365553a14
Merge pull request #5917 from scinote-eln/features/august-release 
Merge features/august release to develop
 2023-08-04 14:01:44 +02:00
Soufiane f856ddf78c
Assigned items in task datatable will not load if stock management is enabled [SCI-8944] (#5904) 
* Fix assigned items datatable in shareable link with stock management [SCI-8944]

* Avoid skipping auth token verification for assets download [SCI-8944]
 2023-08-04 11:21:43 +02:00
Alex Kriuchykhin a943ea2dd7
Merge pull request #5888 from wandji20/wb-SCI-8907 
Create step orderable element for step_text when creating a step via the API [SCI-8907]
 2023-08-03 14:19:05 +02:00
wandji20 90b3f8943a Improve api step controller create action [SCI-8907] 2023-08-03 04:08:26 +01:00
Oleksii Kriuchykhin b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
Martin Artnik 80c5268efd Add read-only mode to OVE [SCI-8962] 2023-08-02 15:46:07 +02:00
wandji 31f8bc19d5
Add unique database index to checklist items position (#5886) 
* Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841]

* Improve protocol checklist item reordering [SCI-8841]

* Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]
 2023-08-02 15:37:01 +02:00
Martin Artnik 76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
ivanscinote 242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications 2023-08-02 13:40:06 +02:00
wandji20 88b7befbcd Create step orderable element for step_text when creating a step via the API [SCI-8907] 2023-08-01 19:55:36 +01:00
wandji20 a0372d14bf Improve base controller timestamp filter method [SCI-8738] 2023-08-01 18:59:58 +01:00
ajugo fa187f3b31
Add shared assets download and fix loading of the shareable button on task [SCI-8754] (#5878) 
* Add shared assets download and fix loading of the shareable button on task [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Load asset for specific task [SCI-8754]
 2023-08-01 16:46:41 +02:00
wandji20 07411fbc25 Refactor base controller timestamp filter method [SCI-8738] 2023-08-01 13:25:17 +01:00
Soufiane 3f3064ba19
Fix Auth issues task public view [SCI-8936] (#5890) 2023-08-01 14:23:48 +02:00
Soufiane 8d6c417936
Extract date formatting from user browser in shareable links views [SCI-8778] (#5889) 2023-08-01 10:38:00 +02:00
wandji20 1e64a246fe Rename filter_timestamps_range to timestamp_filters [SCI-8738] 2023-07-31 11:21:40 +01:00
wandji20 8e96c2427a Add options to filter records by created_at or updated_at timestamps [SCI-8738] 2023-07-27 01:31:57 +01:00
Martin Artnik 3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Ivan Kljun 216f01f151 Apply hounder linter styling suggestions 2023-07-25 15:58:40 +02:00
Ivan Kljun 18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Soufiane 4858f41b3e
Remove user_team related tests [SCI-8815] (#5860) 2023-07-25 14:35:17 +02:00
Alex Kriuchykhin 026e96652b
Fix team name escaping in inventories export modal [SCI-8922] (#5859) 2023-07-25 13:37:45 +02:00
Ivan Kljun 685ec1dddd Clear flash messages at redirect from root path 2023-07-25 11:10:45 +02:00
Oleksii Kriuchykhin de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
artoscinote c3d9488e9f
Fix canvas tag issues [SCI-8917] (#5849) 2023-07-24 17:05:48 +02:00
aignatov-bio 67a8729b41
Merge pull request #5847 from aignatov-bio/ai-sci-8880-clean-up-step-elements 
Prepare step components for results refactor [SCI-8880]
 2023-07-24 14:17:55 +02:00
Alex Kriuchykhin 2489084566
Fix handling of responses in WOPI controller [SCI-8856] (#5838) 2023-07-21 13:25:36 +02:00
artoscinote 7d62a805a3
Upgrade roo to work with Ruby 3, fix rendering of import modal [SCI-8903] (#5836) 2023-07-21 12:48:32 +02:00
aignatov-bio 160bc270b6
Merge pull request #5834 from aignatov-bio/ai-sci-8912-fix-characters-escaping 
Fix escape issues [SCI-8912]
 2023-07-21 11:53:27 +02:00
Alex Kriuchykhin 7cb8feefb9
Fix permission checking in WOPI controller [SCI-8856] (#5833) 2023-07-21 11:53:10 +02:00
Anton 5394fee3db Fix escape issues [SCI-8912] 2023-07-21 11:48:19 +02:00
aignatov-bio cca978dc5a
Merge pull request #5824 from aignatov-bio/ai-sci-8890-fix-navigator-render-for-active-folders 
Fix navigator render for active folder with archived elements [SCI-8890]
 2023-07-21 10:36:35 +02:00
Anton 2a47909e32 Update step text element [SCI-8880] 2023-07-21 10:35:14 +02:00
Alex Kriuchykhin 8aa06bf4af
Fix generation of docx report, fix rendering of modals [SCI-8911] (#5831) 2023-07-20 16:46:16 +02:00
Alex Kriuchykhin 31880521ef
Fix displaying of file previews, refactor file analyzer [SCI-8892] (#5818) 2023-07-20 12:59:45 +02:00
ajugo c4d6fc55af
Fix marvinjs file preview in RTF [SCI-8904] (#5819) 2023-07-20 11:26:58 +02:00
Soufiane c12023f8aa
Remove user_team model and related code [SCI-8815] (#5815) 2023-07-20 10:57:29 +02:00
artoscinote b0f45713cf
Merge pull request #5826 from G-Chubinidze/gc_SCI_8820 
Error at inviting user to SciNote [SCI-8820]
 2023-07-20 10:47:19 +02:00
Giga Chubinidze 4645489527 fixed teams for dropdown 2023-07-20 12:46:31 +04:00
Anton 0c5d9eb23b Fix navigator render for active folder with archived elements [SCI-8890] 2023-07-20 10:18:05 +02:00
Andrej 37d8ac6cd6 Fix shareable links after develop merge 2023-07-20 09:39:17 +02:00
Anton b0b8427f53 Fix edit file result [SCI-8902] 2023-07-19 14:56:29 +02:00
Andrej f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Martin Artnik 5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
aignatov-bio 4b2f520779
Merge pull request #5788 from aignatov-bio/ai-sci-8870-fixed-rtf-preview-for-new-files 
Fix rtf preview for new images [SCI-8870]
 2023-07-19 09:57:56 +02:00
Anton 36ffe3a444 Fix asset result edit mode [SCI-8891] 2023-07-19 09:42:00 +02:00
Giga Chubinidze 6bfbb83df5 Error at inviting user to SciNote 2023-07-19 11:07:17 +04:00
Anton 1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +02:00
aignatov-bio bab8e2c330
Merge pull request #5796 from aignatov-bio/ai-sci-8883-fix-snapshot-table-render 
Fix snapshot table render [SCI-8883]
 2023-07-18 14:16:13 +02:00
wandji 7dcc774414
Refactor html partial rendering in json responses [SCI-8811] (#5763) 
* Remove redundant use of respond_to in controlller actions with just one responder format [SCI-8811]

* Remove redundant begin block and replace 303 status code with :see_other [SCI-8811]
 2023-07-18 13:36:41 +02:00
Anton f710691709 Fix snapshot table render [SCI-8883] 2023-07-18 11:43:55 +02:00
Anton d37f335f17 Fix rtf preview for new images [SCI-8870] 2023-07-18 11:08:39 +02:00
artoscinote e79c73f8c4
Merge pull request #5777 from wandji20/wb-SCI-8851 
Fix issue archiving task result tables and when downloading archived result table
 2023-07-18 08:18:11 +02:00
Soufiane 5736c444f6
Remove not used code for global activities [SCI-4851] (#5773) 
* Fix broken task/activity [SCI-4851]

* Remove unused code for global activities [SCI-4851]
 2023-07-17 15:36:22 +02:00
wandji 063c1209ba
Fix issue when viewing task repository snapshot [SCI-8871] (#5785) 2023-07-17 13:15:04 +02:00
Anton bd1e81f894 Fix preview generation [SCI-8855] 2023-07-17 13:05:33 +02:00
wandji20 3ee5049654 Fix issue archiving task result tables and when downloading archived tables [SCI-8851] 2023-07-15 11:33:44 +01:00
wandji ebe1bd583f
Fix issue json response for creating result table [SCI-8853] (#5768) 
* Fix issue json resposnse for creating result table [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix issues when editing and updating results text/table for task [SCI-8853]

* Fix linter errors [SCI-8853]
 2023-07-14 12:30:36 +02:00
Oleksii Kriuchykhin a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin 092e451f2e Merge branch 'develop' into features/protocol-parsing 2023-07-13 13:59:10 +02:00
Oleksii Kriuchykhin fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Alex Kriuchykhin d419608f18
Connect protocol parsing service to rails backend [SCI-8817] (#5759) 2023-07-13 11:41:53 +02:00
Soufiane 78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Soufiane 6d98b0c235
Reports - Issues after rails upgrade [SCI-8830] (#5758) 
* Fix reports issues after rails upgrade [SCI-8830]

* Fix report image assets [SCI-8830]
 2023-07-12 15:42:34 +02:00
G-Chubinidze ac399e5722
Activities - Issues after rails upgrade [SCI-8824] (#5755) 2023-07-12 11:11:10 +02:00
Soufiane 2f669c93d5
Fix projects issues after rails upgrade [SCI-8827] (#5754) 2023-07-12 11:10:17 +02:00
ajugo 32fc7698d2
Implement welcome modal for shareable links [SCI-8748] (#5729) 2023-07-11 16:01:42 +02:00
Alex Kriuchykhin b852cf92fe
Fix displaying of tinyMCE images in search results [SCI-8823] (#5751) 2023-07-11 14:47:15 +02:00
ajugo 632716e2cd
Remove task manage permission [SCI-8528] (#5672) 2023-07-11 09:29:17 +02:00
artoscinote 4a8582ebc8
Initial implementation of protocol processing modal [SCI-8661] (#5683) 
* Initial implementation of protocol processing modal [SCI-8661]

* Prepare placeholder jobs and integrate notifications [SCI-8661]
 2023-07-11 09:27:15 +02:00
Soufiane d8658991d6
Fix task page issues after rails upgrade [SCI-8821] (#5745) 2023-07-11 09:21:22 +02:00
Soufiane 6aaa68f320
Fix reports issues after rails upgrade [SCI-8830] (#5748) 2023-07-11 09:20:29 +02:00
Soufiane e8c62d6cd8
Fix protocol template issues after rails upgrade [SCI-8822] (#5740) 2023-07-10 13:57:13 +02:00
Soufiane b44678d09a
Switch to keyword parameters in i18n.t [SCI-8810] (#5739) 2023-07-07 14:55:51 +02:00
Soufiane 8fb14645bf
Match protocol template print permissions to show [SCI-8803] (#5726) 2023-07-07 11:01:31 +02:00
ajugo 6c6fc404d2
Implement task shareable modal [SCI-8651] (#5723) 
* Implement task shareable modal [SCI-8651]

* Fix routes [SCI-8651]

* Clean code for vue share button initilization [SCI-8651]
 2023-07-06 16:05:03 +02:00
Soufiane 33bb79d17a
Implement details and notes sections of shareable links [SCI-8750] (#5710) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-07-06 15:10:26 +02:00
Soufiane 6049c7d8b9
Activities for shareable links [SCI-8652] (#5694) 
Define new activities for task shareable links [SCI-8652]
 2023-07-06 15:01:32 +02:00
Anton 4b82ba9613 Merge branch 'features/rails-upgrade' into features/remove-front-end-gems 2023-07-06 11:14:48 +02:00
Soufiane 94ead579e6
Create the general layout for shareable links [SCI-8749] (#5699) 2023-07-06 09:19:29 +02:00
ajugo 836d1b6be1
Add permissions for shareable links and some fixes for controller [SCI-8747] (#5709) 
Add permissions for shareable links and som fixes for controller [SCI-8747]
 2023-07-05 16:21:26 +02:00
Alex Kriuchykhin 5f1c6bf2f0
Fix multiple issues after Rails upgrade [SCI-8780] (#5716) 2023-07-05 12:43:23 +02:00
Alex Kriuchykhin b7e04972e1
Implement model and controller for shareable links, update team model [SCI-8648] (#5693) 2023-07-03 15:54:11 +02:00
artoscinote 1e8304d883
Merge pull request #5697 from wandji20/wb-SCI-8487 
Add filter to remove archived inventories from report widget [SCI-8487]
 2023-07-03 14:48:23 +02:00
ajugo 6dc4b646c5
Add handling for deleted ActiveStorage files [SCI-8264] (#5624) 
Add handling for deleted ActiveStorage files [SCI-8264]
 2023-07-03 13:13:19 +02:00
Anton b956f9de25 Remove bootstrap form 2023-07-03 12:59:13 +02:00
Martin Artnik c7d992ab83 Fixes for saving of result table metadata [SCI-8774] 2023-07-03 12:35:29 +02:00
Martin Artnik 0f3b524492 Fix and amend result table metadata saving [SCI-8774] 2023-06-30 14:11:03 +02:00
wandji20 eb017ff564 Add filter to remove archived inventories from report widget [SCI-8487] 2023-06-30 02:22:57 +01:00
ajugo 563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Giga Chubinidze a2aab6cbeb Parsing (import) protocols - Notifications update [SCI-8693] 2023-06-28 09:05:11 +04:00
artoscinote 5fe463d293
Merge pull request #5674 from sboursen-scinote/sb_SCI-8164-8726 
[SCI-8164][SCI-8726]
 2023-06-26 15:43:29 +02:00
sboursen-scinote 706c2e492b Fix CSS and icon inconsistencies [SCI-8164][SCI-8726] 
- Use the correct arrow-left/arrow-right icons.
- Show the tasks of active experiments in archived branch in the Navigator.
- Fix minor style issues in P/E/T.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-26 15:22:36 +02:00
artoscinote fa60cb6589
Merge pull request #5664 from G-Chubinidze/gc_SCI_8476 
Breadcrumbs on label/protocol template page [SCI-8476]
 2023-06-26 13:00:19 +02:00
Soufiane fdc4f4ddd7
Create an export_limit_exceeded model for repositories export [SCI-8730] (#5667) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-23 12:10:58 +02:00
Giga Chubinidze ef94a4f2bb logic refactor, url removal 2023-06-23 13:39:54 +04:00
artoscinote 496fbc9eca
Merge pull request #5653 from rekonder/aj_SCI_8719 
Remove breadcrumbs project table and fix project filtering [SCI-8719]
 2023-06-23 09:54:00 +02:00
Oleksii Kriuchykhin e86f0e76de Fix breadcrumbs for archived view mode [SCI-8710] 2023-06-22 15:41:37 +02:00
Andrej 3d2f9eae1e Remove breadcrumbs project table and fix filtering [SCI-8719] 2023-06-22 13:44:27 +02:00
Oleksii Kriuchykhin 66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
artoscinote 4fe0ad026d
Change the way ConnectedDevice logging is added to TokensController [SCI-8287] (#5634) 2023-06-20 12:50:36 +02:00
sboursen-scinote ef16771f00 Add breadcrumbs to Fluics page [SCI-8675] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-19 12:20:53 +02:00
Soufiane 966b92e8d2
Activities update for grant project access to all team members [SCI-8383] (#5598) 
* Create new activities for granting/revoking access to all team members on projects [SCI-8383]
 2023-06-16 13:08:02 +02:00
Soufiane b254f5614b
Inventory export FE [SCI-6546] (#5608) 
* Implement the front-end part of inventory export functionality [SCI-6546]

- Add the export button to the action toolbar
- Create new modal and link it to the export repository action
- Update the global export limit counter

* Remove load_repository and check_view_permission for export_repositories [SCI-6546]
 2023-06-16 10:48:39 +02:00
Anton d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
G-Chubinidze 0ad1540a41
Merge branch 'features/ui-revamp' into gc_SCI_8511 2023-06-14 17:02:18 +04:00
Giga Chubinidze 41d42d47bd update addon controller 2023-06-14 05:15:18 +04:00
Giga Chubinidze 88df4b2a11 Settings page - breadcrumbs [SCI-8511] 2023-06-14 05:13:33 +04:00
Soufiane 23e248ca02
Changed wording for activities [SCI-8243] (#5356) 
* Change wording for access activities in projects and protocols [SCI-8243]
* Add project activity for changing all team members role via project option-edit [SCI-8243]
 2023-06-13 16:55:40 +02:00
artoscinote 820bf7808a
Merge pull request #5586 from G-Chubinidze/gc_SCI_8476 
Breadcrumbs on label/protocol template page [SCI-8476]
 2023-06-13 14:49:14 +02:00
Anton b434c8a2c7 Update css for team selection and search field [SCI-8540] 2023-06-13 11:52:14 +02:00