Add sort by date in history page #7157

anurag2787 · 2025-04-06T18:09:34Z

Pull Request Type

Bugfix
Feature Implementation
Documentation
Other

Related issue

Description

In this PR i have added sort button in the history page where allowing user can organize their watch history either by Latest First or Oldest First where it will shows the watch history in ascending or descending order

Testing

Icon should change

Change the sort order using sort dropdown
Check and verify that the icon updates reflect or not on changing the sort order

Earliest first should not show latest when new entry added

Set sort order to Earliest Watched First
Add a new history by watching any new video
Verify that the new entry appears at the end not at the top

Sorting doesn't change when user uses keywords to filter

Set a sort order (Any Latest Watched First or Earliest Watched First)
Enter a search keywords in the search bar
Verify that the filtered results remains in the same sort order as before the search

Sort order change affects all other windows and new windows and future app instances

Set a sort order in one window (Any Latest Watched First or Earliest Watched First)
Open a new window in FreeTube or restart it
Verify that the selected sort order is preserved in second window or after restarting it.

General regression

Switch between sort orders and perform searches repeatedly
Confirm that the UI updates correctly and no unexpected behavior occurs

Demo

Sort By Oldest First

Sort By Latest First

Desktop

OS: Windows 11
OS Version: 24H2 (OS Build 26100.3476)
FreeTube version: 0.23.2

efb4f5ff-1298-471a-8973-3d47447115dc · 2025-04-06T21:21:13Z

Hi @anurag2787 nice to see a pr from you again. Did you already take a look at #6214 and the feedback we left on that

Copilot

Copilot reviewed 5 out of 6 changed files in this pull request and generated 1 comment.

Files not reviewed (1)

src/renderer/views/History/History.css: Language not supported

Comments suppressed due to low confidence (1)

static/locales/en-US.yaml:53

There is a trailing whitespace at the end of the 'Latest First' text which should be removed for consistency.

DateNewestHistory: Latest First

Copilot · 2025-04-06T21:28:20Z

src/renderer/views/History/History.vue

+          :value="sortOrder"
+          :select-names="sortByNames"
+          :select-values="sortByValues"
+          :icon="getIconForSortPreference(setHistorySortOrder)"


The getIconForSortPreference function is receiving setHistorySortOrder as its argument; it likely should receive the current sort order (e.g., the value from sortOrder) to determine the correct icon.

Suggested change

:icon="getIconForSortPreference(setHistorySortOrder)"

:icon="getIconForSortPreference(sortOrder)"

tested how copilot would work on this PR. Please disregard if this is a non issue.

anurag2787 · 2025-04-07T09:27:06Z

In getIconForSortPreference function instead of passing setHistorySortOrder i have passed the value of it sortOrder so that it can determine the correct icon

efb4f5ff-1298-471a-8973-3d47447115dc

Icon doesnt change like on other pages.

VirtualBoxVM_4KNwAlFBhV.mp4

efb4f5ff-1298-471a-8973-3d47447115dc · 2025-04-08T21:37:40Z

static/locales/en-US.yaml

@@ -49,6 +49,8 @@ Global:
  Live: Live
  Community: Community
  Sort By: Sort By
+  DateOldestHistory: Oldest First


Suggested change

DateOldestHistory: Oldest First

DateOldestHistory: Earliest Watched First

efb4f5ff-1298-471a-8973-3d47447115dc · 2025-04-08T21:37:58Z

static/locales/en-US.yaml

@@ -49,6 +49,8 @@ Global:
  Live: Live
  Community: Community
  Sort By: Sort By
+  DateOldestHistory: Oldest First
+  DateNewestHistory: Latest First 


Suggested change

DateNewestHistory: Latest First

DateNewestHistory: Latest Watched First

anurag2787 · 2025-04-12T07:30:06Z

Fixed Icon change like on other pages

12.04.2025_12.46.03_REC.mp4

Also Updated history sort labels

PikachuEXE

It works but I wonder why the new translation keys are added to Global not History

anurag2787 · 2025-04-15T14:01:36Z

I have fixed it, the new translation keys now been added to the History instead of Global

Not quite done reviewing

kommunarr

issue (blocking): When setting order to Earliest Watched First and then new history entries are added, they're shown at the start instead of the end, despite them being the latest entries watched. I believe this is because upsertToHistoryCache is not updated to handle non-default sort methods.

kommunarr · 2025-04-26T14:19:56Z

src/renderer/store/modules/history.js


 const state = {
  historyCacheSorted: [],
+  useAscendingOrder: HISTORY_SORT_BY_VALUES.DateAddedNewest,


Suggested change

useAscendingOrder: HISTORY_SORT_BY_VALUES.DateAddedNewest,

sortOrder: HISTORY_SORT_BY_VALUES.DateAddedNewest,

suggestion: Update variable name and concomitant uses to better reflect its type (sort type, not boolean).

github-actions · 2025-06-18T05:29:19Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2025-06-18T06:21:02Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

anurag2787 · 2025-06-18T06:42:10Z

I have accidentally pushed yarn.lock file in my commit and am now facing some difficulties reverting it back to the original state could you please help me to resolve this

PikachuEXE · 2025-06-19T00:22:10Z

Reversed

PikachuEXE

Changes since my last approval: (for other reviewers

github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Apr 6, 2025

FreeTubeBot enabled auto-merge (squash) April 6, 2025 18:09

efb4f5ff-1298-471a-8973-3d47447115dc requested a review from Copilot April 6, 2025 21:27

Copilot AI reviewed Apr 6, 2025

View reviewed changes

auto-merge was automatically disabled April 7, 2025 09:24
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) April 7, 2025 09:24

efb4f5ff-1298-471a-8973-3d47447115dc requested changes Apr 8, 2025

View reviewed changes

efb4f5ff-1298-471a-8973-3d47447115dc added PR: changes requested and removed PR: waiting for review For PRs that are complete, tested, and ready for review labels Apr 8, 2025

anurag2787 requested a review from efb4f5ff-1298-471a-8973-3d47447115dc April 12, 2025 07:20

auto-merge was automatically disabled April 12, 2025 07:28
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) April 12, 2025 07:28

