diff --git a/apps/files/src/actions/deleteAction.ts b/apps/files/src/actions/deleteAction.ts index f8b7fdb1ac6..d8ed4d35204 100644 --- a/apps/files/src/actions/deleteAction.ts +++ b/apps/files/src/actions/deleteAction.ts @@ -25,8 +25,8 @@ import { translate as t } from '@nextcloud/l10n' import axios from '@nextcloud/axios' import TrashCan from '@mdi/svg/svg/trash-can.svg?raw' -import { registerFileAction, FileAction } from '../services/FileAction' -import logger from '../logger' +import { registerFileAction, FileAction } from '../services/FileAction.ts' +import logger from '../logger.js' registerFileAction(new FileAction({ id: 'delete', diff --git a/apps/files/src/components/CustomElementRender.vue b/apps/files/src/components/CustomElementRender.vue index bb6df3fd854..93cf91f78f3 100644 --- a/apps/files/src/components/CustomElementRender.vue +++ b/apps/files/src/components/CustomElementRender.vue @@ -24,6 +24,12 @@ - - diff --git a/apps/files/src/main.js b/apps/files/src/main.js index e516275ba28..a8464f0ee0d 100644 --- a/apps/files/src/main.js +++ b/apps/files/src/main.js @@ -1,6 +1,6 @@ import './templates.js' import './legacy/filelistSearch.js' -import './actions/deleteAction' +import './actions/deleteAction.ts' import processLegacyFilesViews from './legacy/navigationMapper.js' diff --git a/apps/files/src/store/files.ts b/apps/files/src/store/files.ts index f90f3bff7bb..f3289378096 100644 --- a/apps/files/src/store/files.ts +++ b/apps/files/src/store/files.ts @@ -21,7 +21,7 @@ */ /* eslint-disable */ import type { Folder, Node } from '@nextcloud/files' -import type { FilesStore, RootsStore, RootOptions, Service, FilesState } from '../types' +import type { FilesStore, RootsStore, RootOptions, Service, FilesState } from '../types.ts' import { defineStore } from 'pinia' import { subscribe } from '@nextcloud/event-bus' diff --git a/apps/files/src/store/paths.ts b/apps/files/src/store/paths.ts index 43027390fe1..b0f9552f606 100644 --- a/apps/files/src/store/paths.ts +++ b/apps/files/src/store/paths.ts @@ -20,7 +20,7 @@ * */ /* eslint-disable */ -import type { PathOptions, ServicesState } from '../types' +import type { PathOptions, ServicesState } from '../types.ts' import { defineStore } from 'pinia' import Vue from 'vue' diff --git a/apps/files/src/store/sorting.ts b/apps/files/src/store/sorting.ts index dc83d100478..6afb6fa97b6 100644 --- a/apps/files/src/store/sorting.ts +++ b/apps/files/src/store/sorting.ts @@ -25,7 +25,7 @@ import { generateUrl } from '@nextcloud/router' import { defineStore } from 'pinia' import Vue from 'vue' import axios from '@nextcloud/axios' -import type { direction, SortingStore } from '../types' +import type { direction, SortingStore } from '../types.ts' const saveUserConfig = (mode: string, direction: direction, view: string) => { return axios.post(generateUrl('/apps/files/api/v1/sorting'), { diff --git a/apps/files/src/store/userconfig.ts b/apps/files/src/store/userconfig.ts index d432b502acf..f771de7cc5c 100644 --- a/apps/files/src/store/userconfig.ts +++ b/apps/files/src/store/userconfig.ts @@ -25,9 +25,8 @@ import { generateUrl } from '@nextcloud/router' import { defineStore } from 'pinia' import Vue from 'vue' import axios from '@nextcloud/axios' -import type { UserConfig, UserConfigStore } from '../types' +import type { UserConfig, UserConfigStore } from '../types.ts' import { emit, subscribe } from '@nextcloud/event-bus' -import type { update } from 'cypress/types/lodash' const userConfig = loadState('files', 'config', { show_hidden: false, diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue index 065749adaf5..c8d539113ce 100644 --- a/apps/files/src/views/FilesList.vue +++ b/apps/files/src/views/FilesList.vue @@ -75,11 +75,11 @@ import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js' import TrashCan from 'vue-material-design-icons/TrashCan.vue' import Vue from 'vue' -import Navigation, { ContentsWithRoot } from '../services/Navigation' -import { useFilesStore } from '../store/files' -import { usePathsStore } from '../store/paths' -import { useSelectionStore } from '../store/selection' -import { useSortingStore } from '../store/sorting' +import Navigation, { ContentsWithRoot } from '../services/Navigation.ts' +import { useFilesStore } from '../store/files.ts' +import { usePathsStore } from '../store/paths.ts' +import { useSelectionStore } from '../store/selection.ts' +import { useSortingStore } from '../store/sorting.ts' import BreadCrumbs from '../components/BreadCrumbs.vue' import FilesListVirtual from '../components/FilesListVirtual.vue' import logger from '../logger.js' @@ -276,7 +276,6 @@ export default Vue.extend({ // If we're in the root dir, define the root if (dir === '/') { - console.debug('files', 'Setting root', { service: currentView.id, folder }) this.filesStore.setRoot({ service: currentView.id, root: folder }) } else // Otherwise, add the folder to the store diff --git a/apps/files/src/views/Navigation.cy.ts b/apps/files/src/views/Navigation.cy.ts index c8b0f07dea1..d2fe2b31feb 100644 --- a/apps/files/src/views/Navigation.cy.ts +++ b/apps/files/src/views/Navigation.cy.ts @@ -3,7 +3,7 @@ import * as L10n from '@nextcloud/l10n' import FolderSvg from '@mdi/svg/svg/folder.svg' import ShareSvg from '@mdi/svg/svg/share-variant.svg' -import NavigationService from '../services/Navigation' +import NavigationService from '../services/Navigation.ts' import NavigationView from './Navigation.vue' import router from '../router/router.js' diff --git a/apps/files/src/views/Navigation.vue b/apps/files/src/views/Navigation.vue index f7b089b61c1..e38f769cd67 100644 --- a/apps/files/src/views/Navigation.vue +++ b/apps/files/src/views/Navigation.vue @@ -162,6 +162,7 @@ export default { currentView(view, oldView) { // If undefined, it means we're initializing the view // This is handled by the legacy-view:initialized event + // TODO: remove when legacy views are dropped if (view?.id === oldView?.id) { return } diff --git a/apps/files/src/views/Settings.vue b/apps/files/src/views/Settings.vue index b1c544f8ecf..4fab65a5a1c 100644 --- a/apps/files/src/views/Settings.vue +++ b/apps/files/src/views/Settings.vue @@ -90,7 +90,7 @@ import { generateRemoteUrl, generateUrl } from '@nextcloud/router' import { getCurrentUser } from '@nextcloud/auth' import { showError, showSuccess } from '@nextcloud/dialogs' import { translate } from '@nextcloud/l10n' -import { useUserConfigStore } from '../store/userconfig' +import { useUserConfigStore } from '../store/userconfig.ts' export default { name: 'Settings', diff --git a/apps/files_trashbin/src/actions/restoreAction.ts b/apps/files_trashbin/src/actions/restoreAction.ts index 0d309a3f3c6..493106953a6 100644 --- a/apps/files_trashbin/src/actions/restoreAction.ts +++ b/apps/files_trashbin/src/actions/restoreAction.ts @@ -27,7 +27,8 @@ import { translate as t } from '@nextcloud/l10n' import axios from '@nextcloud/axios' import History from '@mdi/svg/svg/history.svg?raw' -import { registerFileAction, FileAction } from '../../../files/src/services/FileAction' +import { registerFileAction, FileAction } from '../../../files/src/services/FileAction.ts' +import logger from '../../../files/src/logger.js' registerFileAction(new FileAction({ id: 'restore', @@ -64,7 +65,7 @@ registerFileAction(new FileAction({ emit('files:file:deleted', node) return true } catch (error) { - console.error(error) + logger.error(error) return false } }, diff --git a/apps/files_trashbin/src/css/trashbin.css b/apps/files_trashbin/src/css/trashbin.css deleted file mode 100644 index 40bbdfb037b..00000000000 --- a/apps/files_trashbin/src/css/trashbin.css +++ /dev/null @@ -1,3 +0,0 @@ -.files-list__row-trashbin-deleted { - -} diff --git a/apps/files_trashbin/src/main.ts b/apps/files_trashbin/src/main.ts index 118f0ec72ee..aa41f48ab12 100644 --- a/apps/files_trashbin/src/main.ts +++ b/apps/files_trashbin/src/main.ts @@ -19,14 +19,14 @@ * along with this program. If not, see . * */ -import type NavigationService from '../../files/src/services/Navigation' -import type { Navigation } from '../../files/src/services/Navigation' +import type NavigationService from '../../files/src/services/Navigation.ts' +import type { Navigation } from '../../files/src/services/Navigation.ts' import { translate as t, translate } from '@nextcloud/l10n' import DeleteSvg from '@mdi/svg/svg/delete.svg?raw' import moment from '@nextcloud/moment' -import getContents from './services/trashbin' +import { getContents } from './services/trashbin' // Register restore action import './actions/restoreAction' diff --git a/apps/files_trashbin/src/services/trashbin.ts b/apps/files_trashbin/src/services/trashbin.ts index b20911b5b2d..9982750ba5c 100644 --- a/apps/files_trashbin/src/services/trashbin.ts +++ b/apps/files_trashbin/src/services/trashbin.ts @@ -25,7 +25,7 @@ import { File, Folder, parseWebdavPermissions } from '@nextcloud/files' import { generateRemoteUrl, generateUrl } from '@nextcloud/router' import type { FileStat, ResponseDataDetailed } from 'webdav' -import type { ContentsWithRoot } from '../../../files/src/services/Navigation' +import type { ContentsWithRoot } from '../../../files/src/services/Navigation.ts' import client, { rootPath } from './client' @@ -78,7 +78,7 @@ const resultToNode = function(node: FileStat): File | Folder { : new Folder(nodeData) } -export default async (path: string = '/'): Promise => { +export const getContents = async (path: string = '/'): Promise => { // TODO: use only one request when webdav-client supports it // @see https://github.com/perry-mitchell/webdav-client/pull/334 const rootResponse = await client.stat(path, {