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.

Sign up for GitHub

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

Jump to bottom

fix(ConflictPicker): Ensure component works also if browser does not support FileSystemEntry #1171

Merged
merged 1 commit into from
Apr 25, 2024
Merged

fix(ConflictPicker): Ensure component works also if browser does not support FileSystemEntry #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lib/components/ConflictPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadi
import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'

import { isFileSystemEntry } from '../utils/filesystem.ts'
import { n, t } from '../utils/l10n.ts'
import logger from '../utils/logger.ts'
import NodesPicker from './NodesPicker.vue'
Expand Down Expand Up @@ -250,7 +251,7 @@ export default defineComponent({
mounted() {
// Using map keep the same order
this.files = this.conflicts.map((conflict: File|FileSystemEntry|Node) => {
const name = (conflict instanceof File || conflict instanceof FileSystemEntry) ? conflict.name : conflict.basename
const name = (conflict instanceof File || isFileSystemEntry(conflict)) ? conflict.name : conflict.basename
return this.content.find((node: Node) => node.basename === name)
}).filter(Boolean) as Node[]

Expand Down Expand Up @@ -302,17 +303,17 @@ export default defineComponent({
// Files that got selected twice (new and old) gets renamed
const renamed = [] as (File|FileSystemEntry|Node)[]
const toRename = (this.newSelected as (File|FileSystemEntry|Node)[]).filter((node) => {
const name = (node instanceof File || node instanceof FileSystemEntry) ? node.name : node.basename
const name = (node instanceof File || isFileSystemEntry(node)) ? node.name : node.basename
return selectedOldNames.includes(name)
})

// Rename files
if (toRename.length > 0) {
toRename.forEach(file => {
const name = (file instanceof File || file instanceof FileSystemEntry) ? file.name : file.basename
const name = (file instanceof File || isFileSystemEntry(file)) ? file.name : file.basename
const newName = this.getUniqueName(name, directoryContent)
// If File, create a new one with the new name
if (file instanceof File || file instanceof FileSystemEntry) {
if (file instanceof File || isFileSystemEntry(file)) {
// Keep the original file object and force rename
Object.defineProperty(file, 'name', { value: newName })
renamed.push(file)
Expand All @@ -327,7 +328,7 @@ export default defineComponent({

// Remove files that got renamed from the new selection
const selected = (this.newSelected as (File|FileSystemEntry|Node)[]).filter((node) => {
const name = (node instanceof File || node instanceof FileSystemEntry) ? node.name : node.basename
const name = (node instanceof File || isFileSystemEntry(node)) ? node.name : node.basename
// files that are not in the old selection
return !selectedOldNames.includes(name) && !toRename.includes(node)
}) as (File|Node)[]
Expand Down
3 changes: 2 additions & 1 deletion lib/components/NodesPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ import FolderSvg from 'vue-material-design-icons/Folder.vue'
import NcDateTime from '@nextcloud/vue/dist/Components/NcDateTime.js'
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'

import { isFileSystemEntry } from '../utils/filesystem'
import { t } from '../utils/l10n.ts'

const PREVIEW_SIZE = 64
Expand Down Expand Up @@ -231,7 +232,7 @@ export default defineComponent({
},

isFolder(node: File|FileSystemEntry|Node): boolean {
if ('FileSystemEntry' in window && node instanceof FileSystemEntry) {
if (isFileSystemEntry(node)) {
return node.isDirectory
}
// For typescript cast it as we are sure it is no FileSystemEntry here
Expand Down
8 changes: 8 additions & 0 deletions lib/utils/filesystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Helpers for the File and Directory API

// Helper to support browser that do not support the API
export const isFileSystemDirectoryEntry = (o: unknown): o is FileSystemDirectoryEntry => 'FileSystemDirectoryEntry' in window && o instanceof FileSystemDirectoryEntry

export const isFileSystemFileEntry = (o: unknown): o is FileSystemFileEntry => 'FilesystemFileEntry' in window && o instanceof FileSystemFileEntry

export const isFileSystemEntry = (o: unknown): o is FileSystemEntry => 'FileSystemEntry' in window && o instanceof FileSystemEntry
Loading