Merge pull request #46083 from nextcloud/refactor/files-logger

refactor(files): Migrate logger to Typescript

apps/files/src/actions/deleteAction.ts

@@ -11,7 +11,7 @@ import CloseSvg from '@mdi/svg/svg/close.svg?raw'
 import NetworkOffSvg from '@mdi/svg/svg/network-off.svg?raw'
 import TrashCanSvg from '@mdi/svg/svg/trash-can.svg?raw'
 
-import logger from '../logger.js'
+import logger from '../logger.ts'
 import { askConfirmation, canDisconnectOnly, canUnshareOnly, deleteNode, displayName, isTrashbinEnabled } from './deleteUtils'
 
 const queue = new PQueue({ concurrency: 5 })

apps/files/src/actions/favoriteAction.ts

@@ -12,7 +12,7 @@ import Vue from 'vue'
 import StarOutlineSvg from '@mdi/svg/svg/star-outline.svg?raw'
 import StarSvg from '@mdi/svg/svg/star.svg?raw'
 
-import logger from '../logger.js'
+import logger from '../logger.ts'
 import { encodePath } from '@nextcloud/paths'
 
 // If any of the nodes is not favorited, we display the favorite action.

apps/files/src/actions/sidebarAction.ts

@@ -6,7 +6,7 @@ import { Permission, type Node, View, FileAction } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
 import InformationSvg from '@mdi/svg/svg/information-variant.svg?raw'
 
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 export const ACTION_DETAILS = 'details'
 

apps/files/src/components/DragAndDropNotice.vue