efb4f5ff-1298-471a-8973-3d47447115dc previously approved these changes Apr 12, 2025

View reviewed changes

efb4f5ff-1298-471a-8973-3d47447115dc added PR: waiting for review For PRs that are complete, tested, and ready for review and removed PR: changes requested labels Apr 13, 2025

PikachuEXE changed the title ~~Added sort by date~~ Add sort by date in history page Apr 14, 2025

PikachuEXE reviewed Apr 14, 2025

View reviewed changes

auto-merge was automatically disabled April 15, 2025 13:58
Head branch was pushed to by a user without write access

anurag2787 dismissed efb4f5ff-1298-471a-8973-3d47447115dc’s stale review via 8983743 April 15, 2025 13:58

FreeTubeBot enabled auto-merge (squash) April 15, 2025 13:58

efb4f5ff-1298-471a-8973-3d47447115dc previously approved these changes Apr 15, 2025

View reviewed changes

PikachuEXE previously approved these changes Apr 16, 2025

View reviewed changes

PikachuEXE requested review from absidue and ChunkyProgrammer April 16, 2025 00:32

kommunarr requested changes Apr 26, 2025

View reviewed changes

efb4f5ff-1298-471a-8973-3d47447115dc added the PR: changes requested label Jun 13, 2025

anurag2787 added 3 commits June 18, 2025 05:28

Removed unused code

343ba88

Has resolved the conflicts

44e2cbd

resolved branch conflicts

022972e

auto-merge was automatically disabled June 18, 2025 05:29
Head branch was pushed to by a user without write access

anurag2787 dismissed PikachuEXE’s stale review via 343ba88 June 18, 2025 05:29

FreeTubeBot enabled auto-merge (squash) June 18, 2025 05:29

github-actions bot added the PR: merge conflicts / rebase needed label Jun 18, 2025

auto-merge was automatically disabled June 18, 2025 05:33
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) June 18, 2025 05:33

anurag2787 and others added 2 commits June 18, 2025 11:05

Fixed conflict

48cbd2b

Revert yarn.lock to match development branch

e16d423

auto-merge was automatically disabled June 18, 2025 05:35
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) June 18, 2025 05:35

auto-merge was automatically disabled June 18, 2025 06:06
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) June 18, 2025 06:06

auto-merge was automatically disabled June 18, 2025 06:20
Head branch was pushed to by a user without write access

anurag2787 force-pushed the added-sort-in-history branch from c82969d to e16d423 Compare June 18, 2025 06:20

FreeTubeBot enabled auto-merge (squash) June 18, 2025 06:21

github-actions bot removed the PR: merge conflicts / rebase needed label Jun 18, 2025

Reverse yarn.lock changes

2b11bb5

Removed unused import

bfbd46d

auto-merge was automatically disabled June 23, 2025 09:11
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) June 23, 2025 09:11

efb4f5ff-1298-471a-8973-3d47447115dc requested a review from PikachuEXE June 28, 2025 09:26

PikachuEXE approved these changes Jun 29, 2025

View reviewed changes

	:icon="getIconForSortPreference(setHistorySortOrder)"
	:icon="getIconForSortPreference(sortOrder)"

	DateOldestHistory: Oldest First
	DateOldestHistory: Earliest Watched First

	DateNewestHistory: Latest First
	DateNewestHistory: Latest Watched First

	useAscendingOrder: HISTORY_SORT_BY_VALUES.DateAddedNewest,
	sortOrder: HISTORY_SORT_BY_VALUES.DateAddedNewest,

Add sort by date in history page #7157

Are you sure you want to change the base?

Add sort by date in history page #7157

Uh oh!

Conversation

anurag2787 commented Apr 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Type

Related issue

Description

Testing

Icon should change

Earliest first should not show latest when new entry added

Sorting doesn't change when user uses keywords to filter

Sort order change affects all other windows and new windows and future app instances

General regression

Demo

Sort By Oldest First

Sort By Latest First

Desktop

Uh oh!

efb4f5ff-1298-471a-8973-3d47447115dc commented Apr 6, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 6, 2025

Choose a reason for hiding this comment

Uh oh!

efb4f5ff-1298-471a-8973-3d47447115dc Apr 6, 2025

Choose a reason for hiding this comment

Uh oh!

anurag2787 commented Apr 7, 2025

Uh oh!

efb4f5ff-1298-471a-8973-3d47447115dc left a comment

Choose a reason for hiding this comment

Uh oh!

efb4f5ff-1298-471a-8973-3d47447115dc Apr 8, 2025

Choose a reason for hiding this comment

Uh oh!

efb4f5ff-1298-471a-8973-3d47447115dc Apr 8, 2025

Choose a reason for hiding this comment

Uh oh!

anurag2787 commented Apr 12, 2025

Uh oh!

PikachuEXE left a comment

Choose a reason for hiding this comment

Uh oh!

anurag2787 commented Apr 15, 2025

Uh oh!

kommunarr left a comment

Choose a reason for hiding this comment

Uh oh!

kommunarr Apr 26, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jun 18, 2025

Uh oh!

github-actions bot commented Jun 18, 2025

Uh oh!

anurag2787 commented Jun 18, 2025

Uh oh!

PikachuEXE commented Jun 19, 2025

Uh oh!

PikachuEXE left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

anurag2787 commented Apr 6, 2025 •

edited

Loading