Commit graph

3070 commits

Author SHA1 Message Date
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
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
Soufiane
adaa2b6a48
Extend flash messages for direct task items assignment [SCI-8443] (#5414)
Update item assigment modal flash messages [SCI-8443]
2023-05-17 16:17:19 +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
ajugo
43f571c154
Enable Manage access for archived protocols [SCI-8453] (#5411) 2023-05-16 13:25:33 +02:00
Martin Artnik
c8994573fd Add bottom action toolbar to label templates [SCI-8301] 2023-05-16 11:40:07 +02:00
ajugo
f7087a7c24
Switch team for label template opening [SCI-8377] (#5402) 2023-05-16 11:23:32 +02:00
artoscinote
cf13160c4f
Merge pull request #5398 from aignatov-bio/ai-sci-8405-improve-navigation-in-archive-state
Improve navigation in archive state [SCI-8405]
2023-05-16 10:38:37 +02:00
ajugo
c6f5219043
Display all protocol templates for team admin [SCI-8379] (#5391) 2023-05-16 10:29:00 +02:00
ajugo
31b42dc875
Add metadata to table API endpoints [SCI-8376] (#5388) 2023-05-16 10:26:09 +02:00
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Anton
08652e9dde Improve navigation in archive state [SCI-8405] 2023-05-11 13:14:56 +02:00
Anton
8f5560b016 Add barcode search field [SCI-8283] 2023-05-11 11:21:50 +02:00
Soufiane
b1ccd5839b
Implement backend for inventory item assignment to tasks [SCI-8248] (#5367)
Implement backend for inventory item assignment to tasks [SCI-8248]
2023-05-10 16:12:20 +02:00
Alex Kriuchykhin
ab318df1af
Update permissions for team owner to see all protocols and can manage users [SCI-8380] (#5371) 2023-05-09 16:23:29 +02:00
ajugo
783d5d03ab
Add edit button to label templates and fix last updated by [SCI-8373] (#5376) 2023-05-08 11:27:29 +02:00
Andrej
97bde133a8 Fix plate template JSON creation [SCI-8082] 2023-05-08 10:25:50 +02:00
Martin Artnik
7a6fe5050d Fix project folder delete action [SCI-8391] 2023-05-04 14:59:16 +02:00
Andrej
29a9c3781e Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-04 13:34:45 +02:00
Martin Artnik
9b875371a4 Implement task table bottom toolbar [SCI-8298] 2023-05-04 11:29:19 +02:00
ajugo
a288708368
Add API endpoint for protocol templates [SCI-7456] (#5321)
* Add API endpoint for protocol templates [SCI-7456]

* Create protocol template api serializer [SCI-7456]
2023-05-03 15:55:36 +02:00
Soufiane
58782131a8
Flash message for delete draft [SCI-8245] (#5300)
Add redirect flash message after draft delete and before the location redirect [SCI-8245]
2023-05-03 11:16:59 +02:00
Martin Artnik
8beb92fc39 Implement new experiments toolbar [SCI-8296] 2023-04-26 15:51:22 +02:00
Martin Artnik
ed04bc6b6a Implement new Projects bottom toolbar [SCI-8295] 2023-04-26 11:25:29 +02:00
Anton
1bc2baf1f3 Add navigator interactions [SCI-8047] 2023-04-26 10:34:02 +02:00
ajugo
c4a0ebeadf
Fix protocol dropdown options for private protocol [SCI-7983] (#5337) 2023-04-25 16:00:20 +02:00
ajugo
9b49745194
Fix repository_row call when no repository row is selected [SCI-8281] (#5301) 2023-04-25 15:18:12 +02:00
ajugo
d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +02:00
G-Chubinidze
468a5bd2df
Merge pull request #5340 from G-Chubinidze/gc_SCI_8303
Revamp of (top) toolbar - projects, experiments [SCI-8303] [SCI-8304]
2023-04-25 16:51:30 +04:00
aignatov-bio
af9219b7ae
Assign item through repository item modal [SCI-8141] (#5237) 2023-04-25 14:30:14 +02:00
Soufiane
f94d9cc0f2
Direct inventory item assignment to the current task from the item card BE [SCI-8142] (#5163)
Implement controller action to directly assign item to task [SCI-8142]
2023-04-25 14:00:55 +02:00
Anton
3724c38e7d Add archived state for navigator [SCI-8056] 2023-04-25 13:57:29 +02:00
Anton
cb6b2c3855 Add backend for navigator [SCI-8233] 2023-04-24 12:25:56 +02:00
Giga Chubinidze
a0d863e230 Revamp of (top) toolbar - projects [SCI-8303] 2023-04-24 01:43:47 +04:00
Alex Kriuchykhin
9e058af0a3
Fix default public user role assignment for projects [SCI-7969] (#5334) 2023-04-21 11:58:34 +02:00
Anton
7143c3ed5d Add general layout for navigator [SCI-8046
]
2023-04-19 14:19:55 +02:00
Andrej
a33707bd5e Reverse table header/row numbering for plate templates [SCI-8082] 2023-04-19 12:22:22 +02:00
Anton
e8b952f4fd Revert "Revert "Improve breadcrumbs implementation [SCI-8087]""
This reverts commit 78d41d10a6.
2023-04-19 10:53:39 +02:00
G-Chubinidze
5eacd41ca5
Adding well plate table options to "insert step content" select menu [SCI-7931] (#5302)
* well plate implementation without nested dropdown

* Implement dropdown submenu [SCI-7931]

* minor code cleanup

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
Co-authored-by: Martin Artnik <martin@scinote.net>
2023-04-18 15:42:53 +02:00
ajugo
0868f60242
Fix error handling for protocols [SCI-8341] (#5316) 2023-04-18 11:22:17 +02:00
aignatov-bio
6ee87c72ef
Merge pull request #5310 from aignatov-bio/ai-sci-8327-add-webhook-menu-permission-check
Add webhook menu permission check [SCI-8327]
2023-04-18 10:38:40 +02:00
aignatov-bio
20f9b41b78
Merge pull request #5314 from aignatov-bio/ai-sci-8331-small-fixes-for-notifications
Small fixes for notifications [SCI-8331]
2023-04-17 15:35:29 +02:00
Anton
1526553467 Small fixes for notificaitions [SCI-8331] 2023-04-17 15:23:52 +02:00
Anton
737a53633e Fix white border at task page and remove teams/users escaping for navigation [SCI-8326] 2023-04-17 11:36:08 +02:00
aignatov-bio
18590b502d
Merge pull request #5309 from aignatov-bio/ai-sci-8325-fix-date-sorting-in-notifications
Fix date sorting in notifications [SCI-8325]
2023-04-17 11:23:37 +02:00
ajugo
b62f1f5405
Add missing flash messages [SCI-8247] (#5308) 2023-04-14 15:10:35 +02:00
Anton
ad966c1608 Add webhook menu permission check [SCI-8327] 2023-04-14 14:59:14 +02:00
Anton
c990301f1b Fix date sorting in notifications [SCI-8325] 2023-04-14 14:46:57 +02:00
aignatov-bio
ea4fe49699
Merge pull request #5306 from aignatov-bio/ai-sci-8317-fix-messages-filter-in-notification-flyout
Fix messages filter in notifcation flyout [SCI-8317]
2023-04-14 13:28:03 +02:00
Anton
6966c6cba4 Fix messages filter in notifcation flyout [SCI-8317] 2023-04-14 13:16:34 +02:00
Anton
acd6413ca3 Fix navigation sidebar [SCI-8288] 2023-04-14 11:38:28 +02:00
aignatov-bio
cbd84b94b4
Merge pull request #5288 from aignatov-bio/ai-sci-8280-add-counters-logic-to-notifications
Add counters logic for notifications [SCI-8280]
2023-04-13 15:35:56 +02:00
Anton
cb7f41e516 Add counters logic for notifications [SCI-8280] 2023-04-13 15:35:21 +02:00
ajugo
e85f1f8bbd
Show error message for protocols templates with same name [SCI-8247] (#5266) 2023-04-13 15:34:36 +02:00
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor
Features/navigation refactor
2023-04-13 13:59:25 +02:00
ajugo
af7ec3d86d
Fix flash message for step text [SCI-7959] (#5291) 2023-04-12 14:57:46 +02:00
aignatov-bio
78d41d10a6
Revert "Improve breadcrumbs implementation [SCI-8087]" 2023-04-12 14:04:20 +02:00
artoscinote
fa64c8bb5c
Merge pull request #5283 from sboursen-scinote/sb_SCI-8223
CSS: Protocol template list of smaller issues [SCI-8223]
2023-04-12 12:58:25 +02:00
sboursen-scinote
8d3c473898 Fix hound [SCI-8223] 2023-04-11 17:19:26 +02:00
sboursen-scinote
2ae01c4da9 Fix save protocol with existing name error message [SCI-8223] 2023-04-11 17:14:29 +02:00
G-Chubinidze
9ba8cc328b
Revert "Revert "Search by team does not work [SCI-7763]"" 2023-04-11 18:09:24 +04:00
Soufiane
0f8918e9f6
Revision notes written in version modal are not seen/saved [SCI-8279] (#5272)
* Load latest protocol version comment in publish modal [SCI-8279]

* Check publish permission before updating the draft comment [SCI-8279]
2023-04-11 12:50:14 +02:00
aignatov-bio
58c84634a6
Merge pull request #5238 from sboursen-scinote/sb_SCI-8087
Improve breadcrumbs implementation [SCI-8087]
2023-04-06 19:52:33 +02:00
artoscinote
f2df505cfe
Merge pull request #5263 from okriuchykhin/ok_SCI_8207
Refactor user_notifications controller, remove unused code [SCI-8207]
2023-04-06 16:03:40 +02:00
artoscinote
890687052b
Fix permission team scoping in API [SCI-8265] (#5261) 2023-04-06 15:26:39 +02:00
Oleksii Kriuchykhin
60579465ab Refactor user_notifications controller, remove unused code [SCI-8207] 2023-04-06 14:57:00 +02:00
sboursen-scinote
1bd0d693b8 Remove uneccessary variables [SCI-8087] 2023-04-06 14:02:17 +02:00
Anton
624ea16d1f Update top navigation menus [SCI-8262] 2023-04-06 13:07:02 +02:00
sboursen-scinote
e2c0c1a982 Remove uneccessary variables [SCI-8087] 2023-04-06 12:44:20 +02:00
sboursen-scinote
7a3d5e03f4 Refactore after review [SCI-8087] 2023-04-06 12:23:33 +02:00
sboursen-scinote
d58a0004f6 Fix hound [SCI-8087] 2023-04-05 16:59:39 +02:00
sboursen-scinote
5fc798cf6e Refactor P/E/T breadcrumbs implementation using a concern [SCI-8087] 2023-04-05 16:20:41 +02:00
artoscinote
42a6f258a4
Merge pull request #5252 from okriuchykhin/ok_SCI_8199
Fix TinyMCE issue in project export, small fixes for protocols [SCI-8199]
2023-04-04 14:02:59 +02:00
Oleksii Kriuchykhin
a70d8dea74 Fix TinyMCE issue in project export, small fixes for protocols [SCI-8199] 2023-04-04 13:42:20 +02:00
Soufiane
1a1956e163
Change wording for access management to cover project and templates (EDIT 2) [SCI-8231] (#5251)
* Use I18n [SCI-8231]

* Consolidate the message translations [SCI-8231]
2023-04-04 11:55:00 +02:00
artoscinote
96785ae24d
Merge pull request #5250 from sboursen-scinote/sb_SCI-8231
Change wording for access management to cover project and templates (EDIT)  [SCI-8231]
2023-04-04 11:25:53 +02:00
sboursen-scinote
28b7be3779 Fix Hound [SCI-8231] 2023-04-04 11:16:37 +02:00
sboursen-scinote
7ad447d4f2 Change the wording when count is 0 [SCI-8231] 2023-04-04 11:06:38 +02:00
Martin Artnik
79b4f0d03d Add display of validation errors to TinyMCE [SCI-8246] 2023-04-03 15:34:59 +02:00
Alex Kriuchykhin
bed256cd37
Merge pull request #5231 from artoscinote/ma_SCI_8131
Handle removal of last owner public group [SCI-8131]
2023-04-03 13:02:38 +02:00
Martin Artnik
132593c854 Prevent removal of last manually assigned user manager [SCI-8131] 2023-04-03 11:46:32 +02:00
sboursen-scinote
8ae354b180 Merge branch 'features/navigation-refactor' into sb_SCI-8087 2023-04-02 17:33:23 +02:00
Anton
0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
ajugo
a2e6dc7444
Fix missing protocol template name in activity for create [SCI-8242] (#5233)
* Fix missing protocol template name in acitvity for create [SCI-8242]

* Rename @new variable into @new_protocol [SCI-8242]
2023-03-31 14:48:23 +02:00
ajugo
562577e960
Add flash message for removing all users [SCI-8238] (#5232) 2023-03-31 12:14:26 +02:00
ajugo
f535bc1fa0
Fix protocol counter on my statistics [SCI-8240] (#5228) 2023-03-31 10:01:58 +02:00
sboursen-scinote
31b979cde9 Add prefix for archived elements [SCI-8087] 2023-03-30 21:22:33 +02:00
sboursen-scinote
42687547cf Refactor the implementation in projects and experiements [SCI-8087] 2023-03-30 19:13:15 +02:00
sboursen-scinote
b43d14f549 Implement layout breadcrumbs for Protocols and Label templates [SCI-8087] 2023-03-30 19:07:18 +02:00
sboursen-scinote
95797ab8dd Implement layout breadcrumbs for Inventories [SCI-8087] 2023-03-30 18:42:27 +02:00
sboursen-scinote
eda4f140ee Implement layout breadcrumbs for Experiments and Tasks [SCI-8087] 2023-03-30 17:01:47 +02:00
sboursen-scinote
6cf3782339 Implement layout breadcrumbs for Projects and project folders [SCI-8087] 2023-03-30 16:29:21 +02:00
ajugo
e1cf9775fd
Add new activites for all team members [SCI-8224] (#5227) 2023-03-30 16:04:57 +02:00
Oleksii Kriuchykhin
89a45d2b14 Merge branch 'hotfix/1.26.6.4' into develop 2023-03-29 10:39:51 +02:00
Oleksii Kriuchykhin
ee7abc2912 Fix step table renaming [SCI-8216] 2023-03-28 16:03:45 +02:00
Oleksii Kriuchykhin
0beb64511d Fix saving of big tables on steps [SCI-8216] 2023-03-28 13:29:02 +02:00
Alex Kriuchykhin
3d8717e994
Merge pull request #5186 from okriuchykhin/ok_SCI_8177
Improve error handling in protocol archive/restore actions [SCI-8177]
2023-03-27 13:11:11 +02:00
Martin Artnik
9904c7aae3 Add error flash when assignment update fails [SCI-8131] 2023-03-27 12:38:01 +02:00
Alex Kriuchykhin
678d51692e
Merge pull request #5194 from artoscinote/ma_SCI_8131
Prevent removing/changing role for last user with user manage permission on protocol [SCI-8131]
2023-03-24 13:58:57 +01:00
Martin Artnik
b1cce70cc6 Preven removing last user manager for protocols/projects [SCI-8131] 2023-03-24 13:32:38 +01:00
Alex Kriuchykhin
e7bd133895
Merge pull request #5191 from aignatov-bio/ai-sci-8160-update-front-end-permission-for-version-comment
Update front end permission check for version comment [SCI-8160]
2023-03-24 13:14:03 +01:00
Anton
9818e41353 Update front end permission check for version comment [SCI-8160] 2023-03-24 13:11:14 +01:00
ajugo
2734c86ef5
Show/hide duplicate button on team permission change in protocol template repository [SCI-8150] (#5190) 2023-03-24 11:52:48 +01:00
artoscinote
00191e41de
Merge pull request #5192 from scinote-eln/features/token-revocation
Features/token revocation
2023-03-24 11:13:38 +01:00
Alex Kriuchykhin
5016034189
Merge pull request #5187 from artoscinote/ma_SCI_8182
Fix issues with protocol assignments and published attributes [SCI-8182]
2023-03-24 11:05:12 +01:00
Martin Artnik
2ddbc0ed90 Fix protocol migration/assignment issues [SCI-8182] 2023-03-24 10:58:43 +01:00
Oleksii Kriuchykhin
f2c8f67791 Improve error handling in protocol archive/restore actions [SCI-8177] 2023-03-23 15:32:22 +01:00
Oleksii Kriuchykhin
7ef2f68078 Merge branch 'hotfix/1.26.6.3' into develop 2023-03-23 13:26:12 +01:00
Anton
854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Oleksii Kriuchykhin
3443a6fb85 Fix create step comments permissions [SCI-8174] 2023-03-22 12:52:08 +01:00
G-Chubinidze
44cc9d1c90
Revert "Search by team does not work [SCI-7763]" 2023-03-22 13:22:05 +04:00
ajugo
8eb04c50c2
Add removing connected device [SCI-8146] (#5174) 2023-03-21 16:44:24 +01:00
Alex Kriuchykhin
b3889de17b
Merge pull request #5171 from okriuchykhin/ok_SCI_8145
Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157]
2023-03-21 16:40:22 +01:00
Oleksii Kriuchykhin
cf599a8277 Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157] 2023-03-21 16:25:02 +01:00
artoscinote
397e4aeebe
Merge pull request #4935 from G-Chubinidze/gc_SCI_7848
user_my_modules_controller#index_old action updates [SCI-7848]
2023-03-21 11:41:38 +01:00
Giga Chubinidze
8e942379ff changed assignee to designated_users 2023-03-21 14:29:23 +04:00
Oleksii Kriuchykhin
7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
Alex Kriuchykhin
05c4a1c4f0
Add missing sanitization helper to projects access controller [SCI-8158] (#5162) 2023-03-17 11:25:36 +01:00
Anton
248b6b6581 Remove additional code 2023-03-17 11:11:59 +01:00
Anton
da36b7268f Clean old protocol code [SCI-8154] 2023-03-16 14:37:19 +01:00
Alex Kriuchykhin
b0251435e5
Improve escaping of special characters in flash messages [SCI-8137] (#5144) 2023-03-15 15:56:47 +01:00
aignatov-bio
44823da268
Fix escaping for dropdown options and keywords escaping [SCI-8137] (#5145) 2023-03-15 12:55:28 +01:00
Alex Kriuchykhin
00c63b280e
Fix displaying of escaped fields [SCI-8137] (#5141) 2023-03-15 11:14:52 +01:00
aignatov-bio
336cf4d855
Fix PET permission propagation [SCI-8132] (#5139) 2023-03-14 18:48:06 +01:00
aignatov-bio
9a3b056d32
Fix access modal for protocol [SCI-8063] (#5128) 2023-03-14 14:49:11 +01:00
Giga Chubinidze
67539b15de Protocol permissions - button display [SCI-8058] 2023-03-14 12:12:54 +04:00
Alex Kriuchykhin
d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
Anton
ca5f61a0e2 Add all team members through access modal [SCI-8063] 2023-03-09 14:13:01 +01:00
artoscinote
66ec451d5e
Merge pull request #5096 from artoscinote/ma_SCI_8093
Add draft created activity [SCI-8093]
2023-03-08 10:49:45 +01:00
artoscinote
b8c5323fdc
Merge pull request #5094 from artoscinote/ma_SCI_8038
PET access modal fixes [SCI-8038]
2023-03-08 10:49:30 +01:00
Martin Artnik
e4e8997cc1 Add draft created activity [SCI-8093] 2023-03-07 14:45:52 +01:00
Alex Kriuchykhin
bee0fa2de9
Fix protocols re-assigning when removing user from a team [SCI-8034] (#5069) 2023-03-07 14:15:49 +01:00
Martin Artnik
22c039fc77 PET access modal fixes [SCI-8038] 2023-03-07 14:04:05 +01:00
Alex Kriuchykhin
f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
ajugo
6471dbed5b
Fix missing team at the StepTable creation [SCI-8036] (#5090) 2023-03-07 11:26:57 +01:00
aignatov-bio
e090bdf443
Merge pull request #5089 from aignatov-bio/ai-sci-8004-fix-archive-restore-propagation
Fix archive/restore propagation [SCI-8004]
2023-03-07 10:59:24 +01:00
artoscinote
5407943bfd
Merge pull request #5083 from artoscinote/ma_SCI_8039
Protocol/general user assignment changes and fixes [SCI-8039][SCI-8037]
2023-03-07 10:55:37 +01:00
aignatov-bio
e7afc70cab
Merge pull request #5086 from aignatov-bio/ai-sci-8003-fix-wording-for-same-protocol-name
Fix protocol creation error message [SCI-8003]
2023-03-07 10:48:12 +01:00
Anton
55dca41434 Fix archive/restore propagation [SCI-8004] 2023-03-07 10:44:44 +01:00
Alex Kriuchykhin
8956d72f12
Switch to showing of total sum of all versions in protocols table [SCI-8066] (#5082) 2023-03-07 09:58:36 +01:00
Anton
ca76c78a23 Fix protocol creation error message [SCI-8003] 2023-03-06 19:31:45 +01:00
Martin Artnik
2f29477e02 Protocol/general user assignment changes and fixes [SCI-8039] 2023-03-06 16:43:46 +01:00
ajugo
9379d9a175
Fix load protocol to task [SCI-8072] (#5070) 2023-03-06 10:53:01 +01:00
aignatov-bio
d99957d8a1
Merge branch 'features/protocol_versioning' into ai-sci-8021-fix-modifier-name-for-drafts 2023-03-03 20:50:46 +01:00