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.

Sign up for GitHub

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

Clean up code (drop unreachable code) and minor modernization #565

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Clean up code (drop unreachable code) and minor modernization #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d55dbc6
fix: Remove unreachable code
susnux Jan 25, 2024
e0becaf
fix: Optimize and modernize code
susnux Jan 25, 2024
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
14 changes: 14 additions & 0 deletions __tests__/paths.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,20 @@ describe('Path generation', () => {
beforeEach(() => {
window._oc_webroot = ''
window._oc_appswebroots = { forms: '/apps-extra/forms' }

window.OC = {
coreApps: ['', 'admin', 'log', 'core/search', 'core', '3rdparty'],
}
})

test('missing core apps global variable', () => {
delete window.OC.coreApps
expect(generateFilePath('forms', '', 'file.js')).toBe('/apps-extra/forms/file.js')
})

test('missing OC global variable (unit tests)', () => {
delete window.OC
expect(generateFilePath('forms', '', 'file.js')).toBe('/apps-extra/forms/file.js')
})

test('non core PHP index file', () => {
Expand Down
27 changes: 11 additions & 16 deletions lib/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,42 +162,37 @@ export const imagePath = (app: string, file: string) => {
* @return {string} URL with webroot for a file in an app
*/
export const generateFilePath = (app: string, type: string, file: string) => {
const isCore = window?.OC?.coreApps?.indexOf(app) !== -1
const isCore = window?.OC?.coreApps?.includes(app) ?? false
const isPHP = file.slice(-3) === 'php'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also equivalent to file.substring(file.length - 3) === 'php', good catch to reuse it

let link = getRootUrl()
if (file.substring(file.length - 3) === 'php' && !isCore) {
if (isPHP && !isCore) {
link += `/index.php/apps/${app}`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

template strings are more performant on modern browsers than string concatenation (and I think better readable).

if (type) {
link += `/${encodeURI(type)}`
}
if (file !== 'index.php') {
link += `/${file}`
}
} else if (file.substring(file.length - 3) !== 'php' && !isCore) {
} else if (!isPHP && !isCore) {
link = getAppRootUrl(app)
if (type) {
link += '/' + type + '/'
link += `/${type}/`
}
if (link.substring(link.length - 1) !== '/') {
if (link.at(-1) !== '/') {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.at supports negative indices (like in most other languages) which are the index from the end, meaning -1 is the last char.
Reduces the complexity of this statement.

link += '/'
}
link += file
} else {
if ((app === 'settings' || app === 'core' || app === 'search') && type === 'ajax') {
link += '/index.php/'
} else {
link += '/'
link += '/index.php'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving a / character a bit seems to be correct, and isolated in the else block

}
if (!isCore) {
link += 'apps/'
}
Comment on lines -190 to -192
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could never reached, because the above if-else were covering !isCore && isPHP and !isCore && !isPHP meaning when we end here isCore is always true.

if (app !== '') {
app += '/'
link += app
if (app) {
link += `/${app}`
}
if (type) {
link += type + '/'
link += `/${type}`
}
link += file
link += `/${file}`
}
return link
}
Expand Down
Loading