Commit graph

429 commits

Author SHA1 Message Date
Urban Rotnik
6ea39c9363 Add experiment thumbnail, update archived view for experiments
SCI-5481
2021-02-18 12:03:13 +01:00
aignatov-bio
0368579799 Update experiment card css [SCI-5469] 2021-02-16 12:42:09 +01:00
mlorb
20dc9967f5
Merge pull request #3113 from mlorb/ml-sci-5311
Implement the option of deleting empty folders [SCI-5311]
2021-02-15 10:27:05 +01:00
mlorb
78a76ea3a1
Merge pull request #3154 from mlorb/ml-sci-5470
Add no results page on experiments page [SCI-5470]
2021-02-15 10:26:26 +01:00
Urban Rotnik
1ae0b42c2c Fix Dots and Checkbox visibility on experiment cards 2021-02-12 13:25:12 +01:00
Mojca Lorber
b600f22248 Add no results page on experiment page 2021-02-12 12:12:26 +01:00
Urban Rotnik
b831d5fa14 Fix duplicate button permissions 2021-02-12 07:12:26 +01:00
aignatov-bio
41cdc47702
Merge pull request #3151 from urbanrotnik/ur-sci-5475-move-experiment-bug
Fix Move button on Experiment card [SCI-5475]
2021-02-11 21:14:47 +01:00
Urban Rotnik
4cd2bce83f Fix Move button on Experiment card 2021-02-11 18:38:23 +01:00
Mojca Lorber
7071f4a6c5 Send selected folders param to modal 2021-02-11 18:27:16 +01:00
aignatov-bio
1eff3494fb Fix archived experiments page routes and clean old archive page [SCI-5479] 2021-02-11 14:21:15 +01:00
aignatov-bio
1a3c715d72
Merge pull request #3149 from aignatov-bio/ai-sci-5468-connect-details-modal-to-more-button
Add action to more button [SCI-5468]
2021-02-11 13:56:54 +01:00
aignatov-bio
f6422a50ac Add action to more button 2021-02-11 12:41:22 +01:00
Mojca Lorber
ce451f86a8 Fix projects breadcrumbs style [SCI-5349] 2021-02-10 23:33:16 +01:00
Mojca Lorber
19733ba7d9 Refactor deleting of empty folders 2021-02-10 22:11:42 +01:00
aignatov-bio
2fad6f5f8e
Merge pull request #3146 from aignatov-bio/ai-sci-5477-fix-archived-project-routes
Fix archived project routes and experiment archived date [SCI-5477]
2021-02-10 18:38:13 +01:00
aignatov-bio
8adbd11197 Fix archived project routes and experiment archived date [SCI-5477] 2021-02-10 15:05:53 +01:00
aignatov-bio
486dae7559 Add task counter to experiment card [SCI-5467] 2021-02-10 14:50:42 +01:00
aignatov-bio
9d3d1f8eac Connect toolbar actions to buttons [SCI-5465] 2021-02-09 15:47:15 +01:00
mlorb
45da42b924
Merge branch 'develop' into ml-sci-5311 2021-02-07 19:20:09 +01:00
Mojca Lorber
ad61e59593 Change the title Projects to folder/subfolder title [SCI-5456] 2021-02-05 11:04:58 +01:00
aignatov-bio
a843aac769 Add list view for experiments [SCI-5365] 2021-02-04 16:45:31 +01:00
Oleksii Kriuchykhin
c62c464902 Implement editing options and modals for experiment card [SCI-5367] 2021-02-04 12:06:51 +01:00
Oleksii Kriuchykhin
8a0a0cbacc Add view only project users modal for project card [SCI-5337] 2021-02-04 11:25:35 +01:00
aignatov-bio
b4a6644f13
Merge pull request #3133 from aignatov-bio/ai-sci-5457-update-experiments-view-screen
Connect front-end with back-end for experiments page [SCI-5457]
2021-02-04 11:00:17 +01:00
Mojca Lorber
d897e20426 Implement new experiment card layout 2021-02-04 09:02:23 +01:00
aignatov-bio
a7a948abaf Add archive/restore toolbar buttons and backend [SCI-5457] 2021-02-03 14:29:50 +01:00
aignatov-bio
7726eae4da Add experiments page load logic and connect filters [SCI-5457] 2021-02-03 14:29:50 +01:00
Mojca Lorber
9ca89ce9d9 Fix rendering error 2021-02-01 13:16:21 +01:00
aignatov-bio
29cf9be1f6
Add filters to experiments pages [SCI-5366] (#3119)
* Move filters to shared folder [SCI-5366]
2021-01-29 13:24:02 +01:00
Mojca Lorber
1080c22b30 Update Experiments page layout and the toolbar row 2021-01-28 22:47:08 +01:00
Alex Kriuchykhin
24d3ce3606
Merge pull request #3118 from okriuchykhin/ok_SCI_5369
Add breadcrumbs to project experiments page [SCI-5369]
2021-01-28 14:50:21 +01:00
Oleksii Kriuchykhin
b872c6fd14 Add breadrumbs to project experiments page [SCI-5369] 2021-01-25 16:06:48 +01:00
aignatov-bio
8396c086f5
Add sticky toolbar for projects page [SCI-5401] (#3108)
* Add sticky toolbar for projects page [SCI-5401]
2021-01-25 15:36:23 +01:00
aignatov-bio
cea61a6bd2
Add hover effect to project table [SCI-5372] (#3111)
* Add hover effect to projects table [SCI-5372]

* Fix markup [SCI-5372]
2021-01-25 10:26:10 +01:00
Mojca Lorber
c58d5734ad Implement the option of deleting empty folders [SCI-5311] 2021-01-21 19:42:25 +01:00
Urban Rotnik
7cbea1facd
Fix card Restore/Archive actions (#3103) 2021-01-19 17:21:22 +01:00
Alex Kriuchykhin
f15d984d47
Fix navigation between archived and active projects [SCI-5419] (#3100)
* Fix navigation between archived and active projects [SCI-5419]
2021-01-19 11:28:59 +01:00
aignatov-bio
bba1165c7b
Fix edit button for folder in archive mode [SCI-5418] (#3096)
* Fix edit button for folder in archive mode [SCI-5418]

* Remove archive folder from routes [SCI-5418]
2021-01-19 11:22:53 +01:00
Alex Kriuchykhin
64c0875b09
Merge pull request #3091 from aignatov-bio/ai-sci-5392-fixed-archived-experiment-dropdown-options_2
Fix archived experiment dropdown and archived view for projects page [SCI-5392]
2021-01-18 10:32:27 +01:00
Urban Rotnik
496c106497
Merge pull request #3088 from urbanrotnik/ur-sci-5395-breadcrumbs-order 2021-01-15 17:04:31 +01:00
aignatov-bio
6011bb36b6 Fix archived experiment dropdown and archived view for projects page [SCI-5392] 2021-01-15 15:08:27 +01:00
Urban Rotnik
97371f8216 Reorder ProjectFolder inner foldres 2021-01-15 14:22:48 +01:00
Urban Rotnik
998d66b8b9 Add data attribute for moveable permissions
SCI-5405
2021-01-15 13:54:18 +01:00
Alex Kriuchykhin
902a47490d
Merge pull request #3082 from okriuchykhin/ok_SCI_5383_v2
Show folder creation button on archived page [SCI-5383]
2021-01-15 11:38:58 +01:00
aignatov-bio
adb9084787
Fix comments red dot and ordering of comments [SCI-5384] (#3084)
* Fix comments red dot and ordering of comments [SCI-5384]
2021-01-14 16:28:11 +01:00
aignatov-bio
823b9175bd
Small projects pages fixes [SCI-5330] (#3085) 2021-01-14 16:24:28 +01:00
Oleksii Kriuchykhin
8d3a605571 Fix projects index page JS initialization [SCI-5380] 2021-01-14 13:08:29 +01:00
Oleksii Kriuchykhin
ec7d1bf813 Show folder creation button on arhived page [SCI-5383] 2021-01-13 15:26:02 +01:00
Urban Rotnik
1c5337e6ab Fix for move_modal partial rendering 2021-01-12 15:45:21 +01:00
Urban Rotnik
91ea82a21d
Merge pull request #3062 from urbanrotnik/ur-sci-5362-missing-archived-on-date
Add fallback archived_on and archived_by for MyModule and Experiment [SCI-5362]
2021-01-12 15:36:51 +01:00
Urban Rotnik
1070e813fc Add helper for archived_on date 2021-01-12 15:35:35 +01:00
Mojca Lorber
0b9daaa7d5 Change button style again 2021-01-12 14:37:22 +01:00
Alex Kriuchykhin
5f506b7459
Merge pull request #3072 from okriuchykhin/ok_SCI_5383
Fix folder creation for archived view [SCI-5383]
2021-01-12 13:50:20 +01:00
Oleksii Kriuchykhin
78ec862a2c Fix folder creation for archived view [SCI-5383] 2021-01-12 13:06:43 +01:00
aignatov-bio
8533e54adb
Add permission check for open manage user modal and experiment actions dropdown [SCI-5382] (#3073) 2021-01-12 12:16:33 +01:00
mlorb
8fbdfa28d5
Merge pull request #3070 from mlorb/ml-sci-5333
Add no results page for search on project page [SCI-5333]
2021-01-12 12:02:37 +01:00
Alex Kriuchykhin
04f68facd3
Merge pull request #3064 from okriuchykhin/ok_SCI_5344
Add Restore button to the archived Projects screen [SCI-5344]
2021-01-12 10:59:39 +01:00
Mojca Lorber
54a5528495 Add no results page for serach on project page [SCI-5333] 2021-01-12 09:18:19 +01:00
aignatov-bio
e88848cd75
Fix comments counter [SCI-5371] (#3063) 2021-01-11 10:03:13 +01:00
Oleksii Kriuchykhin
684674952c Add Restore button to the archived Projects screen [SCI-5344] 2021-01-09 21:27:19 +01:00
Urban Rotnik
6f155913ff
Merge pull request #3056 from urbanrotnik/ur-sci-5334-move-project-folders-feature
Move projects/folders modal [SCI-5334]
2021-01-07 17:45:19 +01:00
Urban Rotnik
5d79eaa843 Pass projects mode(archived/active) to move_to modal for list [SCI-5334] 2021-01-07 17:42:05 +01:00
Urban Rotnik
3a52f62d85 Implement folders tree for move action 2021-01-07 17:42:01 +01:00
aignatov-bio
276d6abe19
Update archive navigation for tasks page [SCI-5347] (#3052)
* Update archive navigation for tasks page [SCI-5347]
2021-01-07 17:18:52 +01:00
aignatov-bio
0d7da90b15
Small fixes for projects folder cards [SCI-5345] (#3049) 2021-01-07 17:02:25 +01:00
aignatov-bio
5aae35d700
Update archived experiments navigation (#3053) 2021-01-07 14:58:56 +01:00
Alex Kriuchykhin
962b3a532e
Merge pull request #3057 from okriuchykhin/ok_SCI_5317
Add project permissions check to projects toolbar [SCI-5317]
2021-01-07 13:25:34 +01:00
aignatov-bio
1f6fff812a
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048)
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
2021-01-07 13:16:05 +01:00
Oleksii Kriuchykhin
9882539213 Add project permissions check to projects toolbar [SCI-5317] 2021-01-06 22:23:48 +01:00
mlorb
ca955b27a8
Merge pull request #3051 from mlorb/ml-sci-5335
Change buttons style in projects toolbar [SCI-5335]
2021-01-06 15:09:33 +01:00
Oleksii Kriuchykhin
53be6a95c4 Fix projects filter mark, titles and comments mark [SCI-5332] 2021-01-06 11:28:39 +01:00
Mojca Lorber
96e387d06d Change buttons style in projects toolbar [SCI-5335] 2021-01-06 11:13:28 +01:00
Urban Rotnik
8f11376285
Merge pull request #3045 from urbanrotnik/ur-sci-5320-tooptip-for-avatars
Tooltip for users on project cards [SCI-5320]
2021-01-06 09:18:00 +01:00
Mojca Lorber
283bfc8759 Update css for users on project cards 2021-01-05 18:31:33 +01:00
Oleksii Kriuchykhin
c83327b720 Fix project buttons visibility [SCI-5318] 2021-01-05 14:29:20 +01:00
Oleksii Kriuchykhin
696b8d19f0 Fix new project creation and archiving [SCI-5321][SCI-5326] 2021-01-05 14:14:01 +01:00
Urban Rotnik
cd43973952 Add tooltips for users on project cards 2021-01-04 16:44:31 +01:00
Alex Kriuchykhin
163a2d1e60
Merge pull request #3042 from okriuchykhin/ok_SCI_5340
Make active projects view default [SCI-5340]
2021-01-04 11:56:22 +01:00
Oleksii Kriuchykhin
ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin
49dc56caf2 Fix project card menu visibility [SCI-5328] 2020-12-30 22:17:04 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
mlorb
a999fb0c80
Change the layout of the archived projects cards and the list view [SCI-5267] (#3021)
* change the layout of the archived projects cards and the list view

* change order in css
2020-12-18 13:05:23 +01:00
Urban Rotnik
7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik
63a41b123d Fix dropdown JS bug, fix folders_search, apply all new filters to search
SCI-5306
2020-12-18 09:43:11 +01:00
Urban Rotnik
87ca79717c Add separate sorting for active/archived view
[SCI-5306]
2020-12-18 08:41:51 +01:00
mlorb
f6f7211d77
Update styling for projects filters and fix some js bugs [SCI-5210] (#3012)
* Update styling for projects filters and fix some js bugs

* Fix hound
2020-12-17 23:13:45 +01:00
Urban Rotnik
ad4ee65f6b
Merge pull request #3007 from urbanrotnik/ur-sci-5300
Connect manage users modal with new projects cards [SCI-5300]
2020-12-17 13:48:10 +01:00
aignatov-bio
2ca7b81cea
Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011)
* Change experiment archived card [SCI-5270]
2020-12-17 13:07:30 +01:00
Miha Mencin
ba3db65437
Merge pull request #3008 from okriuchykhin/ok_SCI_5273
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
2020-12-17 09:44:40 +01:00
Miha Mencin
ea9f3dcada
Merge pull request #2996 from okriuchykhin/ok_SCI_5253
Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]
2020-12-17 09:17:44 +01:00
aignatov-bio
30cfe78805
Add edit modal for project folders [SCI-5265] (#3002)
Add edit modal for project folders [SCI-5265]
2020-12-14 15:54:18 +01:00
Oleksii Kriuchykhin
94b6c96e48 Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273] 2020-12-12 22:46:30 +01:00
Urban Rotnik
398978c69a Connect users modal to projects index page 2020-12-11 13:07:45 +01:00
Mojca Lorber
5cdab422df Update layout of the navigation for experiments, tasks list and task page 2020-12-10 15:15:36 +01:00
Urban Rotnik
207659a2c1 Fix markup [SCI-5266] 2020-12-10 13:36:38 +01:00
Urban Rotnik
152990b4d6 Add archived mode for Projects
[SCI-5266]
2020-12-09 08:51:55 +01:00
aignatov-bio
6a44e23697
Add projects sidebar [SCI-5178] (#2995)
* Add projects sidebar navigation [SCI-5178]
2020-12-08 16:07:26 +01:00
Oleksii Kriuchykhin
62374bee0a Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253] 2020-12-07 11:04:33 +01:00
Alex Kriuchykhin
7a4f60f25e
Merge pull request #2989 from mlorb/ml-sci-5240
[SCI-5240] Implement Create new folder function
2020-12-04 09:57:05 +01:00
mlorb
9693f84bbd
Implement actions dropdown on project card [SCI-5132] [SCI-5179] (#2968)
* Implement actions dropdown on project card
* make comments counter to work
2020-12-04 09:38:34 +01:00
Mojca Lorber
9253cf5ade Change javascript for modal handeling and some other small fixes 2020-12-03 12:53:19 +01:00
mlorb
74f0f0474a
Merge branch 'features/folders' into ml-sci-5240 2020-12-03 12:50:19 +01:00
Urban Rotnik
478d43f9ce
Merge pull request #2987 from urbanrotnik/ur-sci-5208
Projects cards and list view with filters  [SCI-5208]
2020-12-03 12:30:37 +01:00
Urban Rotnik
3700faa04a Update proejcts grid, include breadcrumbs, fix JS
[SCI-5208]
2020-12-03 12:29:28 +01:00
Oleksii Kriuchykhin
dc15accc86 Update sidebar usages in partials [SCI-5177] 2020-12-03 10:21:53 +01:00
Oleksii Kriuchykhin
9546b8f71d Prepare backend for the improved navigation [SCI-5177] 2020-12-03 10:19:11 +01:00
Mojca Lorber
d7e3b57d0d [SCI-5240] Implement Create new folder function 2020-12-01 09:59:08 +01:00
Oleksii Kriuchykhin
78e050ccc0 Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171] 2020-11-27 14:27:24 +01:00
Urban Rotnik
fcb82fd0d2
Merge pull request #2984 from okriuchykhin/ok_SCI_5204
Project filters: add text field to the filters [SCI-5204]
2020-11-27 12:04:46 +01:00
Oleksii Kriuchykhin
1553d32c6e Project filters: add text field to the filters [SCI-5204] 2020-11-26 21:29:45 +01:00
Urban Rotnik
efd4f8abde Add members dropdown on project filters flyout 2020-11-26 12:29:43 +01:00
Alex Kriuchykhin
5a1f169846
Merge pull request #2978 from urbanrotnik/ur-sci-5244-folders-projects-sorting
Project and folders sorting [SCI-5244]
2020-11-26 11:42:29 +01:00
Urban Rotnik
34fbcb8f56 Add clear functionallity to projects filters 2020-11-26 09:23:22 +01:00
Urban Rotnik
afc6d12b49 Project and folders sorting 2020-11-25 18:34:39 +01:00
Oleksii Kriuchykhin
0de237cece Implement project search with grouping by folder [SCI-5207] 2020-11-25 11:59:02 +01:00
Alex Kriuchykhin
1380d5873d
Merge pull request #2946 from okriuchykhin/ok_SCI_5136
Implement search endpoint for Projects & folders search [SCI-5136]
2020-11-23 13:09:33 +01:00
Alex Kriuchykhin
f5860397f5
Merge pull request #2953 from okriuchykhin/ok_SCI_5183
Make folders selectable for 'Export all' functionality [SCI-5183]
2020-11-20 09:54:53 +01:00
Urban Rotnik
e893d40eea Add filters flyout for projects 2020-11-19 09:23:35 +01:00
Oleksii Kriuchykhin
6dfeae2283 Make folders selectable for 'Export all' functionality [SCI-5183] 2020-11-13 14:39:10 +01:00
Oleksii Kriuchykhin
ee1bcd7aac Implement search endpoint for Projects & folders search [SCI-5136] 2020-11-09 16:16:09 +01:00
Urban Rotnik
0f5bf45cf6 Rebase, add toolbar, minor fixes css and JS 2020-11-06 13:56:21 +01:00
Urban Rotnik
9f12c5f343 New cards and list layout 2020-11-06 13:01:52 +01:00
Oleksii Kriuchykhin
327baafcd7 Improve CSS structure for project toolbar [SCI-5129] 2020-11-04 16:10:40 +01:00
Oleksii Kriuchykhin
258c57870f Implement the toolbar on the Team Projects page [SCI-5129] 2020-11-02 13:28:37 +01:00
Urban Rotnik
042231469c Fix syntax 2020-10-30 13:37:59 +01:00
Oleksii Kriuchykhin
13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
Urban Rotnik
b94a3a6cb8 Clean up controller 2020-10-26 16:17:39 +01:00
Urban Rotnik
1ffc3449bf Clean up index view 2020-10-26 13:42:32 +01:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik
b11f166c38 Fix cucumber tests 2020-07-09 13:14:07 +02:00
Urban Rotnik
8fa024ed10 Remove all tooltips from HTML 2020-04-28 12:30:43 +02:00
Mojca Lorber
24c345721c Add hook 2020-03-13 15:04:56 +01:00
aignatov-bio
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
aignatov-bio
d93095b489 Fix markup 2020-01-06 10:40:20 +01:00
aignatov-bio
ef3814ccec Add new buttons to protocols, tasks, experiments, projects 2020-01-06 10:40:20 +01:00
aignatov-bio
3f38b1e6a1 Add text input fields 2020-01-06 10:40:20 +01:00
aignatov-bio
443ab8645f Add toggles 2020-01-06 10:40:20 +01:00
aignatov-bio
7bfefd8659 Add checkboxes and radio buttons 2020-01-06 10:40:20 +01:00
aignatov-bio
9694117635 Add new colors and buttons 2020-01-06 10:40:20 +01:00
aignatov-bio
23581059e7 Remove image 2019-10-04 14:50:27 +02:00
Anton Ignatov
33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Anton Ignatov
5a1efb84c6 Fix error on archived experiment page 2019-09-18 15:23:45 +02:00
Mojca Lorber
47ccf38662 Redesign of sorting button for projects/experiments cards 2019-09-16 14:43:12 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Luka Murn
2db39c049e Remove projects archive page 2019-08-21 13:10:54 +02:00
Anton Ignatov
a4b2825258 Fix tests for active storage 2019-07-26 15:58:51 +02:00
Luka Murn
83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin
c0c8e0e1a3 Refactor Experiment workflow images [SCI-3539] 2019-07-04 09:33:12 +02:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] (#1808)
* Preparing helpers for comments

* Refactored comments over scinote

* Update events
2019-06-04 14:40:21 +02:00