Skip to content

Add fallback when a there is no preview for a version - #38467

Merged
artonge merged 2 commits into
masterfrom
artonge/fix/files_versions_preview
May 25, 2023
Merged

Add fallback when a there is no preview for a version#38467
artonge merged 2 commits into
masterfrom
artonge/fix/files_versions_preview

Conversation

@artonge

@artongeartonge commented May 25, 2023

Copy link
Copy Markdown
Collaborator

Fix#37067

Before (Chrome)Before (Firefox)After
Screenshot from 2023-05-25 15-43-15Screenshot from 2023-05-25 15-43-06Screenshot from 2023-05-25 15-42-08

@nextcloud/designers Unsure about the new icon. Do you prefer to go with the "After" version, or the "Firefox" one?
No icon could be confusing because the user might think that the file is empty, even though it might not.

@artongeartonge self-assigned this May 25, 2023
@artongeartonge added this to the Nextcloud 28 milestone May 25, 2023
@artonge
artonge requested review from a team, Pytal, nfebe and susnux and removed request for a teamMay 25, 2023 13:41
@artonge
artongeforce-pushed the artonge/fix/files_versions_preview branch from f3981d8 to 48bf654CompareMay 25, 2023 13:42
Comment threadapps/files_versions/src/components/Version.vue Outdated

@szaimenszaimen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

One small suggestion, apart from that tested and works and LGTM!

@artonge

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable27

@artonge

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable26

@artonge

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable25

@nimishavijaynimishavijay left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Good call! The "After" version definitely looks better as you said, and agreed with @szaimen that it can be a lighter color :)

@artonge

Copy link
Copy Markdown
CollaboratorAuthor

/compile amend /

@nextcloud-command
nextcloud-commandforce-pushed the artonge/fix/files_versions_preview branch from ec5c8f9 to 1b3fbb1CompareMay 25, 2023 20:58
artonge added 2 commits May 25, 2023 23:46
Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
artongeforce-pushed the artonge/fix/files_versions_preview branch from 1b3fbb1 to e8eb8a9CompareMay 25, 2023 21:46
@artonge
artonge enabled auto-merge May 25, 2023 22:20
@artonge
artonge merged commit fe146a9 into masterMay 25, 2023
@artonge
artonge deleted the artonge/fix/files_versions_preview branch May 25, 2023 23:14
@backportbot-nextcloud

Copy link
Copy Markdown

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

@backportbot-nextcloud

Copy link
Copy Markdown

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

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# 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-stable26

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

@backportbot-nextcloud

Copy link
Copy Markdown

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

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# 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-stable25

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

@artonge

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable25

@backportbot-nextcloud

Copy link
Copy Markdown

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

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# 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-stable25

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

@solracsf

Copy link
Copy Markdown
Member

/backport to stable27

@solracsf

Copy link
Copy Markdown
Member

/backport to stable26

@solracsf

Copy link
Copy Markdown
Member

/backport to stable25

@backportbot-nextcloud

Copy link
Copy Markdown

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

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# 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-stable26

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

@backportbot-nextcloud

Copy link
Copy Markdown

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

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# 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-stable25

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

@backportbot-nextcloud

Copy link
Copy Markdown

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

@solracsf

Copy link
Copy Markdown
Member

Must be backported manually if needed, it seems 😞

Sign up for freeto 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.

Versions tab shows broken image for empty files

7 participants

@artonge@solracsf@nfebe@Pytal@szaimen@nimishavijay@skjnldsv