web-pkg imports from @ownclouders namespace (#9749)

* Adjust remaining imports * Make imports in web-pkg relative * remove typescript path aliases * Revert incorrect change * fix unit tests * fix sidebar unit tests * fix driveresolver unit tests * fix genericspace unit tests * remove snapshots of moved tests * fix remaining units tests * fix more imports --------- Co-authored-by: Jannik Stehle <[email protected]>
owncloud · Sep 29, 2023 · cd4ae93 · cd4ae93
1 parent 636c532
commit cd4ae93
Show file tree

Hide file tree

Showing 523 changed files with 2,278 additions and 2,037 deletions.
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
@@ -124,6 +124,7 @@
     "yaml": "^2.0.0"
   },
   "peerDependencies": {
+    "@ownclouders/web-client": "workspace:*",
     "@popperjs/core": "^2.4.0",
     "filesize": "^9.0.11",
     "focus-trap": "^7.2.0",
@@ -137,7 +138,6 @@
     "vue": "3.3.4",
     "vue-inline-svg": "^3.1.0",
     "vue-select": "^3.12.0",
-    "web-client": "workspace:@ownclouders/web-client@*",
     "webfontloader": "^1.6.28",
     "portal-vue": "*"
   },

diff --git a/packages/design-system/src/components/OcResource/OcResource.vue b/packages/design-system/src/components/OcResource/OcResource.vue
@@ -82,7 +82,7 @@ import OcIcon from '../OcIcon/OcIcon.vue'
 import OcResourceName from '../OcResourceName/OcResourceName.vue'
 import OcResourceIcon from '../OcResourceIcon/OcResourceIcon.vue'
 import OcResourceLink from '../OcResourceLink/OcResourceLink.vue'
