Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate OC router helpers that are provided by packages #19455

Merged
merged 1 commit into from
Feb 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions core/js/dist/login.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/login.js.map

Large diffs are not rendered by default.

74 changes: 37 additions & 37 deletions core/js/dist/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/main.js.map

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions core/js/dist/maintenance.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/maintenance.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/js/dist/recommendedapps.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/recommendedapps.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions core/src/OC/get_set.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* Get a variable by name
* @param {string} context context
* @returns {Function} getter
* @deprecated 19.0.0 use https://lodash.com/docs#get
*/
export const get = context => name => {
const namespaces = name.split('.')
Expand All @@ -41,6 +42,7 @@ export const get = context => name => {
* Set a variable by name
* @param {string} context context
* @returns {Function} setter
* @deprecated 19.0.0 use https://lodash.com/docs#set
*/
export const set = context => (name, value) => {
const namespaces = name.split('.')
Expand Down
51 changes: 41 additions & 10 deletions core/src/OC/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,16 @@ import L10N, {
} from './l10n'

import {
filePath,
generateUrl,
getRootPath,
generateFilePath,
generateOcsUrl,
generateRemoteUrl,
getRootUrl,
imagePath,
linkTo,
linkToOCS,
linkToRemote,
} from '@nextcloud/router'

import {
linkToRemoteBase,
} from './routing'
import msg from './msg'
Expand Down Expand Up @@ -146,7 +149,7 @@ export default {
* Currently logged in user or null if none
*
* @type String
* @deprecated use {@link OC.getCurrentUser} instead
* @deprecated use `getCurrentUser` from https://www.npmjs.com/package/@nextcloud/auth
*/
currentUser,
dialogs: Dialogs,
Expand All @@ -156,6 +159,7 @@ export default {
* user (public page mode)
*
* @since 9.0.0
* @deprecated 19.0.0 use `getCurrentUser` from https://www.npmjs.com/package/@nextcloud/auth
*/
getCurrentUser,
isUserAdmin,
Expand Down Expand Up @@ -248,26 +252,53 @@ export default {
theme,
Util,
debug,
filePath,
/**
* @deprecated 19.0.0 use `generateFilePath` from https://www.npmjs.com/package/@nextcloud/router
*/
filePath: generateFilePath,
/**
* @deprecated 19.0.0 use `generateUrl` from https://www.npmjs.com/package/@nextcloud/router
*/
generateUrl,
/**
* @deprecated 19.0.0 use https://lodash.com/docs#get
*/
get: get(window),
/**
* @deprecated 19.0.0 use https://lodash.com/docs#set
*/
set: set(window),
getRootPath,
/**
* @deprecated 19.0.0 use `getRootUrl` from https://www.npmjs.com/package/@nextcloud/router
*/
getRootPath: getRootUrl,
/**
* @deprecated 19.0.0 use `imagePath` from https://www.npmjs.com/package/@nextcloud/router
*/
imagePath,
redirect,
reload,
requestToken: getRequestToken(),
/**
* @deprecated 19.0.0 use `linkTo` from https://www.npmjs.com/package/@nextcloud/router
*/
linkTo,
linkToOCS,
linkToRemote,
/**
* @deprecated 19.0.0 use `generateOcsUrl` from https://www.npmjs.com/package/@nextcloud/router
*/
linkToOCS: generateOcsUrl,
/**
* @deprecated 19.0.0 use `generateRemoteUrl` from https://www.npmjs.com/package/@nextcloud/router
*/
linkToRemote: generateRemoteUrl,
linkToRemoteBase,
/**
* Relative path to Nextcloud root.
* For example: "/nextcloud"
*
* @type string
*
* @deprecated since 8.2, use OC.getRootPath() instead
* @deprecated 19.0.0 use `getRootUrl` from https://www.npmjs.com/package/@nextcloud/router
* @see OC#getRootPath
*/
webroot,
Expand Down
3 changes: 3 additions & 0 deletions core/src/OC/routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ export const generateUrl = (url, params, options) => {
* @param {string} app the app id to which the image belongs
* @param {string} file the name of the image file
* @returns {string}
* @deprecated 19.0.0 use `imagePath` from https://www.npmjs.com/package/@nextcloud/router
*/
export const imagePath = (app, file) => {
if (file.indexOf('.') === -1) {
Expand All @@ -122,6 +123,7 @@ export const imagePath = (app, file) => {
* @param {string} type the type of the file to link to (e.g. css,img,ajax.template)
* @param {string} file the filename
* @returns {string} Absolute URL for a file in an app
* @deprecated 19.0.0 use `generateFilePath` from https://www.npmjs.com/package/@nextcloud/router
*/
export const filePath = (app, type, file) => {
const isCore = coreApps.indexOf(app) !== -1
Expand Down Expand Up @@ -172,6 +174,7 @@ export const filePath = (app, type, file) => {
*
* @returns {string} web root path
*
* @deprecated 19.0.0 use `getRootUrl` from https://www.npmjs.com/package/@nextcloud/router
* @since 8.2
*/
export const getRootPath = () => OC.webroot