Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 2 additions & 12 deletions packages/web-pkg/src/components/FilesList/ResourceTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
:parent-folder-link-icon-additional-attributes="
getParentFolderLinkIconAdditionalAttributes(item)
"
:class="{ 'opacity-70': isResourceCut(item) }"
:class="{ 'opacity-60': isResourceCut(item) }"
@click.stop="fileNameClicked({ resource: item, event: $event })"
/>
<oc-button
Expand Down Expand Up @@ -278,7 +278,6 @@ import {
FolderViewModeConstants,
useAuthStore,
useCapabilityStore,
useClipboardStore,
useEmbedMode,
useFolderLink,
useGetMatchingSpace,
Expand All @@ -296,7 +295,6 @@ import { formatDateFromJSDate, formatRelativeDateFromJSDate } from '../../helper
import { SideBarEventTopics } from '../../composables/sideBar'
import ContextMenuQuickAction from '../ContextActions/ContextMenuQuickAction.vue'
import { useInterceptModifierClick } from '../../composables/keyboardActions'
import { ClipboardActions } from '../../helpers/clipboardActions'
import { determineResourceTableSortFields } from '../../helpers/ui/resourceTable'
import { FileActionOptions, useFileActionsRename } from '../../composables/actions'
import { createLocationCommon } from '../../router'
Expand Down Expand Up @@ -399,6 +397,7 @@ const {
isResourceDisabled,
isResourceInDeleteQueue,
isResourceClickable,
isResourceCut,
getResourceLink,
dragItem,
dragSelection,
Expand All @@ -419,9 +418,6 @@ const {
emit
})

const clipboardStore = useClipboardStore()
const { resources: clipboardResources, action: clipboardAction } = storeToRefs(clipboardStore)

const authStore = useAuthStore()
const { userContextReady } = storeToRefs(authStore)

Expand Down Expand Up @@ -636,12 +632,6 @@ const fields = computed(() => {
return fields
})

const isResourceCut = (resource: Resource) => {
if (unref(clipboardAction) !== ClipboardActions.Cut) {
return false
}
return unref(clipboardResources).some((r) => r.id === resource.id)
}
const getTagLink = (tag: string) => {
const currentTerm = unref(router.currentRoute).query?.term
return createLocationCommon('files-common-search', {
Expand Down
2 changes: 2 additions & 0 deletions packages/web-pkg/src/components/FilesList/ResourceTiles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
:draggable="dragDrop"
:lazy="areTilesLazy"
:is-loading="isResourceInDeleteQueue(resource.id)"
:class="{ 'opacity-60': isResourceCut(resource) }"
@contextmenu="showContextMenuOnRightClick($event, resource)"
@file-name-clicked.stop="(event) => fileNameClicked({ resource, event })"
@dragstart="dragStart(resource, $event)"
Expand Down Expand Up @@ -220,6 +221,7 @@ const {
isResourceDisabled,
isResourceInDeleteQueue,
isResourceClickable,
isResourceCut,
getResourceLink,
dragItem,
dragSelection,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { computed, Ref, unref } from 'vue'
import { useResourcesStore } from '../piniaStores'
import { useClipboardStore, useResourcesStore } from '../piniaStores'
import { useRouter } from '../router'
import { useEventBus } from '../eventBus'
import { useInterceptModifierClick } from '../keyboardActions'
Expand All @@ -17,6 +17,8 @@ import { useCanBeOpenedWithSecureView } from './useCanBeOpenedWithSecureView'
import { useFileActions } from '../actions'
import { useResourceViewContextMenu } from './useResourceViewContextMenu'
import { useResourceViewSelection } from './useResourceViewSelection'
import { ClipboardActions } from '../../helpers'
import { storeToRefs } from 'pinia'

/**
* Shared helpers for resource view components (like ResourceTable and ResourceTiles).
Expand Down Expand Up @@ -46,6 +48,9 @@ export const useResourceViewHelpers = ({
postMessage
} = useEmbedMode()

const clipboardStore = useClipboardStore()
const { resources: clipboardResources, action: clipboardAction } = storeToRefs(clipboardStore)

const selectedResources = computed(() => {
return unref(resources).filter((resource) => unref(selectedIds).includes(resource.id))
})
Expand Down Expand Up @@ -102,6 +107,13 @@ export const useResourceViewHelpers = ({
return !isResourceDisabled(resource)
}

const isResourceCut = (resource: Resource) => {
if (unref(clipboardAction) !== ClipboardActions.Cut) {
return false
}
return unref(clipboardResources).some((r) => r.id === resource.id)
}

// tr or tile containing the file clicked
const fileContainerClicked = ({
resource,
Expand Down Expand Up @@ -221,6 +233,7 @@ export const useResourceViewHelpers = ({
isResourceInDeleteQueue,
isResourceDisabled,
isResourceClickable,
isResourceCut,
fileContainerClicked,
fileNameClicked,
fileCheckboxClicked,
Expand Down