Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: show custom storage quota to user #1338

Merged
merged 5 commits into from
May 30, 2022
Merged

fix: show custom storage quota to user #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd9b4dc
chore: remove unused storage tiers concept from website
adamalton May 18, 2022
31870a8
fix: display the correct storage limit based on the `StorageLimitByte…
adamalton May 18, 2022
9dcf890
chore: round the displayed storage limit value down to nearest TiB
adamalton May 23, 2022
aaa0c4b
chore: merge branch 'main' into fix/show-custom-storage-quota-to-user
adamalton May 23, 2022
63ec0b2
chore: merge branch 'main' into fix/show-custom-storage-quota-to-user
adamalton May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/api/src/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,13 @@ export async function userTokensPost (request, env) {
* @param {import('./env').Env} env
*/
export async function userAccountGet (request, env) {
const usedStorage = await env.db.getStorageUsed(Number(request.auth.user._id))

const [usedStorage, storageLimitBytes] = await Promise.all([
env.db.getStorageUsed(request.auth.user._id),
env.db.getUserTagValue(request.auth.user._id, 'StorageLimitBytes')
adamalton marked this conversation as resolved.
Show resolved Hide resolved
])
return new JSONResponse({
usedStorage
usedStorage,
storageLimitBytes
})
}

Expand Down
40 changes: 9 additions & 31 deletions packages/website/components/account/storageManager/storageManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,9 @@ import Button, { ButtonVariant } from 'components/button/button';
import { useUser } from 'components/contexts/userContext';
import { elementIsInViewport } from 'lib/utils';

// Tiers available
export const StorageTiers = {
TIER_1: '0',
TIER_2: '1',
TIER_3: '2',
};

// Raw TiB number of bytes, to be used in calculations
const tebibyte = 1099511627776;
const defaultStorageLimit = tebibyte;

/**
* @typedef {Object} StorageManagerProps
Expand All @@ -34,39 +28,23 @@ const mailTo = `mailto:${emailContent.mail}?subject=${emailContent.subject}&body
* @returns
*/
const StorageManager = ({ className = '', content }) => {
const storageTier = StorageTiers.TIER_1; // No tier available?
const {
storageData: { data, isLoading },
} = useUser();
const uploaded = useMemo(() => data?.usedStorage?.uploaded || 0, [data]);
const psaPinned = useMemo(() => data?.usedStorage?.psaPinned || 0, [data]);
const limit = useMemo(() => data?.storageLimitBytes || defaultStorageLimit, [data]);
const [componentInViewport, setComponentInViewport] = useState(false);
const storageManagerRef = useRef(/** @type {HTMLDivElement | null} */ (null));

const { maxSpaceLabel, unlockLabel, percentUploaded, percentPinned } = useMemo(
() =>
// Storage information by tier
({
[StorageTiers.TIER_1]: {
maxSpaceLabel: content.tiers[0].max_space_label,
unlockLabel: content.tiers[0].unlock_label,
percentUploaded: (uploaded / tebibyte) * 100,
percentPinned: (psaPinned / tebibyte) * 100,
},
[StorageTiers.TIER_2]: {
maxSpaceLabel: content.tiers[1].max_space_label,
unlockLabel: content.tiers[1].unlock_label,
percentUploaded: (uploaded / (tebibyte * 10)) * 100,
percentPinned: (psaPinned / (tebibyte * 10)) * 100,
},
[StorageTiers.TIER_3]: {
maxSpaceLabel: `${Math.floor(uploaded + psaPinned / (tebibyte * 10) + 1) + content.tiers[2].max_space_label}`,
// every increment of 10 changes the amount of space used
percentUploaded: ((uploaded % (tebibyte * 10)) / (tebibyte * 10)) * 100,
percentPinned: ((psaPinned % (tebibyte * 10)) / (tebibyte * 10)) * 100,
},
}[storageTier]),
[storageTier, uploaded, psaPinned, content.tiers]
() => ({
maxSpaceLabel: `${Math.floor(limit / tebibyte)} ${content.max_space_tib_label}`,
unlockLabel: content.unlock_label,
percentUploaded: (uploaded / limit) * 100,
percentPinned: (psaPinned / limit) * 100,
}),
[uploaded, psaPinned, limit, content]
);

useEffect(() => {
Expand Down
5 changes: 4 additions & 1 deletion packages/website/components/contexts/userContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ import AccountBlockedModal from 'components/account/accountBlockedModal/accountB
* @property {string} publicAddress
* @property {string} created
* @property {string} updated
* @property {import('react-query').UseQueryResult<{usedStorage: {uploaded: number, psaPinned: number}}>} storageData
* @property {import('react-query').UseQueryResult<{
* usedStorage: {uploaded: number, psaPinned: number},
* storageLimitBytes: number
* }>} storageData
* @property {string} isLoadingStorage
*/

Expand Down
15 changes: 2 additions & 13 deletions packages/website/content/pages/app/account.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,8 @@
"request": "Submit a request"
},
"loading": "Loading...",
"tiers": [
{
"max_space_label": "1 TiB",
"unlock_label": "1 TiB+"
},
{
"max_space_label": "10 TiB",
"unlock_label": "10 TiB+"
},
{
"max_space_label": "0 TiB+"
}
]
"max_space_tib_label": "TiB",
"unlock_label": "1 TiB+"
},
"file_manager": {
"heading": "Files",
Expand Down