Create infrastructure to allow files to be shared with circles by viniciuscb · Pull Request #6959 · nextcloud/server

viniciuscb · 2017-10-25T16:03:28Z

This PR is necessary to nextcloud/circles#141 .

Proposal and discussion is on nextcloud/circles#137 .

This commit allows the user to view the calendars that are shared with any circle s/he belongs to. Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>

There is a proposal to allow users to filter files shared to circles. This commit is needed to provide the infrastucture for it. Issue: nextcloud/circles#137 Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>

…ivoEITA/server into add_circle_to_caldav_and_filepanel

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>

ArtificialOwl · 2017-10-25T16:43:08Z

+ throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
+ }
+ }
+ */


Maybe cleaning those commented line

ArtificialOwl · 2017-10-25T16:43:54Z

Result for anyone wondering:

ArtificialOwl · 2017-10-25T16:53:39Z

it might needs some unit tests

viniciuscb · 2017-10-31T20:29:57Z

@daita we were informed that nc13 will freeze the new features this friday. What can we make to have this PR accepted?

nickvergessen

I don't really like all this merging of circles into the dav app. We should instead add hooks, so the circles app can provide the functionality with code in it's own Namespace

nickvergessen · 2017-11-01T10:00:54Z

 	const NS_OWNCLOUD = 'http://owncloud.org/ns';
 	const REPORT_NAME = '{http://owncloud.org/ns}filter-files';
 	const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
+	const CIRCLE_PROPERTYNAME = '{http://owncloud.org/ns}circle';


Should be {http:/nextcloud.com/ns}circle

In fact, adding hooks in dav app would be more elegant. But since system tags are already core factored in dav, we thought a first approach would be to have both system tags and circles working similarly.
We would be happy to collaborate to implement hooks in dav in the future, and then migrate both circles and system tags to the hooks approach.
Maybe, for NC13, we could start the way we've implemented now... What do you think?

There is another difference ;)
systemtags are shipped (therefor the code is not missing etc) while circles are totally optional

ArtificialOwl · 2017-11-01T11:06:44Z

The hook thing could be a great improvement !

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>

codecov · 2017-11-01T12:08:09Z

Codecov Report

❗ No coverage uploaded for pull request base (master@c05e8ac). Click here to learn what that means.
The diff coverage is 16.27%.

@@ Coverage Diff @@## master #6959 +/- ##
=========================================
Coverage ? 29.49% Complexity ? 24490 =========================================
Files ? 1581 Lines ? 93622 Branches ? 1359 =========================================
Hits ? 27615 Misses ? 66007 Partials ? 0

Impacted Files	Coverage Δ	Complexity Δ
apps/dav/lib/CalDAV/CalDavBackend.php	`0% <0%> (ø)`	`219 <0> (?)`
apps/dav/lib/Connector/Sabre/SharesPlugin.php	`78.75% <100%> (ø)`	`20 <0> (?)`
apps/dav/lib/Connector/Sabre/FilesReportPlugin.php	`79.73% <23.07%> (ø)`	`50 <3> (?)`
apps/dav/lib/Connector/Sabre/Principal.php	`63.15% <4%> (ø)`	`30 <11> (?)`
core/js/files/client.js	`82.82% <66.66%> (ø)`	`0 <0> (?)`

LukasReschke · 2017-11-03T13:19:40Z

 return $resultFileIds;
 	}

+	private function getCirclesFileIds($circlesIds) {


PHPDocs on the function parameters and the return value would be awesome.
Also is $circlesIds an array? If so you can typehint it with array $circleIds.

LukasReschke · 2017-11-03T13:22:42Z

+ throw new Exception('Principal not found');
+ }
+
+ $userSession = \OC::$server->getUserSession();


Can we inject the current user in the constructor instead?

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

ArtificialOwl · 2017-11-07T17:08:37Z

@viniciuscb - I made the few changes requested by @LukasReschke
Can you test it on your side so we merge this PR before Friday.

viniciuscb · 2017-11-10T12:56:46Z

Hi @daita , taking a look...

viniciuscb · 2017-11-10T14:15:25Z

@daita Seems to be working fine! In my opinion, can merge.

nickvergessen · 2017-11-13T09:21:39Z

 if ($filterRule['name'] === $ns . 'systemtag') {
 $systemTagIds[] = $filterRule['value'];
 }
