Commit graph

12548 commits

Author SHA1 Message Date
mvrazic
bbfe61e376
e2e - added new tags at repoItemSidebar [SCI-10126] (#7040) 2024-02-05 10:21:35 +01:00
wandji
5bdfc41f94
Improve logic for unsharing shared task [SCI-10097] (#7026) 2024-02-05 10:18:56 +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
Gregor Lasnibat
e2f91697f4 (fix) Create new Add-ons section and place SciNote Edit in [SCI-10099] 2024-02-02 15:06:06 +01:00
aignatov-bio
b560cf9e7b
Merge pull request #7048 from aignatov-bio/ai-sci-10116-add-helpers-e2e-testing
Add helpers for e2e testing [SCI-10116]
2024-02-02 13:28:39 +01:00
Anton
7b80d88585 Add helpers for e2e testing [SCI-10116] 2024-02-02 13:20:51 +01:00
ajugo
1948757d15
Add transparent background for perfect scrollbar [SCI-10050] (#7027) 2024-02-02 09:57:08 +01:00
Anton
95492dd884 Fix infinite scroll for new tables [SCI-10098] 2024-02-01 15:15:12 +01:00
Anton
fe92ab7caa Fix column name truncate [SCI-10102] 2024-02-01 13:45:36 +01:00
aignatov-bio
7a154c8fda
Merge pull request #7042 from aignatov-bio/ai-sci-data-tables-css-fixes
Data table small css fixes
2024-02-01 11:48:44 +01:00
Anton
0e94d72442 Data table small css fixes 2024-02-01 11:47:31 +01:00
Martin Artnik
3bf0cec084 Fix download SciNote edit button [SCI-9760] 2024-02-01 11:24:08 +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
1458fd20a8
Merge pull request #6991 from ivanscinote/SCI-10010-ik
Add wrong-version modal for SciNote Edit [SCI-10010]
2024-02-01 10:49:30 +01:00
Ivan Kljun
78f3456da0 Move modals logic to open_locally.js [SCI-10010] 2024-02-01 10:42:40 +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
d24d9a0863
Merge pull request #7014 from G-Chubinidze/gc_SCI_10059
New Module Modal: Error messages are stacked [SCI-10059]
2024-02-01 10:17:34 +01:00
Ivan Kljun
cc4fa19bc1 Merge remote-tracking branch 'upstream/develop' into SCI-10010-ik 2024-02-01 10:15:58 +01:00
aignatov-bio
7ac549e20d
Revert "Bug fixes from table sanity check - Part 2(inventories, tasks) [SCI-10095]" 2024-02-01 09:36:13 +01:00
aignatov-bio
f5fee23f7d
Merge pull request #7033 from aignatov-bio/ai-sci-10090-update-manage-columns-modal
Update columns manage modal [SCI-10090]
2024-02-01 09:31:18 +01:00
G-Chubinidze
4f8524bc42
Merge branch 'features/new-datatable' into gc_SCI_10012 2024-02-01 12:30:58 +04:00
Martin Artnik
a06cf058f1
Merge pull request #7036 from G-Chubinidze/gc_SCI_10095
Bug fixes from table sanity check - Part 2(inventories, tasks) [SCI-10095]
2024-02-01 09:28:55 +01:00
G-Chubinidze
8fc3f18213
Merge branch 'features/new-datatable' into gc_SCI_10094 2024-02-01 11:59:58 +04:00
Giga Chubinidze
b6355ea29e Implement design page for icons [SCI-10094] 2024-02-01 06:00:01 +04:00
Giga Chubinidze
a853df18bc Bug fixes from table sanity check - Part 2(inventories, tasks) [SCI-10095] 2024-02-01 05:30:10 +04:00
Martin Artnik
bdaca8d81a
Merge pull request #7029 from artoscinote/ma_SCI_9840
Fix experiment bulk move permission checks, specs [SCI-9840]
2024-01-31 16:51:34 +01:00
Martin Artnik
041acb548c
Merge pull request #7034 from artoscinote/ma_SCI_9757
Preview Open locally menu fixes [SCI-9795]
2024-01-31 15:54:03 +01:00
Martin Artnik
62d1b7c10b
Merge pull request #7031 from lasniscinote/gl_SCI_9923
(fix) Spacing between lines in RTF is not correct [SCI-9923]
2024-01-31 15:39:44 +01:00
Martin Artnik
4739da3ed1 Preview Open locally menu fixes [SCI-9795] 2024-01-31 15:15:24 +01:00
Anton
f43718ea6d Update columns manage modal [SCI-10090] 2024-01-31 15:05:16 +01:00
Gregor Lasnibat
6b263c6771 (fix) Spacing between lines in RTF is not correct [SCI-9923] 2024-01-31 14:31:09 +01:00
Martin Artnik
73541e8c42 Fix experiment bulk move permission checks, specs [SCI-9840] 2024-01-31 13:52:56 +01:00
Martin Artnik
378b2dc12e
Merge pull request #7015 from lasniscinote/gl_SCI_10002_core
(dev) Redesign Addons page in the Settings [SCI-10002-core]
2024-01-31 11:27:02 +01:00
Martin Artnik
ce90fb63c8
Merge pull request #7004 from lasniscinote/gl_SCI_10017
(fix) Relationship modal selections are preserved [SCI-10017]
2024-01-31 11:26:40 +01:00
ajugo
9d48cbbb86
Improve error handling for label printing [SCI-10039] (#6997) 2024-01-31 11:10:11 +01:00
Gregor Lasnibat
6f72727e38 (dev) Redesign Addons page in the Settings [SCI-10002-core] 2024-01-31 10:22:22 +01:00
Anton
72b40a63a0 Merge branch 'develop' into features/new-datatable 2024-01-30 12:02:04 +01:00
Martin Artnik
aa4a6a5868
Merge pull request #7009 from G-Chubinidze/gc_SCI_9987_v2
Make File Checkout feature switchable in settings [SCI-9987]
2024-01-30 11:21:46 +01:00
Giga Chubinidze
61c34e72aa Make File Checkout feature switchable in settings [SCI-9987] 2024-01-30 14:19:45 +04:00
aignatov-bio
5725e5808c
Merge pull request #7021 from aignatov-bio/ai-sci-10091-update-access-modal
Update access modal [SCI-10091]
2024-01-30 10:53:35 +01:00
Anton
007bebed46 Update access modal [SCI-10091] 2024-01-30 10:28:02 +01:00
aignatov-bio
94a3d551a3
Merge pull request #7008 from ivanscinote/SCI-10081-ik
Implement search on PET tables [SCI-10081]
2024-01-29 11:45:20 +01:00
aignatov-bio
7b720cc674
Merge pull request #7006 from aignatov-bio/ai-sci-10092-update-designated-users
Update task table designated users [SCI-10092]
2024-01-29 11:45:07 +01:00
Giga Chubinidze
171770a7d3 Using tailwind [SCI-10012] 2024-01-29 12:49:55 +04:00
Giga Chubinidze
086c06ab51 New Module Modal: Error messages are stacked [SCI-10059 2024-01-29 12:08:03 +04:00
Soufiane
7f30547182
Fix various issues with Inventories [SCI-10014] (#6979)
- Show added-by column by default.
- Show stock column in view mode if stock is disabled.
- Prevent column name wrapping in column manage modal.
2024-01-26 15:24:17 +01:00
ivanscinote
a719ceb247
Fix publish-draft button [SCI-9953] (#6957) 2024-01-26 15:22:18 +01:00
ivanscinote
9b3f107d13
Fix stackable header z-index [SCI-9759] (#6914) 2024-01-26 15:21:35 +01:00
Anton
6c76e967cb Fix columns sizes [SCI-10093] 2024-01-26 13:24:11 +01:00
Ivan Kljun
67d78092b4 Implement search on PET tables [SCI-10081] 2024-01-26 09:29:39 +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
G-Chubinidze
ff7e225b41
Merge pull request #7003 from G-Chubinidze/gc_SCI_9986_v2
Changed notification flyout settings to smaller text [SCI-9986]
2024-01-25 12:27:35 +04:00
Gregor Lasnibat
54c0534a8d (fix) Relationship modal selections are preserved [SCI-10017] 2024-01-25 09:12:57 +01:00
Giga Chubinidze
c5dd3905eb Changed notification flyout settings to smaller text [SCI-9986] 2024-01-25 11:34:22 +04:00
Ivan Kljun
24faeae5de Update last_modified_by for assets on edit [SCI-10033] 2024-01-24 15:18:34 +01:00
Martin Artnik
b61331b6cb
Merge pull request #7000 from ivanscinote/SCI-10020-ik
Add error messages to AssetSyncController [SCI-10020]
2024-01-24 14:46:58 +01:00
Anton
6bce6808f2 Fix small sanity check bugs [SCI-10080] 2024-01-24 14:06:26 +01:00
Ivan Kljun
718f5fbfad Add error messages to AssetSyncController [SCI-10020] 2024-01-24 11:02:37 +01:00
Martin Artnik
cc29759dd9
Merge pull request #6967 from G-Chubinidze/gc_SCI_9986_v2
Add "Settings" link to Notifications modal [SCI-9986]
2024-01-24 10:45:22 +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
Giga Chubinidze
ab2b6b589a Implement button examples [SCI-10012] 2024-01-24 12:47:45 +04:00
Ivan Kljun
6b50039dac Change event name to be same as function name [SCI-10010] 2024-01-24 09:32:31 +01:00
Gregor Lasnibat
b8173988f9
Merge pull request #6994 from lasniscinote/gl_SCI_10029
(fix) CSS: Error message for too big file in inventory table [SCI-10029]
2024-01-23 20:27:40 +01:00
Ivan Kljun
c2fa110fb2 Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-10010-ik 2024-01-23 15:32:27 +01:00
Anton
75bbd993ee Fix workflow image update [SCI-10073] 2024-01-23 15:20:12 +01:00
Gregor Lasnibat
76ec7a0189 (fix) CSS: Error message for too big file in inventory table [SCI-10029] 2024-01-23 15:15:46 +01:00
Gregor Lasnibat
73beb3abf5
Merge pull request #6992 from lasniscinote/gl_SCI_10074
(fix) Content disappears until page refresh when moving it between results [SCI-10074]
2024-01-23 14:58:21 +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
Gregor Lasnibat
e46cfdc0d4 (fix) Content disappears until page refresh when moving it between results [SCI-10074] 2024-01-23 14:10:08 +01:00
Ivan Kljun
0eb323b2f1 Add wrong-version modal for SciNote Edit [SCI-10010] 2024-01-23 11:54:42 +01:00
Andrej
c90c29332f Fix archive label for assigned items on repository cards [SCI-10072] 2024-01-23 11:38:59 +01:00
Oleksii Kriuchykhin
d71061a75d Merge branch 'release/1.28.0' into develop 2024-01-23 11:17:14 +01:00
Anton
9277d646ac Small fixes for table [SCI-10045] 2024-01-23 11:08:42 +01:00
Alex Kriuchykhin
bbe01f9d38
Fix inclusion of TinyMCE images in project exports [SCI-10051] (#6988) 2024-01-23 10:16:25 +01:00
Martin Artnik
c3bee668dc
Merge pull request #6987 from artoscinote/ma_SCI_9757
Fix Open menu in attachment preview screen [SCI-9757]
2024-01-23 10:02:04 +01:00
ajugo
32b721e07d
Remove Assigned section from item card for snapshot [SCI-10066] (#6986) 2024-01-23 09:27:00 +01:00
Gregor Lasnibat
85cd24fa81
(fix) Assign from task page is closed at opening item card [SCI-10063] (#6985) 2024-01-23 09:26:30 +01:00
Martin Artnik
81a4924d6b Fix Open menu in attachment preview screen [SCI-9757] 2024-01-22 16:41:10 +01:00
ajugo
53253b462e
Fix loading project activites [SCI-10034] (#6977) 2024-01-22 15:32:30 +01:00
Anton
1fff6da45d Refactor checklist [SCI-9959] 2024-01-22 14:01:32 +01:00
Gregor Lasnibat
fc606a7dd4 (fix) Well plate 12 option and 24 translation missing [SCI_10061] 2024-01-22 11:01:31 +01:00
Soufiane
313782d3d4
Implement API V2 tests for item relationships [SCI-10038] (#6972) 2024-01-22 10:50:23 +01:00
wandji
482472fb21
Fix missing unlink icon for child item relationship [SCI-10062] (#6982) 2024-01-22 10:49:07 +01:00
Soufiane
e70889c001
Unlink items to other shared repositories on unsharing [SCI-10055] (#6981)
- Team A has Repository A with Item A
 - Team B
 - Team C has Repository C with Item C

1) Share Repository A and Repository C to Team B

2) Link Item A to Item C in Team B

3) Unshare Repository A from Team B

Item A is unlinked to Item C
2024-01-22 10:45:23 +01:00
aignatov-bio
35774441f2
Merge pull request #6970 from G-Chubinidze/gc_SCI_9989
Remove archive confirmation modals from all tables [SCI-9989]
2024-01-22 10:07:19 +01:00
Martin Artnik
cfb64a125c
Merge pull request #6980 from aignatov-bio/ai-sci-10035-wizard-component
Add wizard component [SCI-10035]
2024-01-22 09:43:03 +01:00
Giga Chubinidze
9b49e891a0 changed experiment move logic similar to modules move 2024-01-22 02:16:24 +04:00
Anton
97c155f626 Add wizard component [SCI-10035] 2024-01-19 20:36:11 +01:00
Martin Artnik
62f040d475
Merge pull request #6978 from lasniscinote/gl_SCI_10061
(fix) Well plate 12 option and 24 translation missing [SCI-10061]
2024-01-19 15:28:43 +01:00
Gregor Lasnibat
5c305c8728 (fix) Well plate 12 option and 24 translation missing [SCI_10061] 2024-01-19 15:26:42 +01:00
Gregor Lasnibat
1bb6055f91 (fix) CSS- item relationship space in child section [SCI-10057] 2024-01-19 14:56:02 +01:00
Martin Artnik
9c755fd911
Merge pull request #6968 from G-Chubinidze/gc_SCI_9962_v2
Improvements of the SciNote Edit option in "Add-ons" [SCI-9962]
2024-01-19 12:20:45 +01: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
Ivan Kljun
a0445a70bf Fix status API request and thumbnail buttons in SciNote Edit [SCI-9993] 2024-01-18 14:49:46 +01:00
Martin Artnik
dca868ac49 Enable clearing of list value in item card [SCI-10031] 2024-01-18 10:22:57 +01:00
Giga Chubinidze
a2cd0b2075 Remove archive confirmation modals from all tables [SCI-9989]" 2024-01-18 04:41:57 +04:00
Giga Chubinidze
5bab70070e Remove time component from project created at and remove visible to column from projects [SCI-9988] 2024-01-18 04:32:19 +04:00
Giga Chubinidze
4f690db5a9 Improvements of the SciNote Edit option in "Add-ons" 2024-01-18 04:12:08 +04:00
Giga Chubinidze
a9a8a79fd9 Add "Settings" link to Notifications modal 2024-01-18 03:53:54 +04:00
Martin Artnik
62068fd8c3
Merge pull request #6928 from ivanscinote/SCI-9838-ik
Fix open locally buttons for thumbnail view [SCI-9838]
2024-01-17 15:01:45 +01:00
Martin Artnik
2299d7e4ff
Merge pull request #6964 from ivanscinote/SCI-9943-ik
Fix createElement method in results.vue [SCI-9943]
2024-01-17 15:00:47 +01:00
Martin Artnik
209ea96798
Merge pull request #6963 from G-Chubinidze/gc_SCI_9925
Red dot is applied on experiment/task page [SCI-9925]
2024-01-17 10:07:03 +01:00
Giga Chubinidze
a5c7e7b8c8 changed flash message 2024-01-17 12:58:43 +04:00
Ivan Kljun
86ca3b32bc Fix createElement method in results.vue [SCI-9943] 2024-01-17 09:28:34 +01:00
Giga Chubinidze
7a803971f9 Red dot is applied on experiment/task page [SCI-9925] 2024-01-17 05:06:32 +04:00
Giga Chubinidze
2ebe3ff2b8 Fixed js error in open locally menu vue 2024-01-16 20:31:12 +04:00
Martin Artnik
7be280e6e1 Fix saving of blank checklist on item sidebar [SCI-10031] 2024-01-16 15:59:21 +01:00
ajugo
d0ecfe53dc
Add no access text to item card [SCI-10013] (#6959) 2024-01-16 15:06:03 +01:00
aignatov-bio
003990993d
Merge pull request #6958 from aignatov-bio/ai-sci-10006-clean-all-tables-code
Remove old tables code [SCI-10006]
2024-01-16 14:14:22 +01:00
Anton
af811db890 Remove old tables code [SCI-10006] 2024-01-16 14:13:40 +01:00
G-Chubinidze
51bcc96251
Merge branch 'features/asset-sync' into gc_SCI_9757 2024-01-16 17:02:46 +04:00
Alex Kriuchykhin
a43eacaa22
Fix inclusion of relationships column in repository exports [SCI-9716] (#6954) 2024-01-16 13:07:11 +01:00
Ivan Kljun
08b7d0a081 Change experiment description to be one line [SCI-9990] 2024-01-16 11:46:00 +01:00
Alex Kriuchykhin
393e624c16
Revert (fix) Item card behavior in cases of error states vol. 2 [SCI-9792] (#6953) 2024-01-16 11:41:20 +01:00
Martin Artnik
6ca8cff524
Merge pull request #6952 from artoscinote/ma_SCI_10018
Fix asset sync activity user [SCI-10018]
2024-01-16 10:53:52 +01:00
Martin Artnik
37b9a2c077 Fix asset sync activity user [SCI-10018] 2024-01-16 10:39:11 +01:00
Martin Artnik
42d01255da
Merge pull request #6940 from G-Chubinidze/gc_SCI_9986
Add Settings link to Notifications modal [SCI-9986]
2024-01-16 10:36:33 +01:00
Giga Chubinidze
21a9d0c691 updated setting url finding 2024-01-16 13:34:06 +04:00
Giga Chubinidze
b46f0f8d4b Changed hardcoded preferences link to vue variable 2024-01-16 05:20:00 +04:00
mvrazic
967950468d
e2e - added new tags - general-inventories-activities [SCI-10016] (#6947) 2024-01-15 17:17:55 +01:00
mvrazic
f57a2d550a
e2e - added new tags at inventories section [SCI-9919] (#6858) 2024-01-15 16:59:05 +01:00
Anton
fe61d6e169 Fix table component infinite scroll 2024-01-15 16:22:00 +01:00
Anton
d4b68407ef Update notifications modal with new component 2024-01-15 16:21:10 +01:00
Ivan Kljun
67d9fdbed5 Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-9838-ik 2024-01-15 16:20:33 +01:00
Martin Artnik
8f95d8d438 Fix copy of app launch modal [SCI-9841] 2024-01-15 16:11:52 +01:00
Ivan Kljun
2e1b86f9b2 Fix open locally buttons for thumbnail view [SCI-9838] 2024-01-15 16:08:59 +01:00
Gregor Lasnibat
e323f329e5
(fix) At click to relationship number in INV table item card is opened from the top [SCI-9927] (#6950) 2024-01-15 15:55:59 +01:00
Gregor Lasnibat
320f2d2801
(fix) Not unified form of number column content on item card [SCI-9982] (#6936) 2024-01-15 15:55:21 +01:00
Soufiane
f19e7fed9c
Fix the mapping of the columns in the task's full view table [SCI-9978] (#6946) 2024-01-15 15:53:23 +01:00
Martin Artnik
7aff908bed Fix issues with local edit buttons after merging develop [SCI-9841][SCI-9862] 2024-01-15 15:16:02 +01:00
Martin Artnik
695c938f22 Fix asset thumbnail hover [SCI-9838] 2024-01-15 13:44:50 +01:00
ajugo
939d31b642
Fix loading archived status for item card relations [SCI-9910] (#6944) 2024-01-15 13:04:23 +01:00
Martin Artnik
bd1e2696c1
Merge pull request #6938 from lasniscinote/gl_SCI_10008
(fix) Modal opened behind the item card [SCI-10008]
2024-01-15 12:52:00 +01:00
Gregor Lasnibat
7b1a31eaf3 (fix) Modal opened behind the item card [SCI-10008] 2024-01-15 12:09:47 +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
Giga Chubinidze
4e29b4dab8 Add Settings link to Notifications modal [SCI-9986] 2024-01-15 05:03:18 +04:00
Giga Chubinidze
aa47cbad95 Make File Checkout feature switchable in settings [SCI-9987] 2024-01-15 04:43:00 +04:00
aignatov-bio
427f7a7b2e
Merge pull request #6935 from aignatov-bio/ai-sci-9984-add-infinite-scroll
Add infinite scrolling to new tables [SCI-9984]
2024-01-12 14:53:59 +01:00
Anton
3bcd40d64e Add infinite scrolling to new tables [SCI-9984] 2024-01-12 14:45:46 +01:00
Martin Artnik
8476419ba1
Merge pull request #6933 from sboursen-scinote/sb_SCI-9673-force-quotes
Force quoting of CSV fields for repository export [SCI-9673]
2024-01-12 13:43:55 +01:00