Commit graph

3490 commits

Author SHA1 Message Date
sboursen-scinote
2dc82c9ed9 Show table header in folder when creating the first project [SCI-9019] 2023-08-18 16:26:53 +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
artoscinote
45791a764f
Merge pull request #6014 from wandji20/wb-SCI-9057
Fix bug in new result table event delegation [SCI-9057]
2023-08-18 10:13:36 +02:00
artoscinote
c28b54c43b
Merge pull request #5937 from G-Chubinidze/gc_SCI_5605
Some icons have the checkboard pattern applied to the background [SCI-5605]
2023-08-18 10:04:06 +02:00
wandji20
cf3cb707fd Fix bug in new result table event delegation [SCI-9057] 2023-08-18 07:16:01 +01:00
Soufiane
4f1ea84489
Add the promotion screen for Sequence editor (OVE) [SCI-8968] (#6007) 2023-08-17 15:39:32 +02:00
Andrej
b07432a444 Add checks for metadata on protocol import [SCI-9064] 2023-08-17 14:20:44 +02:00
Anton
16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
wandji20
25e6cbdbd8 Move inline JavaScript inclusion for new and edit result table to result_tables.js [SCI-9057] 2023-08-16 17:08:25 +01:00
sboursen-scinote
d631098d9a Fix multiple issues with edit sequence on task protocol [SCI-8966]
- Fix edit button label and icon
- Fix preview modal for gene-sequence
2023-08-16 17:01:43 +02:00
Alex Kriuchykhin
975a197716
Merge pull request #5987 from ivanscinote/SCI-9034-shared-task-issues
Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]
2023-08-16 15:34:57 +02:00
Alex Kriuchykhin
5eea990881
Merge pull request #5980 from wandji20/wb-SCI-9058
Move new and edit result asset inline Javascript to result_asset.js  [SCI-9058]
2023-08-16 15:34:21 +02:00
Ivan Kljun
1ea77b4ac8 Apply hound linter suggestions 2023-08-16 15:28:28 +02:00
Ivan Kljun
843cbb06da Fix trigger load and error event in active_storage_previews 2023-08-16 15:27:09 +02:00
wandji20
ebcb784149 Move result asset new and edit event handler to result asset and delete files [SCI-9058] 2023-08-16 13:50:40 +01:00
artoscinote
0062108996
Merge pull request #5984 from wandji20/wb-SCI-9043
Fix inventory item CSS and set nonce shared file preview inline JavaScript [SCI-9043]
2023-08-16 11:17:47 +02:00
Ivan Kljun
860a8efda7 Add moment.js to application.js.erb 2023-08-16 10:52:36 +02:00
Ivan Kljun
1880723c8c Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034] 2023-08-16 10:49:34 +02:00
Martin Artnik
8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
wandji20
b9e391e781 Fix inventory item CSS abd set nonce shared file preview inline JavaScript [SCI-9043] 2023-08-15 14:28:53 +01:00
sboursen-scinote
dcaf55eeb2 Fix icon position for form password fields [SCI-9020] 2023-08-15 09:54:00 +02:00
wandji20
3fc5ac36b0 Set nonce for new and edit result asset inline javascript and fix image preview after editing [SCI-9058] 2023-08-14 16:48:00 +01:00
Anton
6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
wandji20
e27c6174b4 Move unnecessary jquery style update to teams.scss stylesheet [SCI-9003] 2023-08-11 12:11:22 +01:00
wandji20
52fc7eb0e8 Fix Css issues [SCI-9003] 2023-08-11 10:45:51 +01:00
Alex Kriuchykhin
a4ea995027
Revert to using intermediate jquery_bundle file [SCI-9031] (#5962) 2023-08-10 17:19:28 +02:00
Alex Kriuchykhin
c6a545d8b3
Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961) 2023-08-10 16:25:04 +02:00
Martin Artnik
16dbd48ad3 Merge branch 'develop' into features/september-release 2023-08-10 13:21:27 +02:00
Martin Artnik
52eca4eba1 Require jQuery from node_modules 2023-08-10 12:11:22 +02:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
Anton
2da83f460f Test moving jquery 2023-08-09 14:43:17 +02:00
wandji
6c18a5a622
Fix issue previewing image after edit [SCI-8914] (#5908)
* Fix issue previewing image after edit [SCI-8914]
2023-08-09 10:38:01 +02:00
wandji
a1e6392a45
Fix bugs with jquery3 upgrade [SCI-8973] (#5933)
* Fix bugs with jquery3 upgrade [SCI-8973]

* Remove deprecated jquery method (.error, .completed, .success) [SCI-8973]

* Fix linter error [SCI-8973]
2023-08-09 10:33:58 +02:00
Giga Chubinidze
73e35994d5 new icon changes 2023-08-09 04:19:57 +04:00
Martin Artnik
e0ceaa44cd Fix column resizing for existing inventories with no colSize data [SCI-8984] 2023-08-08 14:01:32 +02:00
Alex Kriuchykhin
ab758c747f
Merge pull request #5920 from sboursen-scinote/sb_SCI-8983
Shared task - Details - multiple issues [SCI-8983]
2023-08-08 11:42:14 +02:00
sboursen-scinote
7b2a752d60 Fix multiple issues with shared task [SCI-8983]
- Circumvent authentication by using direct URL Users' avatars
- Change wrong completed-on icon
- Parse dates in browser's format
2023-08-08 11:11:46 +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
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
Giga Chubinidze
a98137bb57 Date range in filters allows start date to be after end date [SCI-8796] 2023-08-03 11:58:34 +04:00
Oleksii Kriuchykhin
b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
ivanscinote
5a531c98ae
Add callback to clear form errors at create wopi files [SCI-8927] (#5877)
* Add callback to clear form errors at create wopi files [SCI-8927]
2023-08-02 15:34:36 +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
Soufiane
8d6c417936
Extract date formatting from user browser in shareable links views [SCI-8778] (#5889) 2023-08-01 10:38:00 +02:00
artoscinote
1c9bd53ff9
Merge pull request #5894 from G-Chubinidze/gc_SCI_8798
Remove text when option is chosen in dropdown selector in add member to team [SCI-8798]
2023-08-01 10:38:00 +02:00
Giga Chubinidze
413e806499 Remove text when option is chosen in dropdown selector in add member to team [SCI-8798] 2023-07-31 19:58:34 +04:00
wandji20
c5d6239e88 Fix issue with repository header changing when fetching data [SCI-8793] 2023-07-27 20:55:11 +01:00
Martin Artnik
ca503401fe Fix loading of column order if no sizes are present [SCI-8934] 2023-07-26 16:05:03 +02:00
Ivan Kljun
9278e887d6 Fix checkbox project select [SCI-8584] 2023-07-26 15:48:24 +02:00
ajugo
44c919d3dc
Implement shareable link task view [SCI-8752] (#5843)
* Implement shareable link task view [SCI-8752]
2023-07-26 15:19:32 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Ivan Kljun
18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Martin Artnik
fa5cad935f Highlight code after saving result [SCI-8926] 2023-07-25 14:36:57 +02:00
Alex Kriuchykhin
026e96652b
Fix team name escaping in inventories export modal [SCI-8922] (#5859) 2023-07-25 13:37:45 +02:00
Martin Artnik
7dd7566080 Fix updating repository checklist to a blank one [SCI-8921] 2023-07-25 12:21:35 +02:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
sboursen-scinote
634d4b6066 Prefill the protocol name in modal when saving from template [SCI-8239] 2023-07-25 09:23:32 +02:00
ajugo
abda07bf4e
Merge pull request #5832 from sboursen-scinote/sb_SCI-8909
Fix manage modal issues [SCI-8909]
2023-07-21 12:13:36 +02:00
artoscinote
a88e66e12b
Merge pull request #5823 from artoscinote/ma_SCI_8733
Preserve column widths when showing/hiding columns [SCI-8733]
2023-07-21 10:33:58 +02:00
sboursen-scinote
e58a12da52 Fix manage modal issues [SCI-8909] 2023-07-21 09:36:10 +02:00
Alex Kriuchykhin
31880521ef
Fix displaying of file previews, refactor file analyzer [SCI-8892] (#5818) 2023-07-20 12:59:45 +02:00
Martin Artnik
c38d58336a Preserve column widths when showing/hiding columns [SCI-8733] 2023-07-20 09:49:29 +02:00
G-Chubinidze
b0c36452b7
Fix export action on project card dropdown [SCI-8833] (#5772)
* Fix export action on project card dropdown [SCI-8833]
2023-07-19 16:05:17 +02:00
ajugo
bcf0dc5069
Merge pull request #5811 from rekonder/aj_SCI_8897
Fix result table rendering in reports [SCI-8897]
2023-07-19 13:13:02 +02:00
Andrej
f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Andrej
2a5f55aed8 Fix result table rendering in reports [SCI-8897] 2023-07-19 11:53:47 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
Giga Chubinidze
323230c2e3 Sorting icons are visible in table header row [SCI-8725] 2023-07-19 11:11:42 +02:00
ajugo
0d37011bba Change behavior of repository table loading on state change [SCI-8637] (#5712) 2023-07-19 11:08:40 +02:00
ajugo
4ac0ee3ace
Fix opening of task/tags for archived my_module [SCI-8886] (#5801) 2023-07-19 10:32:51 +02:00
Anton
f540b3dc8d Fix js error in console log [SCI-8890] 2023-07-19 09:55:27 +02:00
Anton
1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +02:00
wandji
aafeb456fa
Fix CSS issues in experiments tasks page and modal [SCI-8766] (#5738)
* Fix CSS issues in experiments tasks page and modal [SCI-8766]

* Fix linter errors [SCI-8766]

* Increase spacing for icons in ask display modal and remove html.erb extention from render partial

* Optimize changes [SCI-8766]
2023-07-18 13:38:50 +02:00
Giga Chubinidze
1982143608 Clunky parts: button initialization when P/E/T view is changed [SCI-8663] 2023-07-18 01:50:05 +04: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
ajugo
504a0bee62
Fix scroll for protocols.io [SCI-8825] (#5774) 2023-07-17 10:55:36 +02:00
ivanscinote
f21a4ec17b
Remove searchfield glitch at reports and label templates index page (#5769) 2023-07-14 12:30:58 +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
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
aignatov-bio
3de911d714
Merge pull request #5750 from aignatov-bio/ai-sci-8762-css-bugs
CSS fixes [SCI-8762]
2023-07-11 10:59:27 +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
9034793d69
Implement the assigned items datatable for shareable links [SCI-8751] (#5721)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-07-11 08:16:29 +02:00
Anton
8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +02:00
artoscinote
5bcf31ed2e
Fix activity filter loading via URL params [SCI-7537] (#5737) 2023-07-10 13:59:15 +02:00
Soufiane
eb4d0f2065
Revert changing .js.erb file [SCI-8810] (#5741) 2023-07-10 09:43:00 +02:00
Soufiane
b44678d09a
Switch to keyword parameters in i18n.t [SCI-8810] (#5739) 2023-07-07 14:55:51 +02:00
wandji
322346c8e4
Fix dropdown issue for filters [SCI_8781] (#5731) 2023-07-07 10:58:43 +02:00
Anton
9a5abfabf7 Move js gems to packages [SCI-8772] 2023-07-05 12:03:44 +02:00
artoscinote
7b1f444a11
Merge pull request #5689 from wandji20/wb-SCI-8741
Fix avatar image width in smart anotation pop op [SCI-8741]
2023-07-03 14:48:57 +02:00
artoscinote
c4acbf2815
Merge pull request #5692 from artoscinote/ma_SCI_8691
Add action toolbar to archived tasks card view [SCI-8691]
2023-07-03 14:47:47 +02:00
Martin Artnik
308079319c Fix result table editing [SCI-8774] 2023-07-03 13:28:34 +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
Soufiane
9d70d35491
Implement share button on task [SCI-8650] (#5691)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-29 13:38:59 +02:00
Martin Artnik
1d6f3cedc7 Add action toolbar to archived tasks card view [SCI-8691] 2023-06-28 15:39:03 +02:00
wandji20
5fe2bd56b6 Fix avatar image width in smart anotation pop op [SCI-8741] 2023-06-28 11:57:19 +01:00
ajugo
563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Anton
586d9eaf4b CSS fixes [SCI-8758][SCI-8759] 2023-06-27 20:31:25 +02:00
Martin Artnik
39aedd86e0 Fix project sort initialization [SCI-8756] 2023-06-27 15:18:12 +02:00
aignatov-bio
272baeb93e
Merge pull request #5680 from aignatov-bio/ai-sci-8742-small-css-fixes
Small css fixes [SCI-8742]
2023-06-27 12:00:37 +02:00
Anton
e2190cedde Small css fixes [SCI-8742] 2023-06-27 11:58:02 +02:00
Andrej
35ebbadae9 Fix adding tags to the task at creation [SCI-8745] 2023-06-27 10:52:03 +02:00
ajugo
8d29e606d0
Fix filtering of the member on project page [SCI-8743] (#5676) 2023-06-27 10:17:17 +02:00
ajugo
13f0b26875
Fix uploading of old protocol tables [SCI-8736] (#5673) 2023-06-26 11:54:54 +02:00
Martin Artnik
5609184c0f Fix repository export modal [SCI-8734] 2023-06-23 12:41:37 +02:00
artoscinote
b520f8a04b
Merge pull request #5655 from aignatov-bio/ai-sci-8704-fix-avatar-popup
Add left padding to smart annotation popup [SCI-8704]
2023-06-23 10:51:37 +02: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
Soufiane
c71d8df470
Add support to characters in smartAnnotation [SCI-8656] (#5617)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-22 15:40:39 +02:00
Soufiane
b4d4043271
Prevent over submitting on new task click [SCI-8460] (#5659)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-22 14:49:53 +02:00
artoscinote
b78105c546
Fix column width limiting [SCI-7961] (#5656) 2023-06-22 14:33:16 +02:00
Andrej
3d2f9eae1e Remove breadcrumbs project table and fix filtering [SCI-8719] 2023-06-22 13:44:27 +02:00
Anton
2254fcdab0 Add left padding to smart annotation popup [SCI-8704] 2023-06-22 13:36:05 +02:00
ajugo
e82338be70
Fix zoom on pdf preview [SCI-8697] (#5647) 2023-06-22 10:41:35 +02:00
Oleksii Kriuchykhin
66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
Anton
8c385e911f Fix long user name in smart annotation [SCI-8704] 2023-06-21 12:53:18 +02:00
artoscinote
248790360a
Project filter fixes [SCI-8695] (#5640) 2023-06-21 12:30:49 +02:00
Anton
2030b71082 UI CSS Fixes 2023-06-21 12:02:18 +02:00
Soufiane
8b8fd1db42
Fix wicked_pdf asset pipeline [SCI-8684] (#5629)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-21 10:42:27 +02:00
aignatov-bio
0543a9a0c4
Merge pull request #5637 from aignatov-bio/ai-sci-8660-ui-css-fixes
Fix UI css fixes [SCI-8660]
2023-06-20 16:36:45 +02:00
Anton
f675034b7f Fix UI css fixes [SCI-8660] 2023-06-20 15:53:33 +02:00
artoscinote
ad26237d02
Implement column resizing [SCI-7961] (#5596)
* Patch datatables to support ColReorder + ColResize [SCI-7961]

* Implement repository column resizing [SCI-7961]

* Fix colResize and colReorder interactions [SCI-7961]

* Add styling improvements for column interactions [SCI-7961]

* Update grip icons [SCI-7961]

* Tweaks and fixes [SCI-7961]
2023-06-20 12:52:02 +02:00
aignatov-bio
a3aeac1c1d
Merge pull request #5628 from aignatov-bio/ai-sci-ui-css-fixes
UI CSS fixes
2023-06-19 16:00:40 +02:00
Anton
4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
Soufiane
72266fc636
Inventory export FE [SCI-6546] (#5622)
* 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

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Remove load_repository and check_view_permission for export_repositories [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix text grammar in repositories export modal [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Use I18n pluralization [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-19 14:16:55 +02:00
artoscinote
62daa073ae
Merge pull request #5611 from G-Chubinidze/gc_SCI_8526
Double scroller on assign item to task from inventory table [SCI-8526]
2023-06-19 12:36:54 +02:00
Giga Chubinidze
374a474336 removed timeouts 2023-06-19 14:34:54 +04:00
ajugo
76b6d92d6e
Fix task duplication on experiment table page [SCI-8676] (#5618) 2023-06-19 11:20:56 +02:00
artoscinote
36ae7e6ebd
Merge pull request #5621 from G-Chubinidze/gc_SCI_8673
Search field on assign/assigned item to task [SCI-8673]
2023-06-19 10:44:52 +02:00
Giga Chubinidze
44a5a1f3b2 Search field on assign/assigned item to task [SCI-8673] 2023-06-19 10:21:04 +04:00
aignatov-bio
e4076c931a
Merge pull request #5614 from aignatov-bio/ai-sci-8658-css-fixes
UX fixes [SCI-8658][SCI-8667][SCI-8668][SCI-8669][SCI-8672][SCI-8660][SCI-8662]
2023-06-16 12:57:17 +02:00
Anton
289c92cb00 UX fixes [SCI-8658][SCI-8667][SCI-8668][SCI-8669][SCI-8672][SCI-8660][SCI-8662] 2023-06-16 12:38:09 +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
Alex Kriuchykhin
2df9367b01
Remove old JS code, unneeded JS include nonce [SCI-8670] (#5607) 2023-06-16 10:19:54 +02:00
Giga Chubinidze
f8f03e6b51 Double scroller on assign item to task from inventory table [SCI-8526] 2023-06-16 06:50:38 +04:00
aignatov-bio
2c7828a227
Merge pull request #5605 from aignatov-bio/ai-sci-8671-css-fixes
PET css fixes [SCI-8660]
2023-06-15 15:16:50 +02:00
Anton
c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
Soufiane
34b7999e43
Revert disabling of the name input [SCI-8460] (#5602)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-15 14:26:25 +02:00
aignatov-bio
20a411c777
Merge pull request #5600 from scinote-eln/features/ui-revamp
Features/UI revamp
2023-06-15 11:51:44 +02:00
ajugo
2afe589657
Remove double load of current task on dashboard page [SCI-8642] (#5597) 2023-06-15 09:41:46 +02:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
Anton
4674f64905 Add new button style [SCI-8558] 2023-06-14 14:54:10 +02:00
Soufiane
606bdb118b
Prevent submitting forms multiple times [SCI-8560] (#5584)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-13 08:29:26 +02:00
artoscinote
e57da37ec7
Merge pull request #5573 from G-Chubinidze/gc_SCI_8366
New icons implementation [SCI-8366]
2023-06-12 11:25:36 +02:00
Martin Artnik
7dfbc960e3 Font fix + default label icon fix [SCI-8366] 2023-06-12 11:20:33 +02:00
artoscinote
0e14b7de8a
Merge pull request #5544 from sboursen-scinote/sb_SCI-8498
Activity from dropdown disappeared [SCI-8498]
2023-06-09 13:19:52 +02:00
artoscinote
75a70ec080
Merge pull request #5576 from sboursen-scinote/sb_SCI-8532
Automatically close the Assign from inventory window on task screen [SCI-8532]
2023-06-09 10:29:32 +02:00
Soufiane
77de460182
Due date flyout on dashboard calendar [SCI-8600] (#5554)
* Change the scope of the DatePicker datetime format in global activities [SCI-8600]
2023-06-09 09:24:32 +02:00
Martin Artnik
dcc30822f5 New icon tweaks & fixes [SCI-8366] 2023-06-08 17:33:50 +02:00
sboursen-scinote
154910602f Close the Assign from inventory window on success [SCI-8532]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-08 15:33:43 +02:00
G-Chubinidze
dc9d37226a
Update application.js.erb 2023-06-08 10:37:11 +04:00
Giga Chubinidze
a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04:00
artoscinote
dc59376a35
Merge pull request #5558 from sboursen-scinote/sb_SCI-8612
"Number" column decimal units edit mode & infinite spinner [SCI-8612]
2023-06-06 15:23:07 +02:00
Soufiane
ad0418947c
Modal stays open when renaming an inventory via the bottom toolbar [SCI-8613] (#5567)
* Initialize rename and duplicate inventory models [SCI-8613]
2023-06-06 15:18:21 +02:00
aignatov-bio
a032839d62
Merge pull request #5559 from aignatov-bio/ai-sci-8620-fix-reports-table-css
Fix reports table css [SCI-8620]
2023-06-06 12:52:33 +02:00
Martin Artnik
f344b72583 Fix save and load of folder checkbox in filters [SCI-8598] 2023-06-06 12:43:27 +02:00
Anton
0d6cf02eab Fix reports table css [SCI-8620] 2023-06-06 10:54:01 +02:00
sboursen-scinote
5ef6416f6e Refactor inline events in JavaScript HTML tempaltes [SCI-8612]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-06 09:45:00 +02:00
sboursen-scinote
e9c1d0d827 Redirect to experiment page and show flash on move [SCI-8603]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-05 11:58:59 +02:00
Soufiane
30c5b1675f
Missing warning messages when setting up new user [SCI-8595] (#5548)
* Fix form errors in users invitation edit [SCI-8595]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix form errors in users confirmation new [SCI-8595]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix form errors in users registration [SCI-8595]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-02 15:35:29 +02:00
sboursen-scinote
456670dd15 Fix Activities type dropdowns [SCI-8498]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-02 10:39:56 +02:00
artoscinote
c58a852e2a
Merge pull request #5532 from G-Chubinidze/gc_SCI_8098_8147
Cursor position improvements, focused fields - part 1 & 2 [SCI-8098] [SCI-8147]
2023-06-01 12:36:54 +02:00
artoscinote
66ccea318b
Merge pull request #5531 from G-Chubinidze/gc_SCI_8584
Not responsive buttons with closed/opened navigator [SCI-8534]
2023-06-01 12:25:07 +02:00
Giga Chubinidze
14b71d1374 hound fix 2023-06-01 14:24:27 +04:00
ajugo
17e89c6152
Fix extra large image preview for results [SCI-8585] (#5534) 2023-06-01 11:00:55 +02:00
ajugo
31fdaf5e55
Remove search terms on datatable refresh [SCI-8574] (#5533) 2023-06-01 09:52:58 +02:00
artoscinote
015c481a2b
Merge pull request #5530 from artoscinote/ma_SCI_8551
Attempt to fix sporadic task table render errors [SCI-8551]
2023-06-01 09:26:21 +02:00
Giga Chubinidze
801db4b7a4 added resize observer 2023-05-31 19:27:07 +04:00
artoscinote
79d9f3c404
Merge pull request #5523 from G-Chubinidze/gc_SCI_8575
Empty state of inventories - Clickable empty row [SCI-8575]
2023-05-31 16:30:20 +02:00
Martin Artnik
60a0a4ea9b Attempt to fix sporadic task table render errors [SCI-8551] 2023-05-31 16:17:25 +02:00
Soufiane
b40c750965
Turbolinks broken by default with a secure CSP [SCI-8583] (#5529)
* Fix broken Turbolinks with CSP nonce [SCI-8583]
2023-05-31 15:28:16 +02:00
Martin Artnik
7f7fc42ec8 Fix project sorting dropdown [SCI-8398] 2023-05-31 13:44:48 +02:00
Giga Chubinidze
9b7abe8de7 changed logic to accomodate globally 2023-05-31 15:36:09 +04:00
Giga Chubinidze
4c4bec1b50 Empty state of inventories - Clickable empty row [SCI-8575] 2023-05-31 11:52:15 +04:00
ajugo
d3006c9862
Fix archive/restore of protocol templates [SCI-8579] (#5521) 2023-05-31 09:38:24 +02:00
ajugo
d3e11b0dde
Hide experiment action row after archive/restore [SCI-8576] (#5519) 2023-05-31 09:38:09 +02:00
Giga Chubinidze
80b8a8803d amended focus fields 2023-05-31 11:08:16 +04:00
Soufiane
46fc3d17e6
Broken modal for sharing inventories [SCI-8548] (#5506)
* Fix share_modal js loading [SCI-8548]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8548]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8548]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-30 16:15:20 +02:00
Martin Artnik
44ad7703b2 Save and load project filters after table load [SCI-8398] 2023-05-30 15:31:15 +02:00
ajugo
2e9fe37040
Fix repository table reloading and flash messages [SCI-8554] (#5504)
* Fix repository table reloading and flash messages [SCI-8554]

* Pass function for repository reload [SCI-8554]
2023-05-29 11:48:13 +02:00
artoscinote
01b54763a2
Merge pull request #5477 from G-Chubinidze/gc_SCI_8464
CSS: inventory items top toolbar issues [SCI-8464]
2023-05-29 11:32:16 +02:00
G-Chubinidze
43218900e4
Merge branch 'develop' into gc_SCI_8496 2023-05-29 13:27:18 +04:00
Giga Chubinidze
017781d0dc cleanup 2023-05-29 13:25:54 +04:00
artoscinote
1b1ecbfbaf
Merge pull request #5488 from G-Chubinidze/gc_SCI_8147
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
2023-05-29 11:08:41 +02:00
artoscinote
5612303f79
Merge pull request #5487 from G-Chubinidze/gc_SCI_8098
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
2023-05-29 11:07:53 +02:00
artoscinote
b1fe71719a
Merge pull request #5503 from sboursen-scinote/sb_SCI-8546
Duplicated item created in the inventory [SCI-8546]
2023-05-29 10:38:42 +02:00
ajugo
e2624987bd
Save repository table page to local storage [SCI-8512] (#5501) 2023-05-29 10:27:00 +02:00
sboursen-scinote
6240dd0a5f Fix hound [SCI-8546]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-29 09:55:31 +02:00
sboursen-scinote
65cad3fedd Fix duplicated items created in inventories [SCI-8546]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-28 22:36:52 +02:00
Giga Chubinidze
038226fa19 removed test code 2023-05-26 13:44:11 +04:00
aignatov-bio
642932bbcc
Merge pull request #5475 from rekonder/aj_SCI_8490
Add empty states for PET [SCI-8490]
2023-05-26 11:14:38 +02:00
aignatov-bio
e25f91daf7
Merge pull request #5482 from aignatov-bio/ai-sci-8483-fix-toolbar-and-pagination
Unify datatables layout [SCI-8583]
2023-05-26 11:13:18 +02:00
Giga Chubinidze
81db122a08 Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147] 2023-05-26 03:14:27 +04:00
Giga Chubinidze
d72653aff2 Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098] 2023-05-26 02:59:19 +04:00
Soufiane
fc1ce332de
Issue with scrollbar in smart annotation pop-up [SCI-8420] (#5479)
* Fix issues in smart annotation pop-up

- Initialize perfectScrollBar on the current atWho container.
- Close AtWho pop-up when tinyMCE editor is closed.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8420]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Close smart annotation pop-up after tinyMCE save [SCI-8420]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-25 16:01:36 +02:00
G-Chubinidze
2e21e286b7
Merge branch 'develop' into gc_SCI_8464 2023-05-25 15:32:00 +04:00
Anton
e755eb73a3 Unify datatables layout [SCI-8583] 2023-05-25 13:12:27 +02:00
Giga Chubinidze
9d9b454dc4 CSS: inventory items top toolbar issues [SCI-8464] 2023-05-25 11:18:47 +04:00
Andrej
9164534548 Add empty states for PET [SCI-8490] 2023-05-24 18:15:41 +02:00
aignatov-bio
9470313899
Merge pull request #5473 from aignatov-bio/ai-sci-8518-multiple-css-fixes
Multiple small css fixes [SCI-8518]]SCI-8529]
2023-05-24 12:11:11 +02:00
aignatov-bio
1da074bc2a
Merge pull request #5461 from G-Chubinidze/gc_SCI_8370
Revamp of (top) toolbar - Reports [SCI-8370]
2023-05-24 12:07:17 +02:00
aignatov-bio
4a3520883b
Merge pull request #5416 from G-Chubinidze/gc_SCI_8299
Implement the bottom action toolbar - inventories [SCI-8299]
2023-05-24 12:06:47 +02:00
Anton
007eae16cc Multiple small css fixes [SCI-8518]]SCI-8529] 2023-05-24 12:03:47 +02:00
Giga Chubinidze
5cd32d5cfa hound fix 2023-05-24 13:48:32 +04:00
Giga Chubinidze
34d64f6f44 hound fix 2023-05-24 13:39:38 +04:00
Anton
5a7530cdfb Fix label templates pagination [SCI-8483] 2023-05-24 11:24:02 +02:00
Soufiane
c7fcd0a52f
Activate assign items button in Results page [SCI-8419] (#5469)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-24 10:35:58 +02:00
Giga Chubinidze
379ef7a9cc moved to develop, fixed pagination style 2023-05-24 11:57:06 +04:00
Giga Chubinidze
d43f10bc6a 'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] 2023-05-23 22:21:34 +04:00
Soufiane
136fff1f09
Using more than one way of adding file results file title is lost [SCI-8346] (#5354)
Persist uploaded items names when adding new ones [SCI-8346]
2023-05-23 17:30:37 +02:00
Giga Chubinidze
1b060893e7 moved toolbar 2023-05-23 18:03:10 +04:00
ajugo
040b3bddce
Add state switch to experiment level for archived experiments [SCI-8503] (#5464) 2023-05-23 15:29:14 +02:00
aignatov-bio
cdec8023ba
Merge pull request #5448 from aignatov-bio/ai-sci-8413-fix-action-toolbar-init
Fix action toolbar init [SCI-8413]
2023-05-23 12:20:16 +02:00
Anton
c107a48d61 Fix action toolbar init [SCI-8413] 2023-05-23 12:08:04 +02:00
aignatov-bio
2bbeef0775
Merge pull request #5457 from G-Chubinidze/gc_SCI_8302
Reports bottom action toolbar position update [SCI-8302]
2023-05-23 12:02:55 +02:00
Giga Chubinidze
31807eb4ab updated padding of table & toolbar 2023-05-23 13:15:19 +04:00
aignatov-bio
9c20916d8a
Merge pull request #5453 from aignatov-bio/ai-sci-8515-refactor-inventories-scrolling
Fix inventory page layout [SCI-8515]
2023-05-23 10:34:47 +02:00
ajugo
3036c24be3
Prevent double click on protocol creation modal [SCI-8466] (#5458) 2023-05-23 09:50:34 +02:00
Anton
ecbd900362 Fix inventory page layout [SCI-8515] 2023-05-22 15:47:59 +02:00
Anton
7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +02:00
artoscinote
ad64628c8c
Merge pull request #5435 from aignatov-bio/ai-sci-8480-fix-protocols-icons-position
Fix protocol icons position [SCI-8480]
2023-05-18 16:46:02 +02:00
Martin Artnik
e0fb01f164 Remove unecessary view mode button text update [SCI-8436] 2023-05-18 16:43:11 +02:00
ajugo
7e771d457e
Fix assigning items from smart annotation with one team inventory [SCI-8484] (#5434) 2023-05-18 16:23:00 +02:00
Soufiane
351ba06840
FIX: new relic CSP [SCI-8118][SCI-8119] (#5430)
Switch to newRelic manual browser agent using a nonce [SCI-8118][SCI-8119]
2023-05-18 14:20:20 +02:00
Anton
c57188853e Fix protocol icons position
[SCI-8480]
2023-05-18 14:00:05 +02:00
Andrej
100eab9cb0 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates 2023-05-18 10:56:10 +02:00
artoscinote
cabd6bbed5
Merge pull request #5423 from sboursen-scinote/sb_SCI-8252
Button in the toolbar for assigning items to task from the inventory [SCI-8252]
2023-05-18 09:59:49 +02:00
artoscinote
557b422935
Revert "Revamp of (top) toolbar - Reports [SCI-8370]" 2023-05-18 09:46:28 +02:00
artoscinote
8bd6759d5d
Merge pull request #5387 from G-Chubinidze/gc_SCI_8370
Revamp of (top) toolbar - Reports [SCI-8370]
2023-05-18 09:46:03 +02:00
artoscinote
ef0bf65c19
Merge pull request #5424 from G-Chubinidze/gc_SCI_8302
Implement the bottom action toolbar - reports [SI-8302]
2023-05-18 09:44:53 +02:00
Alex Kriuchykhin
0cc253172f
Merge pull request #5326 from rekonder/aj_SCI_8082
Reverse table header/row numbering for plate templates [SCI-8082]
2023-05-18 09:34:19 +02:00
Giga Chubinidze
f161354f1b Implement the bottom action toolbar - reports [SI-8302] 2023-05-18 00:42:16 +04:00
sboursen-scinote
16ccd9703f Implement the assign to task button [SCI-8252] 2023-05-17 16:18:11 +02:00
Martin Artnik
eb5fb16b1b Implement new toolbar for protocols [SCI-8399] 2023-05-17 14:12:40 +02:00
Alex Kriuchykhin
5a06f649d6
Merge pull request #5417 from scinote-eln/features/sa-item-assigning
Features/sa item assigning
2023-05-17 11:45:13 +02:00
artoscinote
aeb84e18d0
Implement bottom action toolbar for repository items [SCI-8300]
Implement bottom action toolbar for repository items [SCI-8300]
2023-05-17 11:27:55 +02:00
Andrej
32d8fc3e0c Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-16 14:26:12 +02:00
Martin Artnik
c8521cd9c4 Make search icon right-alinged [SCI-8301] 2023-05-16 12:30:32 +02:00
Martin Artnik
c8994573fd Add bottom action toolbar to label templates [SCI-8301] 2023-05-16 11:40:07 +02:00