Skip to content

Commit 0526c18

Browse files
authored
Merge pull request #59430 from nextcloud/chore/logger
refactor(files): use consistent logger import
2 parents 239c8cc + 66881a7 commit 0526c18

File tree

79 files changed

+88
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+88
-87
lines changed

apps/files/src/actions/convertUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import { emit } from '@nextcloud/event-bus'
1212
import { n, t } from '@nextcloud/l10n'
1313
import { generateOcsUrl } from '@nextcloud/router'
1414
import PQueue from 'p-queue'
15-
import logger from '../logger.ts'
1615
import { fetchNode } from '../services/WebdavClient.ts'
16+
import { logger } from '../utils/logger.ts'
1717

1818
type ConversionResponse = {
1919
path: string

apps/files/src/actions/deleteAction.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import * as capabilities from '@nextcloud/capabilities'
1010
import * as eventBus from '@nextcloud/event-bus'
1111
import { File, Folder, Permission } from '@nextcloud/files'
1212
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
13-
import logger from '../logger.ts'
13+
import { logger } from '../utils/logger.ts'
1414
import { action } from './deleteAction.ts'
1515
import { shouldAskForConfirmation } from './deleteUtils.ts'
1616

apps/files/src/actions/deleteAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { Permission } from '@nextcloud/files'
1212
import { loadState } from '@nextcloud/initial-state'
1313
import { t } from '@nextcloud/l10n'
1414
import PQueue from 'p-queue'
15-
import logger from '../logger.ts'
15+
import { logger } from '../utils/logger.ts'
1616
import { askConfirmation, canDisconnectOnly, canUnshareOnly, deleteNode, displayName, shouldAskForConfirmation } from './deleteUtils.ts'
1717

1818
// TODO: once the files app is migrated to the new frontend use the import instead:

apps/files/src/actions/downloadAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import { showError } from '@nextcloud/dialogs'
1111
import { emit } from '@nextcloud/event-bus'
1212
import { DefaultType, FileType } from '@nextcloud/files'
1313
import { t } from '@nextcloud/l10n'
14-
import logger from '../logger.ts'
1514
import { useFilesStore } from '../store/files.ts'
1615
import { getPinia } from '../store/index.ts'
1716
import { usePathsStore } from '../store/paths.ts'
17+
import { logger } from '../utils/logger.ts'
1818
import { isDownloadable } from '../utils/permissions.ts'
1919

2020
export const action: IFileAction = {

apps/files/src/actions/favoriteAction.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import axios from '@nextcloud/axios'
99
import * as eventBus from '@nextcloud/event-bus'
1010
import { File, Permission } from '@nextcloud/files'
1111
import { beforeAll, beforeEach, describe, expect, test, vi } from 'vitest'
12-
import logger from '../logger.ts'
12+
import { logger } from '../utils/logger.ts'
1313
import { action } from './favoriteAction.ts'
1414
import * as favoriteAction from './favoriteAction.ts'
1515

apps/files/src/actions/favoriteAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { generateUrl } from '@nextcloud/router'
1616
import { isPublicShare } from '@nextcloud/sharing/public'
1717
import PQueue from 'p-queue'
1818
import Vue from 'vue'
19-
import logger from '../logger.ts'
19+
import { logger } from '../utils/logger.ts'
2020

2121
const queue = new PQueue({ concurrency: 5 })
2222

apps/files/src/actions/moveOrCopyAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import { t } from '@nextcloud/l10n'
1919
import { getConflicts } from '@nextcloud/upload'
2020
import { basename, join } from 'path'
2121
import Vue from 'vue'
22-
import logger from '../logger.ts'
2322
import { getContents } from '../services/Files.ts'
23+
import { logger } from '../utils/logger.ts'
2424
import { canCopy, canMove, getQueue, MoveCopyAction } from './moveOrCopyActionUtils.ts'
2525

2626
/**

apps/files/src/actions/openLocallyAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { translate as t } from '@nextcloud/l10n'
1414
import { encodePath } from '@nextcloud/paths'
1515
import { generateOcsUrl } from '@nextcloud/router'
1616
import { isPublicShare } from '@nextcloud/sharing/public'
17-
import logger from '../logger.ts'
17+
import { logger } from '../utils/logger.ts'
1818
import { isSyncable } from '../utils/permissions.ts'
1919

2020
export const action: IFileAction = {

apps/files/src/actions/sidebarAction.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type { IView } from '@nextcloud/files'
77

88
import { File, Folder, Permission } from '@nextcloud/files'
99
import { beforeEach, describe, expect, test, vi } from 'vitest'
10-
import logger from '../logger.ts'
10+
import { logger } from '../utils/logger.ts'
1111
import { action } from './sidebarAction.ts'
1212

1313
const sidebar = vi.hoisted(() => ({

apps/files/src/actions/sidebarAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import InformationSvg from '@mdi/svg/svg/information-outline.svg?raw'
99
import { getSidebar, Permission } from '@nextcloud/files'
1010
import { t } from '@nextcloud/l10n'
1111
import { isPublicShare } from '@nextcloud/sharing/public'
12-
import logger from '../logger.ts'
12+
import { logger } from '../utils/logger.ts'
1313

1414
export const ACTION_DETAILS = 'details'
1515

0 commit comments

Comments
 (0)