Merge pull request #12971 from owncloud/chore/backport-circular-deps-fix

chore: prevent circular deps

Author: LukasHirt

packages/web-app-password-protected-folders/src/composables/useApplicationFileExtensions.ts

@@ -1,4 +1,4 @@
-import { PASSWORD_PROTECTED_FOLDER_FILE_EXTENSION } from '@ownclouders/web-pkg'
+import { PASSWORD_PROTECTED_FOLDER_FILE_EXTENSION } from '@ownclouders/web-client'
 import { useGettext } from 'vue3-gettext'
 import { shareType } from '../../../design-system/src/utils/shareType'
 import { useCustomHandler } from './useCustomHandler'

packages/web-client/package.json

@@ -84,7 +84,6 @@
   "dependencies": {
     "@casl/ability": "^6.7.1",
     "@microsoft/fetch-event-source": "^2.0.1",
-    "@ownclouders/web-pkg": "workspace:*",
     "axios": "^1.11.0",
     "fast-xml-parser": "^5.0.0",
     "lodash-es": "^4.17.21",

packages/web-client/src/constants.ts

@@ -0,0 +1,7 @@
+export const PASSWORD_PROTECTED_FOLDER_FILE_EXTENSION = 'psec'
+
+/**
+ * List of file extensions that should be hidden from the user.
+ * Hiding the extension currently leads to hiding all actions except delete.
+ */
+export const HIDDEN_FILE_EXTENSIONS = [PASSWORD_PROTECTED_FOLDER_FILE_EXTENSION]

packages/web-client/src/helpers/resource/functions.ts

@@ -3,10 +3,7 @@ import { urlJoin } from '../../utils'
 import { DavPermission, DavProperty } from '../../webdav/constants'
 import { Resource, SearchResource, TrashResource, WebDavResponseResource } from './types'
 import { camelCase } from 'lodash-es'
-import {
-  HIDDEN_FILE_EXTENSIONS,
-  PASSWORD_PROTECTED_FOLDER_FILE_EXTENSION
-} from '@ownclouders/web-pkg/src/constants'
+import { HIDDEN_FILE_EXTENSIONS, PASSWORD_PROTECTED_FOLDER_FILE_EXTENSION } from '../../constants'
 
 const fileExtensions = {
   complex: ['tar.bz2', 'tar.gz', 'tar.xz']

packages/web-client/src/index.ts

@@ -5,5 +5,6 @@ import { webdav } from './webdav'
 export * from './errors'
 export * from './helpers'
 export * from './utils'
+export * from './constants'
 
 export { graph, ocs, webdav }

packages/web-client/tests/unit/helpers/resource/functions.spec.ts

@@ -9,7 +9,7 @@ import {
   extractNameWithoutExtension
 } from '../../../../src/helpers'
 import { DavPermission, DavProperty } from '../../../../src/webdav/constants'
-import { HIDDEN_FILE_EXTENSIONS } from '@ownclouders/web-pkg'
+import { HIDDEN_FILE_EXTENSIONS } from '@ownclouders/web-client'
 
 describe('extractDomSelector', () => {
   it.each([

packages/web-pkg/src/components/FilesList/ResourceListItem.vue

@@ -67,12 +67,11 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import { useGettext } from 'vue3-gettext'
-import { Resource } from '@ownclouders/web-client'
+import { HIDDEN_FILE_EXTENSIONS, Resource } from '@ownclouders/web-client'
 import ResourceIcon from './ResourceIcon.vue'
 import ResourceLink from './ResourceLink.vue'
 import ResourceName from './ResourceName.vue'
 import { RouteLocationRaw } from 'vue-router'
-import { HIDDEN_FILE_EXTENSIONS } from '../../constants'
 import { dirname, join } from 'node:path'
 
 interface Props {

packages/web-pkg/src/components/SideBar/Files/FileInfo.vue

@@ -26,11 +26,10 @@
 
 <script lang="ts">
 import { computed, defineComponent, inject, unref } from 'vue'
-import { Resource } from '@ownclouders/web-client'
+import { HIDDEN_FILE_EXTENSIONS, Resource } from '@ownclouders/web-client'
 import { useResourcesStore } from '../../../composables'
 import ResourceIcon from '../../FilesList/ResourceIcon.vue'
 import ResourceName from '../../FilesList/ResourceName.vue'
-import { HIDDEN_FILE_EXTENSIONS } from '../../../constants'
 
 export default defineComponent({
   name: 'FileInfo',

packages/web-pkg/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts

@@ -5,7 +5,12 @@ import { FileAction, FileActionOptions } from '../../actions'
 import { useAbility } from '../../ability'
 import { useClientService } from '../../clientService'
 import { useRouter } from '../../router'
-import { Resource, SpaceResource, isPersonalSpaceResource } from '@ownclouders/web-client'
+import {
+  HIDDEN_FILE_EXTENSIONS,
+  Resource,
+  SpaceResource,
+  isPersonalSpaceResource
+} from '@ownclouders/web-client'
 import { isLocationSpacesActive } from '../../../router'
 import { useCreateSpace } from '../../spaces'
 import { useSpaceHelpers } from '../../spaces'
@@ -17,7 +22,6 @@ import {
   useResourcesStore,
   useSpacesStore
 } from '../../piniaStores'
-import { HIDDEN_FILE_EXTENSIONS } from '../../../constants'
 
 export const useFileActionsCreateSpaceFromResource = () => {
   const { showMessage, showErrorMessage } = useMessages()

packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts

@@ -1,6 +1,12 @@
 import { cloneStateObject } from '../../../helpers/store'
 import { isSameResource } from '../../../helpers/resource'
-import { DavHttpError, Resource, SpaceResource, urlJoin } from '@ownclouders/web-client'
+import {
+  DavHttpError,
+  PASSWORD_PROTECTED_FOLDER_FILE_EXTENSION,
+  Resource,
+  SpaceResource,
+  urlJoin
+} from '@ownclouders/web-client'
 import { isLocationSpacesActive } from '../../../router'
 import { dirname } from 'path'
 import { createFileRouteOptions } from '../../../helpers'
@@ -22,7 +28,6 @@ import {
 } from '../../piniaStores'
 import { storeToRefs } from 'pinia'
 import { useDeleteWorker } from '../../webWorkers'
-import { PASSWORD_PROTECTED_FOLDER_FILE_EXTENSION } from '../../../constants'
 import { captureException } from '@sentry/vue'
 
 export const useFileActionsDeleteResources = () => {