Commit graph

4384 commits

Author SHA1 Message Date
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
Soufiane 7a798dd92e
Change of color of "x" for task/step comment [SCI-8344] (#5339)
* Change the color and the hover effect of model close button sitewide [SCI-8344]

* Fix hound [SCI-8344]
2023-04-25 16:09:38 +02:00
Soufiane ea2b29ff55
Remove on focus outline from bootstrap btn sitewide [SCI-8344] (#5338) 2023-04-25 16:01:48 +02:00
Soufiane 9fba6a076d
Sync the side bar open/close status with the state of the main content [SCI-7501] (#5323) 2023-04-25 15:32:28 +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
Soufiane ea94cf4581
Bulk editing will display inaccurate changes after saving [SCI-8219] (#5267)
Fix race condition when submitting all forms [SCI-8219]
2023-04-25 14:35:45 +02:00
ajugo 0c24360a81
Fix error message for protocol notes and repository item name [SCI-7185] (#5258) 2023-04-25 14:34:14 +02:00
aignatov-bio af9219b7ae
Assign item through repository item modal [SCI-8141] (#5237) 2023-04-25 14:30:14 +02:00
G-Chubinidze e9cacc3db1
Open Inventory - Double action fix [SCI-7506] (#5200)
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-04-25 14:21:41 +02:00
Anton 3724c38e7d Add archived state for navigator [SCI-8056] 2023-04-25 13:57:29 +02:00
G-Chubinidze 540de67956
Open the label template in the same tab [SCI-8167] (#5189)
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-04-25 13:12:25 +02:00
Giga Chubinidze 5c690c25f6 button wording changes, hound fixes 2023-04-24 16:14:50 +04:00
aignatov-bio 32dc12f4d0
Merge pull request #5336 from aignatov-bio/ai-sci-8233-add-backend-for-navigator
Add backend for navigator [SCI-8233]
2023-04-24 12:50:14 +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
Giga Chubinidze 07f20e0e61 Revamp of (top) toolbar - experiments 2023-04-24 00:34:36 +04:00
G-Chubinidze c6ab7176b8
Merge pull request #5329 from G-Chubinidze/gc_SCI_8293
Implement active/archive and view dropdowns (toolbar) [SCI-8293]
2023-04-20 15:41:45 +04:00
Giga Chubinidze a25e361e4f Implement active/archive and view dropdowns (toolbar) [SCI-8293] 2023-04-20 15:40:38 +04:00
artoscinote 103ce8e70d
Merge pull request #5331 from scinote-eln/develop
Merge develop
2023-04-20 13:31:46 +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
aignatov-bio d7e8f0303f
Merge branch 'features/navigation-refactor-v2' into ai-sci-8016-left-navigation-refactor 2023-04-19 10:33:09 +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
artoscinote 009bffa77a
Merge pull request #5319 from sboursen-scinote/sb_SCI-8286
Update config after protocol.io changed page_id [SCI-8286]
2023-04-18 12:50:31 +02:00
sboursen-scinote b8b33fe480 Update configuration after protocol.io changed default page_id to 0 [SCI-8286] 2023-04-18 12:43:56 +02:00
aignatov-bio 54cbcb4657
Merge pull request #5317 from aignatov-bio/ai-sci-7926-add-new-buttons-tyle
Add tailwind [SCI-7926]
2023-04-18 11:53:02 +02:00
Anton bc2959dfb4 Add new button styles and tailwind [SCI-7926] 2023-04-18 11:36:12 +02:00
Anton 2bbc98c531 Fix signup page layout 2023-04-18 11:03:00 +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 83790be734
Merge pull request #5112 from aignatov-bio/ai-sci-7960-add-disclaimer-to-login-page
Add disclaimer modal [SCI-7960]
2023-04-17 11:25:06 +02:00
Anton 8202d2e817 Add disclaimer modal [SCI-7960] 2023-04-17 11:22:50 +02:00
ajugo b62f1f5405
Add missing flash messages [SCI-8247] (#5308) 2023-04-14 15:10:35 +02:00
Anton 3f0f32113b Fix search page scrolling [SCI-8322] 2023-04-14 13:42:41 +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
artoscinote 19c98653a5
Merge pull request #5299 from sboursen-scinote/sb_SCI-8223
CSS: Protocol template list of smaller issues (Update) [SCI-8223]
2023-04-13 15:00:33 +02:00
aignatov-bio 3ad5b779c4
Merge pull request #5298 from aignatov-bio/ai-sci-8289-css-fixes-for-navigator
Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309]
2023-04-13 14:59:39 +02:00
sboursen-scinote ea384caa60 Fix Hound [SCI-8223] 2023-04-13 14:58:28 +02:00
Anton caf21959bd Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309] 2023-04-13 14:54:03 +02:00
sboursen-scinote 14895dd9f1 Change the position of the edit buttons in the versions modal [SCI-8223] 2023-04-13 14:49:30 +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
artoscinote 549ae8dae1
Merge pull request #5296 from G-Chubinidze/gc_SCI_8086
experiment workflow image border color change
2023-04-13 12:53:15 +02:00
Giga Chubinidze f641c56c07 experiment workflow image border color change 2023-04-13 14:51:14 +04:00
artoscinote d4c5f8a30f
Merge pull request #4988 from sboursen-scinote/sb_SCI-7815
Wrong selection of select all checkbox for P/E/T, report, protocol templates tables [SCI-7815]
2023-04-12 15:48:54 +02:00
sboursen-scinote dcd6f6267d Merge develop in to sb_SCI-7815 [SCI-7815] 2023-04-12 15:46:52 +02:00
aignatov-bio f357babf25
Merge pull request #5293 from aignatov-bio/ai-sci-8269-fix-horizontal-scroll-bar
Small fixes for horizontal scrollbar [SCI-8269]
2023-04-12 15:30:48 +02:00
Anton 5ad0d1c593 Small fixes for horizontal scrollbar [SCI-8269] 2023-04-12 15:23:35 +02:00
artoscinote 862a008f7b
Merge pull request #5246 from G-Chubinidze/gc_SCI_8140
Change of color and hover effect of x - action button for closing the modals [SCI-8140]
2023-04-12 15:09:28 +02:00
artoscinote 3785f22d01
Merge pull request #5275 from G-Chubinidze/gc_SCI_8271
Fix task page - secondary navigation offset [SCI-8271]
2023-04-12 15:08:58 +02:00
Giga Chubinidze d33b499052 hound fix 2023-04-12 17:06:12 +04:00
artoscinote 447f9dc993
Merge pull request #5245 from G-Chubinidze/gc_SCI_8205
Wrong wording for access button [SCI-8205]
2023-04-12 14:40:55 +02:00
artoscinote 9769a70e08
Merge pull request #5282 from G-Chubinidze/gc_SCI_8211
Label "(Draft)" in front of the protocol template name [SCI-8211]
2023-04-12 14:37:15 +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
artoscinote e431056ef1
Merge pull request #5289 from artoscinote/ma_SCI_8292
Fix project pages JS selectors [SCI-8292]
2023-04-12 12:57:00 +02:00
artoscinote 25b3889d4b
Merge pull request #5286 from G-Chubinidze/gc_SCI_8290
No action when clicking on top buttons in single inventory [SCI-8290]
2023-04-12 12:42:35 +02:00
Martin Artnik eb243ca772 Fix project pages JS selectors [SCI-8292] 2023-04-12 12:33:45 +02:00
Giga Chubinidze e899c59535 No action when clicking on top buttons in single inventory [SCI-8290] 2023-04-12 12:18:38 +04:00
G-Chubinidze 32217475c7
Revert "Revert "Archived experiments UI improvements [SCI-8086]"" 2023-04-12 11:34:54 +04:00
sboursen-scinote 8d3c473898 Fix hound [SCI-8223] 2023-04-11 17:19:26 +02:00
Giga Chubinidze 9d7fb94758 added condition check, now it only fires on inline_edit field 2023-04-11 18:47:01 +04:00
Martin Artnik 57187aecaf Add .keep file to app/assets/builds 2023-04-11 12:35:35 +02:00
aignatov-bio 82333bdc18
Merge pull request #5222 from sboursen-scinote/sb_SCI-8134
Role dropdown on protocols.io import to SciNote [SCI-8134]
2023-04-11 11:22:50 +02:00
artoscinote 94b319f16d
Merge pull request #5277 from sboursen-scinote/sb_SCI-8286
Protocols.io search appending results at the end of the list [SCI-8286]
2023-04-11 11:02:47 +02:00
sboursen-scinote 6d984d8dfc Fix protocol.io search [SCI-8286]
- Reduce the number of displayed publications to 20 for speed
- Clear the search result each time a new key (search sentence) is used
2023-04-11 10:30:58 +02:00
artoscinote b3275feedb
Merge pull request #5276 from G-Chubinidze/gc_SCI_7633_v2
updated device table stylings
2023-04-11 10:18:59 +02:00
artoscinote 8a7667432c
Merge pull request #5234 from G-Chubinidze/gc_SCI_8211
Label '(Draft)' in front of the protocol template name [SCI-8211]
2023-04-11 10:14:17 +02:00
Giga Chubinidze 1d44eea8cf updated device table stylings 2023-04-10 23:57:43 +04:00
Giga Chubinidze 23a057a949 Fix task page - secondary navigation offset [SCI-8271] 2023-04-10 23:30:10 +04:00
sboursen-scinote a7c8460090 Fix versions-modal comment spacing [SCI-8223] 2023-04-07 17:36:09 +02:00
sboursen-scinote 33acbc33d1 Fix filter buttons spacing [SCI-8223] 2023-04-07 16:36:32 +02:00
Anton 7b40c305e8 Add infinite scroll to notifications flyout [SCI-8282] 2023-04-07 14:06:29 +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
Giga Chubinidze ceba49acb4 grant access new name, padding update on publish modal 2023-04-06 17:12:56 +04:00
artoscinote fe2d82b944
Merge pull request #5260 from artoscinote/ma_SCI_8270
Fix experiment canvas sizing and padding [SCI-8270]
2023-04-06 15:03:10 +02:00
Martin Artnik fd4bfc9ae6 Fix sidebar hiding [SCI-8270] 2023-04-06 14:57:57 +02:00
Oleksii Kriuchykhin 60579465ab Refactor user_notifications controller, remove unused code [SCI-8207] 2023-04-06 14:57:00 +02:00
Giga Chubinidze 2657c8c172 hound fixes 2023-04-06 16:31:07 +04: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 7a3d5e03f4 Refactore after review [SCI-8087] 2023-04-06 12:23:33 +02:00
Martin Artnik ffa626d53f Fix experiment canvas padding [SCI-8270] 2023-04-06 11:50:56 +02:00
ajugo 3ad1d384ee
Raise character limit for rich text fields and reword limit text error [SCI-7959] (#5221) 2023-04-05 15:34:48 +02:00
artoscinote 80b25f695e
Merge pull request #5188 from sboursen-scinote/sb_SCI-7663
CSS: slight move of the three dots button on cards view [SCI-7663]
2023-04-05 15:27:48 +02:00
artoscinote bd02b71efe
Merge pull request #5157 from sboursen-scinote/sb_SCI-7670
Pressing Enter button cancels adding of a image on task result [SCI-7670]
2023-04-05 15:27:22 +02:00
artoscinote 0f8c73771a
Merge pull request #5001 from sboursen-scinote/sb_SCI-7783
CSS - inventory [SCI-7783]
2023-04-05 15:24:18 +02:00
Giga Chubinidze eb7ff9a5ff Change of color and hover effect of x - action button for closing the modals [SCI-8140] 2023-04-03 19:32:22 +04:00
Anton 52aac69488 Add final version for left menu [SCI-8016] 2023-04-03 13:29:24 +02:00
sboursen-scinote ec0fe7cfd7 Fix Hound [SCI-8087] 2023-04-03 07:12:25 +02:00
sboursen-scinote 6d34ea41d2 Style the new breadcrumbs [SCI-8087] 2023-04-02 18:42:21 +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
Giga Chubinidze 3fc2afde3c Label '(Draft)' in front of the protocol template name [SCI-8211] 2023-03-31 18:30:26 +04:00
ajugo 562577e960
Add flash message for removing all users [SCI-8238] (#5232) 2023-03-31 12:14:26 +02:00
Giga Chubinidze 4a31b27852 added minimum z index on protocols table 2023-03-31 13:42:42 +04:00
sboursen-scinote 501279372c Style the breadcrumbs [SCI-8087] 2023-03-30 21:56:38 +02:00
Giga Chubinidze 890b113de5 CSS: flickering issues on Protocol templates [SCI-8102] 2023-03-30 21:11:28 +04:00
Anton ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
sboursen-scinote 2dfcb56748 Fix dropdown direction in modals [SCI-8134] 2023-03-28 17:19:37 +02:00
Martin Artnik 6412a65d7e Fix new protocol default role, fix reload of protocol access modal [SCI-8217] 2023-03-28 16:22:38 +02:00
Anton 4a5e0de54f Fix css for task protocol [SCI-8214] 2023-03-28 14:53:47 +02:00
ajugo 0ff5cdf9a8
Fix CSS for pdf/docx preview and some minor CSS fixes [SCI-8198] (#5204) 2023-03-27 15:31:27 +02:00
ajugo 26879f200d
Fix CSS for protocol versioning modal [SCI-8194] (#5197) 2023-03-27 13:28:00 +02:00
Alex Kriuchykhin 2bcb9d0639
Merge pull request #5207 from artoscinote/ma_SCI_8131
Add error flash when assignment update fails [SCI-8131]
2023-03-27 12:43:40 +02:00
Martin Artnik 9904c7aae3 Add error flash when assignment update fails [SCI-8131] 2023-03-27 12:38:01 +02:00
Giga Chubinidze 0358e113eb Add new colors to our variables in CSS [SCI-8169] 2023-03-27 13:35:01 +04:00
artoscinote ba57617384
Merge pull request #5195 from artoscinote/ma_SCI_8188
Revert global modal changes [SCI-8188]
2023-03-27 11:15:46 +02:00
Anton 1177eaae5b Add general notifiacitons flyout [SCI-8017] 2023-03-25 17:34:26 +01:00
sboursen-scinote 107d602521 Fix pixel perfect alignment in dropdown [SCI-8032] 2023-03-25 03:01:45 +01:00
Martin Artnik 27713bbd8a Revert global modal changes [SCI-8188] 2023-03-24 13:47:40 +01:00
aignatov-bio d8083b84b6
Merge pull request #5184 from aignatov-bio/ai-sci-8185-css-fixes
Fix tables css [SCI-8185]
2023-03-24 13:14:38 +01:00
aignatov-bio 09a217baca
Merge pull request #5193 from aignatov-bio/ai-sci-8190-fix-protocol-screen-css
Protocol screen css fixes [SCI-8190]
2023-03-24 13:04:00 +01:00
Anton 0b560f5b05 Protocol screen css fixes [SCI-8190] 2023-03-24 12:01:47 +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
sboursen-scinote 245b4bc5b0 Fix the slight move [SCI-7663] 2023-03-23 17:57:47 +01:00
ajugo e065098082
Fix protocol templates rows selection flickering [SCI-8105] (#5185)
* Fix protocol templates rows selection flickering [SCI-8105]

* Fix double initialization of row selection [SCI-8105]
2023-03-23 13:40:21 +01:00
aignatov-bio 172068dbf7
Merge pull request #5182 from G-Chubinidze/gc_SCI_8128
Update sidebar interactions [SCI-8128]
2023-03-23 13:08:34 +01:00
Anton 4edad3f41c Fix tables css [SCI-8185] 2023-03-23 13:05:37 +01:00
ajugo 4c42748e40
Add protocolsIO import preview [SCI-8187] (#5183) 2023-03-23 12:18:30 +01:00
Giga Chubinidze 24da5a8a11 Update sidebar interactions [SCI-8128] 2023-03-23 12:54:14 +04:00
Anton 854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Anton e626c53f78 PET and Protocol tabls fixes [SCI-8176][SCI-8180][SCI-8181] 2023-03-22 13:47:59 +01:00
aignatov-bio 0044726425
Merge branch 'develop' into ai-sci-8155-css-fixes-for-version-modal 2023-03-22 11:32:49 +01:00
G-Chubinidze a1c611ab1e
Revert "Archived experiments UI improvements [SCI-8086]" 2023-03-22 13:21:08 +04:00
ajugo 8eb04c50c2
Add removing connected device [SCI-8146] (#5174) 2023-03-21 16:44:24 +01:00
artoscinote 44098ece5d
Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]" 2023-03-21 15:26:06 +01:00
artoscinote e2dc2e31ee
Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]" 2023-03-21 15:24:40 +01:00
artoscinote a43c941b50
Merge pull request #5170 from G-Chubinidze/gc_SCI_8147
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
2023-03-21 15:18:37 +01:00
artoscinote 634b4145fd
Merge pull request #5169 from G-Chubinidze/gc_SCI_8098
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
2023-03-21 15:17:55 +01:00
Giga Chubinidze 9dcd2f1500 Cursor position improvements, focused fields - part 2 [SCI-8147] 2023-03-21 13:17:44 +04:00
Giga Chubinidze b7490ebcca Cursor position improvements, focused fields - part 1 [SCI-8098 2023-03-21 11:14:44 +04:00
Oleksii Kriuchykhin 7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Anton a684ff2656 CSS fixes for version modal [SCI-8155] 2023-03-20 11:46:01 +01:00
Oleksii Kriuchykhin b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
G-Chubinidze 06eeb3b27f
FE manage devices (table view) + revoking the device [SCI-7633] (#4920)
* FE manage devices (table view) + revoking the device [SCI-7633]

* revocation code optimisation

* hound fixes

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-03-17 13:44:41 +01:00
ajugo cedbd8de20
Fix access modal view for users without manage permissions [SCI-8139] (#5148) 2023-03-17 11:30:51 +01:00
aignatov-bio 5844fce23e
Merge pull request #5156 from aignatov-bio/ai-sci-8154-cleanup-old-protocol-code
Clean old protocol code [SCI-8154]
2023-03-17 11:26:41 +01:00
Anton da36b7268f Clean old protocol code [SCI-8154] 2023-03-16 14:37:19 +01:00
sboursen-scinote 0526bfaae1 Fix the result asset cancel behavior when clicking enter [SCI-7670] 2023-03-16 14:19:24 +01:00
aignatov-bio 33c880149c
Add new general account [SCI-7963] (#5127) 2023-03-16 12:54:24 +01:00