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
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import {
FolderView,
ResourceTable,
SortField,
useCapabilityStore,
useConfigStore,
useFileActions,
Expand All @@ -93,8 +94,6 @@ import { useSelectedResources } from '@opencloud-eu/web-pkg'
import { RouteLocationNamedRaw } from 'vue-router'
import { CreateTargetRouteOptions } from '@opencloud-eu/web-pkg'
import { createFileRouteOptions } from '@opencloud-eu/web-pkg'
import { useResourcesViewDefaults } from '../../composables'
import { folderViewsSharedWithMeExtensionPoint } from '../../extensionPoints'

export default defineComponent({
components: {
Expand Down Expand Up @@ -161,6 +160,18 @@ export default defineComponent({
type: Number,
default: 0
},
viewMode: {
type: String,
required: true
},
viewSize: {
type: Number,
required: true
},
sortFields: {
type: Object as PropType<SortField[]>,
required: true
},

/**
* This is only relevant for CERN and can be ignored in any other cases.
Expand All @@ -171,16 +182,12 @@ export default defineComponent({
default: null
}
},
setup() {
setup(props) {
const capabilityStore = useCapabilityStore()
const configStore = useConfigStore()
const { getMatchingSpace } = useGetMatchingSpace()

const { viewMode, viewSize, sortFields } = useResourcesViewDefaults({
folderViewExtensionPoint: folderViewsSharedWithMeExtensionPoint
})

const { loadPreview } = useLoadPreview(viewMode)
const { loadPreview } = useLoadPreview(computed(() => props.viewMode))

const { triggerDefaultAction } = useFileActions()
const { actions: hideShareActions } = useFileActionsToggleHideShare()
Expand Down Expand Up @@ -214,10 +221,7 @@ export default defineComponent({
updateResourceField,
isExternalShare,
ShareTypes,
loadPreview,
viewMode,
viewSize,
sortFields
loadPreview
}
},

Expand Down
3 changes: 3 additions & 0 deletions packages/web-app-files/src/views/shares/SharedWithMe.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@
areHiddenFilesShown ? $gettext('No hidden shares') : $gettext('No shares')
"
:grouping-settings="groupingSettings"
:view-mode="viewMode"
:view-size="viewSize"
:sort-fields="sortFields"
/>
</template>
</files-view-wrapper>
Expand Down
3 changes: 2 additions & 1 deletion packages/web-pkg/src/components/FilesList/ResourceTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ defineSlots<{
usedQuota?: (props: { resource: Resource }) => unknown
remainingQuota?: (props: { resource: Resource }) => unknown
quickActions?: (props: { resource: Resource }) => unknown
contextMenu?: (props: { resource: Resource; isOpen: boolean }) => unknown
contextMenu?: (props: { resource: Resource }) => unknown
footer?: () => unknown
}>()

Expand Down Expand Up @@ -1200,6 +1200,7 @@ const getSharedWithAvatarItems = (resource: Resource) => {
.resource-table-resource-wrapper-limit-max-width {
max-width: calc(100% - 4 * var(--spacing));
}

.oc-table.condensed > tbody > tr {
@apply h-0;
}
Expand Down
5 changes: 2 additions & 3 deletions tests/e2e/cucumber/features/navigation/shortcut.feature
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@ Feature: Users can create shortcuts for resources and sites
| resource | name | type |
| testavatar.jpg | logo | file |
And "Brian" opens a shortcut "logo.url"
# issue #1360
# Then "Brian" is in a media-viewer
# And "Brian" closes the file viewer
Then "Brian" is in a media-viewer
And "Brian" closes the file viewer

# create a shortcut to the public link
When "Brian" opens the "files" app
Expand Down