Merge pull request #46770 from nextcloud/feat/navigation-files-request

nextcloud · Jul 30, 2024 · b9f35a7 · b9f35a7
2 parents 68864ab + 6427ae1
commit b9f35a7
Show file tree

Hide file tree

Showing 148 changed files with 452 additions and 448 deletions.
diff --git a/apps/files/src/actions/downloadAction.ts b/apps/files/src/actions/downloadAction.ts
@@ -2,9 +2,12 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { generateUrl } from '@nextcloud/router'
+import type { ShareAttribute } from '../../../files_sharing/src/sharing'
+
 import { FileAction, Permission, Node, FileType, View } from '@nextcloud/files'
+import { generateUrl } from '@nextcloud/router'
 import { translate as t } from '@nextcloud/l10n'
+
 import ArrowDownSvg from '@mdi/svg/svg/arrow-down.svg?raw'
 
 const triggerDownload = function(url: string) {
@@ -31,7 +34,7 @@ const isDownloadable = function(node: Node) {
 
 	// If the mount type is a share, ensure it got download permissions.
 	if (node.attributes['mount-type'] === 'shared') {
-		const shareAttributes = JSON.parse(node.attributes['share-attributes'] ?? 'null')
+		const shareAttributes = JSON.parse(node.attributes['share-attributes'] ?? '[]') as Array<ShareAttribute>
 		const downloadAttribute = shareAttributes?.find?.((attribute: { scope: string; key: string }) => attribute.scope === 'permissions' && attribute.key === 'download')
 		if (downloadAttribute !== undefined && downloadAttribute.value === false) {
 			return false

diff --git a/apps/files/src/actions/moveOrCopyActionUtils.ts b/apps/files/src/actions/moveOrCopyActionUtils.ts
@@ -4,6 +4,8 @@
  */
 
 import type { Folder, Node } from '@nextcloud/files'
+import type { ShareAttribute } from '../../../files_sharing/src/sharing'
+
 import { Permission } from '@nextcloud/files'
 import PQueue from 'p-queue'
 
@@ -23,12 +25,6 @@ export const getQueue = () => {
 	return queue
 }
 
-type ShareAttribute = {
-	value: boolean|string|number|null|object|Array<unknown>
-	key: string
-	scope: string
-}
-
 export enum MoveCopyAction {
 	MOVE = 'Move',
 	COPY = 'Copy',

diff --git a/apps/files_sharing/src/components/ExternalShareAction.vue b/apps/files_sharing/src/components/ExternalShareAction.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import Share from '../models/Share.js'
+import Share from '../models/Share.ts'
 
 export default {
 	name: 'ExternalShareAction',

diff --git a/apps/files_sharing/src/components/NewFileRequestDialog.vue b/apps/files_sharing/src/components/NewFileRequestDialog.vue
@@ -143,7 +143,7 @@ import FileRequestDatePassword from './NewFileRequestDialog/NewFileRequestDialog
 import FileRequestFinish from './NewFileRequestDialog/NewFileRequestDialogFinish.vue'
 import FileRequestIntro from './NewFileRequestDialog/NewFileRequestDialogIntro.vue'
 import logger from '../services/logger'
-import Share from '../models/Share'
+import Share from '../models/Share.ts'
 
 enum STEP {
 	FIRST = 0,

diff --git a/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogFinish.vue b/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogFinish.vue
@@ -60,7 +60,7 @@
 
 <script lang="ts">
 import type { PropType } from 'vue'
-import Share from '../../models/Share'
+import Share from '../../models/Share.ts'
 
 import { defineComponent } from 'vue'
 import { generateUrl, getBaseUrl } from '@nextcloud/router'

diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue
@@ -241,7 +241,7 @@ import SharingEntryQuickShareSelect from './SharingEntryQuickShareSelect.vue'
 
 import ExternalShareAction from './ExternalShareAction.vue'
 import GeneratePassword from '../utils/GeneratePassword.ts'
-import Share from '../models/Share.js'
+import Share from '../models/Share.ts'
 import SharesMixin from '../mixins/SharesMixin.js'
 import ShareDetails from '../mixins/ShareDetails.js'
 import { getLoggerBuilder } from '@nextcloud/logger'

diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
@@ -35,7 +35,7 @@ import debounce from 'debounce'
 import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 
 import Config from '../services/ConfigService.ts'
-import Share from '../models/Share.js'
+import Share from '../models/Share.ts'
 import ShareRequests from '../mixins/ShareRequests.js'
 import ShareTypes from '../mixins/ShareTypes.js'
 import ShareDetails from '../mixins/ShareDetails.js'

diff --git a/apps/files_sharing/src/mixins/ShareDetails.js b/apps/files_sharing/src/mixins/ShareDetails.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import Share from '../models/Share.js'
+import Share from '../models/Share.ts'
 import Config from '../services/ConfigService.ts'
 
 export default {

diff --git a/apps/files_sharing/src/mixins/ShareRequests.js b/apps/files_sharing/src/mixins/ShareRequests.js
@@ -8,7 +8,7 @@ import 'url-search-params-polyfill'
 
 import { generateOcsUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
-import Share from '../models/Share.js'
+import Share from '../models/Share.ts'
 import { emit } from '@nextcloud/event-bus'
 
 const shareUrl = generateOcsUrl('apps/files_sharing/api/v1/shares')

diff --git a/apps/files_sharing/src/mixins/SharesMixin.js b/apps/files_sharing/src/mixins/SharesMixin.js
@@ -11,7 +11,7 @@ import { getCurrentUser } from '@nextcloud/auth'
 import PQueue from 'p-queue'
 import debounce from 'debounce'
 
-import Share from '../models/Share.js'
+import Share from '../models/Share.ts'
 import SharesRequests from './ShareRequests.js'
 import ShareTypes from './ShareTypes.js'
 import Config from '../services/ConfigService.ts'