Minor clean up to prevent circular dependency on OC.js

apps/files_versions/src/components/Version.vue

@@ -94,15 +94,15 @@
 			<form class="version-label-modal"
 				@submit.prevent="setVersionLabel(formVersionLabelValue)">
 				<label>
-					<div class="version-label-modal__title">{{ t('photos', 'Version name') }}</div>
+					<div class="version-label-modal__title">{{ t('files_versions', 'Version name') }}</div>
 					<NcTextField ref="labelInput"
 						:value.sync="formVersionLabelValue"
-						:placeholder="t('photos', 'Version name')"
+						:placeholder="t('files_versions', 'Version name')"
 						:label-outside="true" />
 				</label>
 
 				<div class="version-label-modal__info">
-					{{ t('photos', 'Named versions are persisted, and excluded from automatic cleanups when your storage quota is full.') }}
+					{{ t('files_versions', 'Named versions are persisted, and excluded from automatic cleanups when your storage quota is full.') }}
 				</div>
 
 				<div class="version-label-modal__actions">

core/src/OC/capabilities.js

@@ -23,15 +23,16 @@
  */
 
 import { getCapabilities as realGetCapabilities } from '@nextcloud/capabilities'
+import logger from './logger.js'
 
 /**
  * Returns the capabilities
  *
- * @return {Array} capabilities
+ * @return {object} capabilities
  *
  * @since 14.0.0
  */
 export const getCapabilities = () => {
-	OC.debug && console.warn('OC.getCapabilities is deprecated and will be removed in Nextcloud 21. See @nextcloud/capabilities')
+	logger.warn('OC.getCapabilities is deprecated and will be removed in Nextcloud 21. See @nextcloud/capabilities')
 	return realGetCapabilities()
 }

core/src/OC/contactsmenu.js

@@ -26,8 +26,8 @@
 import _ from 'underscore'
 import $ from 'jquery'
 import { Collection, Model, View } from 'backbone'
