Commit graph

8753 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 3d3fa6e871 Do not change team if inventory is shared with current one [SCI-7164] 2022-09-07 11:01:53 +02:00
artoscinote 95105b86af
Fix ininite scroll [SCI-7160] (#4414) 2022-09-07 10:01:00 +02:00
aignatov-bio 2407b95e37
Merge pull request #4411 from aignatov-bio/ai-sci-7169-remove-scroll-before-page-leave
Remove scroll before page leave [SCI-7169]
2022-09-06 12:44:20 +02:00
artoscinote d2b022a17d
Remove obsolete code [SCI-7160] (#4412) 2022-09-06 12:10:20 +02:00
artoscinote 21f91089e9
Prevent loading empty next page in P/E infinite scroll [SCI-7160] (#4410) 2022-09-06 11:57:34 +02:00
Anton 90e962ccbf Remove scroll before page leave [SCI-7169] 2022-09-06 11:15:28 +02:00
artoscinote 9126b7fca4
Add missing protocol description activity [SCI-7140] (#4401) 2022-09-06 11:03:13 +02:00
Alex Kriuchykhin 8a0656ce21
Merge pull request #4147 from okriuchykhin/ok_SCI_6834
Update tests with new team user assignments [SCI-6843]
2022-09-05 14:34:16 +02:00
Anton 47e20d1b27 Add ability to disable zebra printers [SCI-7148] 2022-09-05 12:37:03 +02:00
aignatov-bio b585219be2
Merge pull request #4402 from aignatov-bio/ai-sci-7127-fix-error-handling-for-tinymce
Fix error handling for tinymce [SCI-7127]
2022-09-05 12:36:36 +02:00
Oleksii Kriuchykhin f85a6b5a2e Make experiment card dropdown menu async [SCI-7158] 2022-09-02 18:15:01 +02:00
Oleksii Kriuchykhin e27d063b61 Make permission checks for card selection async [SCI-7157] 2022-09-02 18:10:16 +02:00
Alex Kriuchykhin 0fcedc32ba
Merge pull request #4403 from artoscinote/ma_SCI_7159
Make project action dropdowns async [SCI-7159]
2022-09-02 17:05:35 +02:00
Martin Artnik a2a5e8c4c8 Add caching and improve dynamic reload [SCI-7159] 2022-09-02 16:54:41 +02:00
artoscinote 27b4f398a4
Merge pull request #4404 from G-Chubinidze/gc_SCI_7161
Fix underline in docx report generator [SCI-7161]
2022-09-02 15:13:13 +02:00
Giga Chubinidze f8842cd066 Fix underline in docx report generator [SCI-7161] 2022-09-02 17:11:36 +04:00
Anton 34b87ae92f Fix files loading during copy [SCI-7149] 2022-09-02 15:09:56 +02:00
Giga Chubinidze 85873213b8 Fix underline in docx report generator [SCI-7161] 2022-09-02 16:44:51 +04:00
Martin Artnik ef9cd21ecf Make project action dropdowns async [SCI-7159] 2022-09-02 13:47:45 +02:00
aignatov-bio 491ff286f6
Merge pull request #4390 from aignatov-bio/ai-sci-7113-fix-assigned-repositry-bell-flyout
Fix bell flyout in assigned repository [SCI-7113]
2022-09-02 11:21:17 +02:00
aignatov-bio 2e190510c4
Merge pull request #4397 from aignatov-bio/ai-sci-7136-fix-rte-toolbar-position
Fix rte toolbar position [SCI-7136]
2022-09-02 11:20:32 +02:00
aignatov-bio e605471269
Merge pull request #4392 from aignatov-bio/ai-sci-7100-fix-inivitation-modal
Invite user modal fixes [SCI-7100]
2022-09-02 11:20:18 +02:00
Anton 5f21c06b26 Fix error handling for tinymce [SCI-7127] 2022-09-02 11:19:54 +02:00
Alex Kriuchykhin a5fc66a6f3
Merge pull request #4388 from okriuchykhin/ok_SCI_7047
Add syncing service and schedule for Fluics templates sync [SCI-7047]
2022-09-01 14:13:18 +02:00
Alex Kriuchykhin 284bfe106d
Merge pull request #4398 from okriuchykhin/ok_SCI_7133
Optimise PE cards loading [SCI-7133]
2022-09-01 12:05:05 +02:00
Oleksii Kriuchykhin e276054a80 Optimize PE cards loading [SCI-7133] 2022-09-01 11:59:39 +02:00
artoscinote 87e944c9c4
Merge pull request #4400 from G-Chubinidze/gc_SCI_7141
Fix superscript and subscript  in docx report generator [SCI-7141]
2022-09-01 11:34:08 +02:00
Giga Chubinidze 57c5947d91 Fix superscript and subscript in docx report generator [SCI-7141] 2022-09-01 10:49:17 +04:00
Giga Chubinidze 922652417a Fix superscript and subscript in docx report generator [SCI-7141] 2022-09-01 10:15:31 +04:00
Oleksii Kriuchykhin ba54f42d2f Wrap unsaring actions in transaction [SCI-6918] 2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin bf8f838214 Update repository sharing actions [SCI-6918] 2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin f586c73dc8 Convert team_repository to polymorphic relation [SCI-6917] 2022-08-31 16:42:08 +02:00
Oleksii Kriuchykhin eb04bc974d Update tests with new team user assignments [SCI-6843] 2022-08-31 16:37:00 +02:00
Anton 312f2a1357 Fix rte toolbar position [SCI-7136] 2022-08-31 13:15:08 +02:00
Anton d555227652 Add acitvities and flash messages for component duplication [SCI-7108] 2022-08-31 11:09:38 +02:00
aignatov-bio 57282069e9
Merge pull request #4361 from aignatov-bio/ai-sci-7084-add-sorting-by-default-template
Add sorting by default label template [SCI-7084]
2022-08-31 10:36:02 +02:00
Anton bcc681b14d Add labels template to team import/export [SCI-7089] 2022-08-31 10:28:29 +02:00
aignatov-bio 91f1310338
Merge pull request #4364 from aignatov-bio/ai-sci-7060-update-promo-text
Update label template promo text [SCI-7060]
2022-08-31 10:13:42 +02:00
aignatov-bio 17d69131f3
Merge pull request #4383 from aignatov-bio/ai-sci-7124-fix-old-tinymce-big-tables
Fix overflow issue on step text [SCI-7124]
2022-08-31 10:13:27 +02:00
aignatov-bio 042e0330a7
Merge pull request #4386 from aignatov-bio/ai-sci-7117-fix-project-scroll-issue
Fix project/experiment scroll issue [SCI-7117]
2022-08-31 10:13:10 +02:00
artoscinote ceb3d95e0f
Merge pull request #4394 from artoscinote/ma_SCI_7135
Fix smart annotations for locked tasks [SCI-7135]
2022-08-31 09:58:48 +02:00
Martin Artnik d3665a940e Fix smart annotations for locked tasks [SCI-7135] 2022-08-31 09:49:47 +02:00
artoscinote 04245c8244
Merge pull request #4393 from artoscinote/ma_SCI_7118
Fix sorting of results by newest/oldest (by updated_at) [SCI-7118]
2022-08-31 09:10:26 +02:00
Martin Artnik 6b25759715 Fix import issues with date formatting [SCI-7111] 2022-08-31 09:06:16 +02:00
Martin Artnik bd1e30d19b Add default measurments to label templates [SCI-7129] 2022-08-30 16:16:02 +02:00
Martin Artnik 194963a94e Fix sorting of results by newest/oldest (by updated_at) [SCI-7118] 2022-08-30 11:48:09 +02:00
Anton 0862221345 Invite user modal fixes [SCI-7100] 2022-08-29 14:01:31 +02:00
Anton d2639d4633 Fix bell flyout in assigned repository [SCI-7113] 2022-08-29 11:30:39 +02:00
Oleksii Kriuchykhin b2b059b7e1 Add syncing service and schedule for Fluics templates sync [SCI-7047] 2022-08-29 09:59:13 +02:00
Anton a1117fbc0e Fix project/experiment scroll issue [SCI-7117] 2022-08-26 16:29:53 +02:00
ajugo 185bf0b197
Add label template dropdown to print dialog [SCI-7051] (#4369) 2022-08-26 10:53:55 +02:00
Anton 81dd259c25 Fix tinymce memory leak [SCI-7138] 2022-08-26 10:52:55 +02:00
Anton 0747a495c9 Fix overflow issue on step text [SCI-7124] 2022-08-25 15:32:03 +02:00
aignatov-bio 6706e886e3
Merge pull request #4382 from aignatov-bio/ai-sci-7085-update-css-for-view-screen
Fix css for label template view screen [SCI-7085]
2022-08-25 14:33:57 +02:00
Alex Kriuchykhin dac492cfd4
Merge pull request #4353 from okriuchykhin/ok_SCI_7045
Add list label templates method to Fluics API client [SCI-7045]
2022-08-25 13:40:40 +02:00
Anton 9daa3f6d69 Fix css for label view page [SCI-7085] 2022-08-25 13:25:34 +02:00
Anton 771c40d4f0 CSS fixes for label template screen [SCI-7085] 2022-08-24 17:57:34 +02:00
aignatov-bio 6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 2022-08-24 17:48:48 +02:00
artoscinote 7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
Anton e22af8830a Add activties to step duplication [SCI-7109] 2022-08-24 13:45:39 +02:00
artoscinote 766d2bb3e0
Fix checkboxes for technicians [SCI-7122] (#4378) 2022-08-23 18:10:28 +02:00
Anton 3e539adbde Fix step drag/drop file [SCI-7123] 2022-08-23 17:59:28 +02:00
Anton bc112dd6af Add step duplication [SCI-7109] 2022-08-23 17:54:33 +02:00
Alex Kriuchykhin 8744286d98
Merge pull request #4377 from okriuchykhin/ok_SCI_7126
Fix export of protocols with empty step text fields [SCI-7126]
2022-08-23 15:11:09 +02:00
Oleksii Kriuchykhin 3d00249644 Fix export of protocols with empty step text fields [SCI-7126] 2022-08-23 14:30:30 +02:00
artoscinote 74b9101e6f
Enable table scroll for locked tasks [SCI-7125] (#4375) 2022-08-23 14:23:21 +02:00
Anton d8bcdb09e4 Fix drag n drop for locked tasks [SCI-7123 2022-08-23 14:20:24 +02:00
artoscinote c2242b6cc8
Amend how checkboxes work with locking [SCI-7122] (#4374) 2022-08-23 10:10:20 +02:00
Anton 1bac9aeb4c Add duplication to components [SCI-7108] 2022-08-22 15:03:49 +02:00
Andrej 371f5e782b Remove strikethrough for step name and checklist items [SCI-7116] 2022-08-19 16:02:20 +02:00
Oleksii Kriuchykhin 497fc3a2a5 Fix API endpoints for step elements creation [SCI-7101] 2022-08-18 17:31:29 +02:00
Anton 45bbbfffe4 Update label template promo text [SCI-7060] 2022-08-18 15:33:19 +02:00
aignatov-bio 1e6e0f5038
Merge pull request #4360 from aignatov-bio/ai-sci-7107-fix-attachmets-actions-dropdown-position
Fix attachments actions dropdown position [SCI-7107]
2022-08-18 12:47:01 +02:00
Anton 46990b3df4 Add sorting by default label template [SCI-7084] 2022-08-18 11:49:22 +02:00
Anton 2d60ce7e99 Fix attachments actions dropdown position [SCI-7107] 2022-08-18 11:35:30 +02:00
Anton 96d52254c3 Fix file uploading for unlimited storage [SCI-7105] 2022-08-18 11:26:42 +02:00
Anton 5677e45e0c Add insert ability for code in content block [SCI-7055] 2022-08-17 13:40:35 +02:00
Anton 4f312bf329 Finalize insert field dropdown [SCI-7054] 2022-08-17 12:58:27 +02:00
aignatov-bio 606b0bdaa3
Merge pull request #4357 from aignatov-bio/ai-sci-7033-fix-error-on-task-text-field
Fix error on task text field [SCI-7033]
2022-08-16 12:23:03 +02:00
Anton 46b2b87654 Fix error on task text field [SCI-7033] 2022-08-16 12:21:59 +02:00
ajugo 5cdc8488b5
Add tooltips to step asset file name [SCI-7022] (#4356) 2022-08-16 12:20:37 +02:00
Anton 1a13e1bfc6 Fix unexpected error on step attachments [SCI-7032] 2022-08-16 11:22:19 +02:00
Anton 174d33bba8 Add column dropdown to label template editor [SCI-7054] 2022-08-16 10:16:40 +02:00
Oleksii Kriuchykhin 08e654d5fb Add list label templates method to Fluics API client [SCI-7045] 2022-08-12 19:47:29 +02:00
ajugo 39fbb2a9a0
Fix office modal and protocol status [SCI-7064] (#4352) 2022-08-12 14:57:56 +02:00
ajugo 8dec17f606
Add print label button in view repository role [SCI-7097] (#4351) 2022-08-12 14:55:14 +02:00
Oleksii Kriuchykhin f02f625e1e Add client for ZPL preview generation service [SCI-7049] 2022-08-12 12:57:19 +02:00
artoscinote e4a7aa3dad
Add name prompt for tables with empty names [SCI-7082] (#4348)
* Add name prompt for tables with empty names [SCI-7082]

* Move to separate component [SCI-7082]
2022-08-12 10:17:45 +02:00
Alex Kriuchykhin 32c53e223b
Merge pull request #4342 from okriuchykhin/ok_SCI_7071
Fix WOPI editing after creation issue [SCI-7071]
2022-08-11 15:52:17 +02:00
Alex Kriuchykhin 9d1218398b
Merge pull request #4334 from okriuchykhin/ok_SCI_7070
Fix toggling of checklist items with smart annotations [SCI-7070]
2022-08-11 15:52:02 +02:00
ajugo 83c78d660f
Added activity for update protocol name [SCI-7095] (#4346)
* Added activity for update protocol name [SCI-7095]

* Fix activity log for updated protocol name [SCI-7095]

* Fix activity log for updated protocol name [SCI-7095]
2022-08-11 14:09:01 +02:00
Anton 3d6d6c3b5a Fix css for step insert component menu [SCI-6955] 2022-08-11 11:10:12 +02:00
ajugo 2c3ddcbb93
Add tinymce image to imported protocol [SCI-7076] (#4345) 2022-08-11 10:00:14 +02:00
ajugo 12fc3b0b3b
Fix protocol repository issues [SCI-7003] (#4343)
* Fix protocol repository issues [SCI-7003]

* Remove unnecessary inRepository [SCI-7003]
2022-08-10 15:39:45 +02:00
artoscinote 5df1701ae7
Improve cancel edit button reliability, fix blink for non-smart-annotation fields [SCI-7068] (#4344) 2022-08-10 15:34:17 +02:00
Oleksii Kriuchykhin fc77adf2bc Fix toggling of checklist items with smart annotations [SCI-7070] 2022-08-10 14:48:47 +02:00
artoscinote a37c236518
Inline edit and checklist improvements [SCI-7031] (#4340)
* Inline edit and checklist improvements [SCI-7031]

* Fix smart annotations in inline edit [SCI-7031]
2022-08-10 14:43:23 +02:00
Oleksii Kriuchykhin 7cea3faf1e Fix WOPI editing after creation issue [SCI-7071] 2022-08-10 14:02:09 +02:00
aignatov-bio f1013c59fd
Merge pull request #4341 from aignatov-bio/ai-sci-7094-fix-protocol-description-save-in-repository
Fix protocol description save in protocol repository [SCI-7094]
2022-08-10 13:57:18 +02:00
Anton f39e86d40b Fix protocol description save in protocol repository [SCI-7094] 2022-08-10 13:46:50 +02:00
artoscinote 610ee6bdaa
Don't adjust step position in bulk deletion [SCI-7079] (#4339) 2022-08-10 12:05:24 +02:00
artoscinote 4e768bec04
Add endpoint for fetching label template tags [SCI-7053] (#4319) 2022-08-10 11:35:38 +02:00
Alex Kriuchykhin b91d9e3a28
Merge pull request #4336 from okriuchykhin/ok_SCI_7073
Fix result with WOPI file creation [SCI-7073]
2022-08-10 11:24:27 +02:00
aignatov-bio 6334b481ef
Merge pull request #4337 from aignatov-bio/ai-sci-7080-fix-step-element-deletetion
Fix step element delete callback [SCI-7080]
2022-08-10 11:03:17 +02:00
Anton 8694a02cf1 Fix asset serializer [SCI-7093] 2022-08-10 10:58:39 +02:00
Oleksii Kriuchykhin d178bc38a6 Fix result with WOPI file creation [SCI-7073] 2022-08-10 10:50:56 +02:00
Anton 5cd887831c Fix step element delete callback [SCI-7080] 2022-08-10 10:50:18 +02:00
artoscinote 04a282b725
Hide blank table name if task is locked [SCI-7066] (#4333) 2022-08-10 10:38:10 +02:00
artoscinote 3a26b62bf5
Activity and checklist fixes [SCI-7079] (#4330) 2022-08-10 10:37:27 +02:00
ajugo b6f273410b
Fix protocol repository CSS [SCI-7064] (#4335)
* Fix protocol repository CSS [SCI-7064]

* Fix protocol repository CSS [SCI-7064]

* Fix hound [SCI-7064]
2022-08-10 10:27:15 +02:00
aignatov-bio b4e7877b99
Merge pull request #4328 from aignatov-bio/ai-sci-7077-fix-report-protocol-name-issue
Fix protocol name in report [SCI-7077][SCI-7078]
2022-08-10 10:06:05 +02:00
aignatov-bio 30000676e9
Merge pull request #4331 from aignatov-bio/ai-sci-7072-fix-rearrange-step-issues
Add title to rearrange modal elements [SCI-7072]
2022-08-10 10:05:45 +02:00
Alex Kriuchykhin f67654ffeb
Merge pull request #4332 from okriuchykhin/ok_SCI_6986_v2
Fix protocol linked protocol changes tracking [SCI-6986]
2022-08-09 17:03:48 +02:00
Anton c044215b21 Add title to rearrange modal elements [SCI-7072] 2022-08-09 14:19:28 +02:00
Oleksii Kriuchykhin d1a46b3fc2 Fix protocol linked protocol changes tracking [SCI-6986] 2022-08-09 14:15:49 +02:00
Anton 147127a739 Fix protocol name in report [SCI-7077][SCI-7078] 2022-08-09 13:50:00 +02:00
artoscinote c106c2d997
Add active reminders filter [SCI-7004] (#4280) 2022-08-09 10:23:40 +02:00
artoscinote 187197488b
Pdf viewer and protocol fixes [SCI-7074] (#4327) 2022-08-09 10:13:43 +02:00
artoscinote 19d2fea4fe
Fix checkboxes [SCI-7057] (#4317) 2022-08-09 09:25:18 +02:00
ajugo 1ee091aa53
Fix selected default step title and step name placeholder [SCI-7067] (#4326)
* Fix selected default step title in edit mode and step name placeholder [SCI-7067]

* Add new placeholder label [SCI-7067]
2022-08-08 16:50:34 +02:00
artoscinote 6bfb25ba50
Fix cancel edit buttons [SCI-7068] (#4325) 2022-08-08 16:18:59 +02:00
Alex Kriuchykhin 897a8f71ec
Merge pull request #4318 from okriuchykhin/ok_SCI_7058
Fix team switching when viewing repository from another team [SCI-7058]
2022-08-08 13:10:31 +02:00
aignatov-bio 85cc7ae581
Merge pull request #4324 from aignatov-bio/ai-sci-7062-marvinjs-save-issue
Fix marvinJS save issue [SCI-7062]
2022-08-08 11:52:15 +02:00
aignatov-bio 0fdc9e9723
Merge pull request #4322 from aignatov-bio/ai-sci-7075-fix-protocol-creation-from-dashboard
Fix protocol creation from dashboard [SCI-7075]
2022-08-08 11:50:15 +02:00
Anton 6db1ec0a34 Fix marvinJS save issue [SCI-7062] 2022-08-08 11:48:58 +02:00
Anton ffaa6c6abb Fix inline field when value change [SCI-7069] 2022-08-08 11:32:10 +02:00
Anton edbcbffae4 Fix protocol creation from dashboard [SCI-7075] 2022-08-08 11:26:12 +02:00
Anton 51cb951e06 Update labels index page [SCI-7048] 2022-08-08 11:15:46 +02:00
artoscinote eb619184a5
Implement typed label templates [SCI-7046] (#4316)
* Implement typed label templates [SCI-7046]

* Add structure.sql, fix migration [SCI-7046]

* Fix method name [SCI-7046]

* Add dependent option to team - label_template relation [SCI-7046]

* Migration code style, add input sanitization [SCI-7046]

* Fix new label creation [SCI-7046]
2022-08-08 10:06:00 +02:00
Oleksii Kriuchykhin 13c33c3c05 Fix team switching when viewing repository from another team [SCI-7058] 2022-08-05 14:13:36 +02:00
Anton 7992cd97a1 Fix smart annotation on step text and checklist [SCI-7059] 2022-08-05 11:23:36 +02:00
ajugo 899ab608f8
Prefill protocol name at save to protocol repository modal [SCI-7065] (#4314) 2022-08-05 10:46:54 +02:00
ajugo 68bbb87797
Fix cancel at closing file modal and remove edit button for marvinjs asset [SCI-7061] (#4313) 2022-08-05 10:46:14 +02:00
aignatov-bio e5448f3d1f
Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen
Add general layout for template view screen [SCI-7030]
2022-08-04 14:13:25 +02:00
Anton a38aa80fb5 Add main functionality to view/edit screen [SCI-7041] 2022-08-04 13:37:21 +02:00
ajugo b58e3cd4d8
Add zebra settings screen [SCI-7016] (#4310)
* Add zebra settings screen [SCI-7016]

* Fix hound [SCI-7016]
2022-08-04 11:14:35 +02:00
artoscinote 9478779218
TinyMCE fixes [SCI-7033] (#4308) 2022-08-04 11:06:25 +02:00
artoscinote ee9c877929
Implement BS tooltips on repository toolbar [SCI-6691] (#4309) 2022-08-04 11:05:55 +02:00
Anton 31202922af Add general layout for template [SCI-7030] 2022-08-04 10:51:30 +02:00
Anton 8c080ea04c Add promo page for label templates [SCI-7029] 2022-08-02 14:51:18 +02:00
Oleksii Kriuchykhin cb71bb4a99 Fix copying of TinyMCE images when loading protocol from repository [SCI-7043] 2022-08-02 13:43:50 +02:00
ajugo 8222227712
Fix new step alignment and author list in protocols [SCI-6991] (#4304) 2022-08-02 12:22:29 +02:00
Anton c7b0d1d6f8 Small CSS task fixes [SCI-7032] 2022-08-02 11:00:13 +02:00
artoscinote 89a3bc8072
Checklist fixes [SCI-7031] (#4302) 2022-08-02 10:18:25 +02:00
ajugo 74a688e8ae
Fix protocol title and archived result tag [SCI-6979] (#4303) 2022-08-02 10:06:00 +02:00
Alex Kriuchykhin 61395482a3
Merge pull request #4299 from okriuchykhin/ok_SCI_6978_v2
Fix long result names in PDF reports [SCI-6978]
2022-08-01 16:37:23 +02:00
aignatov-bio ec5879b53f
Merge pull request #4300 from aignatov-bio/ai-sci-7001-fix-attachment-menu-elements-allignment
Fix image editor callback after save image [SCI-7019]
2022-08-01 13:59:54 +02:00
Anton bf50c42549 Fix error handling for step attachments [SCI-7032] 2022-08-01 13:57:17 +02:00
Anton 784c10aec9 Fix image editor callback after save image [SCI-7019] 2022-08-01 13:32:55 +02:00
ajugo 20095067a1
Fix checklist reordering issue [SCI-7039] (#4298) 2022-08-01 13:25:29 +02:00