diff options
author | John Molakvoæ <skjnldsv@protonmail.com> | 2023-08-18 11:10:00 +0200 |
---|---|---|
committer | John Molakvoæ <skjnldsv@protonmail.com> | 2023-08-23 14:03:51 +0200 |
commit | 2c9acd5d5d9b99a586ab35d86780cdaf0e94df5e (patch) | |
tree | 9e0f53bc7aead84b3313287294cd3bd593bf809d /apps/files_external | |
parent | b4e71ad0fb282fbc9981924b9783ae6659a9e4fe (diff) | |
download | nextcloud-server-2c9acd5d5d9b99a586ab35d86780cdaf0e94df5e.tar.gz nextcloud-server-2c9acd5d5d9b99a586ab35d86780cdaf0e94df5e.zip |
feat: migrate FileAction from server
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files_external')
7 files changed, 8 insertions, 10 deletions
diff --git a/apps/files_external/src/actions/enterCredentialsAction.spec.ts b/apps/files_external/src/actions/enterCredentialsAction.spec.ts index ef3a767365b..d1aefd08efe 100644 --- a/apps/files_external/src/actions/enterCredentialsAction.spec.ts +++ b/apps/files_external/src/actions/enterCredentialsAction.spec.ts @@ -21,8 +21,7 @@ */ import { action } from './enterCredentialsAction' import { expect } from '@jest/globals' -import { File, Folder, Permission, View } from '@nextcloud/files' -import { DefaultType, FileAction } from '../../../files/src/services/FileAction' +import { File, Folder, Permission, View, DefaultType, FileAction } from '@nextcloud/files' import type { StorageConfig } from '../services/externalStorage' import { STORAGE_STATUS } from '../utils/credentialsUtils' diff --git a/apps/files_external/src/actions/enterCredentialsAction.ts b/apps/files_external/src/actions/enterCredentialsAction.ts index 460909dfa84..49b0ab4076e 100644 --- a/apps/files_external/src/actions/enterCredentialsAction.ts +++ b/apps/files_external/src/actions/enterCredentialsAction.ts @@ -31,7 +31,7 @@ import axios from '@nextcloud/axios' import LoginSvg from '@mdi/svg/svg/login.svg?raw' import Vue from 'vue' -import { registerFileAction, FileAction, DefaultType } from '../../../files/src/services/FileAction' +import { registerFileAction, FileAction, DefaultType } from '@nextcloud/files' import { STORAGE_STATUS, isMissingAuthConfig } from '../utils/credentialsUtils' import { isNodeExternalStorage } from '../utils/externalStorageUtils' diff --git a/apps/files_external/src/actions/inlineStorageCheckAction.ts b/apps/files_external/src/actions/inlineStorageCheckAction.ts index bd509f8fde1..fa2f567b1f7 100644 --- a/apps/files_external/src/actions/inlineStorageCheckAction.ts +++ b/apps/files_external/src/actions/inlineStorageCheckAction.ts @@ -32,7 +32,7 @@ import '../css/fileEntryStatus.scss' import { getStatus, type StorageConfig } from '../services/externalStorage' import { isMissingAuthConfig, STORAGE_STATUS } from '../utils/credentialsUtils' import { isNodeExternalStorage } from '../utils/externalStorageUtils' -import { registerFileAction, FileAction } from '../../../files/src/services/FileAction' +import { registerFileAction, FileAction } from '@nextcloud/files' export const action = new FileAction({ id: 'check-external-storage', diff --git a/apps/files_external/src/actions/openInFilesAction.spec.ts b/apps/files_external/src/actions/openInFilesAction.spec.ts index 4f25d2449b4..49ad623c894 100644 --- a/apps/files_external/src/actions/openInFilesAction.spec.ts +++ b/apps/files_external/src/actions/openInFilesAction.spec.ts @@ -21,8 +21,7 @@ */ import { action } from './openInFilesAction' import { expect } from '@jest/globals' -import { Folder, Permission, View } from '@nextcloud/files' -import { DefaultType, FileAction } from '../../../files/src/services/FileAction' +import { Folder, Permission, View, DefaultType, FileAction } from '@nextcloud/files' import type { StorageConfig } from '../services/externalStorage' import { STORAGE_STATUS } from '../utils/credentialsUtils' diff --git a/apps/files_external/src/actions/openInFilesAction.ts b/apps/files_external/src/actions/openInFilesAction.ts index 2c9579041ea..0359e81998d 100644 --- a/apps/files_external/src/actions/openInFilesAction.ts +++ b/apps/files_external/src/actions/openInFilesAction.ts @@ -25,7 +25,7 @@ import type { StorageConfig } from '../services/externalStorage' import { generateUrl } from '@nextcloud/router' import { translate as t } from '@nextcloud/l10n' -import { registerFileAction, FileAction, DefaultType } from '../../../files/src/services/FileAction' +import { registerFileAction, FileAction, DefaultType } from '@nextcloud/files' import { STORAGE_STATUS } from '../utils/credentialsUtils' export const action = new FileAction({ diff --git a/apps/files_external/src/services/externalStorage.ts b/apps/files_external/src/services/externalStorage.ts index 95010c2b6a4..ea4db8a1fe8 100644 --- a/apps/files_external/src/services/externalStorage.ts +++ b/apps/files_external/src/services/externalStorage.ts @@ -22,8 +22,9 @@ // eslint-disable-next-line n/no-extraneous-import import type { AxiosResponse } from 'axios' import type { OCSResponse } from '../../../files_sharing/src/services/SharingService' +import type { ContentsWithRoot } from '@nextcloud/files' -import { Folder, Permission, type ContentsWithRoot } from '@nextcloud/files' +import { Folder, Permission } from '@nextcloud/files' import { generateOcsUrl, generateRemoteUrl, generateUrl } from '@nextcloud/router' import { getCurrentUser } from '@nextcloud/auth' import axios from '@nextcloud/axios' diff --git a/apps/files_external/src/utils/externalStorageUtils.spec.ts b/apps/files_external/src/utils/externalStorageUtils.spec.ts index dc901544a98..04fdd7de2b0 100644 --- a/apps/files_external/src/utils/externalStorageUtils.spec.ts +++ b/apps/files_external/src/utils/externalStorageUtils.spec.ts @@ -19,8 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -import { File, Folder, Permission } from '@nextcloud/files' -import { isNodeExternalStorage } from './externalStorageUtils' +import { File, Folder, Permission, isNodeExternalStorage } from './externalStorageUtils' import { expect } from '@jest/globals' describe('Is node an external storage', () => { |