Skip to content

Commit

Permalink
Merge pull request #44001 from nextcloud/fix/migrate-settings-logger-…
Browse files Browse the repository at this point in the history
…to-ts

fix(settings): Migrate logger to TypeScript
  • Loading branch information
skjnldsv authored Mar 5, 2024
2 parents 00e0fa4 + d7746f2 commit 0d4e648
Show file tree
Hide file tree
Showing 29 changed files with 40 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import { generateUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
import { showError } from '@nextcloud/dialogs'
import logger from '../../logger.js'
import logger from '../../logger.ts'
export default {
name: 'GroupSelect',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import { showError } from '@nextcloud/dialogs'
import { saveProfileDefault } from '../../service/ProfileService.js'
import { validateBoolean } from '../../utils/validate.js'
import logger from '../../logger.js'
import logger from '../../logger.ts'
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/components/UserList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ import UserListHeader from './Users/UserListHeader.vue'
import UserRow from './Users/UserRow.vue'
import { defaultQuota, isObfuscated, unlimitedQuota } from '../utils/userUtils.ts'
import logger from '../logger.js'
import logger from '../logger.ts'
import usersSvg from '../../img/users.svg?raw'
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/components/Users/VirtualList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import Vue from 'vue'
import { vElementVisibility } from '@vueuse/components'
import { debounce } from 'debounce'
import logger from '../../logger.js'
import logger from '../../logger.ts'
Vue.directive('elementVisibility', vElementVisibility)
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/components/WebAuthn/AddDevice.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import '@nextcloud/password-confirmation/dist/style.css'
import logger from '../../logger.js'
import logger from '../../logger.ts'
import {
startRegistration,
finishRegistration,
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/components/WebAuthn/Section.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import sortBy from 'lodash/fp/sortBy.js'
import AddDevice from './AddDevice.vue'
import Device from './Device.vue'
import logger from '../../logger.js'
import logger from '../../logger.ts'
import { removeRegistration } from '../../service/WebAuthnRegistrationSerice.js'
const sortByName = sortBy('name')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @copyright 2020 Christoph Wurst <[email protected]>
*
* @author Roeland Jago Douma <[email protected]>
* @author Christoph Wurst <[email protected]>
*
* @license AGPL-3.0-or-later
*
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/main-admin-basic-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { getRequestToken } from '@nextcloud/auth'
import { loadState } from '@nextcloud/initial-state'
import { translate as t } from '@nextcloud/l10n'

import logger from './logger.js'
import logger from './logger.ts'

import ProfileSettings from './components/BasicSettings/ProfileSettings.vue'
import BackgroundJob from './components/BasicSettings/BackgroundJob.vue'
Expand Down
9 changes: 5 additions & 4 deletions apps/settings/src/store/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@
*
*/

import api from './api.js'
import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router'
import { getCapabilities } from '@nextcloud/capabilities'
import logger from '../logger.js'
import { parseFileSize } from '@nextcloud/files'
import { generateOcsUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'

import api from './api.js'
import logger from '../logger.ts'

const orderGroups = function(groups, orderBy) {
/* const SORT_USERCOUNT = 1;
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/utils/handlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import { showError } from '@nextcloud/dialogs'
import { translate as t } from '@nextcloud/l10n'

import logger from '../logger.js'
import logger from '../logger.ts'

/**
* @param {import('axios').AxiosError} error the error
Expand Down
4 changes: 2 additions & 2 deletions dist/settings-users-3239.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-3239.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-admin-basic-settings.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @copyright 2020 Christoph Wurst <[email protected]>
*
* @author Roeland Jago Douma <[email protected]>
* @author Christoph Wurst <[email protected]>
*
* @license AGPL-3.0-or-later
*
Expand Down
2 changes: 1 addition & 1 deletion dist/settings-vue-settings-admin-basic-settings.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-admin-delegation.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-admin-delegation.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @copyright 2020 Christoph Wurst <[email protected]>
*
* @author Roeland Jago Douma <[email protected]>
* @author Christoph Wurst <[email protected]>
*
* @license AGPL-3.0-or-later
*
Expand Down
2 changes: 1 addition & 1 deletion dist/settings-vue-settings-admin-delegation.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-apps-users-management.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
/**
* @copyright 2020 Christoph Wurst <[email protected]>
*
* @author Roeland Jago Douma <[email protected]>
* @author Christoph Wurst <[email protected]>
*
* @license AGPL-3.0-or-later
*
Expand Down
2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-personal-info.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-personal-info.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-personal-security.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
/**
* @copyright 2020 Christoph Wurst <[email protected]>
*
* @author Roeland Jago Douma <[email protected]>
* @author Christoph Wurst <[email protected]>
*
* @license AGPL-3.0-or-later
*
Expand Down
2 changes: 1 addition & 1 deletion dist/settings-vue-settings-personal-security.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-personal-webauthn.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @copyright 2020 Christoph Wurst <[email protected]>
*
* @author Roeland Jago Douma <[email protected]>
* @author Christoph Wurst <[email protected]>
*
* @license AGPL-3.0-or-later
*
Expand Down
2 changes: 1 addition & 1 deletion dist/settings-vue-settings-personal-webauthn.js.map

Large diffs are not rendered by default.

0 comments on commit 0d4e648

Please sign in to comment.