cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-22 07:29:08 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: handle trailing slash in URL preset

Browse Source
This commit is contained in:
Carlos Valente
2025-01-19 11:10:32 +01:00
committed by Carlos Valente
parent 0450eb9169
commit b4c7b84f92
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/common/utils/urlPresets.ts
+8 -1
View File
@@ -28,6 +28,13 @@ export const validateUrlPresetPath = (preset: string): { message: string; isVali
return { isValid: true, message: 'ok' }; return { isValid: true, message: 'ok' };
}; };
/**
* Utility removes trailing slash from a string
*/
function removeTrailingSlash(text: string): string {
return text.replace(/\/$/, '');
}
/** /**
* Gets the URL to send a preset to * Gets the URL to send a preset to
* @param location * @param location
@@ -38,7 +45,7 @@ export const getRouteFromPreset = (location: Location, data: URLPreset[], search
const currentURL = location.pathname.substring(1); const currentURL = location.pathname.substring(1);
// we need to check if the whole url here is an alias, so we can redirect // we need to check if the whole url here is an alias, so we can redirect
const foundPreset = data.filter((d) => d.alias === currentURL && d.enabled)[0]; const foundPreset = data.find((preset) => preset.alias === removeTrailingSlash(currentURL) && preset.enabled);
if (foundPreset) { if (foundPreset) {
return generateUrlFromPreset(foundPreset); return generateUrlFromPreset(foundPreset);
} }