diff options
Diffstat (limited to 'apps/files_sharing/src')
9 files changed, 13 insertions, 15 deletions
diff --git a/apps/files_sharing/src/actions/acceptShareAction.spec.ts b/apps/files_sharing/src/actions/acceptShareAction.spec.ts index 7ad8a42a1a6..b87cbef6a1c 100644 --- a/apps/files_sharing/src/actions/acceptShareAction.spec.ts +++ b/apps/files_sharing/src/actions/acceptShareAction.spec.ts @@ -21,8 +21,7 @@ */ import { action } from './acceptShareAction' import { expect } from '@jest/globals' -import { File, Permission, View } from '@nextcloud/files' -import { FileAction } from '../../../files/src/services/FileAction' +import { File, Permission, View, FileAction } from '@nextcloud/files' import * as eventBus from '@nextcloud/event-bus' import axios from '@nextcloud/axios' import '../main' diff --git a/apps/files_sharing/src/actions/acceptShareAction.ts b/apps/files_sharing/src/actions/acceptShareAction.ts index 8bd8d6a5533..6992b0b53ab 100644 --- a/apps/files_sharing/src/actions/acceptShareAction.ts +++ b/apps/files_sharing/src/actions/acceptShareAction.ts @@ -23,11 +23,11 @@ import type { Node, View } from '@nextcloud/files' import { emit } from '@nextcloud/event-bus' import { generateOcsUrl } from '@nextcloud/router' +import { registerFileAction, FileAction } from '@nextcloud/files' import { translatePlural as n } from '@nextcloud/l10n' import axios from '@nextcloud/axios' import CheckSvg from '@mdi/svg/svg/check.svg?raw' -import { FileAction, registerFileAction } from '../../../files/src/services/FileAction' import { pendingSharesViewId } from '../views/shares' export const action = new FileAction({ diff --git a/apps/files_sharing/src/actions/openInFilesAction.spec.ts b/apps/files_sharing/src/actions/openInFilesAction.spec.ts index 2d723770ee9..a0ef71f830a 100644 --- a/apps/files_sharing/src/actions/openInFilesAction.spec.ts +++ b/apps/files_sharing/src/actions/openInFilesAction.spec.ts @@ -24,8 +24,7 @@ import { File, Permission, View } from '@nextcloud/files' import '../main' import { action } from './openInFilesAction' -import { DefaultType, FileAction } from '../../../files/src/services/FileAction' -import { deletedSharesViewId, pendingSharesViewId, sharedWithOthersViewId, sharedWithYouViewId, sharesViewId, sharingByLinksViewId } from '../views/shares' +import { DefaultType, FileAction, deletedSharesViewId, pendingSharesViewId, sharedWithOthersViewId, sharedWithYouViewId, sharesViewId, sharingByLinksViewId } from '../views/shares' const view = { id: 'files', diff --git a/apps/files_sharing/src/actions/openInFilesAction.ts b/apps/files_sharing/src/actions/openInFilesAction.ts index ff7ccde2f36..0a92d5d20ae 100644 --- a/apps/files_sharing/src/actions/openInFilesAction.ts +++ b/apps/files_sharing/src/actions/openInFilesAction.ts @@ -19,10 +19,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -import { translate as t } from '@nextcloud/l10n' import type { Node } from '@nextcloud/files' -import { registerFileAction, FileAction, DefaultType } from '../../../files/src/services/FileAction' +import { registerFileAction, FileAction, DefaultType } from '@nextcloud/files' +import { translate as t } from '@nextcloud/l10n' + import { sharesViewId, sharedWithYouViewId, sharedWithOthersViewId, sharingByLinksViewId } from '../views/shares' export const action = new FileAction({ diff --git a/apps/files_sharing/src/actions/rejectShareAction.spec.ts b/apps/files_sharing/src/actions/rejectShareAction.spec.ts index bc666b7c081..292aec4c630 100644 --- a/apps/files_sharing/src/actions/rejectShareAction.spec.ts +++ b/apps/files_sharing/src/actions/rejectShareAction.spec.ts @@ -21,8 +21,7 @@ */ import { action } from './rejectShareAction' import { expect } from '@jest/globals' -import { File, Folder, Permission, View } from '@nextcloud/files' -import { FileAction } from '../../../files/src/services/FileAction' +import { File, Folder, Permission, View, FileAction } from '@nextcloud/files' import * as eventBus from '@nextcloud/event-bus' import axios from '@nextcloud/axios' import '../main' diff --git a/apps/files_sharing/src/actions/rejectShareAction.ts b/apps/files_sharing/src/actions/rejectShareAction.ts index 7fb04d36227..d7ba1a5d560 100644 --- a/apps/files_sharing/src/actions/rejectShareAction.ts +++ b/apps/files_sharing/src/actions/rejectShareAction.ts @@ -23,11 +23,11 @@ import type { Node, View } from '@nextcloud/files' import { emit } from '@nextcloud/event-bus' import { generateOcsUrl } from '@nextcloud/router' +import { registerFileAction, FileAction } from '@nextcloud/files' import { translatePlural as n } from '@nextcloud/l10n' import axios from '@nextcloud/axios' import CloseSvg from '@mdi/svg/svg/close.svg?raw' -import { FileAction, registerFileAction } from '../../../files/src/services/FileAction' import { pendingSharesViewId } from '../views/shares' export const action = new FileAction({ diff --git a/apps/files_sharing/src/actions/restoreShareAction.spec.ts b/apps/files_sharing/src/actions/restoreShareAction.spec.ts index 2c37dd83857..44460a62495 100644 --- a/apps/files_sharing/src/actions/restoreShareAction.spec.ts +++ b/apps/files_sharing/src/actions/restoreShareAction.spec.ts @@ -21,8 +21,7 @@ */ import { action } from './restoreShareAction' import { expect } from '@jest/globals' -import { File, Permission, View } from '@nextcloud/files' -import { FileAction } from '../../../files/src/services/FileAction' +import { File, Permission, View, FileAction } from '@nextcloud/files' import * as eventBus from '@nextcloud/event-bus' import axios from '@nextcloud/axios' import '../main' diff --git a/apps/files_sharing/src/actions/restoreShareAction.ts b/apps/files_sharing/src/actions/restoreShareAction.ts index d1b67f10b08..c41f3f2c413 100644 --- a/apps/files_sharing/src/actions/restoreShareAction.ts +++ b/apps/files_sharing/src/actions/restoreShareAction.ts @@ -22,12 +22,12 @@ import type { Node, View } from '@nextcloud/files' import { emit } from '@nextcloud/event-bus' +import { FileAction, registerFileAction } from '@nextcloud/files' import { generateOcsUrl } from '@nextcloud/router' import { translatePlural as n } from '@nextcloud/l10n' -import axios from '@nextcloud/axios' import ArrowULeftTopSvg from '@mdi/svg/svg/arrow-u-left-top.svg?raw' +import axios from '@nextcloud/axios' -import { FileAction, registerFileAction } from '../../../files/src/services/FileAction' import { deletedSharesViewId } from '../views/shares' export const action = new FileAction({ diff --git a/apps/files_sharing/src/services/SharingService.ts b/apps/files_sharing/src/services/SharingService.ts index 2b5e2e0d329..4534183a637 100644 --- a/apps/files_sharing/src/services/SharingService.ts +++ b/apps/files_sharing/src/services/SharingService.ts @@ -23,9 +23,10 @@ import type { AxiosPromise } from 'axios' import { Folder, File, type ContentsWithRoot } from '@nextcloud/files' -import { generateOcsUrl, generateRemoteUrl, generateUrl } from '@nextcloud/router' +import { generateOcsUrl, generateRemoteUrl } from '@nextcloud/router' import { getCurrentUser } from '@nextcloud/auth' import axios from '@nextcloud/axios' + import logger from './logger' export const rootPath = `/files/${getCurrentUser()?.uid}` |