+ if ($filterRule['name'] === $ns . 'circle') {


it's CIRCLE_PROPERTYNAME now

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

nickvergessen · 2017-11-13T10:05:32Z

 body += ' <oc:systemtag>' + escapeHTML(systemTagIds) + '</oc:systemtag>\n';
 });
+ _.each(filter.circlesIds, function(circlesIds) {
+ body += ' <oc:circle>' + escapeHTML(circlesIds) + '</oc:circle>\n';


MorrisJobke · 2017-12-08T15:02:37Z

I moved this to 14

MorrisJobke · 2018-03-06T20:46:39Z

@viniciuscb @daita Sorry that this somehow slipped through. What is the status of this?

Fixed

MorrisJobke · 2018-06-29T07:53:20Z

The unit tests in this one fail :/

@danxuliu @georgehrke @daita Mind to have a look at this one?

…to_caldav_and_filepanel

MorrisJobke · 2018-11-07T14:44:46Z

This was continued in #12119 -> let's close this one here

viniciuscb added 4 commits October 20, 2017 10:10

Provide calendars shared w/ current user's circles
9357b99
This commit allows the user to view the calendars that are shared with any circle s/he belongs to. Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>

Created infrastructure to show circles' shared files
253b263
There is a proposal to allow users to filter files shared to circles. This commit is needed to provide the infrastucture for it. Issue: nextcloud/circles#137 Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>

Merge branch 'add_circle_to_caldav_and_filepanel' of github.com:colet…
fff74e1
…ivoEITA/server into add_circle_to_caldav_and_filepanel

Changes to comply tocoletivoEITA/circles#2
87c60b6
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>

MorrisJobke requested review from ArtificialOwl and rullzer October 25, 2017 16:40

ArtificialOwl reviewed Oct 25, 2017
View reviewed changes

ArtificialOwl approved these changes Oct 25, 2017
View reviewed changes

ArtificialOwl added this to the Nextcloud 13 milestone Oct 25, 2017

ArtificialOwl added 3. to review Waiting for reviews enhancement labels Oct 25, 2017

nickvergessen previously requested changes Nov 1, 2017
View reviewed changes

Polishing: get files shared to circles in caldav
3e623e1
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>

LukasReschke previously requested changes Nov 3, 2017
View reviewed changes

fixing
e840dc5
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Merge branch 'master' into add_circle_to_caldav_and_filepanel
70069e2

nickvergessen reviewed Nov 13, 2017
View reviewed changes

using CIRCLE__PROPERTYNAME
7063683
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

nickvergessen reviewed Nov 13, 2017
View reviewed changes

fgsl mentioned this pull request Nov 29, 2017
Show circle name in details of a shared file (group user) #7340
Closed

MorrisJobke modified the milestones: Nextcloud 13, Nextcloud 14 Dec 8, 2017

MorrisJobke added the stale Ticket or PR with no recent activity label Jun 19, 2018

nextcloud-bot removed the stale Ticket or PR with no recent activity label Jun 29, 2018

MorrisJobke modified the milestones: Nextcloud 14, Nextcloud 15 Jun 29, 2018

MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jul 9, 2018

Merge branch 'add_circle_to_caldav_and_filepanel-15' into add_circle_…
38bfba8
…to_caldav_and_filepanel

MorrisJobke closed this Nov 7, 2018

MorrisJobke removed this from the Nextcloud 15 milestone Nov 7, 2018

Uh oh!

Uh oh!

Conversation

viniciuscb commented Oct 25, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ArtificialOwl commented Oct 25, 2017

Uh oh!

ArtificialOwl commented Oct 25, 2017

Uh oh!

viniciuscb commented Oct 31, 2017

Uh oh!

nickvergessen left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ArtificialOwl commented Nov 1, 2017

Uh oh!

codecovBot commented Nov 1, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ArtificialOwl commented Nov 7, 2017

Uh oh!

viniciuscb commented Nov 10, 2017

Uh oh!

viniciuscb commented Nov 10, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented Dec 8, 2017

Uh oh!

MorrisJobke commented Mar 6, 2018

Uh oh!

MorrisJobke commented Jun 29, 2018

Uh oh!

MorrisJobke commented Nov 7, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codecovBot commented Nov 1, 2017•
edited
Loading