show used space in user list #5342

icewind1991 · 2017-06-12T13:27:28Z

Fixes #117

Makes the quota dropdown into a progress bar, used space is shown as tooltip on hover

soamz · 2017-06-12T14:16:50Z

I dont see it.
Is it another latest version ?

MorrisJobke · 2017-06-12T14:57:21Z

Is it another latest version ?

This is a pull request. That means the code on ready for comments before it gets into the product.

MorrisJobke · 2017-06-12T17:10:18Z

beside this little nitpick that looks really good 👍

MorrisJobke

tooltip is escaped weirdly:

enoch85 · 2017-06-12T19:05:49Z

"Unlimited" will disappear right? I mean this implementation will show the same values as this PR #5305?

enoch85 · 2017-06-12T19:09:43Z

Also, would it be possible to show the % of the total used storage?

codecov · 2017-06-12T19:54:34Z

Codecov Report

Merging #5342 into master will decrease coverage by 9.37%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #5342      +/-   ##
============================================
- Coverage     54.15%   44.77%   -9.38%     
+ Complexity    22326     1678   -20648     
============================================
  Files          1380      157    -1223     
  Lines         85535    13426   -72109     
  Branches       1329     1329              
============================================
- Hits          46320     6012   -40308     
+ Misses        39215     7414   -31801

Impacted Files	Coverage Δ	Complexity Δ
lib/private/Files/Storage/DAV.php	`64.6% <0%> (-0.22%)`	`161% <0%> (ø)`
apps/dav/lib/Connector/Sabre/Node.php
settings/ajax/setquota.php
lib/private/Preview/MSOfficeDoc.php
lib/private/SystemTag/SystemTag.php
apps/systemtags/appinfo/routes.php
apps/dav/lib/DAV/CustomPropertiesBackend.php
lib/private/Encryption/Keys/Storage.php
lib/private/Updater/VersionCheck.php
.../Exceptions/EncryptionHeaderKeyExistsException.php
... and 1212 more

Fixed

LukasReschke

Nice stuff and works as expected, see comments for remarks :)

LukasReschke · 2017-06-12T19:56:27Z

lib/private/Files/Config/UserMountCache.php

@@ -332,4 +333,29 @@ public function remoteStorageMounts($storageId) {
 			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
 		$query->execute();
 	}
+
+	public function getUsedSpaceForUsers(array $userIds) {


Can I haz test? 🍪 😉

LukasReschke · 2017-06-12T19:57:43Z

lib/public/Files/Config/IUserMountCache.php

+	 * Note that this only includes the space in their home directory,
+	 * not any incoming shares or external storages.
+	 *
+	 * @param string[] $userIds


Is there a reason that this is an array of userIds instead of IUser[]? The other functions all take the user objects :)

LukasReschke · 2017-06-12T19:58:12Z

settings/Controller/UsersController.php

