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.

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

Undo Feature For Remove From Playlist. #5885

Open
wants to merge 9 commits into
base: development
Choose a base branch
from

Conversation

Soham456
Copy link

@Soham456 Soham456 commented Oct 17, 2024

Pull Request Type

  • Feature Implementation

Related issue

closes #5421

Additional context

resolved yarn.lock conflict

@github-actions github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Oct 17, 2024
@FreeTubeBot FreeTubeBot enabled auto-merge (squash) October 17, 2024 09:43
@absidue absidue added the DO NOT MERGE UNTIL AFTER RELEASE Do not merge before the next release as this is not a bug fix label Oct 17, 2024
@absidue
Copy link
Member

absidue commented Oct 22, 2024

Could you please also undo the changes to the unrelated files? This time please do it in this pull request instead of closing and creating a duplicate one.

@@ -129,11 +129,10 @@ function moveVideoDown(videoId, playlistItemId) {
}

/**
* @param {string} videoId
* @param {string} playlistItemId
* @param {string} result
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
* @param {string} result
* @param {any} video

Comment on lines 134 to 135
function removeFromPlaylist(result) {
emit('remove-from-playlist', result)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
function removeFromPlaylist(result) {
emit('remove-from-playlist', result)
function removeFromPlaylist(video) {
emit('remove-from-playlist', video)

@efb4f5ff-1298-471a-8973-3d47447115dc 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 DO NOT MERGE UNTIL AFTER RELEASE Do not merge before the next release as this is not a bug fix labels Oct 23, 2024
@absidue absidue added DO NOT MERGE UNTIL AFTER RELEASE Do not merge before the next release as this is not a bug fix and removed DO NOT MERGE UNTIL AFTER RELEASE Do not merge before the next release as this is not a bug fix labels Oct 23, 2024
auto-merge was automatically disabled October 27, 2024 15:00

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) October 27, 2024 15:00
@Soham456 Soham456 requested a review from absidue October 28, 2024 09:17
@ChunkyProgrammer ChunkyProgrammer added PR: waiting for review For PRs that are complete, tested, and ready for review and removed PR: changes requested labels Nov 3, 2024
Copy link
Collaborator

@PikachuEXE PikachuEXE left a comment

Choose a reason for hiding this comment

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

We already have a file telling editor to use spaces instead of tabs for indent
https://github.com/FreeTubeApp/FreeTube/blob/development/.editorconfig
Please setup your editor (info at https://editorconfig.org) and fix those tabs

Comment on lines 600 to 616
this.removeVideo({
_id: this.playlistId,
videoId: videoData.videoId,
playlistItemId: videoData.playlistItemId,
})

// Update playlist's `lastUpdatedAt`
this.updatePlaylist({ _id: this.playlistId })
showToast(this.$t('User Playlists.SinglePlaylistView.Toast["Video has been removed. Click here to undo."]'), 3000, () => {
this.addVideoBackToPlaylist(videoData);
}
);
} catch (e) {
showToast(this.$t('User Playlists.SinglePlaylistView.Toast.There was a problem with removing this video'))
console.error(e)
}

Copy link
Collaborator

Choose a reason for hiding this comment

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

these
Also remove the last blank line before the end of method?

showToast(this.$t('User Playlists.SinglePlaylistView.Toast.There was a problem with removing this video'))
console.error(e)
showToast(this.$t('User Playlists.SinglePlaylistView.Toast.There was a problem with adding this video back to playlist'));
console.error(e);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please remove unnecessary semicolons

@absidue absidue added PR: changes requested and removed PR: waiting for review For PRs that are complete, tested, and ready for review labels Nov 3, 2024
auto-merge was automatically disabled November 16, 2024 11:47

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) November 16, 2024 11:48
auto-merge was automatically disabled November 16, 2024 12:21

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) November 16, 2024 12:21
Copy link
Collaborator

@PikachuEXE PikachuEXE left a comment

Choose a reason for hiding this comment

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

In src/renderer/views/Playlist/Playlist.vue there is another usage of removeVideoFromPlaylist that should be updated

auto-merge was automatically disabled November 17, 2024 12:47

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) November 17, 2024 12:48
Copy link
Member

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

Choose a reason for hiding this comment

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

Undo should place the video in the same position it was in before. Now it behaves like you have deleted the video and manually added it again to the playlist.

VirtualBoxVM_W0FVtMIPuA.mp4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature Request]: Undo for "Remove from Playlist"
5 participants