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

fix(files): Fix type issues of mixing string and number #41952

Closed
wants to merge 1 commit into from
Closed

fix(files): Fix type issues of mixing string and number #41952

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
58 changes: 34 additions & 24 deletions apps/files/src/components/FileEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@
import type { PropType } from 'vue'

import { extname, join } from 'path'
import { FileType, formatFileSize, Permission, Folder, File as NcFile, NodeStatus, Node, View } from '@nextcloud/files'
import { FileType, formatFileSize, Permission, Folder, File as NcFile, NodeStatus, Node as NcNode, View, Navigation } from '@nextcloud/files'
import { getUploader } from '@nextcloud/upload'
import { showError } from '@nextcloud/dialogs'
import { translate as t } from '@nextcloud/l10n'
import { vOnClickOutside } from '@vueuse/components'
import moment from '@nextcloud/moment'
import Vue from 'vue'
import Vue, { defineComponent } from 'vue'

import { action as sidebarAction } from '../actions/sidebarAction.ts'
import { getDragAndDropPreview } from '../utils/dragUtils.ts'
Expand All @@ -132,7 +132,7 @@ import logger from '../logger.js'

Vue.directive('onClickOutside', vOnClickOutside)

export default Vue.extend({
export default defineComponent({
name: 'FileEntry',

components: {
Expand All @@ -153,12 +153,16 @@ export default Vue.extend({
type: Boolean,
default: false,
},
/**
* The source to render
* Only valid nodes can be rendered, so the fileId is required to be set on source!
*/
source: {
type: [Folder, NcFile, Node] as PropType<Node>,
type: [Folder, NcFile, NcNode] as PropType<NcNode>,
required: true,
},
nodes: {
type: Array as PropType<Node[]>,
type: Array as PropType<NcNode[]>,
required: true,
},
filesListWidth: {
Expand Down Expand Up @@ -194,8 +198,8 @@ export default Vue.extend({
},

computed: {
currentView(): View {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why remove the typing?

Copy link
Contributor Author

@susnux susnux Dec 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Because it was wrong, the correct type would be View | null as this is the type of Navigation.active .
So the correct typing is inferred.

return this.$navigation.active as View
currentView() {
return (this.$navigation as Navigation).active
},
columns() {
// Hide columns if the list is too small
Expand All @@ -210,10 +214,12 @@ export default Vue.extend({
return (this.$route?.query?.dir?.toString() || '/').replace(/^(.+)\/$/, '$1')
},
currentFileId() {
return this.$route.params?.fileid || this.$route.query?.fileid || null
const text = this.$route.params?.fileid || this.$route.query?.fileid
return text ? parseInt(text) : null
},
fileid() {
return this.source?.fileid?.toString?.()
// We do not render files without file ID see files store
return this.source.fileid!
},
uniqueId() {
return hashCode(this.source.source)
Expand All @@ -238,7 +244,7 @@ export default Vue.extend({
},

size() {
const size = parseInt(this.source.size, 10) || 0
const size = this.source.size ?? 0
if (typeof size !== 'number' || size < 0) {
return t('files', 'Pending')
}
Expand All @@ -247,12 +253,12 @@ export default Vue.extend({
sizeOpacity() {
const maxOpacitySize = 10 * 1024 * 1024

const size = parseInt(this.source.size, 10) || 0
const size = this.source.size ?? 0
if (!size || size < 0) {
return {}
}

const ratio = Math.round(Math.min(100, 100 * Math.pow((this.source.size / maxOpacitySize), 2)))
const ratio = Math.round(Math.min(100, 100 * Math.pow(((this.source.size ?? 0) / maxOpacitySize), 2)))
return {
color: `color-mix(in srgb, var(--color-main-text) ${ratio}%, var(--color-text-maxcontrast))`,
}
Expand Down Expand Up @@ -299,17 +305,17 @@ export default Vue.extend({
},

isActive() {
return this.fileid === this.currentFileId?.toString?.()
return this.fileid === this.currentFileId
},

canDrag() {
const canDrag = (node: Node): boolean => {
const canDrag = (node: NcNode): boolean => {
return (node?.permissions & Permission.UPDATE) !== 0
}

// If we're dragging a selection, we need to check all files
if (this.selectedFiles.length > 0) {
const nodes = this.selectedFiles.map(fileid => this.filesStore.getNode(fileid)) as Node[]
const nodes = this.selectedFiles.map(fileid => this.filesStore.getNode(fileid)) as NcNode[]
return nodes.every(canDrag)
}
return canDrag(this.source)
Expand Down Expand Up @@ -357,7 +363,7 @@ export default Vue.extend({
// Reset loading state
this.loading = ''

this.$refs.preview.reset()
this.$refs.preview?.reset?.()

// Close menu
this.openedMenu = false
Expand All @@ -380,19 +386,23 @@ export default Vue.extend({
},

execDefaultAction(...args) {
this.$refs.actions.execDefaultAction(...args)
this.$refs.actions?.execDefaultAction?.(...args)
},

openDetailsIfAvailable(event) {
event.preventDefault()
event.stopPropagation()
if (sidebarAction?.enabled?.([this.source], this.currentView)) {
if (this.currentView && sidebarAction?.enabled?.([this.source], this.currentView)) {
sidebarAction.exec(this.source, this.currentView, this.currentDir)
}
},

onDragOver(event: DragEvent) {
this.dragover = this.canDrop
if (!event.dataTransfer) {
return
}

if (!this.canDrop) {
event.dataTransfer.dropEffect = 'none'
return
Expand Down Expand Up @@ -438,7 +448,7 @@ export default Vue.extend({
}

const nodes = this.draggingStore.dragging
.map(fileid => this.filesStore.getNode(fileid)) as Node[]
.map(fileid => this.filesStore.getNode(fileid)) as NcNode[]

const image = await getDragAndDropPreview(nodes)
event.dataTransfer?.setDragImage(image, -10, -10)
Expand Down Expand Up @@ -474,18 +484,18 @@ export default Vue.extend({
return
}

const nodes = this.draggingFiles.map(fileid => this.filesStore.getNode(fileid)) as Node[]
nodes.forEach(async (node: Node) => {
const nodes = this.draggingFiles.map(fileid => this.filesStore.getNode(fileid)) as NcNode[]
nodes.forEach(async (node: NcNode) => {
Vue.set(node, 'status', NodeStatus.LOADING)
try {
// TODO: resolve potential conflicts prior and force overwrite
await handleCopyMoveNodeTo(node, this.source, isCopy ? MoveCopyAction.COPY : MoveCopyAction.MOVE)
await handleCopyMoveNodeTo(node, this.source as Folder, isCopy ? MoveCopyAction.COPY : MoveCopyAction.MOVE)
} catch (error) {
logger.error('Error while moving file', { error })
if (isCopy) {
showError(t('files', 'Could not copy {file}. {message}', { file: node.basename, message: error.message || '' }))
showError(t('files', 'Could not copy {file}. {message}', { file: node.basename, message: (error as Error).message || '' }))
} else {
showError(t('files', 'Could not move {file}. {message}', { file: node.basename, message: error.message || '' }))
showError(t('files', 'Could not move {file}. {message}', { file: node.basename, message: (error as Error).message || '' }))
}
} finally {
Vue.set(node, 'status', undefined)
Expand Down
20 changes: 14 additions & 6 deletions apps/files/src/components/FileEntry/FileEntryCheckbox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@
</template>

<script lang="ts">
import { Node } from '@nextcloud/files'
import type { Node } from '@nextcloud/files'
import type { PropType } from 'vue'

import { translate as t } from '@nextcloud/l10n'
import Vue, { PropType } from 'vue'
import { defineComponent } from 'vue'

import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
Expand All @@ -41,7 +43,7 @@ import { useKeyboardStore } from '../../store/keyboard.ts'
import { useSelectionStore } from '../../store/selection.ts'
import logger from '../../logger.js'

export default Vue.extend({
export default defineComponent({
name: 'FileEntryCheckbox',

components: {
Expand All @@ -55,7 +57,7 @@ export default Vue.extend({
required: true,
},
fileid: {
type: String,
type: Number,
required: true,
},
isLoading: {
Expand Down Expand Up @@ -85,12 +87,17 @@ export default Vue.extend({
return this.selectedFiles.includes(this.fileid)
},
index() {
return this.nodes.findIndex((node: Node) => node.fileid === parseInt(this.fileid))
return this.nodes.findIndex((node: Node) => node.fileid === this.fileid)
},
},

methods: {
onSelectionChange(selected: boolean) {
// eslint-disable-next-line jsdoc/require-jsdoc
function isNumber(value: unknown): value is number {
return typeof value === 'number'
}

const newSelectedIndex = this.index
const lastSelectedIndex = this.selectionStore.lastSelectedIndex

Expand All @@ -103,8 +110,9 @@ export default Vue.extend({

const lastSelection = this.selectionStore.lastSelection
const filesToSelect = this.nodes
.map(file => file.fileid?.toString?.())
.map(file => file.fileid)
.slice(start, end + 1)
.filter(isNumber)
artonge marked this conversation as resolved.
Show resolved Hide resolved

// If already selected, update the new selection _without_ the current file
const selection = [...lastSelection, ...filesToSelect]
Expand Down
Loading
Loading