Show the used quota inside the app #337

mneuwert · 2019-03-28T06:43:49Z

Description

Changed SDK which retrieves quota if available and stores it in the instance of OCItem
Changed the UI to show quota in the prompt of the navigation bar
Right now space occupied by the files in the current folder is shown as bytes used information

Related Issue

#228

Motivation and Context

As a user I want to see how much storage space is already in use

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

Test plan

https://github.com/owncloud/QA/blob/master/Mobile/iOS-app/User%20Quota.md

Bugs & improvements

(1) Quota not shown Show the used quota inside the app #337 (comment) [FIXED]
(2) Values not correctly displayed Show the used quota inside the app #337 (comment)

mneuwert · 2019-03-28T06:48:27Z

@michaelstingl @jesmrec please check out the video showing how current implementation is working. As you can see if user navigates through the folder structure the quota in use changes and the value is corresponding to the total size of files in that particular folder, so only in the root folder you would see the total space allocated by the files of the user. I think on one hand it is useful information (per folder total size) but on the other hand I am not sure if it is intuitive. Also any other suggestions / wishes / ideas are welcome

hosy · 2019-03-28T08:29:15Z

@mneuwert thank you for your implementation. I thought the quota should shown in the account list, below the Server URL. Your current implementation can be misunderstood, because user can think the used quota is the size of the current folder. But I like the idea. Maybe you can change it, to only show the size of the folder without "of 5,21 GB" -> "679 kb used" and display the total used size of quota in the account list.

Maybe it is possible to use the new custom OCQuery by @felix-schwarz to get the total size of Documents, Photos, Videos, Others, (...) like the iCloud Storage overview:

michaelstingl · 2019-03-28T17:30:09Z

Vertical space is valuable. Not sure if we should show it on top of every folder. But quota could be different in every folder, so we could show it with the folder-info…

felix-schwarz · 2019-03-29T08:44:19Z

A few thoughts:

I think of quota as a global number. I find it confusing when I start in the root folder with "161.9 MB of 5.21 GB used" and then get to see "135.6 MB of 5.21 GB used" in the Documents folder. The latter gives me the impression that I have more free space available than I actually have.
If more than one quota is possible (I guess in shared folders (cc @michaelstingl)?), then we should have a concept of "quota roots", so that I get to see the quota numbers of the "quota root". So f.ex. "161.9 MB of 5.21 GB used" for all directories in my account and then "20 MB of 100 MB" for the shared folder with quota and all its subfolders.
thinking of where to put the quota, I have no favorite, but also think that it shouldn't occupy vertical space permanently (unless, maybe, the remaining space is less than a percentage or fixed amount of total storage). Maybe a cell at the end of the table view? Or a new "Show quota" action that shows a nice table that lists all "quota roots" and their available and total space.

For sub-folders total space occupied by it’s items is shown

codecov · 2019-04-02T07:41:08Z

Codecov Report

Merging #337 into master will increase coverage by 0.07%.
The diff coverage is 71.42%.

@@            Coverage Diff             @@
##           master     #337      +/-   ##
==========================================
+ Coverage   30.25%   30.32%   +0.07%     
==========================================
  Files         234      234              
  Lines       15910    15938      +28     
==========================================
+ Hits         4813     4833      +20     
- Misses      11097    11105       +8

