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

feat: Compare files side by side #1835

Merged
merged 2 commits into from Aug 8, 2023
Merged

Conversation

juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented Aug 3, 2023

Contributes to nextcloud/server#39140

@juliushaertl
Copy link
Member Author

@skjnldsv I'd much appreciate an early review even though still in draft.

One topic I was unsure about was how we want to determine which handlers support the comparison view. For now I keep a allow list in https://github.com/nextcloud/server/pull/39171/files#diff-8c16136a0fe1baf1357890af01439aebe1da2380f96f80afb1eab039157311b8R111 but was thinking if we should just have a supportsComparison property on the handler registration instead.

@juliushaertl juliushaertl added enhancement New feature or request 2. developing Work in progress labels Aug 3, 2023
@juliushaertl juliushaertl added this to the Nextcloud 28 milestone Aug 3, 2023
@skjnldsv
Copy link
Member

skjnldsv commented Aug 3, 2023

if we should just have a supportsComparison property on the handler registration instead.

Defnitely!
Every handler should provide if they supports comparison or not 👍

src/views/Viewer.vue Outdated Show resolved Hide resolved
@juliushaertl
Copy link
Member Author

@jancborchardt @marcoambrosini Does it make sense to add images for side by side comparison? Videos/audio probably don't as per nextcloud/server#39140 (comment)

This would also give us at least one default handler we can use in server cypress tests for versions then. Otherwise I'd just cover this with tests in text.

@juliushaertl juliushaertl marked this pull request as ready for review August 7, 2023 08:15
@juliushaertl juliushaertl added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 7, 2023
@marcoambrosini
Copy link
Member

@juliushaertl I don't think we have interesting use-cases for that, but I might be missing something :)

@juliushaertl
Copy link
Member Author

Will push some tests in text then for this feature.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl
Copy link
Member Author

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@skjnldsv
Copy link
Member

skjnldsv commented Aug 8, 2023

Cypress failure is also present on master, haven't found the time to adjust

@juliushaertl juliushaertl merged commit ffd1c24 into master Aug 8, 2023
22 of 27 checks passed
@juliushaertl juliushaertl deleted the feat/version-comparison branch August 8, 2023 14:29
@skjnldsv
Copy link
Member

skjnldsv commented Aug 8, 2023

/backport to stable27

@backportbot-nextcloud backportbot-nextcloud bot added the backport-request Pending backport by the backport-bot label Aug 8, 2023
@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@skjnldsv
Copy link
Member

skjnldsv commented Aug 8, 2023

/backport to stable27

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@mejo-
Copy link
Member

mejo- commented Aug 8, 2023

/backport 6b67e4e to stable27

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@juliushaertl
Copy link
Member Author

/backport 6b67e4e to stable27

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@juliushaertl juliushaertl removed the backport-request Pending backport by the backport-bot label Jan 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants