Commit graph

3581 commits

Author SHA1 Message Date
ajugo
8a9c4e6cb9
Merge pull request #7292 from wandji20/wb-SCI-10419
Add support for filtering projects in experiment controller clone and move actions SCI-[10419]
2024-03-18 09:01:22 +01:00
sboursen-scinote
ea5016f5bb Fix save to invetory modal [SCI-10331] 2024-03-17 11:19:05 +01:00
wandji20
5b5f593537 Add support for filtering projects in experiment controller clone and move actions SCI-[10419] 2024-03-16 16:53:00 +01:00
wandji20
e58b616a7b Fix issue loading experiment assigned users [SCI-10455] 2024-03-16 06:08:19 +01:00
wandji
6b0be64952
Add user preferences link in notification settings flyout [SCI-10438] (#7280) 2024-03-14 13:27:27 +01:00
Soufiane
ce5c02d590
Fix user roles for protocol access modal [SCI-10388] (#7275) 2024-03-14 13:17:07 +01:00
wandji
8165f46f3f
Call task checkStateState after status update [SCI-10198] (#7272) 2024-03-14 13:15:32 +01:00
Martin Artnik
be4f27750c Merge branch 'release/1.30.0' into develop 2024-03-13 15:26:35 +01:00
Martin Artnik
560ff947e5
Merge pull request #7266 from artoscinote/ma_SCI_10433
Fix ambiguous column references in results controller [SCI-10433]
2024-03-13 10:55:49 +01:00
Martin Artnik
fa25716e24 Fix ambiguous column references in results controller [SCI-10433] 2024-03-12 17:21:10 +01:00
ajugo
166a9592f5
Fix designated users flyout filtering [SCI-10415] (#7252) 2024-03-12 14:16:45 +01:00
wandji
9e39181242
Update protocols linked task modal to match figma design [SCI-10392] (#7243) 2024-03-12 14:13:13 +01:00
Soufiane
9dcd831704
Fix various issues with Reports [SCI-10331] (#7219) 2024-03-12 13:57:55 +01:00
Alex Kriuchykhin
8f09c9bc26
Fix unsafe user handling in the Linkedin sign-up flow [SCI-10421] (#7259) 2024-03-12 13:02:44 +01:00
Alex Kriuchykhin
e835925ab9
Improve sign in handling in OmniAuth controller [SCI-10421] (#7247) 2024-03-12 09:43:53 +01:00
Giga Chubinidze
ac47dcf0a5 Inventory duplicating removes old inventory stock units [SCI-10251] 2024-03-08 18:33:13 +04:00
Oleksii Kriuchykhin
d004b1e7a0 Merge branch 'features/bugfixes' into develop 2024-03-08 11:21:26 +01:00
ajugo
bd920611e9
Fix read project users permission [SCI-10355] (#7224) 2024-03-07 13:32:20 +01:00
ajugo
8407361083
Merge pull request #7215 from G-Chubinidze/gc_SCI_10239
For item relationship missing archived tag for inventory [SCI-10239]
2024-03-07 08:50:06 +01:00
Giga Chubinidze
afe573a044 For item relationship missing archived tag for inventory [SCI-10239] 2024-03-07 04:25:03 +04:00
Alex Kriuchykhin
c1263eb06f
Fix ordering by ID in protocols and tasks tables, remove obsolete protocols datatable [SCI-10387] (#7209) 2024-03-06 16:04:41 +01:00
ajugo
654b107965
Fix ordering on share repository modal [SCI-4716] (#7207) 2024-03-06 13:58:31 +01:00
aignatov-bio
d807b56b28
Merge pull request #7167 from aignatov-bio/ai-sci-10301-add-pagination-to-linked-tasks-modal
Add pagination to linked task modal [SCI-10301]
2024-03-01 17:29:42 +01:00
Anton
6b27779746 Add pagination to linked task modal [SCI-10301] 2024-03-01 17:28:42 +01:00
aignatov-bio
1abd370d3e
Merge pull request #7158 from wandji20/wb-SCI-10292
Fix issue moving experiments [SCI-10292]
2024-02-29 13:29:33 +01:00
wandji20
b59392b932 Fix issue moving experiments [SCI-10292] 2024-02-28 13:58:09 +01:00
Giga Chubinidze
cfa859b7c7 Inventory duplicating and stock column issues [SCI-10251] 2024-02-28 16:42:11 +04:00
Anton
0d7f3993f6 Fix versions modal [SCI-10296] 2024-02-28 12:42:31 +01:00
Anton
5902161cb9 Replace old access modal [SCI-10267] 2024-02-26 15:22:09 +01:00
Anton
d72e63a0f2 Merge branch 'develop' into features/inventory-import-improvements 2024-02-26 10:46:49 +01:00
Anton
57c5140267 Add quick filter flyout [SCI-10248] 2024-02-23 14:16:03 +01:00
Anton
41e92dd1e2 Fix multiple resize [SCI-10245] 2024-02-21 19:44:22 +01:00
wandji20
8221466666 Replace task flow buttons partial after successful change of task status [SCI-10198] 2024-02-21 15:25:04 +01:00
Anton
ed0db94089 Merge branch 'develop' into features/new-datatable 2024-02-21 12:51:17 +01:00
Anton
fdee40ba97 Fix protocol access template [SCI-10242] 2024-02-21 12:33:30 +01:00
Martin Artnik
f8aae8aca6 Merge branch 'develop' into features/inventory-import-improvements 2024-02-20 15:18:07 +01:00
Martin Artnik
fc441bbfaa Fixed typos in clone experiment action [SCI-10232] 2024-02-19 10:46:47 +01:00
Anton
54428ff4f1 Fix routes for experiments my modules [SCI-10207] 2024-02-16 13:15:47 +01:00
Martin Artnik
7ac00c5007 Fix making backup copy of conflicting files [SCI-10228] 2024-02-16 13:06:17 +01:00
Ivan Kljun
aae8d4d227 Remove team arg from post_process_file [SCI-10103] 2024-02-16 10:39:19 +01:00
Ivan Kljun
c8b910ebc4 Merge remote-tracking branch 'upstream/develop' into SCI-10103-ik2 2024-02-16 10:06:27 +01:00
Ivan Kljun
c043a9375a Fix asset sync update to account for WOPI and post process [SCI-10103] 2024-02-16 09:53:26 +01:00
Oleksii Kriuchykhin
66f5df87e9 Merge branch 'develop' into features/sso-improvements 2024-02-16 09:46:20 +01:00
Ivan Kljun
e35878a9b8 Fix saving last_modified_by for WOPI audit trails [SCI-10033] 2024-02-15 14:14:38 +01:00
ajugo
7fe6aae843
Fix consumption check for full view repository [SCI-10184] (#7082) 2024-02-13 15:05:34 +01:00
Martin Artnik
baa2201622
Merge pull request #7070 from ivanscinote/SCI-10122-ik
Add polling for asset changes for SciNote Edit [SCI-10122]
2024-02-12 14:15:48 +01:00
Ivan Kljun
5276faa74b Fix applying last_modified_by at asset update [SCI-10033] 2024-02-07 15:31:13 +01:00
Ivan Kljun
aec115f669 Add polling for asset changes for SciNote Edit [SCI-10122] 2024-02-07 11:26:40 +01:00
Alex Kriuchykhin
8fa1c21e73
Fix snapshoting for LinkedRepository caused by external_id uniqueness constraint [SCI-9817] (#7066) 2024-02-06 14:23:01 +01:00
Gregor Lasnibat
e8c74a057e (fix) Missing page data at opening result page from link [SCI-9462] 2024-02-06 12:59:37 +01:00
Alex Kriuchykhin
342e9dbb19
Switch to asset text extraction with ActiveStorage analyzer [SCI-9954] (#6956) 2024-02-05 16:24:06 +01:00
Martin Artnik
3a700bae13 Add create activity in case of asset sync file conflict [SCI-10021] 2024-02-05 13:12:21 +01:00
ajugo
71be4db51b
Fix sorting of teams on shared inventory modal window and sorting on task assigning modal [SCI-4716] (#7051) 2024-02-05 10:27:01 +01:00
ajugo
6184d0caa8
Add obsolete tag for not used activites [SCI-10121] (#7050) 2024-02-05 10:25:20 +01:00
Soufiane
e85f48d51f
Delay marking Docx report as ready till after preview is created [SCI-10037] (#7025) 2024-02-05 10:18:23 +01:00
Oleksii Kriuchykhin
e724b15499 Merge branch 'develop' into features/sso-improvements 2024-02-01 15:38:07 +01:00
Ivan Kljun
e4e3a61c5a Merge remote-tracking branch 'upstream/features/new-datatable' into SCI-9983-ik 2024-02-01 11:00:31 +01:00
Martin Artnik
baa5a57822
Merge pull request #7002 from ivanscinote/SCI-10033-ik
Update last_modified_by for assets on edit [SCI-10033]
2024-02-01 10:19:08 +01:00
Martin Artnik
73541e8c42 Fix experiment bulk move permission checks, specs [SCI-9840] 2024-01-31 13:52:56 +01:00
Anton
72b40a63a0 Merge branch 'develop' into features/new-datatable 2024-01-30 12:02:04 +01:00
Anton
fad8b53222 Update task table designated users [SCI-10092] 2024-01-25 15:56:48 +01:00
Oleksii Kriuchykhin
384afbcc4b Merge branch 'features/asset-sync' into develop 2024-01-25 11:32:26 +01:00
Ivan Kljun
24faeae5de Update last_modified_by for assets on edit [SCI-10033] 2024-01-24 15:18:34 +01:00
Ivan Kljun
718f5fbfad Add error messages to AssetSyncController [SCI-10020] 2024-01-24 11:02:37 +01:00
ajugo
fc99c0ef5b
Fix reordering of the result elements [SCI-10079] (#6998) 2024-01-24 10:07:59 +01:00
Alex Kriuchykhin
f9a1b952b6
Split inventory item relationships API V2 endpoint into separate endpoints for parents and children [SCI-10078] (#6996) 2024-01-24 10:04:38 +01:00
Anton
75bbd993ee Fix workflow image update [SCI-10073] 2024-01-23 15:20:12 +01:00
Martin Artnik
bd4471b98b
Merge pull request #6865 from G-Chubinidze/gc_SCI_9840
"Move" feature for multiple selected tasks and experiments (bulk action) [SCI-9840]
2024-01-23 14:32:23 +01:00
Giga Chubinidze
98af81cd8a Changed error handling [SCI-9840] 2024-01-23 17:28:11 +04:00
Oleksii Kriuchykhin
d71061a75d Merge branch 'release/1.28.0' into develop 2024-01-23 11:17:14 +01:00
Anton
1fff6da45d Refactor checklist [SCI-9959] 2024-01-22 14:01:32 +01:00
Soufiane
313782d3d4
Implement API V2 tests for item relationships [SCI-10038] (#6972) 2024-01-22 10:50:23 +01:00
Giga Chubinidze
9b49e891a0 changed experiment move logic similar to modules move 2024-01-22 02:16:24 +04:00
Anton
bd48ae1d07 Merge branch 'features/asset-sync' of github.com:scinote-eln/scinote-web into features/asset-sync 2024-01-19 11:34:42 +01:00
Anton
9d19fe8382 Merge branch 'develop' into features/asset-sync 2024-01-19 11:33:40 +01:00
Anton
4b3666b4f8 Merge branch 'develop' into features/new-datatable 2024-01-19 11:10:32 +01:00
Anton
ed2a54229a Add design page 2024-01-19 10:52:07 +01:00
Ivan Kljun
c9490ca528 Implement saving of table state to DB [SCI-9983] 2024-01-19 10:12:54 +01:00
Oleksii Kriuchykhin
d146dc8cb4 Merge branch 'develop' into features/sso-improvements 2024-01-19 09:31:12 +01:00
Giga Chubinidze
a5c7e7b8c8 changed flash message 2024-01-17 12:58:43 +04:00
Anton
af811db890 Remove old tables code [SCI-10006] 2024-01-16 14:13:40 +01:00
Martin Artnik
37b9a2c077 Fix asset sync activity user [SCI-10018] 2024-01-16 10:39:11 +01:00
ajugo
939d31b642
Fix loading archived status for item card relations [SCI-9910] (#6944) 2024-01-15 13:04:23 +01:00
ajugo
701c4c2f86
Fix unlinkind relationship connections [SCI-9912] (#6942) 2024-01-15 12:03:09 +01:00
Martin Artnik
ef5f822af2 Merge branch 'develop' into features/asset-sync 2024-01-15 11:57:03 +01:00
ajugo
566decd9ed
Inventory relationship fixes [SCI-10005] (#6941) 2024-01-15 11:08:08 +01:00
ajugo
98ee391d03
Filter already connected items on repository item relationship modal [SCI-9916] (#6934) 2024-01-15 09:41:52 +01:00
Anton
7233f4c8ab Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2024-01-11 15:27:10 +01:00
Anton
de72f60cc1 Merge branch 'develop' into features/new-datatable 2024-01-11 15:14:36 +01:00
Anton
62edf89699 Replace reports table [SCI-9803] 2024-01-11 10:06:39 +01:00
wandji
e31448c8e7
Add archived label for inventories and item in item card relationships and modal [SCI-9122] (#6884) 2024-01-10 17:23:15 +01:00
Oleksii Kriuchykhin
3b97571777 Merge branch 'features/inventory-items-relationships' into develop 2024-01-10 17:10:20 +01:00
Martin Artnik
7a4d17f63e Merge branch 'develop' into features/asset-sync 2024-01-10 16:31:21 +01:00
Soufiane
a7dd9d49b2
Add links to items in linked/unlinked related activities [SCI-9718] (#6921) 2024-01-10 15:32:01 +01:00
Soufiane
5b365fce3b
Fix error handling for items relationships destroy action [SCI-9718] (#6911) 2024-01-09 15:31:21 +01:00
Anton
3346c55941 Merge branch 'develop' into features/new-datatable 2024-01-09 10:36:21 +01:00
ajugo
a6c0c7294b
Improve objects loading and permissions checking for repository rows [SCI-9763] (#6875) 2024-01-09 09:37:50 +01:00
Soufiane
4649a17cf9
Fix failing tests for item relationships [SCI-9719] (#6900) 2024-01-08 14:41:38 +01:00
ajugo
e2233523d2
Simplified create method for Repository row connections [SCI-9909] (#6873) 2024-01-08 14:14:24 +01:00
wandji
465c8d1f80
Unify API step and result elements controllers implementation and types [SCI-9907] (#6854)
* Unify api step and result elements controllers implementation and types [SCI-9907]

* Update wrong serializer types [SCI-9907]

* Rename result and step text types [SCI-9907]

* Combine result and step assets serializer [SCI-9907]
2024-01-08 10:31:14 +01:00
Anton
993a8da518 Migrate inventory tables [SCI-9804] 2024-01-05 19:03:14 +01:00
Oleksii Kriuchykhin
95ab33a58b Merge branch 'develop' into features/inventory-items-relationships 2024-01-05 11:27:32 +01:00
Soufiane
67ea1b15fe
Implement API V2 endpoints for item relationships [SCI-9719] (#6847) 2024-01-04 16:42:25 +01:00
Alex Kriuchykhin
da7b7518fc
Fix file text extraction for API results endpoints [SCI-9933] (#6874)
Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
2024-01-04 14:31:56 +01:00
Martin Artnik
e360113838 Merge branch 'develop' into features/asset-sync 2024-01-04 10:07:11 +01:00
wandji
5c0c3e0eca
Add permission helper for connecting inventory items [SCI-9915] (#6868) 2024-01-04 09:47:40 +01:00
wandji
b36354d521
Set order for inventory and inventory items endpoints (RepositoryRowConnectionController) [SCI-9914] (#6859) 2024-01-03 17:09:37 +01:00
Alex Kriuchykhin
dd312062d3
Fix permissions checking for active storage blobs belonging to different teams [SCI-9918] (#6871) 2024-01-03 17:09:15 +01:00
G-Chubinidze
84c53cb5f5
Merge branch 'features/asset-sync' into gc_SCI_9710 2024-01-03 18:23:25 +04:00
Giga Chubinidze
544611c3fa hound fix 2024-01-03 18:19:32 +04:00
Anton
4671754d52 Migrate protocols table [SCI-9802] 2024-01-03 14:57:32 +01:00
Giga Chubinidze
eaf713e4bd move response status fix 2024-01-03 17:50:18 +04:00
Giga Chubinidze
ebdeaf8b42 add transaction to move exp function 2024-01-03 12:58:13 +04:00
Giga Chubinidze
cc8a10edb0 "Move" feature for multiple selected tasks and experiments (bulk action) 2023-12-29 12:53:46 +04:00
Soufiane
5ca33bb96a
Add activities for item relationships [SCI-9718] (#6788) 2023-12-21 12:33:06 +01:00
Alex Kriuchykhin
3de2f6d0f1
Add generic SAML SSO strategy implementation [SCI-9579] (#6775) 2023-12-20 17:52:33 +01:00
Anton
79969492dd Replace tasks table [SCI-9801] 2023-12-20 17:47:09 +01:00
Alex Kriuchykhin
dbedac3a9b
Add omniauth_openid_connect gem, implement basic sign-in flow [SCI-9578] (#6666) 2023-12-20 14:02:09 +01:00
wandji
54b1c182d8
Add V2 API endpoints for step elements [SCI-9650] (#6825)
* Add V2 API endpoints for step elements [SCI-9650]

* Rewrite step controller actions in order to read V2 step serializer [SCI-9650]
2023-12-19 15:36:41 +01:00
Andrej
436be9cbdd Fix filter label on webhook page [SCI-9752] 2023-12-19 10:41:23 +01:00
ajugo
a343701299
Implement api v2 for results [SCI-9651] (#6699) 2023-12-14 11:31:12 +01:00
Oleksii Kriuchykhin
372ef32f03 Merge branch 'develop' into features/inventory-items-relationships 2023-12-14 11:28:04 +01:00
Anton
c3b4360ff5 Merge branch 'develop' into features/new-datatable 2023-12-13 16:11:35 +01:00
Martin Artnik
9b97e397ed Merge branch 'develop' into features/asset-sync 2023-12-13 16:05:18 +01:00
Oleksii Kriuchykhin
970dc7185b Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-13 16:01:09 +01:00
Alex Kriuchykhin
741e053ef4
Add checking for ability to share a repository with allowed write [SCI-9853] (#6807) 2023-12-13 15:31:21 +01:00
Martin Artnik
e99e5c46c6 Fix activities for access permissions [SCI-9863] 2023-12-12 14:32:26 +01:00
Martin Artnik
0344860827 Add reminder job interval option 2023-12-12 14:08:42 +01:00
Martin Artnik
c599c939b8 Fix project assignment activity & notification recipients [SCI-9863] 2023-12-12 12:18:12 +01:00
Anton
985dddef17 Finish experiment table [SCI-9800] 2023-12-11 15:57:45 +01:00
Anton
a894d6bd26 Finish main experiments actions [SCI-9800] 2023-12-11 10:47:53 +01:00
wandji
dceb92021a
Connect add relationship modal to backend [SCI-9711] (#6749) 2023-12-11 10:43:47 +01:00
Anton
75f7437001 Fix markup 2023-12-11 09:26:13 +01:00
wandji
6f27b4c450
Call project project user assignment job with perform now [SCi-9750] (#6766)
* Add polling to update project user assignments list [SCi-9750]

* Call project project user assignment job with perform now [SCI-9750]

* Call UserAssignments::PropagateAssignmentJob directly from destroy action SCI-[9750]
2023-12-08 10:27:50 +01:00
Anton
7ffad5b659 Experiments table migration [SCI-9800] 2023-12-07 12:53:21 +01:00
Anton
65e9e5abb4 Merge branch 'develop' into features/new-datatable 2023-12-07 09:51:45 +01:00
Anton
687bac024a Migrate access modal to VUE [SCI-9799] 2023-12-06 14:12:22 +01:00
Martin Artnik
7c73f284b4 Merge branch 'features/notification-revamp' into develop 2023-12-06 11:36:32 +01:00
Martin Artnik
66feec3074 Merge branch 'develop' into features/asset-sync 2023-12-06 11:23:31 +01:00
Oleksii Kriuchykhin
d1e7ab5efb Merge branch 'develop' into features/inventory-items-relationships 2023-12-06 11:11:30 +01:00
Oleksii Kriuchykhin
bd89a0c9bf Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-06 11:09:34 +01:00
Martin Artnik
469f581e20
Merge pull request #6769 from G-Chubinidze/gc_SCI_9788
Redundant notifications [SCI-9788]
2023-12-06 09:30:17 +01:00
G-Chubinidze
e1ff625351
Merge branch 'features/asset-sync' into gc_SCI_9710 2023-12-06 11:48:18 +04:00
Giga Chubinidze
a25113275a added access permission blocks 2023-12-06 11:02:25 +04:00
Martin Artnik
31e55488a7
Merge pull request #6750 from G-Chubinidze/gc_SCI_9788
Redundant notifications [SCI-9788]
2023-12-05 14:57:01 +01:00
Giga Chubinidze
70ed2cb868 logic cleanup 2023-12-05 12:06:58 +04:00
Anton
d125eae4bb Fix smart annotation on steps [SCI-9799] 2023-12-04 11:17:06 +01:00
Giga Chubinidze
121cbe7471 Redundant notifications [SCI-9788] 2023-12-04 11:29:17 +04:00
Gregor Lasnibat
c1e3c2b6c6 (fix) Update of item table not done, stock modal entry [SCI-9789] 2023-12-01 16:44:13 +01:00
Anton
9971de5c4c Finalize projects table 2023-12-01 09:56:14 +01:00