Skip to content

fix(files): sort not working after changing views - #50161

Merged
st3iny merged 1 commit into
masterfrom
fix/files/sort-after-view-change
Jan 16, 2025
Merged

fix(files): sort not working after changing views#50161
st3iny merged 1 commit into
masterfrom
fix/files/sort-after-view-change

Conversation

@st3iny

@st3iny st3iny commented Jan 13, 2025 •
edited
Loading

Copy link
Copy Markdown
Member
  • Resolves: #

Summary

Sorting the tabular view in files breaks if the view is changed twice.

How to reproduce?

  1. Open the files app and sort by size.
  2. Switch to another view, e.g. the "Personal files" view.
  3. Sort again by size -> still works
  4. Switch back to the main files view.
  5. Sort again by size -> sort order doesn't change

Problem: The global $navigation object is not reactive enough and misses some changes.

Before

2025-01-14.13-49-24.mp4

After

2025-01-14.13-51-11.mp4

TODO

  • Record screencasts (before vs. after)
  • Pray that cypress tests still pass
  • Add a cypress test to prevent regressions

Checklist

@st3iny st3iny self-assigned this Jan 13, 2025
@st3iny

st3iny commented Jan 13, 2025

Copy link
Copy Markdown
Member Author

/backport to stable30

@st3iny

st3iny commented Jan 13, 2025

Copy link
Copy Markdown
Member Author

/backport to stable29

@st3iny
st3iny force-pushed the fix/files/sort-after-view-change branch from 446823a to 1c3ec2a Compare January 14, 2025 13:16
@st3iny
st3iny marked this pull request as ready for review January 14, 2025 13:16
@st3iny
st3iny requested a review from skjnldsv as a code owner January 14, 2025 13:16
@st3iny
st3iny requested review from ShGKme and susnux January 14, 2025 13:16
susnux
susnux reviewed Jan 14, 2025
View reviewed changes
Comment thread apps/files/src/main.ts Outdated
@st3iny st3iny added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jan 14, 2025
@st3iny
st3iny marked this pull request as draft January 14, 2025 14:54
@st3iny
st3iny force-pushed the fix/files/sort-after-view-change branch 2 times, most recently from b97a3d2 to c966e04 Compare January 15, 2025 16:32
@st3iny
st3iny marked this pull request as ready for review January 15, 2025 17:26
@st3iny st3iny added 3. to review Waiting for reviews technical debt 🧱 🤔🚀 and removed 2. developing Work in progress labels Jan 15, 2025
@st3iny
st3iny requested a review from susnux January 15, 2025 17:26
ShGKme
ShGKme approved these changes Jan 15, 2025
View reviewed changes
Comment thread apps/files/src/main.ts
Comment on lines -47 to -51
// Init Navigation Service
// This only works with Vue 2 - with Vue 3 this will not modify the source but return just a observer
const Navigation = Vue.observable(getNavigation())
Vue.prototype.$navigation = Navigation

@ShGKme ShGKme Jan 15, 2025

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.

🥳

@susnux susnux Jan 15, 2025

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.

🎉

susnux
susnux approved these changes Jan 15, 2025
View reviewed changes

@susnux susnux 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.

🚀

@st3iny
st3iny force-pushed the fix/files/sort-after-view-change branch from 189daf0 to 18a670b Compare January 15, 2025 21:24
@st3iny st3iny added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 15, 2025
@st3iny
st3iny enabled auto-merge January 15, 2025 21:25
@skjnldsv

skjnldsv commented Jan 16, 2025

Copy link
Copy Markdown
Member

apps/files/src/views/Navigation.cy.ts failure is related

@st3iny
fix(files): sort not working after changing views
835994a 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
@st3iny
st3iny force-pushed the fix/files/sort-after-view-change branch from 18a670b to 835994a Compare January 16, 2025 07:57
@st3iny
st3iny merged commit b2d1df7 into master Jan 16, 2025
@st3iny
st3iny deleted the fix/files/sort-after-view-change branch January 16, 2025 08:07
@backportbot

This comment was marked as resolved.

Sign in to view
@backportbot backportbot Bot mentioned this pull request Jan 16, 2025
Merged
2 tasks
@skjnldsv skjnldsv mentioned this pull request Jan 16, 2025
Merged
@st3iny

This comment was marked as resolved.

Sign in to view
@st3iny st3iny added this to the Nextcloud 31 milestone Jan 20, 2025
@backportbot

This comment was marked as resolved.

Sign in to view
@st3iny st3iny mentioned this pull request Jan 20, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@susnux susnux susnux approved these changes
@skjnldsv skjnldsv skjnldsv approved these changes
@ShGKme ShGKme ShGKme approved these changes

Assignees

@st3iny st3iny

Labels

4. to release Ready to be released and/or waiting for tests to finish backport-request bug feature: files technical debt 🧱 🤔🚀

Projects

💌 📅 👥 Groupware team
Archived in project

Milestone

Nextcloud 31

Development

Successfully merging this pull request may close these issues.

4 participants

@st3iny @skjnldsv @susnux @ShGKme