@@ -138,7 +142,8 @@ public function __construct($appName,
 								ITimeFactory $timeFactory,
 								ICrypto $crypto,
 								Manager $keyManager,
-								IJobList $jobList) {
+								IJobList $jobList,
+								IUserMountCache $userMountCache) {


Also adjust the PHPDocs 😉

icewind1991 · 2017-06-13T13:36:36Z

@LukasReschke all fixed

LukasReschke · 2017-06-14T13:09:47Z

tests/lib/Files/Config/UserMountCacheTest.php

@@ -455,4 +456,34 @@ public function testGetMountsForFileIdDeletedUser() {
 		$cachedMounts = $this->cache->getMountsForFileId($rootId);
 		$this->assertEmpty($cachedMounts);
 	}
+
+	public function testGtUsedSpaceForUsers() {


testGetUsedSpaceForUsers? 😉

Signed-off-by: Robin Appelman <robin@icewind.nl>

MorrisJobke

Tested and works 👍

linucksrox · 2017-06-21T15:09:17Z

I've been using this, and it works nicely 👍
I reported an issue #5470 which was a result of this pull request. Something in /settings/css/settings.css has changed causing a layout issue on the Personal configuration page. I haven't had a chance to dig more into what the fix could be, but wanted to mention this here.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

MorrisJobke · 2017-06-21T17:24:34Z

I fixed the missing PHPDoc for the public interface. Now the CI should be fine :)

All fixed

codecov-io · 2017-07-04T10:05:36Z

Codecov Report

Merging #5342 into master will decrease coverage by 22.87%.
The diff coverage is 0%.

@@              Coverage Diff              @@
##             master    #5342       +/-   ##
=============================================
- Coverage     54.03%   31.15%   -22.88%     
+ Complexity    22465    22463        -2     
=============================================
  Files          1389     1388        -1     
  Lines         85957    85373      -584     
  Branches       1329     1329               
=============================================
- Hits          46449    26602    -19847     
- Misses        39508    58771    +19263

Impacted Files	Coverage Δ	Complexity Δ
settings/Controller/UsersController.php	`0% <0%> (-69.2%)`	`114 <20> (+2)`
settings/templates/users/part.userlist.php	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
lib/private/Files/Config/UserMountCache.php	`3.44% <0%> (-85.69%)`	`39 <2> (-1)`
apps/files_versions/lib/Command/Expire.php	`0% <0%> (-100%)`	`3% <0%> (ø)`
lib/private/DB/OCSqlitePlatform.php	`0% <0%> (-100%)`	`5% <0%> (ø)`
apps/user_ldap/lib/Migration/UUIDFix.php	`0% <0%> (-100%)`	`5% <0%> (ø)`
apps/user_ldap/lib/Mapping/GroupMapping.php	`0% <0%> (-100%)`	`1% <0%> (ø)`
apps/provisioning_api/lib/AppInfo/Application.php	`0% <0%> (-100%)`	`6% <0%> (ø)`
apps/user_ldap/lib/BackendUtility.php	`0% <0%> (-100%)`	`1% <0%> (ø)`
lib/private/DB/SQLiteSessionInit.php	`0% <0%> (-100%)`	`4% <0%> (ø)`
... and 373 more

MorrisJobke · 2017-07-04T10:10:25Z

I fixed the not updated unit tests 😉

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

icewind1991 requested review from rullzer, nickvergessen and MorrisJobke June 12, 2017 13:27

icewind1991 mentioned this pull request Jun 12, 2017

Show color bar in quota column of % used space #117

Closed

icewind1991 added the 3. to review Waiting for reviews label Jun 12, 2017

icewind1991 added this to the Nextcloud 13 milestone Jun 12, 2017

MorrisJobke previously requested changes Jun 12, 2017

View reviewed changes

MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 12, 2017

LukasReschke previously requested changes Jun 12, 2017

View reviewed changes

icewind1991 force-pushed the userlist-used-space branch from 3bb42a9 to 4c27f00 Compare June 13, 2017 13:35

LukasReschke reviewed Jun 14, 2017

View reviewed changes

show used space in user list

2e8e6f9

Signed-off-by: Robin Appelman <robin@icewind.nl>

icewind1991 force-pushed the userlist-used-space branch from 4c27f00 to 2e8e6f9 Compare June 15, 2017 12:07

MorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 15, 2017

MorrisJobke approved these changes Jun 15, 2017

View reviewed changes

Added missing PHPDoc for @SInCE

96e1dab

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 21, 2017

MorrisJobke force-pushed the userlist-used-space branch 3 times, most recently from 01da4b6 to 4b518f5 Compare July 5, 2017 09:27

Update unit tests

f2b8535

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

MorrisJobke force-pushed the userlist-used-space branch from 4b518f5 to f2b8535 Compare July 5, 2017 11:50

MorrisJobke merged commit 7d58bb7 into master Jul 5, 2017

MorrisJobke deleted the userlist-used-space branch July 5, 2017 13:15

Schmuuu mentioned this pull request Aug 7, 2017

Add disk space to output? nextcloud/serverinfo#46

Closed

MorrisJobke mentioned this pull request Nov 6, 2017

Show how much space a user is using in admin overview #7086

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

show used space in user list #5342

show used space in user list #5342

icewind1991 commented Jun 12, 2017 •

edited

Loading

soamz commented Jun 12, 2017

MorrisJobke commented Jun 12, 2017

MorrisJobke commented Jun 12, 2017

MorrisJobke left a comment

enoch85 commented Jun 12, 2017 •

edited

Loading

enoch85 commented Jun 12, 2017

codecov bot commented Jun 12, 2017 •

edited

Loading

LukasReschke left a comment

LukasReschke Jun 12, 2017

LukasReschke Jun 12, 2017

LukasReschke Jun 12, 2017

icewind1991 commented Jun 13, 2017

LukasReschke Jun 14, 2017

icewind1991 Jun 15, 2017

MorrisJobke left a comment

linucksrox commented Jun 21, 2017 •

edited

Loading

MorrisJobke commented Jun 21, 2017

codecov-io commented Jul 4, 2017 •

edited by codecov bot

Loading

MorrisJobke commented Jul 4, 2017

show used space in user list #5342

show used space in user list #5342

Conversation

icewind1991 commented Jun 12, 2017 • edited Loading

soamz commented Jun 12, 2017

MorrisJobke commented Jun 12, 2017

MorrisJobke commented Jun 12, 2017

MorrisJobke left a comment

Choose a reason for hiding this comment

enoch85 commented Jun 12, 2017 • edited Loading

enoch85 commented Jun 12, 2017

codecov bot commented Jun 12, 2017 • edited Loading

Codecov Report

LukasReschke left a comment

Choose a reason for hiding this comment

LukasReschke Jun 12, 2017

Choose a reason for hiding this comment

LukasReschke Jun 12, 2017

Choose a reason for hiding this comment

LukasReschke Jun 12, 2017

Choose a reason for hiding this comment

icewind1991 commented Jun 13, 2017

LukasReschke Jun 14, 2017

Choose a reason for hiding this comment

icewind1991 Jun 15, 2017

Choose a reason for hiding this comment

MorrisJobke left a comment

Choose a reason for hiding this comment

linucksrox commented Jun 21, 2017 • edited Loading

MorrisJobke commented Jun 21, 2017

codecov-io commented Jul 4, 2017 • edited by codecov bot Loading

Codecov Report

MorrisJobke commented Jul 4, 2017

icewind1991 commented Jun 12, 2017 •

edited

Loading

enoch85 commented Jun 12, 2017 •

edited

Loading

codecov bot commented Jun 12, 2017 •

edited

Loading

linucksrox commented Jun 21, 2017 •

edited

Loading

codecov-io commented Jul 4, 2017 •

edited by codecov bot

Loading