Impacted Files	Coverage Δ
ownCloud/SDK Extensions/OCItem+Extension.swift	`79.05% <0%> (-3.01%)`	⬇️
ownCloud/Theming/NSObject+ThemeApplication.swift	`88.4% <100%> (+0.08%)`	⬆️
ownCloud/Client/ClientQueryViewController.swift	`33.01% <95%> (+1.53%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d2d2b62...2fe289a. Read the comment docs.

codecov · 2019-04-02T07:41:08Z

Codecov Report

Merging #337 into master will increase coverage by 0.07%.
The diff coverage is 71.42%.

@@            Coverage Diff             @@
##           master     #337      +/-   ##
==========================================
+ Coverage   30.25%   30.32%   +0.07%     
==========================================
  Files         234      234              
  Lines       15910    15938      +28     
==========================================
+ Hits         4813     4833      +20     
- Misses      11097    11105       +8

Impacted Files	Coverage Δ
ownCloud/SDK Extensions/OCItem+Extension.swift	`79.05% <0%> (-3.01%)`	⬇️
ownCloud/Theming/NSObject+ThemeApplication.swift	`88.4% <100%> (+0.08%)`	⬆️
ownCloud/Client/ClientQueryViewController.swift	`33.01% <95%> (+1.53%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d2d2b62...ee16ffa. Read the comment docs.

jesmrec · 2019-04-02T09:00:05Z

(1) [FIXED]

Root folder is not showing the quota:

codecov-io · 2019-04-02T10:36:22Z

Codecov Report

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

@@           Coverage Diff            @@
##             master    #337   +/-   ##
========================================
  Coverage          ?     30%           
========================================
  Files             ?     234           
  Lines             ?   16316           
  Branches          ?       0           
========================================
  Hits              ?    4896           
  Misses            ?   11420           
  Partials          ?       0

Impacted Files	Coverage Δ
ownCloud/Client/ClientQueryViewController.swift	`32.73% <76.47%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 82c42ec...99820a9. Read the comment docs.

# Conflicts: # ios-sdk # ownCloud/Client/ClientQueryViewController.swift

jesmrec · 2019-04-03T16:40:59Z

(2)

I checked the different cases with some findings:

An user with Default quota displays in root folder:

the propfind returns:

<d:quota-used-bytes>348737755</d:quota-used-bytes>
<d:quota-available-bytes>-3</d:quota-available-bytes>

quota-used-bytes is the number of bytes used in the account, but if you display in MB, the value is not correctly transformed, (348737755 bytes are 332.6 MB)

in case of -3 nothing should be displayed as limit, like 332.6 MB used

An user with limited quota. For example, 1GB:

in such case the propfind responses something like

<d:quota-used-bytes>348737755</d:quota-used-bytes>
<d:quota-available-bytes>725004069</d:quota-available-bytes>

The result should be something like: 332.6 MB of 1 GB used

An user with Unlimited quota:

same case as Default

An user with Other quota:

same case as limited quota.

mneuwert · 2019-04-03T17:07:48Z

@jesmrec strictly speaking, the MB calculation is correct. There was an effort to unify data amount units, and actually as in your comment 348737755 bytes are 332.6 MiB (Mebibyte) but not MB (Megabyte). macOS I think is used mixed formats and decimal style (SI prefixes) is used to reflect how much storage is occupied by files and the "old" style (where KB is 1024 Bytes) is used to e.g. show how much memory is used say by a running process.

jesmrec · 2019-04-03T17:24:49Z

thanks for the explanation @mneuwert. Calculation was already fixed.

jesmrec · 2019-04-03T17:25:22Z

Everything fixed. Approved.

- Update ClientQueryViewController to updated OCCore.rootQuota property layout - Make the footer show always (fixes issues where new accounts would first show separator lines - and then suddenly get replaced with the quota) - Make quota label use correct color (the previous was unreadable with the Classic theme)

CLAassistant · 2019-04-03T20:49:19Z

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ hosy
✅ mneuwert
❌ felix-schwarz
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

First implementation of quota displaying

e9aee23

mneuwert requested review from felix-schwarz, jesmrec and michaelstingl March 28, 2019 06:44

mneuwert self-assigned this Mar 28, 2019

mneuwert added feature:fileList p3-medium Normal priority discussion labels Mar 28, 2019

mneuwert added this to the 1.1.0-Next milestone Mar 28, 2019

mneuwert and others added 2 commits April 1, 2019 15:38

Showing quota as table view footer for root folder

f568fa9

For sub-folders total space occupied by it’s items is shown

Merge branch 'master' into feature/user_quota

2fe289a

mneuwert added 2 commits April 2, 2019 10:30

Changed SDK version and setting quota label only once

dbe54b9

Updated SDK version

ee16ffa

Quota information is retrieved through KVO from OCCore properties

c82ca90

jesmrec requested a review from hosy April 3, 2019 14:43

mneuwert added 2 commits April 3, 2019 18:37

Merge remote-tracking branch 'origin/master' into feature/user_quota

deb3a6e

# Conflicts: # ios-sdk # ownCloud/Client/ClientQueryViewController.swift

Updated to SDK with merged master changes

549e1d7

jesmrec self-assigned this Apr 3, 2019

Fix for negative </d:quota-available-bytes>

d03099e

Fixed total quota calculation

8e2c57f

jesmrec approved these changes Apr 3, 2019

View reviewed changes

Removed a hack to keep navigation bar prompt in the same color as title

c4f3783

hosy removed the discussion label Apr 3, 2019

felix-schwarz approved these changes Apr 3, 2019

View reviewed changes

link against newest ios sdk

f827ec4

jesmrec added the Approved by QA Approved by QA label Apr 4, 2019

Merge branch 'master' into feature/user_quota

99820a9

hosy merged commit 6583d9f into master Apr 4, 2019

delete-merged-branch bot deleted the feature/user_quota branch April 4, 2019 08:03

michaelstingl modified the milestones: 1.1.0-Next, 1.0.0-Current Apr 5, 2019

jesmrec mentioned this pull request May 3, 2019

Roadmap #94

Open

45 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Show the used quota inside the app #337

Show the used quota inside the app #337

mneuwert commented Mar 28, 2019 •

edited by jesmrec

Loading

mneuwert commented Mar 28, 2019

hosy commented Mar 28, 2019

michaelstingl commented Mar 28, 2019

felix-schwarz commented Mar 29, 2019

codecov bot commented Apr 2, 2019

codecov bot commented Apr 2, 2019 •

edited

Loading

jesmrec commented Apr 2, 2019 •

edited

Loading

codecov-io commented Apr 2, 2019 •

edited by codecov bot

Loading

jesmrec commented Apr 3, 2019

mneuwert commented Apr 3, 2019 •

edited

Loading

jesmrec commented Apr 3, 2019

jesmrec commented Apr 3, 2019

CLAassistant commented Apr 3, 2019 •

edited

Loading

Show the used quota inside the app #337

Show the used quota inside the app #337

Conversation

mneuwert commented Mar 28, 2019 • edited by jesmrec Loading

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

Test plan

Bugs & improvements

mneuwert commented Mar 28, 2019

hosy commented Mar 28, 2019

michaelstingl commented Mar 28, 2019

felix-schwarz commented Mar 29, 2019

codecov bot commented Apr 2, 2019

Codecov Report

codecov bot commented Apr 2, 2019 • edited Loading

Codecov Report

jesmrec commented Apr 2, 2019 • edited Loading

(1) [FIXED]

codecov-io commented Apr 2, 2019 • edited by codecov bot Loading

Codecov Report

jesmrec commented Apr 3, 2019

(2)

mneuwert commented Apr 3, 2019 • edited Loading

jesmrec commented Apr 3, 2019

jesmrec commented Apr 3, 2019

CLAassistant commented Apr 3, 2019 • edited Loading

mneuwert commented Mar 28, 2019 •

edited by jesmrec

Loading

codecov bot commented Apr 2, 2019 •

edited

Loading

jesmrec commented Apr 2, 2019 •

edited

Loading

codecov-io commented Apr 2, 2019 •

edited by codecov bot

Loading

mneuwert commented Apr 3, 2019 •

edited

Loading

CLAassistant commented Apr 3, 2019 •

edited

Loading