-
-import OC from './index.js'
+import { getCurrentUser } from '@nextcloud/auth'
+import { generateUrl } from '@nextcloud/router'
 
 /**
  * @class Contact
@@ -361,9 +361,9 @@ const ContactsMenuView = View.extend({
 			contacts: viewData.contacts,
 			searchTerm: searchTerm,
 			contactsAppEnabled: viewData.contactsAppEnabled,
-			contactsAppURL: OC.generateUrl('/apps/contacts'),
-			canInstallApp: OC.isUserAdmin(),
-			contactsAppMgmtURL: OC.generateUrl('/settings/apps/social/contacts')
+			contactsAppURL: generateUrl('/apps/contacts'),
+			canInstallApp: getCurrentUser()?.isAdmin,
+			contactsAppMgmtURL: generateUrl('/settings/apps/social/contacts')
 		}))
 		this.$('#contactsmenu-contacts').html(list.$el)
 	},
@@ -427,7 +427,7 @@ ContactsMenu.prototype = {
 	 * @returns {Promise}
 	 */
 	_getContacts: function(searchTerm) {
-		var url = OC.generateUrl('/contactsmenu/contacts')
+		var url = generateUrl('/contactsmenu/contacts')
 		return Promise.resolve($.ajax(url, {
 			method: 'POST',
 			data: {

core/src/OC/dialogs.js

@@ -50,8 +50,10 @@ import $ from 'jquery'
 import IconMove from '@mdi/svg/svg/folder-move.svg?raw'
 import IconCopy from '@mdi/svg/svg/folder-multiple.svg?raw'
 
-import OC from './index.js'
 import { FilePickerType, getFilePickerBuilder } from '@nextcloud/dialogs'
+import moment from '@nextcloud/moment'
+import { formatFileSize } from '@nextcloud/files'
+import { generateFilePath } from '@nextcloud/router'
 import { basename } from 'path'
 
 /**
@@ -608,12 +610,12 @@ const Dialogs = {
 			$conflict.data('data', data)
 
 			$conflict.find('.filename').text(original.name)
-			$originalDiv.find('.size').text(OC.Util.humanFileSize(original.size))
-			$originalDiv.find('.mtime').text(OC.Util.formatDate(original.mtime))
+			$originalDiv.find('.size').text(formatFileSize(original.size))
+			$originalDiv.find('.mtime').text(moment(original.mtime).format('LLL'))
 			// ie sucks
 			if (replacement.size && replacement.lastModified) {
-				$replacementDiv.find('.size').text(OC.Util.humanFileSize(replacement.size))
-				$replacementDiv.find('.mtime').text(OC.Util.formatDate(replacement.lastModified))
+				$replacementDiv.find('.size').text(formatFileSize(replacement.size))
+				$replacementDiv.find('.mtime').text(moment(replacement.lastModified).format('LLL'))
 			}
 			var path = original.directory + '/' + original.name
 			var urlSpec = {
@@ -833,7 +835,7 @@ const Dialogs = {
 		var defer = $.Deferred()
 		if (!this.$messageTemplate) {
 			var self = this
-			$.get(OC.filePath('core', 'templates', 'message.html'), function(tmpl) {
+			$.get(generateFilePath('core', 'templates', 'message.html'), function(tmpl) {
 				self.$messageTemplate = $(tmpl)
 				defer.resolve(self.$messageTemplate)
 			})
@@ -849,7 +851,7 @@ const Dialogs = {
 		var defer = $.Deferred()
 		if (!this.$fileexistsTemplate) {
 			var self = this
-			$.get(OC.filePath('files', 'templates', 'fileexists.html'), function(tmpl) {
+			$.get(generateFilePath('files', 'templates', 'fileexists.html'), function(tmpl) {
 				self.$fileexistsTemplate = $(tmpl)
 				defer.resolve(self.$fileexistsTemplate)
 			})

core/src/OC/index.js

@@ -58,7 +58,7 @@ import {
 	TAG_FAVORITE,
 } from './constants.js'
 import ContactsMenu from './contactsmenu.js'
-import { currentUser, getCurrentUser } from './currentuser.js'
+import { getCurrentUser } from '@nextcloud/auth'
 import Dialogs from './dialogs.js'
 import EventSource from './eventsource.js'
 import { get, set } from './get_set.js'
@@ -78,7 +78,6 @@ import {
 	showMenu,
 	unregisterMenu,
 } from './menu.js'
-import { isUserAdmin } from './admin.js'
 import L10N from './l10n.js'
 import {
 	getCanonicalLocale,
@@ -146,10 +145,13 @@ export default {
 	/**
 	 * Currently logged in user or null if none
 	 *
-	 * @type {string}
-	 * @deprecated use `getCurrentUser` from https://www.npmjs.com/package/@nextcloud/auth
+	 * @type {string|undefined}
+	 * @deprecated 28.0.0 use `getCurrentUser` from https://www.npmjs.com/package/@nextcloud/auth
+	 */
+	currentUser: getCurrentUser()?.uid,
+	/**
+	 * @deprecated 28.0.0 https://www.npmjs.com/package/@nextcloud/dialogs
 	 */
-	currentUser,
 	dialogs: Dialogs,
 	EventSource,
 	/**
@@ -160,7 +162,10 @@ export default {
 	 * @deprecated 19.0.0 use `getCurrentUser` from https://www.npmjs.com/package/@nextcloud/auth
 	 */
 	getCurrentUser,
-	isUserAdmin,
+	/**
+	 * @deprecated 19.0.0 use `getCurrentUser` from https://www.npmjs.com/package/@nextcloud/auth
+	 */
+	isUserAdmin: () => getCurrentUser()?.isAdmin,
 	L10N,
 
 	/**

dist/core-files_fileinfo.js.LICENSE.txt → core/src/OC/logger.js

@@ -1,10 +1,7 @@
 /**
- * Copyright (c) 2015
+ * @copyright 2023 Louis Chmn <[email protected]>
  *
- * @author Julius Härtl <[email protected]>
- * @author Robin Appelman <[email protected]>
- * @author Roeland Jago Douma <[email protected]>
- * @author Vincent Petry <[email protected]>
+ * @author 2023 Louis Chmn <[email protected]>
  *
  * @license AGPL-3.0-or-later
  *
@@ -22,3 +19,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+import { getLoggerBuilder } from '@nextcloud/logger'
+
+export default getLoggerBuilder()
+	.setApp('core')
+	.detectUser()
+	.build()

core/src/OC/password-confirmation.js

@@ -24,10 +24,10 @@
 
 import _ from 'underscore'
 import $ from 'jquery'
-import moment from 'moment'
+import moment from '@nextcloud/moment'
 import { generateUrl } from '@nextcloud/router'
-
-import OC from './index.js'
+import { translate as t } from '@nextcloud/l10n'
+import dialogs from './dialogs.js'
 
 /**
  * @namespace OC.PasswordConfirmation
@@ -61,7 +61,7 @@ export default {
 			title: t('core', 'Authentication required'),
 			text: t(
 				'core',
-				'This action requires you to confirm your password'
+				'This action requires you to confirm your password',
 			),
 			confirm: t('core', 'Confirm'),
 			label: t('core', 'Password'),
@@ -73,7 +73,7 @@ export default {
 		const self = this
 
 		if (this.requiresPasswordConfirmation()) {
-			OC.dialogs.prompt(
+			dialogs.prompt(
 				config.text,
 				config.title,
 				function(result, password) {
@@ -85,7 +85,7 @@ export default {
 				},
 				true,
 				config.label,
-				true
+				true,
 			).then(function() {
 				const $dialog = $('.oc-dialog:visible')
 				$dialog.find('.ui-icon').remove()
@@ -124,7 +124,7 @@ export default {
 			},
 			error() {
 				config.error = t('core', 'Failed to authenticate, try again')
-				OC.PasswordConfirmation.requirePasswordConfirmation(self.callback, config)
+				self.requirePasswordConfirmation(self.callback, config)
 			},
 		})
 	},

core/src/OC/util-history.js

@@ -22,7 +22,11 @@
  */
 
 import _ from 'underscore'
-import OC from './index.js'
+
+import {
+	build as buildQueryString,
+	parse as parseQueryString,
+} from './query-string.js'
 
 /**
  * Utility class for the history API,
@@ -45,14 +49,14 @@ export default {
 	 * or a map
 	 * @param {string} [url] URL to be used, otherwise the current URL will be used,
 	 * using the params as query string
-	 * @param {boolean} [replace=false] whether to replace instead of pushing
+	 * @param {boolean} [replace] whether to replace instead of pushing
 	 */
 	_pushState(params, url, replace) {
 		let strParams
 		if (typeof (params) === 'string') {
 			strParams = params
 		} else {
-			strParams = OC.buildQueryString(params)
+			strParams = buildQueryString(params)
 		}
 
 		if (window.history.pushState) {
@@ -157,10 +161,10 @@ export default {
 		let params
 		// try and parse from URL hash first
 		if (query) {
-			params = OC.parseQueryString(this._decodeQuery(query))
+			params = parseQueryString(this._decodeQuery(query))
 		}
 		// else read from query attributes
-		params = _.extend(params || {}, OC.parseQueryString(this._decodeQuery(location.search)))
+		params = _.extend(params || {}, parseQueryString(this._decodeQuery(location.search)))
 		return params || {}
 	},
 
@@ -175,7 +179,7 @@ export default {
 		}
 		params = (e && e.state)
 		if (_.isString(params)) {
-			params = OC.parseQueryString(params)
+			params = parseQueryString(params)
 		} else if (!params) {
 			params = this.parseUrlQuery() || {}
 		}

core/src/OC/util.js

@@ -21,10 +21,11 @@
  *
  */
 
-import moment from 'moment'
+import moment from '@nextcloud/moment'
 
 import History from './util-history.js'
-import OC from './index.js'
+import logger from './logger.js'
+import { getLanguage } from '@nextcloud/l10n'
 import { formatFileSize as humanFileSize } from '@nextcloud/files'
 
 /**
@@ -74,7 +75,7 @@ export default {
 	 * Inspired by computerFileSize in helper.php
 	 *
 	 * @param  {string} string file size in human-readable format
-	 * @return {number} or null if string could not be parsed
+	 * @return {number|null} or null if string could not be parsed
 	 *
 	 *
 	 */
@@ -124,7 +125,7 @@ export default {
 	 */
 	formatDate(timestamp, format) {
 		if (window.TESTING === undefined) {
-			OC.debug && console.warn('OC.Util.formatDate is deprecated and will be removed in Nextcloud 21. See @nextcloud/moment')
+			logger.warn('OC.Util.formatDate is deprecated and will be removed in Nextcloud 21. See @nextcloud/moment')
 		}
 		format = format || 'LLL'
 		return moment(timestamp).format(format)
@@ -136,7 +137,7 @@ export default {
 	 */
 	relativeModifiedDate(timestamp) {
 		if (window.TESTING === undefined) {
-			OC.debug && console.warn('OC.Util.relativeModifiedDate is deprecated and will be removed in Nextcloud 21. See @nextcloud/moment')
+			logger.warn('OC.Util.relativeModifiedDate is deprecated and will be removed in Nextcloud 21. See @nextcloud/moment')
 		}
 		const diff = moment().diff(moment(timestamp))
 		if (diff >= 0 && diff < 45000) {
@@ -219,7 +220,7 @@ export default {
 				} else {
 					// Note: This locale setting isn't supported by all browsers but for the ones
 					// that do there will be more consistency between client-server sorting
-					return aa[x].localeCompare(bb[x], OC.getLanguage())
+					return aa[x].localeCompare(bb[x], getLanguage())
 				}
 			}
 		}

core/src/OC/xhr-error.js

@@ -24,7 +24,6 @@
 import _ from 'underscore'
 import $ from 'jquery'
 
-import OC from './index.js'
 import Notification from './notification.js'
 
 /**
@@ -65,7 +64,7 @@ export const processAjaxError = xhr => {
 						OC.reload()
 					}
 					timer++
-				}, 1000 // 1 second interval
+				}, 1000, // 1 second interval
 				)
 
 				// only call reload once