@@ -37,7 +37,7 @@ import TrayArrowDownIcon from 'vue-material-design-icons/TrayArrowDown.vue'
 
 import { useNavigation } from '../composables/useNavigation'
 import { dataTransferToFileTree, onDropExternalFiles } from '../services/DropService'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 export default defineComponent({
 	name: 'DragAndDropNotice',

apps/files/src/components/FileEntry/FileEntryActions.vue

@@ -93,7 +93,7 @@ import ArrowLeftIcon from 'vue-material-design-icons/ArrowLeft.vue'
 import CustomElementRender from '../CustomElementRender.vue'
 
 import { useNavigation } from '../../composables/useNavigation'
-import logger from '../../logger.js'
+import logger from '../../logger.ts'
 
 export default defineComponent({
 	name: 'FileEntryActions',

apps/files/src/components/FileEntry/FileEntryCheckbox.vue

@@ -14,17 +14,20 @@
 </template>
 
 <script lang="ts">
-import { Node, FileType } from '@nextcloud/files'
+import type { Node } from '@nextcloud/files'
+import type { PropType } from 'vue'
+import type { FileSource } from '../../types.ts'
+
+import { FileType } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
-import { type PropType, defineComponent } from 'vue'
+import { defineComponent } from 'vue'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 
 import { useKeyboardStore } from '../../store/keyboard.ts'
 import { useSelectionStore } from '../../store/selection.ts'
-import logger from '../../logger.js'
-import type { FileSource } from '../../types.ts'
+import logger from '../../logger.ts'
 
 export default defineComponent({
 	name: 'FileEntryCheckbox',

apps/files/src/components/FileEntry/FileEntryName.vue

@@ -53,7 +53,7 @@ import { useNavigation } from '../../composables/useNavigation'
 import { useRouteParameters } from '../../composables/useRouteParameters.ts'
 import { useRenamingStore } from '../../store/renaming.ts'
 import { getFilenameValidity } from '../../utils/filenameValidity.ts'
-import logger from '../../logger.js'
+import logger from '../../logger.ts'
 
 export default defineComponent({
 	name: 'FileEntryName',

apps/files/src/components/FileEntryMixin.ts

@@ -18,7 +18,7 @@ import { action as sidebarAction } from '../actions/sidebarAction.ts'
 import { getDragAndDropPreview } from '../utils/dragUtils.ts'
 import { hashCode } from '../utils/hashUtils.ts'
 import { dataTransferToFileTree, onDropExternalFiles, onDropInternalFiles } from '../services/DropService.ts'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 Vue.directive('onClickOutside', vOnClickOutside)
 

apps/files/src/components/FilesListTableHeader.vue

@@ -68,7 +68,7 @@ import { useNavigation } from '../composables/useNavigation'
 import { useFilesStore } from '../store/files.ts'
 import { useSelectionStore } from '../store/selection.ts'
 import filesSortingMixin from '../mixins/filesSorting.ts'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 export default defineComponent({
 	name: 'FilesListTableHeader',

apps/files/src/components/FilesListTableHeaderActions.vue

@@ -26,21 +26,25 @@
 </template>
 
 <script lang="ts">
-import { Node, NodeStatus, View, getFileActions } from '@nextcloud/files'
+import type { Node, View } from '@nextcloud/files'
+import type { PropType } from 'vue'
+import type { FileSource } from '../types'
+
+import { NodeStatus, getFileActions } from '@nextcloud/files'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { translate } from '@nextcloud/l10n'
+import { defineComponent } from 'vue'
+
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcIconSvgWrapper from '@nextcloud/vue/dist/Components/NcIconSvgWrapper.js'
 import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
-import Vue, { defineComponent, type PropType } from 'vue'
 
 import { useActionsMenuStore } from '../store/actionsmenu.ts'
 import { useFilesStore } from '../store/files.ts'
 import { useSelectionStore } from '../store/selection.ts'
 import filesListWidthMixin from '../mixins/filesListWidth.ts'
-import logger from '../logger.js'
-import type { FileSource } from '../types'
+import logger from '../logger.ts'
 
 // The registered actions list
 const actions = getFileActions()
@@ -136,11 +140,10 @@ export default defineComponent({
 		/**
 		 * Get a cached note from the store
 		 *
-		 * @param {number} fileId the file id to get
-		 * @return {Folder|File}
+		 * @param source The source of the node to get
 		 */
-		getNode(fileId) {
-			return this.filesStore.getNode(fileId)
+		getNode(source: string): Node|undefined {
+			return this.filesStore.getNode(source)
 		},
 
 		async onActionClick(action) {
@@ -150,7 +153,7 @@ export default defineComponent({
 				// Set loading markers
 				this.loading = action.id
 				this.nodes.forEach(node => {
-					Vue.set(node, 'status', NodeStatus.LOADING)
+					this.$set(node, 'status', NodeStatus.LOADING)
 				})
 
 				// Dispatch action execution
@@ -190,7 +193,7 @@ export default defineComponent({
 				// Remove loading markers
 				this.loading = null
 				this.nodes.forEach(node => {
-					Vue.set(node, 'status', undefined)
+					this.$set(node, 'status', undefined)
 				})
 			}
 		},

apps/files/src/components/FilesListVirtual.vue

@@ -81,7 +81,7 @@ import FilesListTableFooter from './FilesListTableFooter.vue'
 import FilesListTableHeader from './FilesListTableHeader.vue'
 import filesListWidthMixin from '../mixins/filesListWidth.ts'
 import VirtualList from './VirtualList.vue'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 import FilesListTableHeaderActions from './FilesListTableHeaderActions.vue'
 import FileListFilters from './FileListFilters.vue'
 

apps/files/src/components/NavigationQuota.vue

@@ -37,7 +37,7 @@ import ChartPie from 'vue-material-design-icons/ChartPie.vue'
 import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
 import NcProgressBar from '@nextcloud/vue/dist/Components/NcProgressBar.js'
 
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 export default {
 	name: 'NavigationQuota',

apps/files/src/components/TransferOwnershipDialogue.vue

@@ -52,7 +52,7 @@ import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 import Vue from 'vue'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 const picker = getFilePickerBuilder(t('files', 'Choose a file or folder to transfer'))
 	.setMultiSelect(false)

apps/files/src/components/VirtualList.vue

@@ -59,7 +59,7 @@ import debounce from 'debounce'
 import Vue from 'vue'
 
 import filesListWidthMixin from '../mixins/filesListWidth.ts'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 interface RecycledPoolItem {
 	key: string,

apps/files/src/newMenu/newTemplatesFolder.ts

@@ -15,7 +15,7 @@ import { newNodeName } from '../utils/newNodeDialog'
 
 import PlusSvg from '@mdi/svg/svg/plus.svg?raw'
 import axios from '@nextcloud/axios'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 let templatesPath = loadState<string|false>('files', 'templates_path', false)
 logger.debug('Initial templates folder', { templatesPath })

apps/files/src/services/DropService.ts

@@ -17,7 +17,7 @@ import Vue from 'vue'
 import { Directory, traverseTree, resolveConflict, createDirectoryIfNotExists } from './DropServiceUtils'
 import { handleCopyMoveNodeTo } from '../actions/moveOrCopyAction'
 import { MoveCopyAction } from '../actions/moveOrCopyActionUtils'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 /**
  * This function converts a list of DataTransferItems to a file tree.

apps/files/src/services/DropServiceUtils.ts

@@ -10,7 +10,7 @@ import { openConflictPicker } from '@nextcloud/upload'
 import { showError, showInfo } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
 
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 /**
  * This represents a Directory in the file tree

apps/files/src/services/Files.ts

@@ -8,7 +8,7 @@ import type { FileStat, ResponseDataDetailed } from 'webdav'
 import { CancelablePromise } from 'cancelable-promise'
 import { File, Folder, davGetDefaultPropfind, davResultToNode, davRootPath } from '@nextcloud/files'
 import { client } from './WebdavClient.ts'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 /**
  * Slim wrapper over `@nextcloud/files` `davResultToNode` to allow using the function with `Array.map`

apps/files/src/services/ServiceWorker.js

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import { generateUrl } from '@nextcloud/router'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 export default () => {
 	if ('serviceWorker' in navigator) {

apps/files/src/views/FilesList.vue

@@ -159,7 +159,7 @@ import BreadCrumbs from '../components/BreadCrumbs.vue'
 import FilesListVirtual from '../components/FilesListVirtual.vue'
 import filesListWidthMixin from '../mixins/filesListWidth.ts'
 import filesSortingMixin from '../mixins/filesSorting.ts'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 import DragAndDropNotice from '../components/DragAndDropNotice.vue'
 
 const isSharingEnabled = (getCapabilities() as { files_sharing?: boolean })?.files_sharing !== undefined

apps/files/src/views/Navigation.vue

@@ -81,7 +81,7 @@ import { useNavigation } from '../composables/useNavigation'
 import { useFilenameFilter } from '../composables/useFilenameFilter'
 import { useFiltersStore } from '../store/filters.ts'
 import { useViewConfigStore } from '../store/viewConfig.ts'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 export default defineComponent({
 	name: 'Navigation',

apps/files/src/views/Sidebar.vue

@@ -108,7 +108,7 @@ import FileInfo from '../services/FileInfo.js'
 import LegacyView from '../components/LegacyView.vue'
 import SidebarTab from '../components/SidebarTab.vue'
 import SystemTags from '../../../systemtags/src/components/SystemTags.vue'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 export default {
 	name: 'Sidebar',

apps/files/src/views/TemplatePicker.vue

@@ -60,7 +60,7 @@ import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import TemplatePreview from '../components/TemplatePreview.vue'
 import TemplateFiller from '../components/TemplateFiller.vue'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
 const border = 2
 const margin = 8

apps/files_trashbin/src/actions/restoreAction.ts

@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import { emit } from '@nextcloud/event-bus'
+import { encodePath } from '@nextcloud/paths'
 import { generateRemoteUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
 import { Permission, Node, View, registerFileAction, FileAction } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
 import axios from '@nextcloud/axios'
 import History from '@mdi/svg/svg/history.svg?raw'
 
-import logger from '../../../files/src/logger.js'
-import { encodePath } from '@nextcloud/paths'
+import logger from '../../../files/src/logger.ts'
 
 registerFileAction(new FileAction({
 	id: 'restore',

dist/7493-7493.js.map.license

@@ -0,0 +1 @@
+7493-7493.js.license