Commit graph

7064 commits

Author SHA1 Message Date
Urban Rotnik
998d66b8b9 Add data attribute for moveable permissions
SCI-5405
2021-01-15 13:54:18 +01:00
Urban Rotnik
05bcb7c502
Merge pull request #3086 from urbanrotnik/ur-sci-5394-missing-archived-results
Fix missing results of archived task [SCI-5394]
2021-01-15 13:53:13 +01:00
Urban Rotnik
2fa54d7898
Merge pull request #3087 from urbanrotnik/ur-sci-5397-folder-link-in-activities
Fix folder's activities links [SCI-5397]
2021-01-15 13:52:55 +01:00
Urban Rotnik
c9bbc64751 Fix missing results of archived task
[SCI-5394]
2021-01-15 11:40:25 +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
Urban Rotnik
517026a252
Merge pull request #3083 from urbanrotnik/ur-sci-5393-fix-filters
Trigger search on filters flyout close, fix render when filters are clear [SCI-5393]
2021-01-15 11:34:03 +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
Urban Rotnik
531b6cd554 Fix folder's activities links 2021-01-14 15:06:56 +01:00
Urban Rotnik
7cd85d8e9d
Merge pull request #3080 from urbanrotnik/ur-sci-5388
Fix border radius [SCI-5388]
2021-01-14 14:05:20 +01:00
Urban Rotnik
e099827b1b Trigger search on filters flyout close, fix render when filters are clear [SCI-5393] 2021-01-14 13:36:45 +01:00
Oleksii Kriuchykhin
8d3a605571 Fix projects index page JS initialization [SCI-5380] 2021-01-14 13:08:29 +01:00
Urban Rotnik
0e17cde499 Fix line height 2021-01-14 08:54:17 +01:00
Oleksii Kriuchykhin
ec7d1bf813 Show folder creation button on arhived page [SCI-5383] 2021-01-13 15:26:02 +01:00
Urban Rotnik
8d076d8c58 Fix border radius [SCI-5388] 2021-01-13 09:07:35 +01:00
Urban Rotnik
60a1e602e0 Add ProjectFolders relation to Folder serializer 2021-01-12 17:09:39 +01:00
Urban Rotnik
1c5337e6ab Fix for move_modal partial rendering 2021-01-12 15:45:21 +01:00
Alex Kriuchykhin
62b1aaf033
Merge pull request #3077 from okriuchykhin/ok_SCI_5386
Fix flash messages on sign-in [SCI-5386]
2021-01-12 15:44:24 +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
Oleksii Kriuchykhin
cf3b0916f6 Fix flash messages on sign-in [SCI-5386] 2021-01-12 15:28:30 +01:00
Urban Rotnik
ef82fcc5ee
Merge pull request #3075 from urbanrotnik/ur-sci-5379-clean-folder-info
Remove project_folder in callback [SCI-5379]
2021-01-12 15:17:16 +01:00
Urban Rotnik
2a3bafd6a0 Add fallback archived_on and archived_by columns to parent for MyModule and Experiment [SCI-5362] 2021-01-12 14:53:06 +01:00
mlorb
61c3a8417e
Merge pull request #3076 from mlorb/ml-sci-5335-v2
Change button style again [SCI-5335]
2021-01-12 14:52:50 +01:00
aignatov-bio
7cc6ce5659
Fix projects page member filter [SCI-5385] (#3074) 2021-01-12 14:49:24 +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
Urban Rotnik
485aa0d541 Remove project_folder in callback 2021-01-12 13:04:36 +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
Urban Rotnik
3ad14e06b2
Merge pull request #3067 from urbanrotnik/ur-sci-5379-clean-folder-info
Remove project_folder reference on project archive [SCI-5379]
2021-01-12 11:27:08 +01:00
aignatov-bio
8099c4ed4c
Fix error on task page without due date [SCI-5375] (#3066) 2021-01-12 11:11:40 +01:00
Urban Rotnik
c04f427c9e
Merge pull request #3065 from urbanrotnik/ur-sci-5377-missing-arrows
Fix arrows for JS Tree [SCI-5377]
2021-01-12 11:08:05 +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
Urban Rotnik
996f604df1 Touch parent folder of folder 2021-01-12 10:46:19 +01:00
Mojca Lorber
54a5528495 Add no results page for serach on project page [SCI-5333] 2021-01-12 09:18:19 +01:00
Urban Rotnik
244995cb3d Fix assets location and url references [SCI-5377] 2021-01-11 17:56:51 +01:00
Urban Rotnik
baba7fc9e7 Remove project_folder reference on project archive [SCI-5379] 2021-01-11 13:54:21 +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
f478ad91c3
Merge pull request #3058 from urbanrotnik/ur-sci-5312
Folder name uniqueness validation on folder level and renaming [SCI-5312]
2021-01-08 10:40:52 +01:00
Urban Rotnik
fbce70be0c Add unique validation and ensure_uniqueness callback while moving folder
[SCI-5312]
2021-01-08 08:21:09 +01:00
Urban Rotnik
be2949b316 Fix tests 2021-01-08 08:05:05 +01:00
Urban Rotnik
427b5d7107
Merge pull request #3059 from biosistemika/features/folders
Features/folders into develop
2021-01-08 06:26:44 +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
3dc76a3e57 Fix typo, update carets 2021-01-07 17:42:04 +01:00
Urban Rotnik
3a52f62d85 Implement folders tree for move action 2021-01-07 17:42:01 +01:00
Urban Rotnik
20acd9b693 Fix controller and tests 2021-01-07 17:41:39 +01:00
Urban Rotnik
ba13a0b14b Add jstree lib 2021-01-07 17:41:32 +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
Urban Rotnik
88ed583a0c Fix error rendering on new proejct_folder modal 2021-01-07 16:41:10 +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
aignatov-bio
1515ffa3f5
Add searching to projects member filter [SCI-5373] (#3054) 2021-01-07 13:01:14 +01:00
Oleksii Kriuchykhin
9882539213 Add project permissions check to projects toolbar [SCI-5317] 2021-01-06 22:23:48 +01:00
mlorb
2bd3850802
Merge pull request #3055 from mlorb/ml-sci-5374
Fix bug with users edit link not working [SCI-5374]
2021-01-06 15:33:43 +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
Mojca Lorber
b1eb4003ed Fix bug with users edit link not working 2021-01-06 14:55:27 +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
mlorb
e8b48e51f4
Merge pull request #3050 from mlorb/ml-sci-5336
Fix table view of project page display of users [SCI-5336]
2021-01-06 10:14:08 +01:00
aignatov-bio
ef57489cd9
Update repositories sidebar [SCI-5329] (#3031)
* Update repositories sidebar [SCI-5329]
2021-01-06 10:13:10 +01:00
Mojca Lorber
5298a91b48 Fix table view of project page display of users [SCI-5336] 2021-01-06 09:52:13 +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
2ebd78676f Move sanitize_input 2021-01-06 09:14:43 +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
Oleksii Kriuchykhin
f43340a849 Fix projects visibility in the sidebar [SCI-5338] 2021-01-05 13:50:42 +01:00
Alex Kriuchykhin
a8991356b5
Merge pull request #3033 from okriuchykhin/ok_SCI_5341
Fix restore action for experiments and tasks [SCI-5341]
2021-01-05 10:09:39 +01:00
Alex Kriuchykhin
d94d344c22
Merge pull request #3046 from okriuchykhin/ok_SCI_5361
Add default sorting to ProjectsOverviewService [SCI-5361]
2021-01-05 10:04:53 +01:00
aignatov-bio
f795d5180d
Fix file previews bugs [SCI-5284] (#3026) 2021-01-05 09:11:22 +01:00
aignatov-bio
2fe55250b9
Update settings navigation [SCI-5316] (#3028) 2021-01-05 09:11:05 +01:00
Oleksii Kriuchykhin
1c27b99ba5 Add default sorting to ProjectsOverviewService [SCI-5361] 2021-01-04 22:37:25 +01:00
Oleksii Kriuchykhin
58cce0f153 Improve task restoring and refactor flash messages [SCI-5341] 2021-01-04 17:00:23 +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
Alex Kriuchykhin
e0e796c5e7
Merge pull request #3040 from okriuchykhin/ok_SCI_5328
Fix project card menu visibility [SCI-5328]
2021-01-04 11:55:54 +01:00
Urban Rotnik
a53bfbdd33
Merge pull request #3014 from urbanrotnik/ur-sci-5283-smart-annotation-archived-link
Add 'archived' to smart annotation for repository item [SCI-5283]
2021-01-04 11:53:47 +01:00
Urban Rotnik
216db90e4a
Merge pull request #3013 from urbanrotnik/ur-sci-5084-smart-annotation-missing-icon
Fix cursor on SmartAnnotation [SCI-5084]
2021-01-04 11:18:13 +01:00
Urban Rotnik
d08f17d5b5
Merge pull request #3022 from urbanrotnik/ur-sci-5288-remove-name-uniqueness
Remove uniqueness validation on Experiment name [SCI-5288]
2021-01-04 10:56:51 +01:00
Alex Kriuchykhin
4638e74e1e
Merge pull request #3041 from okriuchykhin/ok_SCI_5327
Fix links in sidebar navigation [SCI-5327]
2021-01-04 10:53:38 +01:00
Alex Kriuchykhin
15a8524a99
Merge pull request #3039 from okriuchykhin/ok_SCI_5339
Disable comment adding for archived objects [SCI-5339]
2021-01-04 10:53:13 +01:00
Alex Kriuchykhin
794ba8ac0a
Merge pull request #3019 from okriuchykhin/ok_SCI_4973
Fix redirects after 2FA sign in [SCI-4973]
2021-01-04 10:52:16 +01:00
mlorb
7b48869557
Merge pull request #3024 from mlorb/ml-sci-5293
[SCI-5293] Remove Archived results tab on archived Task
2021-01-04 10:25:18 +01:00
mlorb
dafe8a072a
Merge pull request #3035 from mlorb/ml-sci-5095
[SCI-5095] Change color of sidebar icons and labels
2021-01-04 10:23:52 +01:00
mlorb
aa7ddb7fbe
Merge pull request #3036 from mlorb/ml-sci-5059
[SCI-5059] Change font size for manage columns list
2021-01-04 10:23:22 +01:00
Oleksii Kriuchykhin
ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin
8f0a3fb61c Fix links in sidebar navigation [SCI-5327] 2020-12-30 22:49:02 +01:00
Oleksii Kriuchykhin
49dc56caf2 Fix project card menu visibility [SCI-5328] 2020-12-30 22:17:04 +01:00
Oleksii Kriuchykhin
738f668ba9 Disable comment adding for archived objects [SCI-5339] 2020-12-30 11:46:56 +01:00
Mojca Lorber
bd49e277cc [SCI-5059] Change font size for manage columns list 2020-12-29 11:27:52 +01:00
Mojca Lorber
80b472aba0 [SCI-5095] Change color of sidebar icons and labels 2020-12-29 11:15:22 +01:00
Oleksii Kriuchykhin
f76eb170a1 Fix restore action for experiments and tasks [SCI-5341] 2020-12-28 22:21:38 +01:00
Oleksii Kriuchykhin
0cb221609a Fix global activities page [SCI-5324] 2020-12-27 22:05:15 +01:00
Mojca Lorber
62af5cc723 [SCI-5287] Show step collapse/expand on task 2020-12-22 15:50:27 +01:00
Mojca Lorber
21c0ea4f8d [SCI-5293] Remove Archived results tab on archived Task 2020-12-21 11:56:33 +01:00
Urban Rotnik
4ff1770d50 Remove uniqueness validation on Experiment name
SCI-5288
2020-12-18 16:48:50 +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
d3e38c89f8 Update BE sorting for archived fodlers&projects
SCI-5306
2020-12-18 11:27:17 +01:00
Urban Rotnik
7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik
7c967d32f1 Reset invalid state
SCI-5306
2020-12-18 09:46:05 +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
Urban Rotnik
4f657ab343 Fix CSS
SCI-5306
2020-12-18 08:37:57 +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
Oleksii Kriuchykhin
069704cb78 Fix redirects after 2FA sign in [SCI-4973] 2020-12-17 19:32:15 +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
Miha Mencin
f284ef1592
Merge pull request #3009 from okriuchykhin/ok_SCI_5276
Archiving: update archived TASK screen layout [SCI-5276]
2020-12-17 13:46:35 +01:00
Oleksii Kriuchykhin
7bb334e737 Archiving: update archived TASK screen layout [SCI-5276] 2020-12-17 13:26:44 +01:00
Urban Rotnik
3eb667b6ba
Merge pull request #3005 from urbanrotnik/ur-sci-5274-archived-task-cards
Archived tasks cards [SCI-5274] [SCI-5275]
2020-12-17 13:17:11 +01:00
Miha Mencin
6dc4fae45b
Merge pull request #3003 from okriuchykhin/ok_SCI_5268
Archiving: add 'archived' flag on folder [SCI-5268]
2020-12-17 13:13:26 +01:00
Urban Rotnik
d4c84a38e5 Fix css
[SCI-5274]
2020-12-17 13:11:30 +01:00
Urban Rotnik
19f16555c6 Add checkbox and restore button
[SCI-5275]
2020-12-17 13:11:20 +01:00
Urban Rotnik
cd7b94b434 Fix users/comments tab showing
[SCI-5274]
2020-12-17 13:08:58 +01:00
Urban Rotnik
9a7ffb0645 Add Tags modal to archived tags screen
[SCI-5274]
2020-12-17 13:08:57 +01:00
Urban Rotnik
2ae075e893 Use canvas task card for archived task card
[SCI-5274]
2020-12-17 13:08:53 +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
Oleksii Kriuchykhin
f150a11c4f Archiving: add 'archived' flag on folder [SCI-5268] 2020-12-17 12:47:23 +01:00
Oleksii Kriuchykhin
0c65f3f7c2 Implement sorting on the project screen (when filterin/searching) [SCI-5281] 2020-12-17 12:43:09 +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
Urban Rotnik
2d4b0fdbdc
Merge pull request #3010 from urbanrotnik/ur-sci-5294-remove-editing-options-of-archived-results
Refactor result permissions [SCI-5294]
2020-12-17 06:17:18 +01:00
aignatov-bio
329a5bff0b
Fix repository text field rendering [SCI-5304] (#3015) 2020-12-15 12:23:19 +01:00
Urban Rotnik
a4fd69c292 Add 'archived' to smart annotation for repository item 2020-12-15 07:36:49 +01:00
Urban Rotnik
c7c6e2d0f2 Fix cursor on SmartAnnotation 2020-12-14 17:29:30 +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
Urban Rotnik
ad8cf8a1fa Refactor result permissions 2020-12-14 12:50:54 +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
aignatov-bio
a32a2f28d3 Fix permission for assets in results 2020-12-08 15:31:57 +01:00
aignatov-bio
188013dd56 Change permission for sorting in steps and asset view [SCI-5289] 2020-12-08 10:45:43 +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
Urban Rotnik
1332ad2fcd Fix project creation activity [SCI-5181] 2020-12-04 14:13:43 +01:00
Urban Rotnik
342eb34925
Merge pull request #2994 from aignatov-bio/ai-sci-5285-fix-protocol-revert-from-repository
Fix protocol revert from repository [SCI-5285]
2020-12-04 12:25:36 +01:00
aignatov-bio
568fcb20df Fix protocol revert from repository [SCI-5285] 2020-12-04 12:07:25 +01:00
Urban Rotnik
7773afbcdb Add activities for Project Folders [SCI-5181] 2020-12-04 12:03:49 +01:00
aignatov-bio
6bd021d88a
Add gallery view after image update [SCI-5286] (#2993)
* Add gallery view after image update [SCI-5286]
2020-12-04 11:47:24 +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
aignatov-bio
edd774b045
Merge pull request #2992 from aignatov-bio/ai-sci-fix-asset-link-partial-in-item-card
Fix asset link partial in item card
2020-12-03 13:19:30 +01:00