UI(storage): display per-folder storage usage in Paths widget #7326
+66
−38
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
Cloudflare Pages deployment
|
|
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Comment on lines
+21
to
+22
| refetchOnWindowFocus: false, | ||
| }); |
Contributor
There was a problem hiding this comment.
Unexpected trailing comma. @stylistic/comma-dangle
Fix available:
Suggested change
| refetchOnWindowFocus: false, | |
| }); | |
| refetchOnWindowFocus: false | |
| }); |
| const hasFolderSize = typeof folderSize === 'number' && folderSize >= 0; | ||
| const driveTotal = (folder as any)?.DriveTotalBytes ?? (folder as any)?.DriveCapacity; | ||
| const readableFolderSize = hasFolderSize ? getReadableSize(folderSize) : undefined; | ||
| const readableDriveTotal = typeof driveTotal === 'number' && driveTotal >= 0 ? getReadableSize(driveTotal) : undefined; |
Contributor
There was a problem hiding this comment.
Unexpected any. Specify a different type. @typescript-eslint/no-explicit-any
Suggestion(s) available:
Suggested change
| const folderSize = (folder as any)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as any)?.Size; | |
| const folderSize = (folder as unknown)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as any)?.Size; |
Suggested change
| const folderSize = (folder as any)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as any)?.Size; | |
| const folderSize = (folder as never)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as any)?.Size; |
| const hasFolderSize = typeof folderSize === 'number' && folderSize >= 0; | ||
| const driveTotal = (folder as any)?.DriveTotalBytes ?? (folder as any)?.DriveCapacity; | ||
| const readableFolderSize = hasFolderSize ? getReadableSize(folderSize) : undefined; | ||
| const readableDriveTotal = typeof driveTotal === 'number' && driveTotal >= 0 ? getReadableSize(driveTotal) : undefined; |
Contributor
There was a problem hiding this comment.
Unexpected any. Specify a different type. @typescript-eslint/no-explicit-any
Suggestion(s) available:
Suggested change
| const folderSize = (folder as any)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as any)?.Size; | |
| const folderSize = (folder as any)?.FolderSizeBytes ?? (folder as unknown)?.SizeBytes ?? (folder as any)?.Size; |
Suggested change
| const folderSize = (folder as any)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as any)?.Size; | |
| const folderSize = (folder as any)?.FolderSizeBytes ?? (folder as never)?.SizeBytes ?? (folder as any)?.Size; |
| const hasFolderSize = typeof folderSize === 'number' && folderSize >= 0; | ||
| const driveTotal = (folder as any)?.DriveTotalBytes ?? (folder as any)?.DriveCapacity; | ||
| const readableFolderSize = hasFolderSize ? getReadableSize(folderSize) : undefined; | ||
| const readableDriveTotal = typeof driveTotal === 'number' && driveTotal >= 0 ? getReadableSize(driveTotal) : undefined; |
Contributor
There was a problem hiding this comment.
Unexpected any. Specify a different type. @typescript-eslint/no-explicit-any
Suggestion(s) available:
Suggested change
| const folderSize = (folder as any)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as any)?.Size; | |
| const folderSize = (folder as any)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as unknown)?.Size; |
Suggested change
| const folderSize = (folder as any)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as any)?.Size; | |
| const folderSize = (folder as any)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as never)?.Size; |
| const readableFolderSize = hasFolderSize ? getReadableSize(folderSize) : undefined; | ||
| const readableDriveTotal = typeof driveTotal === 'number' && driveTotal >= 0 ? getReadableSize(driveTotal) : undefined; | ||
|
|
||
| return ( |
Contributor
There was a problem hiding this comment.
Unexpected any. Specify a different type. @typescript-eslint/no-explicit-any
Suggestion(s) available:
Suggested change
| const driveTotal = (folder as any)?.DriveTotalBytes ?? (folder as any)?.DriveCapacity; | |
| const driveTotal = (folder as unknown)?.DriveTotalBytes ?? (folder as any)?.DriveCapacity; |
Suggested change
| const driveTotal = (folder as any)?.DriveTotalBytes ?? (folder as any)?.DriveCapacity; | |
| const driveTotal = (folder as never)?.DriveTotalBytes ?? (folder as any)?.DriveCapacity; |
Comment on lines
+25
to
+26
| : (typeof folderTotal === 'number' && folderTotal > 0) ? folderTotal | ||
| : calculateTotal(folder); |
Contributor
There was a problem hiding this comment.
':' should be placed at the end of the line. @stylistic/operator-linebreak
Fix available:
Suggested change
| : (typeof folderTotal === 'number' && folderTotal > 0) ? folderTotal | |
| : calculateTotal(folder); | |
| (typeof folderTotal === 'number' && folderTotal > 0) ? folderTotal | |
| : calculateTotal(folder); |
| const folderTotal = (folder as any)?.FolderSizeBytes ?? (folder as any)?.SizeBytes ?? (folder as any)?.Size; | ||
|
|
||
| const total = (typeof driveTotal === 'number' && driveTotal > 0) ? driveTotal | ||
| : (typeof folderTotal === 'number' && folderTotal > 0) ? folderTotal |
Contributor
There was a problem hiding this comment.
Extract this nested ternary operation into an independent statement. sonarjs/no-nested-conditional
|
|
||
| const total = (typeof driveTotal === 'number' && driveTotal > 0) ? driveTotal | ||
| : (typeof folderTotal === 'number' && folderTotal > 0) ? folderTotal | ||
| : calculateTotal(folder); |
Contributor
There was a problem hiding this comment.
Expected indentation of 12 spaces but found 8. @stylistic/indent
Fix available:
Suggested change
| : calculateTotal(folder); | |
| : calculateTotal(folder); |
Comment on lines
+26
to
+27
| : calculateTotal(folder); | ||
|
|
Contributor
There was a problem hiding this comment.
':' should be placed at the end of the line. @stylistic/operator-linebreak
Fix available:
Suggested change
| : calculateTotal(folder); | |
| calculateTotal(folder); | |
| if (total <= 0) return 0; | ||
|
|
||
| return Math.min(100, (used / total) * 100); | ||
| }; |
Contributor
There was a problem hiding this comment.
Newline required at end of file but not found. @stylistic/eol-last
Fix available:
Suggested change
| }; | |
| }; | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #7323
Summary
Prefer per-folder
FolderSizeBytesandDriveTotalBytesreturned by the backend when rendering the Dashboard → Paths widget. Only show a progress bar when folder-level sizes exist to avoid misleading identical bars per path.Changes
FolderSizeBytes/DriveTotalBytesinsrc/apps/dashboard/features/storage/utils/space.ts.StorageListItem.tsxonly when per-folder sizes exist.useSystemStorageto confirm API returns the new fields.src/lib/jellyfin-apiclient/*files as needed.Verification
Webfolder onT:\shows its separate drive capacity; other paths onC:\show different totals.Notes
This PR depends on backend changes that provide
FolderSizeBytesandDriveTotalBytesvia the System Storage API. See backend PR:jellyfin/jellyfin#<backend-pr-number>(link when created).