Move useSort composable to web-pkg

packages/web-app-files/src/components/FilesList/ResourceTable.vue

@@ -199,6 +199,7 @@ import {
   useCapabilityFilesTags,
   useCapabilityProjectSpacesEnabled,
   useCapabilityShareJailEnabled,
+  SortDir,
   useStore,
   useUserContext
 } from 'web-pkg/src/composables'
@@ -213,7 +214,6 @@ import { SideBarEventTopics } from 'web-pkg/src/composables/sideBar'
 import { configurationManager } from 'web-pkg/src/configuration'
 import ContextMenuQuickAction from 'web-pkg/src/components/ContextActions/ContextMenuQuickAction.vue'
 
-import { SortDir } from 'web-app-files/src/composables'
 import { useResourceRouteResolver } from 'web-app-files/src/composables/filesList/useResourceRouteResolver'
 import { ViewModeConstants } from 'web-app-files/src/composables/viewMode'
 import { ClipboardActions } from 'web-app-files/src/helpers/clipboardActions'

packages/web-app-files/src/components/FilesList/ResourceTiles.vue

@@ -99,13 +99,13 @@
 import { onBeforeUpdate, defineComponent, nextTick, PropType, computed, ref, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { Resource, SpaceResource } from 'web-client'
-import { useStore } from 'web-pkg/src/composables'
+import { useStore, SortDir, SortField } from 'web-pkg/src/composables'
 import { ImageDimension } from 'web-pkg/src/constants'
 import { createFileRouteOptions } from 'web-pkg/src/helpers/router'
 import { displayPositionedDropdown } from 'web-pkg/src/helpers/contextMenuDropdown'
 import { createLocationSpaces } from 'web-app-files/src/router'
 import ContextMenuQuickAction from 'web-pkg/src/components/ContextActions/ContextMenuQuickAction.vue'
-import { SortDir, SortField, ViewModeConstants } from 'web-app-files/src/composables'
+import { ViewModeConstants } from 'web-app-files/src/composables'
 
 // Constants should match what is being used in OcTable/ResourceTable
 // Alignment regarding naming would be an API-breaking change and can

packages/web-app-files/src/components/Shares/SharedWithMeSection.vue

@@ -94,14 +94,13 @@ import { ImageDimension, ImageType } from 'web-pkg/src/constants'
 import { VisibilityObserver } from 'web-pkg/src/observer'
 import { mapActions } from 'vuex'
 import { useFileActions } from '../../composables/actions/files/useFileActions'
-import { useCapabilityShareJailEnabled, useStore } from 'web-pkg/src/composables'
+import { useCapabilityShareJailEnabled, SortDir, useStore } from 'web-pkg/src/composables'
 import { createLocationSpaces } from '../../router'
 import ListInfo from '../../components/FilesList/ListInfo.vue'
 import { ShareStatus } from 'web-client/src/helpers/share'
 import ContextActions from '../../components/FilesList/ContextActions.vue'
 import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
 import { useSelectedResources } from '../../composables/selection'
-import { SortDir } from '../../composables'
 import { RouteLocationNamedRaw } from 'vue-router'
 import { buildShareSpaceResource, Resource, SpaceResource } from 'web-client/src/helpers'
 import { configurationManager } from 'web-pkg/src/configuration'

packages/web-app-files/src/composables/index.ts

@@ -7,5 +7,4 @@ export * from './router'
 export * from './selection'
 export * from './shares'
 export * from './spaces'
-export * from './sort'
 export * from './viewMode'

packages/web-app-files/src/composables/resourcesViewDefaults/useResourcesViewDefaults.ts

@@ -1,8 +1,8 @@
 import { nextTick, computed, unref, Ref } from 'vue'
 import { folderService } from '../../services/folder'
 import { fileList } from '../../helpers/ui'
-import { usePagination, useFileListHeaderPosition, SortField } from '../'
-import { useSort, SortDir } from '../sort/'
+import { usePagination, useFileListHeaderPosition } from '../'
+import { useSort, SortDir, SortField } from 'web-pkg/src/composables'
 import { useSideBar } from 'web-pkg/src/composables/sideBar'
 
 import {

packages/web-app-files/src/helpers/ui/resourceTable.ts

@@ -1,4 +1,4 @@
-import { SortDir, SortField } from '../../composables/sort'
+import { SortDir, SortField } from 'web-pkg/src/composables'
 
 export const determineSortFields = (firstResource): SortField[] => {
   if (!firstResource) {

packages/web-app-files/src/helpers/ui/resourceTiles.ts

@@ -1,4 +1,4 @@
-import { SortDir, SortField } from '../../composables/sort'
+import { SortDir, SortField } from 'web-pkg/src/composables'
 
 // just a dummy function to trick gettext tools
 function $gettext(msg) {

packages/web-app-files/src/views/shares/SharedWithMe.vue

@@ -62,7 +62,7 @@
 
 <script lang="ts">
 import { mapGetters } from 'vuex'
-import { useSort, useResourcesViewDefaults } from '../../composables'
+import { useResourcesViewDefaults } from '../../composables'
 
 import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
 import AppBar from '../../components/AppBar/AppBar.vue'
@@ -74,7 +74,7 @@ import SideBar from '../../components/SideBar/SideBar.vue'
 import FilesViewWrapper from '../../components/FilesViewWrapper.vue'
 import { buildShareSpaceResource } from 'web-client/src/helpers'
 import { configurationManager } from 'web-pkg/src/configuration'
-import { useCapabilityShareJailEnabled, useStore } from 'web-pkg/src/composables'
+import { useCapabilityShareJailEnabled, useSort, useStore } from 'web-pkg/src/composables'
 
 export default defineComponent({
   components: {

packages/web-app-files/src/views/spaces/Projects.vue

@@ -79,7 +79,7 @@ import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
 
 import AppBar from '../../components/AppBar/AppBar.vue'
 import CreateSpace from '../../components/AppBar/CreateSpace.vue'
-import { useAbility, useClientService, useStore } from 'web-pkg/src/composables'
+import { useAbility, useClientService, useSort, useStore } from 'web-pkg/src/composables'
 import { ImageDimension } from 'web-pkg/src/constants'
 import SpaceContextActions from '../../components/Spaces/SpaceContextActions.vue'
 import { isProjectSpaceResource, SpaceResource } from 'web-client/src/helpers'
@@ -90,7 +90,7 @@ import { eventBus } from 'web-pkg/src/services/eventBus'
 import { SideBarEventTopics, useSideBar } from 'web-pkg/src/composables/sideBar'
 import { WebDAV } from 'web-client/src/webdav'
 import { useScrollTo } from 'web-app-files/src/composables/scrollTo'
-import { useSelectedResources, useSort, ViewModeConstants } from 'web-app-files/src/composables'
+import { useSelectedResources, ViewModeConstants } from 'web-app-files/src/composables'
 import { sortFields as availableSortFields } from '../../helpers/ui/resourceTiles'
 
 export default defineComponent({

packages/web-app-files/tests/mocks/useSortMock.ts

@@ -1,4 +1,4 @@
-import { useSort } from 'web-app-files/src/composables'
+import { useSort } from 'web-pkg/src/composables'
 import { ref } from 'vue'
 
 export const useSortMock = (

packages/web-app-files/tests/unit/views/shares/SharedWithMe.spec.ts

@@ -1,5 +1,6 @@
 import SharedWithMe from '../../../../src/views/shares/SharedWithMe.vue'
-import { useResourcesViewDefaults, useSort } from 'web-app-files/src/composables'
+import { useResourcesViewDefaults } from 'web-app-files/src/composables'
+import { useSort } from 'web-pkg/src/composables/sort'
 import { useResourcesViewDefaultsMock } from 'web-app-files/tests/mocks/useResourcesViewDefaultsMock'
 import { ShareStatus } from 'web-client/src/helpers/share'
 import { ref } from 'vue'
@@ -16,6 +17,7 @@ import {
 } from 'web-test-helpers'
 
 jest.mock('web-app-files/src/composables')
+jest.mock('web-pkg/src/composables/sort')
 
 describe('SharedWithMe view', () => {
   it('appBar always present', () => {

packages/web-pkg/src/composables/index.ts

@@ -10,4 +10,5 @@ export * from './localStorage'
 export * from './router'
 export * from './previewService'
 export * from './spaces'
+export * from './sort'
 export * from './store'

packages/web-app-files/src/composables/sort/useSort.ts → packages/web-pkg/src/composables/sort/useSort.ts

@@ -128,7 +128,7 @@ const defaultSortDirection = (name: string, fields: SortField[]): SortDir => {
   return SortDir.Desc
 }
 
-const sortHelper = <T extends SortableItem>(
+export const sortHelper = <T extends SortableItem>(
   items: T[],
   fields: SortField[],
   sortBy: string,

packages/web-app-files/tests/unit/composables/sort/useSort.spec.ts → packages/web-pkg/tests/unit/composables/sort/useSort.spec.ts

@@ -1,5 +1,5 @@
 import { ref, unref } from 'vue'
-import { SortDir, SortOptions, useSort } from '../../../../src/composables'
+import { SortDir, SortOptions, useSort } from 'web-pkg'
 import { Resource } from 'web-client/src/helpers/resource'
 import { getComposableWrapper } from 'web-test-helpers'