Commit graph

1007 commits

Author SHA1 Message Date
Martin Artnik
6a8f8cb419
Merge pull request #6194 from artoscinote/ma_SCI_9279
Fix z-index issues with share modal [SCI-9279]
2023-09-13 10:11:38 +02:00
Martin Artnik
c5eb1759b6
Merge pull request #6198 from artoscinote/ma_SCI_9285
Fix result pagination, fix new step/result buttons [SCI-9285]
2023-09-13 10:00:01 +02:00
aignatov-bio
637093f69e
Merge pull request #6188 from aignatov-bio/ai-sci-9254-fix-inline-edit
Fix inline edit [SCI-9254]
2023-09-13 09:59:50 +02:00
Gregor Lasnibat
6709d5ee73 Finished v.01 of inventory item card (RepositoryItemSidebar) [SCI-9091] 2023-09-13 08:34:07 +02:00
Martin Artnik
6114dd7afc Fix result pagination, fix new step/result buttons [SCI-9285] 2023-09-12 17:33:47 +02:00
Martin Artnik
b78ed02bf4 Fix z-index issues with share modal [SCI-9279] 2023-09-12 14:11:34 +02:00
G-Chubinidze
067d0ca51e
Merge branch 'features/september-release' into gc_SCI_9105 2023-09-12 02:19:02 +04:00
Giga Chubinidze
46af9af0a9 Implement results expand/collapse, and expand/collapse all [SCI-9105] 2023-09-12 02:11:58 +04:00
Anton
982da48bbe Fix inline edit vue component [SCI-9254] 2023-09-11 17:15:00 +02:00
Anton
67c6d66ff1 Fixing inline edit [SCI-9254] 2023-09-11 15:58:53 +02:00
aignatov-bio
daa708a840
Merge pull request #6183 from aignatov-bio/ai-sci-fix-css-task-results
CSS fixed for task protocol
2023-09-11 15:57:36 +02:00
Anton
3f12f91b4a CSS fixed for task protocol 2023-09-11 12:19:21 +02:00
Martin Artnik
8c3ff1813a
Merge pull request #6177 from artoscinote/ma_SCI_9267
Fix attachment sorting in results [SCI-9267]
2023-09-11 10:01:26 +02:00
Martin Artnik
266c78deb1
Merge pull request #6179 from artoscinote/ma_SCI_9278
Disable move button in move content modal if there's no target selected [SCI-9278]
2023-09-11 09:59:47 +02:00
wandji
a3dd30d218
Load OVE packages via yarn [SCI-9231] (#6176)
* Add OVE yarn package and load assets from node_modules [SCI-9231]

* Move hardcoded text to i18 [SCI-9231]
2023-09-11 09:50:05 +02:00
Martin Artnik
f0c77b4e7d Disable move button in move content modal if there's no target selected [SCI-9278] 2023-09-08 16:26:29 +02:00
Martin Artnik
ede9e40be8 Fix attachment sorting in results [SCI-9267] 2023-09-08 16:07:43 +02:00
Anton
7b44a47d51 Add active/archive switch to results page [SCI-9264] 2023-09-08 13:42:02 +02:00
Gregor Lasnibat
5ad6b27f9c
Merge pull request #6169 from lasniscinote/gl_SCI_9256
Fix styles for input in OVE/Marvin editor [SCI-9256]
2023-09-08 10:19:59 +02:00
wandji
8e4dbbac58
Remove name when loading ove file [SCI-9169] (#6165) 2023-09-07 17:19:09 +02:00
Gregor Lasnibat
93a1c842d9 Fix styles for input in OVE/Marvin editor [SCI-9256] 2023-09-07 15:42:37 +02:00
aignatov-bio
92749d5ec2
Merge branch 'features/september-release' into ai-sci-9210-add-move-action-to-asset-card 2023-09-07 14:15:17 +02:00
Anton
53d08fe09d Fix permissions on results [SCI-9253] 2023-09-07 12:12:30 +02:00
Anton
8f9072f46e Fix navigator CSS [SCI-9230][SCI-9233] 2023-09-07 10:45:50 +02:00
Martin Artnik
70bdb870b5
Merge pull request #6124 from artoscinote/ma_SCI_9209
Fix attachment deletion and image errors [SCI-9209]
2023-09-07 10:37:41 +02:00
Anton
7af03bd651 Add move action to asset thumbnail [SCI-9210] 2023-09-07 10:33:33 +02:00
Anton
1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
Martin Artnik
1e49cc5608
Merge pull request #6149 from G-Chubinidze/gc_SCI_9187
Implement type-to-search functionality in the "Move to different results" modal [SCI-9187]
2023-09-06 14:31:05 +02:00
Giga Chubinidze
76b7c45021 Implement type-to-search functionality in the 'Move to different result' modal [SCI-9187] 2023-09-06 16:12:31 +04:00
Gregor Lasnibat
c030d2b6d1 Fix missing paperclip icon for file attachment [SCI-9224] 2023-09-06 13:52:03 +02:00
Gregor Lasnibat
f172c97a79 Fix missing OVE file preview [SCI-9214] 2023-09-06 12:45:42 +02:00
aignatov-bio
b5883178a4
Merge pull request #6123 from ivanscinote/SCI-9016-inline-edit-component-ui-rework
Rework inline edit vue component UI [SCI-9016]
2023-09-06 10:49:18 +02:00
Anton
48b89fc699 Fix activities for results [SCI-9206][SCI-9205][SCI-9207] 2023-09-05 16:25:21 +02:00
Martin Artnik
94932d0b04 Fix attachment deletion and image errors [SCI-9209] 2023-09-05 14:43:16 +02:00
aignatov-bio
7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability 2023-09-05 14:41:23 +02:00
aignatov-bio
647fb76910
Merge branch 'features/september-release' into ai-sci-9108-add-infinite-scroll 2023-09-05 14:40:03 +02:00
aignatov-bio
c33243b962
Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields
Add title to text component [SCI-9141]
2023-09-05 14:32:42 +02:00
aignatov-bio
c3a5bf2e37
Merge pull request #6136 from aignatov-bio/ai-sci-9195-fix-tinymce-sticky-header
Fix tinymce header [SCI-9195]
2023-09-05 14:31:20 +02:00
Ivan Kljun
a6abfc7e31 Applying hound suggestions [SCI-9016] 2023-09-05 13:39:21 +02:00
Anton
b4659e88a9 Fix tinymce header [SCI-9195] 2023-09-05 12:06:48 +02:00
Ivan Kljun
86e2cfe747 Merge remote-tracking branch 'upstream/features/september-release' into SCI-9016-inline-edit-component-ui-rework 2023-09-05 11:31:30 +02:00
artoscinote
8d352b758a
Merge pull request #6133 from ivanscinote/SCI-9182-rearranging-content-within-a-result-modal-translation
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
2023-09-05 11:09:08 +02:00
Ivan Kljun
56744e2dcd Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182] 2023-09-05 11:02:39 +02:00
artoscinote
c59ee1c358
Merge pull request #6132 from G-Chubinidze/gc_SCI_9179
Archiving results doesn't work [SCI-9179]
2023-09-05 10:53:43 +02:00
Giga Chubinidze
b7da98c1dd Archiving results doesn't work [SCI-9179] 2023-09-05 11:55:15 +04:00
Anton
86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Giga Chubinidze
3b8669ed84 Add timestamps to results [SCI-9181] 2023-09-04 11:40:32 +04:00
Gregor Lasnibat
b382bb441e Fix save empty OVE [SCI-9193] 2023-09-02 06:44:30 +02:00
lasniscinote
178d46dfae
Merge pull request #6134 from lasniscinote/gl_SCI_9213
Fix gene sequence attachment icons [SCI-9213]
2023-09-05 12:58:19 +02:00
Alex Kriuchykhin
f0fe040932
Fix OVE asset preview reloading after update [SCI-9112] (#6122) 2023-09-05 11:36:37 +02:00
Gregor Lasnibat
589faef72f Fix gene sequence attachment icons [SCI-9213] 2023-09-02 03:14:51 +02:00
Ivan Kljun
40638dbb63 Rework inline edit vue component UI [SCI-9016] 2023-09-01 17:18:13 +02:00
wandji
c46c2ee9d6
Detach the File name changes from changing filename inside the OVE [SCI-9169] (#6116) 2023-09-01 13:54:41 +02:00
artoscinote
dc535bce52
Merge pull request #6121 from G-Chubinidze/gc_SCI_9186
Button translation in the "Move to different result" Modal [sci-9186]
2023-09-01 11:40:57 +02:00
artoscinote
7b73e03a5f
Merge pull request #6120 from G-Chubinidze/gc_SCI_9185
Placeholder text in the "Move to different result" modal dropdown [SCI-9185]
2023-09-01 11:40:34 +02:00
Giga Chubinidze
b71323d720 changed object mutation/changed placeholder check 2023-09-01 13:37:48 +04:00
artoscinote
51227b5c65
Merge pull request #6119 from G-Chubinidze/gc_SCI_9081
Placeholder text (titles, description field) [SCI-9081]
2023-09-01 11:02:06 +02:00
Martin Artnik
3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
wandji
bed7f574f0
Hide align toolbar option in OVE editor [SCI-9113] (#6113)
* Hide align toolbar option in OVE editor [SCI-9113]

* Hide alligment toolbar in OVE editor [SCI-9113]
2023-09-01 10:18:36 +02:00
Giga Chubinidze
6db9134065 Button translation in the "Move to different result" Modal 2023-09-01 11:59:56 +04:00
Giga Chubinidze
100fdde5ca Placeholder text in the "Move to different result" modal dropdown 2023-09-01 11:49:43 +04:00
Anton
d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
Oleksii Kriuchykhin
b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
wandji
167abe5239
Add .json extension to OVE import tooltip [SCI-9116] (#6112)
* Add .json extension to OVE import tooltip [SCI-9116]

* Override import and downlod tooltip values [SCI-9116]
2023-08-31 12:51:49 +02:00
Anton
2d76e628be Add infinite scroll to results [SCI-9108] 2023-08-30 15:51:23 +02:00
G-Chubinidze
7a1b1b5cf5
UI rework of thumbnail view asset controls [SCI-9015] (#6104)
* UI rework of thumbnail view asset controls [SCI-9015]

* styling change css -> tailwind
2023-08-30 15:42:55 +02:00
aignatov-bio
f5235a9b9d
Merge pull request #6097 from aignatov-bio/ai-sci-8980-scrolling-on-task-page
Add sticky scrolling to task page [SCI-8980]
2023-08-30 11:54:28 +02:00
Anton
6a287fa54f Add sticky scrolling to task page [SCI-8980] 2023-08-30 11:09:27 +02:00
aignatov-bio
e8f839d719
Merge pull request #6088 from aignatov-bio/ai-sci-8977-ui-revamp-filters-modal
Revamp filters flyouts [SCI-8977]
2023-08-29 10:18:54 +02:00
Anton
eb44724ece Fix marving JS button initialization [SCI-9144] 2023-08-28 15:53:58 +02:00
Anton
171a996aec Revamp filters flyouts [SCI-8977] 2023-08-28 13:15:41 +02:00
G-Chubinidze
bbffce5e03
Placeholder text (titles, description field) [SCI-9081] (#6087)
* Placeholder text (titles, description field) [SCI-9081]

* removed serializer code

* Update table.vue
2023-08-28 10:36:40 +02:00
Giga Chubinidze
0e2f9ff81d removed serializer code 2023-08-28 12:14:44 +04:00
Giga Chubinidze
6d8d804c71 Placeholder text (titles, description field) [SCI-9081] 2023-08-28 10:32:08 +04:00
ajugo
db4aa53f72
Merge pull request #5993 from sboursen-scinote/sb_SCI-9038
Set sequence attachments file icon [SCI-9038]
2023-08-25 21:53:22 +02:00
Anton
6615c01cb4 Add input field with search history [SCI-9102] 2023-08-25 15:02:27 +02:00
Soufiane
a19ab3b519
Fix OVE CSS issues [SCI-9114] (#6081)
- Fix broken CSS import.
- Hide body scroll when editor is open.
- Fix editor header design.
2023-08-25 14:22:37 +02:00
sboursen-scinote
195df7936f Use custom images for marvin and OVE [SCI-9038] 2023-08-25 13:59:18 +02:00
wandji
61da3a12b9
Add menubar to ove editor [SCI-9115] (#6079)
* Add menubar to ove editor [SCI-9115]
2023-08-25 11:36:33 +02:00
Anton
e66968357a Fix hound 2023-08-25 09:46:53 +02:00
Anton
f31d2b8912 Add move ability to attachments [SCI-9088] 2023-08-24 15:57:03 +02:00
Soufiane
9d0f62824e
Remove blinking button from actiontoolbar when loading [SCI-9067] (#6062) 2023-08-24 09:19:35 +02:00
artoscinote
0bea4a06ef
Add result duplicate action [SCI-8959] (#6019) 2023-08-23 15:05:31 +02:00
Ivan Kljun
39ed4b1b92 Hide Cancel/Save btns after click at Share task modal [SCI-9008] 2023-08-23 14:20:24 +02:00
artoscinote
e1416e3efd
Merge branch 'features/september-release' into ma_SCI_9013 2023-08-23 12:01:14 +02:00
Martin Artnik
b3965e5aca Implement result filters [SCI-9013] 2023-08-23 11:59:21 +02:00
aignatov-bio
c111d287ef
Merge pull request #6039 from aignatov-bio/ai-sci-9024-add-move-modal-for-elements
Add element movements between step and results [SCI-9024]
2023-08-22 12:26:57 +02:00
Anton
e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Andrej
29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
G-Chubinidze
1253511020
Merge pull request #6035 from G-Chubinidze/gc_SCI_9014
Add thumbnail asset preview to list view assets [SCI-9014]
2023-08-22 12:22:06 +04:00
Giga Chubinidze
c699095d1a Add thumbnail asset preview to list view assets [SCI-9014] 2023-08-22 05:55:20 +04:00
wandji
1d051aeb0f
Fix CSS UI issues for shareable links task sharing [SCI-9080] (#6031)
* Fix css UI issues for shareable links task sharing [SCI-9080]
2023-08-21 16:07:38 +02:00
artoscinote
8f24e90ee4
Merge pull request #6030 from wandji20/wb-SCI-9074
Fix css issue protocol template author edit [SCI-9074]
2023-08-21 12:58:23 +02:00
artoscinote
d8da463dc2
Merge pull request #5956 from ivanscinote/SCI-9008-share-task-modal
Move blur event to whole modal at Share task [SCI-9008]
2023-08-21 12:04:54 +02:00
wandji20
b41b0b04f0 Fix css issue protocol template author edit [SCI-9074] 2023-08-21 11:01:07 +01:00
artoscinote
00167e30b0
Merge pull request #6029 from artoscinote/ma_SCI_8422
Fix filtering of template tags [SCI-8422]
2023-08-21 11:56:28 +02:00
Ivan Kljun
5902ee28e1 Remove blur event function as it is redundant 2023-08-21 11:52:57 +02:00
Martin Artnik
fc18c76efd Fix filtering of template tags [SCI-8422] 2023-08-21 11:44:01 +02:00
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
wandji20
5e6138fa18 Replace unecessary margin value with tailwind value [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20
0ae44eb3a7 Use default tailwind size for task assigned protocol description [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20
7c07befd3e Fix CSS issues in protocols, and quick start(new task) [SCI-9018] 2023-08-21 09:27:28 +01:00
Ivan Kljun
0553b5b0dc Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal 2023-08-21 09:32:59 +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
f21c1ba7c5
Merge pull request #6009 from artoscinote/ma_SCI_8959
Add some basic result component layout [SCI-8959]
2023-08-17 16:42:26 +02:00
Martin Artnik
23a8872e11 Add some basic result component layout [SCI-8959] 2023-08-17 16:32:42 +02:00
artoscinote
2cc49ec6b5
Merge pull request #6005 from wandji20/wb-SCI-9003
Fix CSS style issues [SCI-9003]
2023-08-17 15:48:07 +02:00
ajugo
dd80b4019b
Merge pull request #5942 from sboursen-scinote/sb_SCI-8987
Fix micro-interactions for shareable links modals [SCI-8987]
2023-08-17 15:28:43 +02:00
sboursen-scinote
ef9368d2cb Fix micro-interactions for shareable links modals [SCI-8987] 2023-08-17 15:22:16 +02:00
ajugo
032655f4e7
Merge pull request #6002 from rekonder/aj_SCI_8986
Show toast message on successful copy [SCI-8986]
2023-08-17 15:14:05 +02:00
wandji20
4a3f8146e3 Fix CSS style issues [wb-SCI-9003] 2023-08-17 13:11:58 +01:00
Alex Kriuchykhin
c356018965
Merge pull request #5918 from sboursen-scinote/sb_SCI-8981
Share button is disabled for locked and archived tasks [SCI-8981]
2023-08-17 14:10:09 +02:00
Anton
16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
Andrej
9a09fbc8ce Show toast message on successful copy [SCI-8986] 2023-08-17 11:21:53 +02:00
Andrej
6e8dda64b2 Create new sequence attachment on task protocol step [SCI-8948] 2023-08-17 09:38:44 +02:00
Giga Chubinidze
63ed250f4a Result action menu [SCI-8954] 2023-08-17 10:29:34 +04: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
Martin Artnik
8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
artoscinote
083bd4b1e2
Merge pull request #5827 from aignatov-bio/ai-sci-8843-fix-notification-infinite-scroll
Fix infinite scroll for notifications [SCI-8843]
2023-08-16 10:27:07 +02:00
sboursen-scinote
dc27620d00 Make share button independent of task status flow or archived state [SCI-8981] 2023-08-16 10:22:55 +02:00
Anton
6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
Anton
f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
Martin Artnik
16dbd48ad3 Merge branch 'develop' into features/september-release 2023-08-10 13:21:27 +02:00
Ivan Kljun
949da66414 Move blur event to whole modal at Share task [SCI-9008] 2023-08-10 11:58:35 +02:00
Martin Artnik
4d4eebd78e Fix glitchy dropdowns on Safari [SCI-8946] 2023-08-10 11:46:31 +02:00
Soufiane
aedd3e0b6d
Fix multiple issues for Shared tasks feature [SCI-8985] (#5936)
- Centre vertically all related modals
- Convert task header tabs to sentence case
2023-08-10 09:43:31 +02:00
Andrej
104a9d5c17 Implemented trial period for open vector editor [SCI-8962] 2023-08-10 08:58:49 +02:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
artoscinote
c42a10e131
Merge pull request #5945 from ivanscinote/SCI-8955-result-content-rearange
Make result content rearrangable [SCI-8955]
2023-08-09 15:58:17 +02:00
Ivan Kljun
669bb3dd48 Make result content rearrangable (UI needs to be finalised and tested with actual data) [SCI-8955] 2023-08-09 13:58:25 +02:00
Anton
f688995635 Refactor task page UX [SCI-8951] 2023-08-09 11:03:30 +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
Anton
fcd76661c7 Fix inline edit 2023-08-08 11:09:26 +02:00
Anton
758b28261d Merge branch 'develop' into features/september-release 2023-08-07 16:30:28 +02:00
Martin Artnik
11fb166a0c Migration fix, additional endpoints, cleanup [SCI-8947] 2023-08-07 16:09:15 +02:00
Martin Artnik
633abf69c0 Basic results toolbar implementation [SCI-8952] 2023-08-07 16:09:15 +02:00
Martin Artnik
fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
ajugo
c8fbdacf22
Merge pull request #5921 from rekonder/aj_SCI_8986
Copy shareable link when you enable sharing for task [SCI-8986]
2023-08-07 15:17:49 +02:00
Anton
7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +02:00
Oleksii Kriuchykhin
6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +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
Anton
89d7241f60 Merge branch 'develop' into features/september-release 2023-08-07 10:35:15 +02:00
Andrej
84233506c0 Copy shareable link when you enable sharing for task [SCI-8986] 2023-08-07 09:47:44 +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
sboursen-scinote
40f78f4a28 Fix shareable links CSS [SCI-8975]
- Fix the style of the toggle button globally.
- Fix permissions on who can toggle team shareable links.
- Change wrong translations in shareable links modal.
- Remove placeholder text for start-date
2023-08-04 12:34:04 +02:00
sboursen-scinote
c27c7245bc Fix various CSS issues [SCI-8940]
- Maintain the position of the top navigation controls when user is without team.
- Add "missing" avatar to avatar change modal
- Disable wrapping of (A) in archived P/E/T
- Fix padding/margin issues in Archived tasks and Protocol templates
2023-08-04 09:11:53 +02:00
Oleksii Kriuchykhin
b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
Martin Artnik
80c5268efd Add read-only mode to OVE [SCI-8962] 2023-08-02 15:46:07 +02:00
wandji
31f8bc19d5
Add unique database index to checklist items position (#5886)
* Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841]

* Improve protocol checklist item reordering [SCI-8841]

* Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]
2023-08-02 15:37:01 +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
wandji
2680b317e5
Fix issue when toggling repository items search fields [SCI-8874] (#5855)
* Fix issue when toggling repository items search fields [SCI-8874]

* Refactor outside click directive and make it available for all components [SCI-8874]
2023-08-01 10:41:58 +02:00
ajugo
e71d5805ca
Refactored settings for Label templates feature and Zebra printing [SCI-8918] (#5895)
* Refactored settings for Label templates feature and Zebra printing [SCI-8918]

* Add check for label template [SCI-8918]
2023-08-01 10:30:57 +02:00
artoscinote
f117c21ea5
Merge pull request #5873 from aignatov-bio/ai-sci-8905-refactor-insert-menu
Refactor insert menu [SCI-8905]
2023-08-01 10:13:23 +02:00
Anton
2b83243aa8 Refactor insert menu [SCI-8905] 2023-07-26 16:28:32 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Anton
f4d8983040 Update attachments section [SCI-8879] 2023-07-25 15:10:09 +02:00
Ivan Kljun
18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Anton
9393f3cc0f Fix navigator console errors [SCI-8890] 2023-07-25 11:11:55 +02:00
Giga Chubinidze
ab41b5e219 Some icons have the checkboard pattern applied to the background [SCI-5605] 2023-07-25 11:52:31 +04:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
ajugo
f44f083b0b
Merge pull request #5846 from sboursen-scinote/sb_SCI-8239
Save as new protocol template from task - read the protocol name [SCI-8239]
2023-07-25 09:34:49 +02:00
Soufiane
effdc9563a
Improve Breadcrumbs responsiveness [SCI-8494] (#5778)
- Refactor Breadcrumbs using VUE.
- Implement responsiveness breakpoints
2023-07-25 09:24:49 +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
Anton
aa87b332e4 Prepare step components for results refactor [SCI-8880] 2023-07-24 14:07:11 +02:00
Martin Artnik
ebfaca6966 Clear wopi file length error on input, css fix [SCI-8877] 2023-07-24 12:46:45 +02:00
artoscinote
ff83b97d7b
Merge pull request #5841 from artoscinote/ma_SCI_8894
Fix tinymce loading placeholders for text elements [SCI-8894]
2023-07-24 10:39:14 +02:00
Soufiane
5a44400fbb
Fix zebra printer CSP issue [SCI-8859] (#5806) 2023-07-21 16:54:57 +02:00
Martin Artnik
30e07ff1e9 Fix tinymce loading placeholders for text elements [SCI-8894] 2023-07-21 16:25:44 +02:00
Anton
2a47909e32 Update step text element [SCI-8880] 2023-07-21 10:35:14 +02:00
Anton
0163d56186 Fix infinite scroll for notifications [SCI-8843] 2023-07-20 11:04:17 +02:00
Ivan Kljun
b516382fc4 Remove notification tabs logic and variables 2023-07-19 13:38:16 +02:00
Ivan Kljun
c306b17e93 Remove notifications tabs component [SCI-8807] 2023-07-19 13:12:42 +02:00
Andrej
f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
Anton
f540b3dc8d Fix js error in console log [SCI-8890] 2023-07-19 09:55:27 +02:00
aignatov-bio
b18421ec4b
Merge pull request #5762 from aignatov-bio/ai-sci-8735-add-error-modal-for-protocol-parsing
Added error handling for protocol import [SCI-8735]
2023-07-18 10:21:11 +02:00
artoscinote
5a65b94ce3
Merge pull request #5714 from wandji20/wb-SCI-8744
Set blank default date for added_on repository filters [SCI-8744]
2023-07-18 08:41:14 +02:00
ajugo
d71351fcbc
Fix scrollTo for inventory filter [SCI-8869] (#5782) 2023-07-17 15:39:19 +02:00
wandji
2698681548
Fix Not correct naming for label in global activity filter (#5776)
* Update translation for label_repository and sort template label names in label print modal

* Rename label_repository to label_templates in translation file and initializer/extends) [SCI-8808]
2023-07-17 15:38:28 +02:00
ivanscinote
a483699d73
CSS: Protocol templates UI issues [SCI-8790] (#5736)
* CSS: Protocol templates UI issues [SCI-8790]

* Reorder css properties

* Remove whitespace in scss

* Adding flexible class to protocols-show
2023-07-14 12:31:54 +02:00
ivanscinote
5519cfe75f
Fix label templates, inline edit, checklist and step [SCI-8792] (#5766)
* Fix label templates, inline edit, checklist and step [SCI-8792]

* Add mouse selection to protocol name on task and protocol desc.

* Fix css hound suggestions
2023-07-14 12:31:15 +02:00
wandji20
a63e6f20b4 Remove redundant check [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
8bacfa4158 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
20fb1e9285 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
973d65ca00 Set blank default date for added_on repository filters [SCI-8744] 2023-07-13 18:28:51 +01: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
Anton
4cc6513f82 Fix css for protocol checklists [SCI-8788] 2023-07-13 13:55:32 +02:00
Anton
25b11bfb24 Added error handling for protocol import [SCI-8735] 2023-07-13 11:51:35 +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
aignatov-bio
c90060dbec
Merge pull request #5757 from aignatov-bio/ai-sci-8762-css-fixes
Multiple CSS fixes [SCI-8762]
2023-07-12 14:34:59 +02:00
Anton
24454a0fb9 Multiple CSS fixes [SCI-8762] 2023-07-12 12:25:31 +02:00
aignatov-bio
683fe22475
Merge pull request #5753 from aignatov-bio/ai-sci-8716-fix-checklists-drag-n-drop-interactions
Fix checklists drag/drop interactions in Safari [SCI-8716]
2023-07-12 09:48:27 +02:00
ajugo
051e686787
Implement automatic check for new notifications [SCI-8654] (#5631) 2023-07-11 16:05:34 +02:00
Anton
71020c032d Fix checklists drag/drop interactions in Safari [SCI-8716] 2023-07-11 13:42:08 +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
Anton
8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +02:00
G-Chubinidze
25aa644102
Removing Support button from the top navigation [SCI-8806] (#5744) 2023-07-10 14:03:47 +02:00
ajugo
6c6fc404d2
Implement task shareable modal [SCI-8651] (#5723)
* Implement task shareable modal [SCI-8651]

* Fix routes [SCI-8651]

* Clean code for vue share button initilization [SCI-8651]
2023-07-06 16:05:03 +02:00
Martin Artnik
ed4af7ae26 Properly unload scroll listener when unloading a select [SCI-8802] 2023-07-06 10:31:26 +02:00
artoscinote
8f88d2d894
Merge pull request #5700 from G-Chubinidze/gc_SCI_8422
Label templates issues on edit template page [SCI-8422]
2023-07-03 14:47:00 +02:00
Giga Chubinidze
b1490c81a0 changed timeout to nexttick 2023-07-03 13:50:44 +04:00
Giga Chubinidze
4bc25ac00f Label templates issues on edit template page [SCI-8422] 2023-07-03 10:56:20 +04:00
Anton
586d9eaf4b CSS fixes [SCI-8758][SCI-8759] 2023-06-27 20:31:25 +02:00
Anton
8fac4c1b7c UI CSS fixes 2023-06-22 11:55:23 +02:00
Anton
2030b71082 UI CSS Fixes 2023-06-21 12:02:18 +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
Soufiane
8e6854309e
Fix broken inventory page [SCI-8690] (#5633)
- Stretch the datatable body to take all of the available space.
- Reload the datatable upon item assignment to task.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-20 14:29:35 +02:00
artoscinote
62411fb77b
Merge pull request #5517 from sboursen-scinote/sb_SCI-8316
Add office file to task step - reload file does not work for empty file [SCI-8316]
2023-06-20 11:12:28 +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
Martin Artnik
6913874257 Fix bottom toolbar position update [SCI-8683] 2023-06-19 14:10:55 +02:00
G-Chubinidze
7c55585e1f
Merge branch 'develop' into gc_SCI_8645 2023-06-19 10:18:27 +04:00
Giga Chubinidze
96ff988c77 Buttons title (tooltip on hover) - top action toolbar [SCI-8645] 2023-06-19 10:04:58 +04:00
Martin Artnik
5f3b009bfc Add support for boostrap modals to action toolbar [SCI-8681] 2023-06-16 15:14:58 +02:00
Martin Artnik
e44b3bb568 Fix bottom action toolbar responsiveness [SCI-8682] 2023-06-16 14:17:46 +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
artoscinote
0680379dd6
Merge pull request #5599 from G-Chubinidze/gc_SCI_8630
Buttons title (tooltip on hover) - top navigation [SCI-8630]
2023-06-15 15:18:52 +02:00
Anton
c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
Giga Chubinidze
69c7176976 Buttons title (tooltip on hover) - top navigation [SCI-8630] 2023-06-15 04:59:34 +04:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
Anton
5643ca4387 Update bottom action toolbar css [SCI-8541] 2023-06-14 15:10:17 +02:00
ajugo
272de72231
Prevent closing assign modal from inventory for dropdown options [SCI-8640] (#5593) 2023-06-14 14:57:58 +02:00
Anton
4674f64905 Add new button style [SCI-8558] 2023-06-14 14:54:10 +02:00
ajugo
dea721cdf0
Fix click away table update [SCI-8432] (#5589) 2023-06-14 10:20:40 +02:00
Anton
86e980f773 Updated top navigation [SCI-8540] 2023-06-13 14:12:41 +02:00
Anton
b434c8a2c7 Update css for team selection and search field [SCI-8540] 2023-06-13 11:52:14 +02:00
artoscinote
91aab57914
Merge pull request #5580 from sboursen-scinote/sb_SCI-8545
Improvement of dropdown in Assign to task modal [SCI-8545]
2023-06-12 14:38:16 +02:00
Anton
16d4a09cfa Update left navigation 2023-06-12 14:23:26 +02:00
Soufiane
2e16302812
Team admin can see all projects in Navigator [SCI-8549] [SCI-8381] (#5575)
Disable project links if team admin is missing read permission [SCI-8381]
2023-06-12 12:55:32 +02:00
Anton
5f55070fec Navigator ui revamp [SCI-8539][SCI-8467] 2023-06-12 11:53:24 +02:00
sboursen-scinote
43bf1cf0eb Add loading state to select_search [SCI-8545]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-12 10:49:31 +02:00
sboursen-scinote
ad78759393 Handle no action buttons in the toolbar edge case [SCI-8626]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-09 10:11:31 +02:00
Martin Artnik
27c2850f49 More fixes for icons [SCI-8366] 2023-06-08 18:12:28 +02:00
Martin Artnik
dcc30822f5 New icon tweaks & fixes [SCI-8366] 2023-06-08 17:33:50 +02:00
Giga Chubinidze
a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04:00
artoscinote
164829fd7c
Fix issue where blur prevention is not turned off in assignment modal dropdown [SCI-8588] (#5570) 2023-06-07 09:52:57 +02:00
artoscinote
98cb0df46b
Fix issues with assign to task dropdowns [SCI-8588] (#5568) 2023-06-06 15:31:40 +02:00
G-Chubinidze
3a2ad1eda6
Well template table arrow & math calculation disabled [SCI-8596] (#5549) 2023-06-02 16:08:42 +02:00
artoscinote
fa05ce15f3
Merge pull request #5476 from G-Chubinidze/gc_SCI_8473
Position of opened drop down [SCI-8473]
2023-06-01 12:32:53 +02:00
ajugo
b9b84ef79d
Fix perfect scrollbar effects and size of the buttons on navigation [SCI-8567] (#5525) 2023-05-31 12:39:20 +02:00
sboursen-scinote
4848236fd3 Merge branch 'develop' into sb_SCI-8509
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-30 16:07:26 +02:00
sboursen-scinote
a58803a2cd Fix Reload button for new attachement (Wopi) when content changes [SCI-8316]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-30 15:49:38 +02:00
ajugo
b0a7699184
Fix action toolbar for project folders [SCI-8572] (#5514) 2023-05-30 12:50:33 +02:00
Martin Artnik
bb32f3a935 Improve bottom action toolbar responsiveness [SCI-8550] 2023-05-29 16:34:07 +02:00
artoscinote
65d7c96467
Merge pull request #5489 from G-Chubinidze/gc_SCI_8520
Missing tooltips on the bottom action toolbar [SCI-8520]
2023-05-29 11:29:50 +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
852bba642f
Merge pull request #5500 from G-Chubinidze/gc_SCI_8385
Empty screen revamp [SCI-8385]
2023-05-29 11:02:15 +02:00
Giga Chubinidze
534afe64cb changed current team variable 2023-05-29 13:00:54 +04:00
artoscinote
5b90a657e4
Merge pull request #5502 from artoscinote/ma_SCI_8525
Add 'no actions' message to action toolbar [SCI-8525]
2023-05-29 10:26:42 +02:00
artoscinote
6ce9e41c2f
Merge pull request #5497 from aignatov-bio/ai-sci-8538-add-navigator-horizontal-scrollbar
Add navigator horizontal scrollbar [SCI-8538]
2023-05-29 10:21:26 +02:00
Martin Artnik
a5fe01a07a Add 'no actions' message to action toolbar [SCI-8525] 2023-05-29 09:33:18 +02:00
Giga Chubinidze
59bdd7d8d2 Empty screen revamp [SCI-8385] 2023-05-29 01:42:26 +04:00
Giga Chubinidze
5df26d757f Missing tooltips on the bottom action toolbar [SCI-8520] 2023-05-28 03:52:24 +04:00
Soufiane
1a689c9329
Add no-options placehoder to experiments dropdown [SCI-8517] (#5495)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 21:10:53 +02:00
Anton
61a6d8326c Add navigator horizontal scrollbar [SCI-8538] 2023-05-26 16:58:11 +02:00
Soufiane
e5dc1f365b
Add a no-options placeholder for projects selector [SCI-8544] (#5492)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 11:47:35 +02:00
Soufiane
cb14333fca
Issues with the "Assign item to task" modal part 1 [SCI-8513] (#5486)
* Fix Select bounding box calculations [SCI-8513]

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

* Abbreviate very long select text [SCI-8513]

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

* Remove gap when dropdown is open [SCI-8513]

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

* Fix hound [SCI-8513]

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

* Add small refactor [SCI-8513]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 11:41:47 +02:00
sboursen-scinote
a77ee62f8e Fix hover effect depending on the type of the navigator link [SCI-8509]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 11:19:27 +02:00
Giga Chubinidze
d72653aff2 Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098] 2023-05-26 02:59:19 +04:00
Giga Chubinidze
c68151fcdf added user dropdown class 2023-05-25 11:20:11 +04:00
Soufiane
f21dc998b9
Add filtering for project/experiment filter for assignable tasks [SCI-8442] (#5441)
* Remove object without  edit permission in P/E/T filters [SCI-8442]

* Leave only experiments and projects with active tasks [SCI-8442]
2023-05-24 10:47:27 +02:00
aignatov-bio
1a9eab09c3
Merge pull request #5463 from aignatov-bio/ai-sci-8426-fix-tiny-mce-in-safari
Fix tinyMCE layout in safari [SCI-8426]
2023-05-23 21:13:21 +02:00
Anton
043ce88434 Fix tinyMCE layout in safari [SCI-8426] 2023-05-23 13:28:31 +02:00
Anton
bbdb852377 Fix barcode button [SCI-8485] 2023-05-23 12:33:07 +02:00
Anton
7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +02:00
Anton
db06ff5946 Fix scrolling position in navigator [SCI-8491] 2023-05-19 11:46:36 +02:00
artoscinote
b10e5a4ab8
Merge pull request #5432 from aignatov-bio/ai-sci-8423-fix-navigator-hover-color
Fix navigator archive color [SCI-8423]
2023-05-18 16:46:55 +02:00
Anton
6918bbd84a Fix navigator hover color [SCI-8423] 2023-05-18 13:33:08 +02:00
Martin Artnik
f6d782392c Fix margin between toolbar buttons [SCI-8479] 2023-05-18 11:58:45 +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
aignatov-bio
31bb1210af
Merge pull request #5422 from aignatov-bio/ai-sci-8438-navigation-css-fixes
Update navigation css [SCI-8438]
2023-05-18 08:58:48 +02:00
sboursen-scinote
9662eb7264 Improve the logic of the select and select_search components
> There is no need for the two components to hold their `value` state.
It can be propagated from the component that uses them.
This will help 'clear' the search when modification is finished.
2023-05-17 19:01:16 +02: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
artoscinote
20593f087e
Merge pull request #5421 from artoscinote/ma_SCI_8399
Implement new toolbar for protocols [SCI-8399]
2023-05-17 15:00:38 +02:00
Anton
3bdd903623 Update navigation css [SCI-8438] 2023-05-17 14:18:16 +02:00
Martin Artnik
eb5fb16b1b Implement new toolbar for protocols [SCI-8399] 2023-05-17 14:12:40 +02:00
aignatov-bio
23f4b01c8e
Merge pull request #5418 from aignatov-bio/ai-sci-update-scinote-icon-font
Update SciNote icon font
2023-05-17 12:30:13 +02:00
Anton
a33b1b0da7 Update scinote icon font 2023-05-17 12:00:59 +02:00
artoscinote
a52ee99781
Add debounce file [SCI-8300] (#5419) 2023-05-17 12:00:37 +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
Andrej
6ed55be62c Fix merge conflicts 2023-05-17 11:40:14 +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
Anton
15a6f72894 Navigator CSS fixes [SCI-8430][SCI-8439] 2023-05-16 14:05:56 +02:00
Soufiane
19cad569b3
Cache the values of formulas of HOT tables in meta data [SCI-8173] (#5406) 2023-05-16 11:19:56 +02:00
Soufiane
dda3d1bc6b
Fix typo [SCI-8250] (#5393) 2023-05-16 11:19:19 +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
artoscinote
1d30389298
Merge pull request #5407 from G-Chubinidze/gc_SCI_8441
CSS: Smaller visual bugs; Inventory & Tasks [SCI-8441]
2023-05-16 10:38:04 +02:00
ajugo
d8945cc627
Fix large asset preview [SCI-8433] (#5408) 2023-05-16 10:24:08 +02:00
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Giga Chubinidze
dee32d8986 CSS: Smaller visual bugs; Inventory & Tasks [SCI-8441] 2023-05-16 11:22:46 +04:00
Anton
08652e9dde Improve navigation in archive state [SCI-8405] 2023-05-11 13:14:56 +02:00
Anton
8b901cb485 Fix navigator sorting [SCI-8400] 2023-05-11 12:38:54 +02:00
artoscinote
dae4697585
Merge pull request #5383 from artoscinote/ma_SCI_8315
Track user full name update in navigation [SCI-8315]
2023-05-11 11:27:12 +02:00
aignatov-bio
168fa0a4bc
Merge pull request #5394 from aignatov-bio/ai-sci-8283-add-barcode-search-field
Add barcode search field [SCI-8283]
2023-05-11 11:26:48 +02:00