Commit graph

3605 commits

Author SHA1 Message Date
aignatov-bio 5d2a6074bf
Merge pull request #7556 from aignatov-bio/ai-sci-10712-small-fixes-for-global-search
Small fixes for global search [SCI-10712]
2024-05-15 13:51:17 +02:00
Anton b3fe869c23 Small fixes for global search [SCI-10712] 2024-05-15 12:28:53 +02:00
Gregor Lasnibat ef534eab4f (fix) Quick search: Remove tooltip [SCI-10699] 2024-05-14 16:28:20 +02:00
Gregor Lasnibat db3ba2aadb Create 'import mapping' step [SCI-10579] 2024-05-13 15:19:00 +02:00
Martin Artnik bc6e43052f Merge branch 'develop' into features/inventory-import-improvements 2024-05-13 11:52:27 +02:00
Andrej fc506839e1 Merge branch 'features/global-search' into develop 2024-05-09 13:29:33 +02:00
aignatov-bio 74ce54f832
Merge pull request #7467 from ivanscinote/SCI-10453-ik
Save navigator state per user [SCI-10453]
2024-05-09 11:20:00 +02:00
Anton 78cd3efad3 Small fixes for global search [SCI-10681] 2024-05-08 11:52:01 +02:00
Martin Artnik 496d3fe628 Fix OpenID unlink translation [SCI-10671] 2024-05-06 13:05:49 +02:00
Anton 32bd7086e0 Add new task modal for dashboard [SCI-10141] 2024-05-06 12:47:36 +02:00
aignatov-bio 1af9e8b359
Merge pull request #7326 from G-Chubinidze/gc_SCI_10350
Change the placeholder text in New task and Create folder modal [SCI-10350]
2024-04-26 10:19:01 +02:00
sboursen-scinote f9a060e5dd Fix typo in unlink connected accounts modal [SCI-10671] 2024-04-25 17:04:05 +02:00
aignatov-bio 2ad7c36f0f
Merge pull request #7329 from sboursen-scinote/sb_SCI-9506
Add inventory items landing page [SCI-9506]
2024-04-25 11:11:35 +02:00
Giga Chubinidze cb37a3a4c4 Add new activity for editing items through "Import" function [SCI-10169] 2024-04-25 03:29:58 +04:00
Anton 62f0e76e3e CSS fixes for global search filters [SCI-10635] 2024-04-22 13:36:22 +02:00
Andrej a87261d68d Merge branch 'develop' into features/global-search 2024-04-18 17:02:26 +02:00
Andrej c740452086 Merge branch 'features/sso-improvements' into develop 2024-04-18 15:58:17 +02:00
aignatov-bio 38d8e3a57e
Merge pull request #7488 from aignatov-bio/ai-sci-10636-unify-global-search-page
Small css fixes and microinteractions [SCI-10630][SCI-10306]
2024-04-18 11:06:39 +02:00
Anton 9bd64104f3 Small css fixes and microinteractions [SCI-10630] 2024-04-18 11:05:37 +02:00
Andrej c253d0ffcf Clean quick search [SCI-10246] 2024-04-16 13:52:53 +02:00
sboursen-scinote d3e5b66d67 Change error message wording and update logic [SCI-9506]
- Landing page is /repositories/:repository_id?landing_page=true&row_id=:repository_row_id
2024-04-16 12:59:56 +02:00
sboursen-scinote 8f9ea0e749 Add inventory items landing page [SCI-9506] 2024-04-16 11:43:37 +02:00
Andrej 9e887db01d Disable azure authentication for giot [SCI-10631] 2024-04-16 11:17:42 +02:00
sboursen-scinote b29ebc4005 Fix Rack::Attack deprication message [SCI-10623] 2024-04-16 10:14:29 +02:00
wandji20 abbd37b9c0 Add endpoint for assigning multiple task to inventory [SCI-10429] 2024-04-15 21:48:33 +01:00
Martin Artnik 2ff3477956
Merge pull request #7427 from rekonder/aj_SCI_10246
Implement quick search backend [SCI-10246]
2024-04-15 10:36:12 +02:00
Anton 7b3e5a06e0 Fix label templates seelctor in print modal [SCI-10632] 2024-04-12 11:17:09 +02:00
wandji20 4aa4b69608 Rename Azure AD SSO to Microsoft Entra ID [SCI-10616] 2024-04-11 18:57:42 +01:00
Ivan Kljun 47757ad550 Save navigator state per user [SCI-10453] 2024-04-11 16:16:31 +02:00
Ivan Kljun 24553a0db6 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10550-ik 2024-04-11 13:19:10 +02:00
ajugo d5665b9c14
Merge pull request #7461 from aignatov-bio/ai-sci-10614-lost-formatting-for-exp-desc
Bugs fixes for next release [SCI-10614][SCI-10598][SCI-10593][SCI-10611][SCI-9957][SCI-10605]
2024-04-11 10:44:23 +02:00
Andrej d2ace74d75 Enable leave for team owners for yourself [SCI-9957] 2024-04-11 09:57:21 +02:00
wandji20 d24f3b76a8 Add no search results page to Global search page [SCI-10481] 2024-04-11 08:22:50 +01:00
Anton 4110e966c8 Add inventory name to label templates [SCI-10611] 2024-04-10 18:52:52 +02:00
Ivan Kljun d54ff46a93 Improve export inventories modals with file_type options of xslx/csv [SCI-10550] 2024-04-10 16:55:49 +02:00
ajugo 9c559a0c65
Merge pull request #7433 from wandji20/wb-SCI-10572
Split external services for CSP for script_src and connect_src [SCI-10572]
2024-04-10 10:55:03 +02:00
ajugo 591d733dc4
Merge pull request #7448 from rekonder/aj_SCI_9957
Enable leave for team owners for yourself [SCI-9957]
2024-04-10 10:44:32 +02:00
aignatov-bio 28082eecee
Merge pull request #7453 from aignatov-bio/ai-sci-10611-add-inventory-name-to-label-template
Add inventory name to label templates [SCI-10611]
2024-04-09 14:42:43 +02:00
Anton e6bda25c82 Add inventory name to label templates [SCI-10611] 2024-04-09 14:39:49 +02:00
Martin Artnik 745c52a158
Merge pull request #7451 from lasniscinote/gl_SCI_10578
(dev) Create 'update inventory' modal first step [SCI-10578]
2024-04-09 14:24:45 +02:00
Gregor Lasnibat f07b4a8065 (dev) Create 'update inventory' modal first step [SCI-10578] 2024-04-09 14:18:41 +02:00
Andrej 7efbd223bf Merge branch 'develop' into features/sso-improvements 2024-04-09 13:54:23 +02:00
Martin Artnik f0143755b6
Merge pull request #7419 from ivanscinote/SCI-10258-ik
Remember the state of Step (Collapsed or Extended) per User [SCI-10258]
2024-04-09 13:22:18 +02:00
Andrej 8e94cd5ce6 Enable leave for team owners for yourself [SCI-9957] 2024-04-09 10:07:06 +02:00
ajugo e0578778cf
Merge pull request #7443 from rekonder/aj_SCI_10522
Improve handling of tinymce images for pdf reports [SCI-10522]
2024-04-09 10:06:05 +02:00
wandji20 cc90078219 Implement skeleton loading for object groups in global search page [SCI-10480] 2024-04-08 17:23:14 +01:00
Andrej 7052c767ed Improve handling of tinymce images for pdf reports [SCI-10522] 2024-04-08 14:57:14 +02:00
Martin Artnik c35c03e5b1
Merge pull request #7429 from ivanscinote/SCI-10581-ik
Fix rufus jobs to release db connections after use [SCI-10581]
2024-04-08 14:51:00 +02:00
Anton c2da52a6bb Add sorting to global search [SCI-10528] 2024-04-08 12:54:46 +02:00
Martin Artnik fb1a302249
Merge pull request #7440 from artoscinote/ma_SCI_10494
(dev) Placeholder for new import modal [SCI-10494]
2024-04-08 11:48:33 +02:00
Martin Artnik 743d0f57b7 (dev) Placeholder for new import modal [SCI-10494] 2024-04-08 11:35:41 +02:00
Anton 01abb78d4e Connecte filters modal [SCI-10536] 2024-04-08 10:36:29 +02:00
sboursen-scinote 874c333496 Add openid connect and saml connected accounts [SCI-10584] 2024-04-08 07:52:36 +02:00
Giga Chubinidze 06cf1bbbcb Improve the copy in "Export inventories" and "Export inventory" modal [SCI-10575] 2024-04-07 16:57:49 +04:00
wandji20 9ac0dca68a Split external services for CSP for script_src and connect_src [sci_10572] 2024-04-05 11:12:35 +01:00
wandji20 e993964692 Add task protocol results to global search page [SCI-10473] 2024-04-04 13:05:27 +01:00
aignatov-bio 2921a1fbaa
Merge pull request #7384 from sboursen-scinote/sb_SCI-10478
Implement global search results component for Label templates [SCI-10478]
2024-04-04 14:02:15 +02:00
aignatov-bio 6ac5ad3d71
Merge pull request #7426 from wandji20/wb-SCI-10475
Add asset results to global search page [SCI-10475]
2024-04-04 13:59:24 +02:00
Ivan Kljun cda3ce29df Fix rufus jobs to release db connections after use [SCI-10581] 2024-04-04 13:09:49 +02:00
wandji20 6483780d33 Add asset results to global search page [SCI-10475] 2024-04-04 10:51:01 +01:00
Anton c6f5997fda Add filter component to quick search [SCI-10305] 2024-04-04 11:49:20 +02:00
Andrej ae5cebe7d7 Implement quick search backend [SCI-10246] 2024-04-04 11:24:17 +02:00
aignatov-bio 6c5efb604f
Merge pull request #7416 from sboursen-scinote/sb_SCI-10476
Implement global search results component for inventory items [SCI-10476]
2024-04-04 09:56:13 +02:00
Ivan Kljun c49ddd972b Remember the state of Step (Collapsed or Extended) per User [SCI-10258] 2024-04-03 15:01:36 +02:00
Anton 45c96651cd Merge branch 'develop' into features/inventory-import-improvements 2024-04-03 14:49:00 +02:00
Anton ba5eca7d8e Merge branch 'features/global-search' of github.com:scinote-eln/scinote-web into features/global-search 2024-04-03 14:47:59 +02:00
Anton f6aae51f83 Merge branch 'develop' into features/global-search 2024-04-03 14:47:28 +02:00
Andrej 6e95ba13f9 Merge branch 'develop' into features/sso-improvements 2024-04-03 13:32:15 +02:00
sboursen-scinote da19a79851 Implement global search results component for Label templates [SCI-10478] 2024-04-03 01:04:43 +02:00
sboursen-scinote 84dd5eaa70 Implement global search results component for inventory items [SCI-10476] 2024-04-03 00:55:09 +02:00
wandji20 7eb3cff06e Add check for different sso providers [SCI-10214] 2024-04-02 13:38:21 +01:00
wandji20 39a11f6774 Add missing BETA tag on import with protocol parser [SCI-10559] 2024-04-01 21:43:29 +01:00
wandji20 414fa7abfb Change min width for tasks table due date and status columns [SCI-10544] 2024-03-29 10:34:34 +01:00
wandji20 230f180f18 Add experiment group to global search page [SCI-10471] 2024-03-29 08:34:13 +01:00
wandji20 9a90bc67f6 Replace expired link on the Zebra printer instructions page [SCI-10545] 2024-03-28 12:27:06 +01:00
Ivan Kljun 8cd28e3aa6 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10256-ik 2024-03-28 11:32:21 +01:00
Martin Artnik ea4c356e10 Add file duplicate activities [SCI-10257] 2024-03-28 09:52:58 +01:00
Ivan Kljun 580f67dbf1 Refactor method for renaming attached files [SCI-10256] 2024-03-28 08:46:40 +01:00
wandji20 1f7566ae73 Add project folders group to global search page [SCI-10470] 2024-03-27 16:03:56 +01:00
Martin Artnik 7c92d9beba Add duplicate asset functionality [SCI-10257] 2024-03-27 12:56:45 +01:00
sboursen-scinote 9c6dac339e Implement global search results component for Protocol templates [SCI-10477] 2024-03-27 10:37:36 +01:00
Ivan Kljun 7366134fe3 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10256-ik 2024-03-26 15:28:09 +01:00
Andrej ac9c16d459 Merge branch 'develop' into features/sso-improvements 2024-03-26 10:36:04 +01:00
sboursen-scinote 73b7572cd5 Add small css fixes for more link in experiment description [SCI-10519] 2024-03-25 18:33:43 +01:00
Gregor Lasnibat 411a182f25
Merge pull request #7291 from lasniscinote/gl_SCI_10399
(dev) Detect duplicated item IDs when parsing a spreadsheet [SCI-10399]
2024-03-25 13:03:44 +01:00
Gregor Lasnibat 640f3168bc (dev) Detect duplicated item IDs when parsing a spreadsheet [SCI-10399] 2024-03-25 11:52:53 +01:00
Martin Artnik 6b4ae0e59a Merge branch 'develop' into features/inventory-import-improvements 2024-03-25 10:20:13 +01:00
Anton 478da52272 Add projects search results component [SCI-10469] 2024-03-22 16:37:59 +01:00
Anton fe1aee4f23 Add general layout for global search [SCI-10468] 2024-03-21 15:56:35 +01:00
Anton 63c0c554e6 Merge branch 'develop' into features/global-search 2024-03-21 14:24:37 +01:00
Giga Chubinidze 762b97f732 Change the placeholder text in New task and Create folder modal [SCI-10350] 2024-03-21 13:59:48 +04:00
Ivan Kljun a5eda08cf2 Enable renaming attached files [SCI-10256] 2024-03-21 10:38:27 +01:00
Anton 19dd06e246 Update buttons focus and active state [SCI-10249] 2024-03-19 14:20:30 +01:00
wandji20 5eabf7237a Unify state menu dropdown in tables [SCI-10445] 2024-03-15 21:32:43 +01:00
wandji 660a067433
Show entries detail only after data is loaded [SCI-10317] (#7285) 2024-03-14 18:20:20 +01:00
Soufiane ce5c02d590
Fix user roles for protocol access modal [SCI-10388] (#7275) 2024-03-14 13:17:07 +01:00
wandji 8300c2c3c3
Add entries and selected entries in paging [SCI-10317] (#7276) 2024-03-14 13:12:03 +01:00
Martin Artnik be4f27750c Merge branch 'release/1.30.0' into develop 2024-03-13 15:26:35 +01:00
Soufiane fdb2146c87
Fix wrong translation in protocol template [SCI-10389] (#7249) 2024-03-12 14:43:47 +01:00
wandji 9e39181242
Update protocols linked task modal to match figma design [SCI-10392] (#7243) 2024-03-12 14:13:13 +01:00
Martin Artnik 763c741662 Clean up stock management modal [SCI-10422] 2024-03-12 13:24:55 +01:00
Martin Artnik 38601bbb40
Merge pull request #7163 from lasniscinote/gl_SCI_10222
(dev) Create a POC for Phase 0 of improved importing to inventories [SCI-10222]
2024-03-12 13:07:29 +01:00
Gregor Lasnibat e8b4e40391 (dev) Create a POC for Phase 0 of improved importing to inventories [SCI-10222] 2024-03-11 15:55:36 +01:00
Oleksii Kriuchykhin d004b1e7a0 Merge branch 'features/bugfixes' into develop 2024-03-08 11:21:26 +01:00
aignatov-bio d47b98f6fb
Merge pull request #7211 from aignatov-bio/ai-sci-10357-access-member-fixes
Update access modal interactions [SCI-10357][SCI-10348]
2024-03-06 16:39:53 +01:00
Anton a8f97e3ba5 Update access modal interactions [SCI-10357] 2024-03-06 16:17:24 +01: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
wandji 690e0d421f
Add advance filter for relationships to inventory items table [SCI-10068] (#7007) 2024-03-06 13:48:15 +01:00
Andrej 92946e33ff Merge branch 'features/inventory-import-improvements' into features/bugfixes 2024-03-06 10:18:35 +01:00
Gregor Lasnibat c9ecf359a9 (fix) To change text in Move to different step modal [SCI-10096] 2024-03-04 11:49:08 +01:00
wandji20 baccaa0f32 Fix various issues with label templates [SCI-10335] 2024-03-03 18:34:07 +01:00
Anton c1561f01f7 Update project/experiment cards 2024-03-01 17:17:24 +01:00
Andrej 817326bd79 Add comments and updated on columns to Project table [SCI-10284] 2024-02-29 09:07:53 +01:00
Andrej db43c96619 Add advance filtering to protocol template table [SCI-10288] 2024-02-28 15:21:09 +01:00
G-Chubinidze f75d3b3952
Merge branch 'develop' into gc_SCI_101000 2024-02-27 16:38:04 +04: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
aignatov-bio 9e652809aa
Merge pull request #7131 from wandji20/wb-SCI-10230
Change name column header names for exp, inventories, protocol and label templates tables [SCI-10230]
2024-02-23 10:06:44 +01:00
wandji20 98e45a4c87 Change name column header names for exp, inventories, protocol and label templates tables [SCI-10230] 2024-02-22 14:01:17 +01:00
Martin Artnik 8a6782eb10
Merge pull request #7127 from lasniscinote/gl_SCI_10096
(fix) To change text in Move to different step modal [SCI-10096]
2024-02-22 11:50:42 +01:00
Martin Artnik 5eee7fefef
Merge pull request #7084 from G-Chubinidze/gc_SCI_10150
Unification of column titles in tables and text in "Reset to defaults" modal (column management) [SCI-10150]"
2024-02-22 11:37:42 +01:00
Gregor Lasnibat ba6c7de529 (fix) To change text in Move to different step modal [SCI-10096] 2024-02-21 16:29:55 +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
G-Chubinidze c48359c402
Merge branch 'features/new-datatable' into gc_SCI_10150 2024-02-21 04:27:36 +04:00
Martin Artnik f8aae8aca6 Merge branch 'develop' into features/inventory-import-improvements 2024-02-20 15:18:07 +01:00
G-Chubinidze 1dccae57e2
Merge branch 'features/new-datatable' into gc_SCI_10189 2024-02-20 13:38:40 +04:00
Giga Chubinidze 3f5b0dd30c To add "Archived on"column to Projects table (archived state) & rename column titles of "archived on" [SCI-10189] 2024-02-20 03:35:38 +04:00
Giga Chubinidze 26881eccdb Fixed repository id column [SCI-10100] 2024-02-19 02:55:18 +04:00
Anton 54428ff4f1 Fix routes for experiments my modules [SCI-10207] 2024-02-16 13:15:47 +01:00
Oleksii Kriuchykhin 66f5df87e9 Merge branch 'develop' into features/sso-improvements 2024-02-16 09:46:20 +01:00
Anton b5f08d2542 Add new render for task tags [SCI-10106] 2024-02-15 10:10:15 +01:00
Giga Chubinidze 0d24e9bec4 Changed confirm reset default modal warning message [SCI-10150] 2024-02-14 15:45:52 +04:00
Giga Chubinidze d570673947 Unification of column titles in tables and text in "Reset to defaults" modal (column management) [SCI-10150]" 2024-02-14 05:38:41 +04: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
Anton afc256ae15 Replace legacy tags modal [SCI-10125] 2024-02-12 12:22:20 +01:00
Martin Artnik 86ab489da3 SciNote version modal fixes [SCI-10183] 2024-02-12 11:25:34 +01:00
Ivan Kljun aec115f669 Add polling for asset changes for SciNote Edit [SCI-10122] 2024-02-07 11:26:40 +01:00
Anton 25defa9e43 Update tags modal [SCI-10105] 2024-02-06 15:28:00 +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 6d10159fce
Merge pull request #7049 from lasniscinote/gl_SCI_10099
(fix) Create new SciNote-apps section and place SciNote Edit in [SCI-10099]
2024-02-05 13:26:05 +01:00
ajugo 6184d0caa8
Add obsolete tag for not used activites [SCI-10121] (#7050) 2024-02-05 10:25:20 +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
Alex Kriuchykhin 24278c287f
Fix sign in with OpenID Connect with disabled discovery [SCI-9578] (#7046) 2024-02-02 12:06:22 +01:00
Oleksii Kriuchykhin e724b15499 Merge branch 'develop' into features/sso-improvements 2024-02-01 15:38:07 +01:00
wandji 4c5789620c
Mark task complete and uncomplete obsolete activity filters [SCI-9946] (#7030) 2024-02-01 13:25:32 +01:00
Alex Kriuchykhin 8dcd00c433
Add support of server side session store [SCI-9960] (#6974) 2024-02-01 13:14:31 +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
Ivan Kljun cc4fa19bc1 Merge remote-tracking branch 'upstream/develop' into SCI-10010-ik 2024-02-01 10:15:58 +01:00