-import { Resource } from 'web-client/src'
+import { Resource } from '@ownclouders/web-client/src'
 
 /**
  * Displays a resource together with the resource type icon or thumbnail

diff --git a/packages/design-system/src/components/OcResourceIcon/OcResourceIcon.spec.ts b/packages/design-system/src/components/OcResourceIcon/OcResourceIcon.spec.ts
@@ -2,7 +2,7 @@ import { shallowMount } from 'web-test-helpers'
 import { AVAILABLE_SIZES } from '../../helpers/constants'
 import { OcResourceIcon } from '..'
 import { OcResourceIconMapping, ocResourceIconMappingInjectionKey } from './types'
-import { Resource } from 'web-client'
+import { Resource } from '@ownclouders/web-client'
 
 const resourceIconMapping: OcResourceIconMapping = {
   extension: {

diff --git a/packages/design-system/src/components/OcResourceIcon/OcResourceIcon.vue b/packages/design-system/src/components/OcResourceIcon/OcResourceIcon.vue
@@ -17,7 +17,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, inject, PropType, unref } from 'vue'
-import { Resource } from 'web-client'
+import { Resource } from '@ownclouders/web-client'
 
 import OcIcon from '../OcIcon/OcIcon.vue'
 import { AVAILABLE_SIZES, IconType } from '../../helpers'

diff --git a/packages/design-system/src/components/OcResourceIcon/types.ts b/packages/design-system/src/components/OcResourceIcon/types.ts
@@ -1,4 +1,4 @@
-import { IconType } from 'design-system/src/helpers'
+import { IconType } from '../../helpers'
 
 export type OcResourceIconMapping = Record<'mimeType' | 'extension', Record<string, IconType>>
 export const ocResourceIconMappingInjectionKey = 'oc-resource-icon-mapping'
diff --git a/packages/design-system/src/components/OcTile/OcTile.vue b/packages/design-system/src/components/OcTile/OcTile.vue
@@ -74,7 +74,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType } from 'vue'
-import { Resource } from 'web-client'
+import { Resource } from '@ownclouders/web-client'
 
 import OcImg from '../OcImage/OcImage.vue'
 import OcResource from '../OcResource/OcResource.vue'

diff --git a/packages/design-system/src/components/_OcGhostElement/_OcGhostElement.vue b/packages/design-system/src/components/_OcGhostElement/_OcGhostElement.vue
@@ -11,7 +11,7 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue'
-import { Resource } from 'web-client/src'
+import { Resource } from '@ownclouders/web-client/src'
 
 /**
  * Please head to the ownCloud web ResourceTable component (https://github.com/owncloud/web/blob/master/packages/web-app-files/src/components/FilesList/ResourceTable.vue) for a demo of the Ghost Element.

diff --git a/packages/design-system/src/helpers/types.ts b/packages/design-system/src/helpers/types.ts
@@ -1,5 +1,3 @@
-import { ConfigurationManager } from 'web-pkg'
-
 export type IconFillType = 'fill' | 'line' | 'none'
 export type IconType = {
   name: string
@@ -19,7 +17,7 @@ export interface ContextualHelperData {
 }
 
 export interface ContextualHelperOptions {
-  configurationManager: ConfigurationManager
+  configurationManager: unknown
 }
 
 export interface ContextualHelper {

diff --git a/packages/web-app-admin-settings/package.json b/packages/web-app-admin-settings/package.json
@@ -4,21 +4,24 @@
   "private": true,
   "description": "ownCloud admin settings",
   "license": "AGPL-3.0",
+  "devDependencies": {
+    "web-test-helpers": "workspace:*"
+  },
   "dependencies": {
     "deep-object-diff": "^1.1.9",
     "email-validator": "^2.0.4",
     "mark.js": "^8.11.1"
   },
   "peerDependencies": {
+    "@ownclouders/web-client": "workspace:*",
+    "@ownclouders/web-pkg": "workspace:*",
     "axios": "^0.27.2 || ^1.0.0",
     "design-system": "workspace:@ownclouders/design-system@*",
     "fuse.js": "^6.5.3",
     "lodash-es": "4.17.21",
     "uuid": "^9.0.0",
     "vue-concurrency": "4.0.1",
     "vuex": "4.1.0",
-    "web-app-admin-settings": "workspace:*",
-    "web-client": "workspace:@ownclouders/web-client@*",
-    "web-pkg": "workspace:@ownclouders/web-pkg@*"
+    "web-app-admin-settings": "workspace:*"
   }
 }
diff --git a/packages/web-app-admin-settings/src/components/AppTemplate.vue b/packages/web-app-admin-settings/src/components/AppTemplate.vue
@@ -70,9 +70,7 @@
 
 <script lang="ts">
 import { perPageDefault, paginationOptions } from 'web-app-admin-settings/src/defaults'
-import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
-import SideBar from 'web-pkg/src/components/SideBar/SideBar.vue'
-import BatchActions from 'web-pkg/src/components/BatchActions.vue'
+import { AppLoadingSpinner, SideBar, BatchActions } from '@ownclouders/web-pkg'
 import {
   defineComponent,
   inject,
@@ -84,11 +82,11 @@ import {
   VNodeRef,
   watch
 } from 'vue'
-import { eventBus, useAppDefaults } from 'web-pkg'
-import { SideBarEventTopics } from 'web-pkg/src/composables/sideBar'
-import { Panel } from 'web-pkg/src/components/SideBar'
+import { eventBus, useAppDefaults } from '@ownclouders/web-pkg'
+import { SideBarEventTopics } from '@ownclouders/web-pkg'
+import { Panel } from '@ownclouders/web-pkg'
 import { BreadcrumbItem } from 'design-system/src/components/OcBreadcrumb/types'
-import ViewOptions from 'web-pkg/src/components/ViewOptions.vue'
+import { ViewOptions } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   components: {

diff --git a/packages/web-app-admin-settings/src/components/General/AppearanceSection.vue b/packages/web-app-admin-settings/src/components/General/AppearanceSection.vue
@@ -44,13 +44,13 @@
 
 <script lang="ts">
 import { defineComponent, computed, unref, VNodeRef, ref } from 'vue'
-import ContextActionMenu from 'web-pkg/src/components/ContextActions/ContextActionMenu.vue'
+import { ContextActionMenu } from '@ownclouders/web-pkg'
 import {
   useGeneralActionsResetLogo,
   useGeneralActionsUploadLogo
 } from '../../composables/actions/general'
 import { supportedLogoMimeTypes } from '../../defaults'
-import { useStore } from 'web-pkg/src/composables'
+import { useStore } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'AppearanceSection',

diff --git a/packages/web-app-admin-settings/src/components/General/InfoSection.vue b/packages/web-app-admin-settings/src/components/General/InfoSection.vue
@@ -25,7 +25,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { useStore } from 'web-pkg/src/composables'
+import { useStore } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'InfoSection',

diff --git a/packages/web-app-admin-settings/src/components/Groups/ContextActions.vue b/packages/web-app-admin-settings/src/components/Groups/ContextActions.vue
@@ -5,12 +5,12 @@
 </template>
 
 <script lang="ts">
-import { useActionsShowDetails } from 'web-pkg'
+import { useActionsShowDetails } from '@ownclouders/web-pkg'
 import { computed, defineComponent, PropType, unref } from 'vue'
-import ContextActionMenu from 'web-pkg/src/components/ContextActions/ContextActionMenu.vue'
-import { GroupActionOptions } from 'web-pkg/src/composables/actions'
+import { ContextActionMenu } from '@ownclouders/web-pkg'
+import { GroupActionOptions } from '@ownclouders/web-pkg'
 import { useGroupActionsEdit, useGroupActionsDelete } from '../../composables/actions/groups'
-import { useStore } from 'web-pkg/src/composables'
+import { useStore } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'ContextActions',

diff --git a/packages/web-app-admin-settings/src/components/Groups/CreateGroupModal.vue b/packages/web-app-admin-settings/src/components/Groups/CreateGroupModal.vue
@@ -27,8 +27,8 @@
 
 <script lang="ts">
 import { defineComponent, ref } from 'vue'
-import { Group } from 'web-client/src/generated'
-import { MaybeRef, useClientService } from 'web-pkg'
+import { Group } from '@ownclouders/web-client/src/generated'
+import { MaybeRef, useClientService } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'CreateGroupModal',

diff --git a/packages/web-app-admin-settings/src/components/Groups/GroupsList.vue b/packages/web-app-admin-settings/src/components/Groups/GroupsList.vue
@@ -117,16 +117,16 @@ import {
 } from 'vue'
 import Fuse from 'fuse.js'
 import Mark from 'mark.js'
-import { displayPositionedDropdown, eventBus, SortDir } from 'web-pkg'
-import { SideBarEventTopics } from 'web-pkg/src/composables/sideBar'
-import { Group } from 'web-client/src/generated'
-import ContextMenuQuickAction from 'web-pkg/src/components/ContextActions/ContextMenuQuickAction.vue'
+import { displayPositionedDropdown, eventBus, SortDir } from '@ownclouders/web-pkg'
+import { SideBarEventTopics } from '@ownclouders/web-pkg'
+import { Group } from '@ownclouders/web-client/src/generated'
+import { ContextMenuQuickAction } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
-import { defaultFuseOptions } from 'web-pkg/src/helpers'
-import { useFileListHeaderPosition, usePagination } from 'web-pkg/src/composables'
-import Pagination from 'web-pkg/src/components/Pagination.vue'
+import { defaultFuseOptions } from '@ownclouders/web-pkg'
+import { useFileListHeaderPosition, usePagination } from '@ownclouders/web-pkg'
+import { Pagination } from '@ownclouders/web-pkg'
 import { perPageDefault, perPageStoragePrefix } from 'web-app-admin-settings/src/defaults'
-import { useKeyboardActions } from 'web-pkg/src/composables/keyboardActions'
+import { useKeyboardActions } from '@ownclouders/web-pkg'
 import {
   useKeyboardTableMouseActions,
   useKeyboardTableNavigation

diff --git a/packages/web-app-admin-settings/src/components/Groups/SideBar/DetailsPanel.vue b/packages/web-app-admin-settings/src/components/Groups/SideBar/DetailsPanel.vue
@@ -25,7 +25,7 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue'
 import GroupInfoBox from './GroupInfoBox.vue'
-import { Group } from 'web-client/src/generated'
+import { Group } from '@ownclouders/web-client/src/generated'
 
 export default defineComponent({
   name: 'DetailsPanel',

diff --git a/packages/web-app-admin-settings/src/components/Groups/SideBar/EditPanel.vue b/packages/web-app-admin-settings/src/components/Groups/SideBar/EditPanel.vue
@@ -24,9 +24,9 @@
 </template>
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue'
-import { Group } from 'web-client/src/generated'
-import CompareSaveDialog from 'web-pkg/src/components/SideBar/CompareSaveDialog.vue'
-import { MaybeRef, useClientService } from 'web-pkg'
+import { Group } from '@ownclouders/web-client/src/generated'
+import { CompareSaveDialog } from '@ownclouders/web-pkg'
+import { MaybeRef, useClientService } from '@ownclouders/web-pkg'
 import GroupInfoBox from './GroupInfoBox.vue'
 
 export default defineComponent({

diff --git a/packages/web-app-admin-settings/src/components/Groups/SideBar/GroupInfoBox.vue b/packages/web-app-admin-settings/src/components/Groups/SideBar/GroupInfoBox.vue
@@ -7,7 +7,7 @@
 </template>
 <script lang="ts">
 import { computed, defineComponent, PropType, unref } from 'vue'
-import { Group } from 'web-client/src/generated'
+import { Group } from '@ownclouders/web-client/src/generated'
 import { useGettext } from 'vue3-gettext'
 export default defineComponent({
   name: 'GroupInfoBox',

diff --git a/packages/web-app-admin-settings/src/components/Groups/SideBar/MembersPanel.vue b/packages/web-app-admin-settings/src/components/Groups/SideBar/MembersPanel.vue
@@ -21,8 +21,8 @@ import { computed, defineComponent, inject, ref, watch, unref, Ref } from 'vue'
 import MembersRoleSection from '../../Groups/SideBar/MembersRoleSection.vue'
 import Fuse from 'fuse.js'
 import Mark from 'mark.js'
-import { Group } from 'web-client/src/generated'
-import { defaultFuseOptions } from 'web-pkg/src/helpers'
+import { Group } from '@ownclouders/web-client/src/generated'
+import { defaultFuseOptions } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'GroupsMembersPanel',

diff --git a/packages/web-app-admin-settings/src/components/Groups/SideBar/MembersRoleSection.vue b/packages/web-app-admin-settings/src/components/Groups/SideBar/MembersRoleSection.vue
@@ -13,7 +13,7 @@
 </template>
 <script lang="ts">
 import { defineComponent, PropType } from 'vue'
-import { User } from 'web-client/src/helpers'
+import { User } from '@ownclouders/web-client/src/helpers'
 
 export default defineComponent({
   name: 'MembersRoleSection',

diff --git a/packages/web-app-admin-settings/src/components/Spaces/ContextActions.vue b/packages/web-app-admin-settings/src/components/Spaces/ContextActions.vue
@@ -12,10 +12,9 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, unref } from 'vue'
-import { SpaceResource } from 'web-client'
-import ContextActionMenu from 'web-pkg/src/components/ContextActions/ContextActionMenu.vue'
-import QuotaModal from 'web-pkg/src/components/Spaces/QuotaModal.vue'
-import { useCapabilitySpacesMaxQuota, useStore } from 'web-pkg/src/composables'
+import { SpaceResource } from '@ownclouders/web-client'
+import { ContextActionMenu, QuotaModal } from '@ownclouders/web-pkg'
+import { useCapabilitySpacesMaxQuota, useStore } from '@ownclouders/web-pkg'
 
 import {
   useSpaceActionsDelete,
@@ -25,7 +24,7 @@ import {
   useSpaceActionsRename,
   useSpaceActionsRestore,
   useActionsShowDetails
-} from 'web-pkg/src/composables/actions'
+} from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'ContextActions',

diff --git a/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue b/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue
@@ -19,19 +19,19 @@
 </template>
 
 <script lang="ts">
-import ActionMenuItem from 'web-pkg/src/components/ContextActions/ActionMenuItem.vue'
+import { ActionMenuItem } from '@ownclouders/web-pkg'
 import {
   useSpaceActionsDelete,
   useSpaceActionsDisable,
   useSpaceActionsEditDescription,
   useSpaceActionsEditQuota,
   useSpaceActionsRename,
   useSpaceActionsRestore
-} from 'web-pkg/src/composables/actions/spaces'
-import QuotaModal from 'web-pkg/src/components/Spaces/QuotaModal.vue'
+} from '@ownclouders/web-pkg'
+import { QuotaModal } from '@ownclouders/web-pkg'
 import { computed, defineComponent, inject, unref } from 'vue'
-import { SpaceResource } from 'web-client'
-import { useCapabilitySpacesMaxQuota, useStore } from 'web-pkg/src/composables'
+import { SpaceResource } from '@ownclouders/web-client'
+import { useCapabilitySpacesMaxQuota, useStore } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'ActionsPanel',

diff --git a/packages/web-app-admin-settings/src/components/Spaces/SideBar/MembersPanel.vue b/packages/web-app-admin-settings/src/components/Spaces/SideBar/MembersPanel.vue
@@ -38,12 +38,16 @@
 </template>
 <script lang="ts">
 import { computed, defineComponent, inject, ref, watch, unref } from 'vue'
-import { Resource } from 'web-client/src'
+import { Resource } from '@ownclouders/web-client/src'
 import MembersRoleSection from './MembersRoleSection.vue'
 import Fuse from 'fuse.js'
 import Mark from 'mark.js'
-import { spaceRoleEditor, spaceRoleManager, spaceRoleViewer } from 'web-client/src/helpers/share'
-import { defaultFuseOptions } from 'web-pkg/src/helpers'
+import {
+  spaceRoleEditor,
+  spaceRoleManager,
+  spaceRoleViewer
+} from '@ownclouders/web-client/src/helpers/share'
+import { defaultFuseOptions } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'MembersPanel',

diff --git a/packages/web-app-admin-settings/src/components/Spaces/SideBar/MembersRoleSection.vue b/packages/web-app-admin-settings/src/components/Spaces/SideBar/MembersRoleSection.vue
@@ -25,8 +25,8 @@
 </template>
 <script lang="ts">
 import { computed, defineComponent, PropType } from 'vue'
-import { ShareTypes } from 'web-client/src/helpers/share'
-import { SpaceRole } from 'web-client/src/helpers'
+import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
+import { SpaceRole } from '@ownclouders/web-client/src/helpers'
 
 export default defineComponent({
   name: 'MembersRoleSection',

diff --git a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue
@@ -124,25 +124,24 @@ import {
   displayPositionedDropdown,
   formatFileSize,
   defaultFuseOptions
-} from 'web-pkg/src/helpers'
+} from '@ownclouders/web-pkg'
 import { computed, defineComponent, nextTick, onMounted, PropType, ref, unref, watch } from 'vue'
-import { SpaceResource } from 'web-client/src/helpers'
-import { spaceRoleEditor, spaceRoleManager, spaceRoleViewer } from 'web-client/src/helpers/share'
+import { SpaceResource } from '@ownclouders/web-client/src/helpers'
+import {
+  spaceRoleEditor,
+  spaceRoleManager,
+  spaceRoleViewer
+} from '@ownclouders/web-client/src/helpers/share'
 import Mark from 'mark.js'
 import Fuse from 'fuse.js'
 import { useGettext } from 'vue3-gettext'
-import { eventBus, SortDir } from 'web-pkg'
-import { SideBarEventTopics } from 'web-pkg/src/composables/sideBar'
-import ContextMenuQuickAction from 'web-pkg/src/components/ContextActions/ContextMenuQuickAction.vue'
-import {
-  useFileListHeaderPosition,
-  useRoute,
-  useRouter,
-  usePagination
-} from 'web-pkg/src/composables'
-import Pagination from 'web-pkg/src/components/Pagination.vue'
+import { eventBus, SortDir } from '@ownclouders/web-pkg'
+import { SideBarEventTopics } from '@ownclouders/web-pkg'
+import { ContextMenuQuickAction } from '@ownclouders/web-pkg'
+import { useFileListHeaderPosition, useRoute, useRouter, usePagination } from '@ownclouders/web-pkg'
+import { Pagination } from '@ownclouders/web-pkg'
 import { perPageDefault, perPageStoragePrefix } from 'web-app-admin-settings/src/defaults'
-import { useKeyboardActions } from 'web-pkg/src/composables/keyboardActions'
+import { useKeyboardActions } from '@ownclouders/web-pkg'
 import {
   useKeyboardTableMouseActions,
   useKeyboardTableNavigation