-
Notifications
You must be signed in to change notification settings - Fork 40
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Activity tab in files sidebar #358
Conversation
You guys rock!! :-) |
170ec3b
to
0fe39a5
Compare
@nickvergessen I fixed the spinner issue. Currently it looks like this using the existing CSS from the page: |
Nice! :) Of course the activities shown in there should only be the ones pertaining to that specific file. :) |
@@ -49,3 +49,12 @@ | |||
// Cron job for sending emails and pruning the activity list | |||
$c->getServer()->getJobList()->add('OCA\Activity\BackgroundJob\EmailNotification'); | |||
$c->getServer()->getJobList()->add('OCA\Activity\BackgroundJob\ExpireActivities'); | |||
|
|||
// Needed for the files sidebar entry | |||
\OCP\Util::connectHook( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Move to FilesHooksStatic::register()
@jancborchardt see previous comment
|
|
url: function() { | ||
var query = { | ||
page: 1, | ||
filter: 'all' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
filter: 'filter'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but only when objectid or objecttype are set ? or always ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all gives all, filter uses object id and type, see the following lines:
https://github.com/owncloud/activity/pull/363/files#diff-7842161f69cff3997d7b10126d8c368fR223
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this still needs updating?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
scroll down
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we only set the filter if either objectId or objectType are set. Else we fetch all (could be used later in other views)
activity filter option is merged, event listener for loading js/css is merged if you rebase we can test it all together |
Will do |
0fe39a5
to
31a1abe
Compare
Rebased, fixed the hook and adapted.
|
Oops, I missed some files |
31a1abe
to
e238f12
Compare
Should be good now. |
|
Added error handler for the collection's fetch operation. Message markup now rendered properly. Added unit tests for ActivityTabView and ActivityCollection.
Unit tests added. But they will only run once owncloud/core#18459 is merged in core. |
See how difficult it is to load core's JS files in the right order: https://github.com/owncloud/activity/pull/358/files#diff-6e207d934280c969b0add642e133ee90R29 Fortunately we added "core/js/core.json" that lists the core JS files for that which can be reused here. |
This is ready for review @jancborchardt @nickvergessen |
Works 👍 |
Activity tab in files sidebar
Yup, nice! :) |
@nickvergessen FYI
Not sure what attributes the endpoint is going to return eventually.
Everything is a dummy at the moment.