aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/src/components/FileEntry.vue
diff options
context:
space:
mode:
authorFerdinand Thiessen <opensource@fthiessen.de>2024-11-14 23:24:47 +0100
committerFerdinand Thiessen <opensource@fthiessen.de>2024-11-16 22:00:30 +0100
commitc06723c44afbc16cf85d316fb086887c18de09c7 (patch)
tree514848f120c78b6e1970cf7ff1ba62ef1328dfa2 /apps/files/src/components/FileEntry.vue
parent67a02fa611c8a88dc500cff2c93033bb3db436b7 (diff)
downloadnextcloud-server-c06723c44afbc16cf85d316fb086887c18de09c7.tar.gz
nextcloud-server-c06723c44afbc16cf85d316fb086887c18de09c7.zip
refactor(files): Adjust `useNavigation` composable to enforce active view
In some cases it is guaranteed that we have a proper active view, e.g. when the file list is loaded (so within FileEntry* components). This does not change anything but the Typescript types, so the `currentView` is typed as `View` instead of `View | null“. Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'apps/files/src/components/FileEntry.vue')
-rw-r--r--apps/files/src/components/FileEntry.vue7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue
index f6f93be1dc8..fc5c7fb97f6 100644
--- a/apps/files/src/components/FileEntry.vue
+++ b/apps/files/src/components/FileEntry.vue
@@ -74,7 +74,7 @@
<!-- View columns -->
<td v-for="column in columns"
:key="column.id"
- :class="`files-list__row-${currentView?.id}-${column.id}`"
+ :class="`files-list__row-${currentView.id}-${column.id}`"
class="files-list__row-column-custom"
:data-cy-files-list-row-column-custom="column.id"
@click="openDetailsIfAvailable">
@@ -135,7 +135,8 @@ export default defineComponent({
const filesStore = useFilesStore()
const renamingStore = useRenamingStore()
const selectionStore = useSelectionStore()
- const { currentView } = useNavigation()
+ // The file list is guaranteed to be only shown with active view - thus we can set the `loaded` flag
+ const { currentView } = useNavigation(true)
const {
directory: currentDir,
fileId: currentFileId,
@@ -180,7 +181,7 @@ export default defineComponent({
if (this.filesListWidth < 512 || this.compact) {
return []
}
- return this.currentView?.columns || []
+ return this.currentView.columns || []
},
size() {