Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const SORT_PROPERTIES = [
'upTotal',
'sizeBytes',
'dateAdded',
'dateFinished',
] as const;

interface SortDropdownProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const ICONS: Partial<Record<TorrentListColumn, JSX.Element>> = {
hash: <Hash />,
dateAdded: <Calendar />,
dateCreated: <CalendarCreated />,
dateFinished: <Calendar />,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We would need a new icon here.

isPrivate: <Lock />,
message: <TrackerMessage />,
percentComplete: <DownloadThick />,
Expand Down Expand Up @@ -116,6 +117,8 @@ const DefaultTorrentListCellContent: FC<TorrentListCellContentProps> = observer(
return <DateCell date={torrent[column]} />;
case 'dateCreated':
return <DateCell date={torrent[column]} />;
case 'dateFinished':
return <DateCell date={torrent[column]} />;
case 'downRate':
return <Size value={torrent[column]} isSpeed />;
case 'upRate':
Expand Down
1 change: 1 addition & 0 deletions client/src/javascript/constants/SortDirections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const SortDirections: Record<string, 'asc' | 'desc'> = {
dateAdded: 'desc',
dateFinished: 'desc',
downRate: 'desc',
downTotal: 'desc',
upRate: 'desc',
Expand Down
1 change: 1 addition & 0 deletions client/src/javascript/constants/TorrentListColumns.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const TorrentListColumns = {
dateAdded: 'torrents.properties.date.added',
dateFinished: 'torrents.properties.date.finished',
downRate: 'torrents.properties.download.speed',
downTotal: 'torrents.properties.download.total',
eta: 'torrents.properties.eta',
Expand Down
1 change: 1 addition & 0 deletions client/src/javascript/i18n/strings/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@
"torrents.properties.comment": "Comment",
"torrents.properties.date.added": "Added",
"torrents.properties.date.created": "Created",
"torrents.properties.date.finished": "Completed",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finished would be more consistent here.

"torrents.properties.directory": "Location",
"torrents.properties.download.speed": "Download Speed",
"torrents.properties.download.total": "Downloaded",
Expand Down
2 changes: 2 additions & 0 deletions shared/constants/defaultFloodSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const defaultFloodSettings: Readonly<FloodSettings> = {
{id: 'seeds', visible: true},
{id: 'dateAdded', visible: true},
{id: 'dateCreated', visible: false},
{id: 'dateFinished', visible: true},
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to display this by default?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Up to you

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing you don't want it displayed by default, so I'll change it.

{id: 'directory', visible: false},
{id: 'hash', visible: false},
{id: 'isPrivate', visible: false},
Expand All @@ -41,6 +42,7 @@ const defaultFloodSettings: Readonly<FloodSettings> = {
seeds: 100,
dateAdded: 100,
dateCreated: 100,
dateFinished: 100,
directory: 100,
hash: 100,
isPrivate: 100,
Expand Down