mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-11-20 03:25:52 +01:00
Code Issues Projects Releases Wiki Activity

implement PR suggestion to do all encoding in fn, so return type is str

Browse Source
This commit is contained in:
Bruno Windels 2022-11-25 17:45:31 +01:00
parent 467a76c223
commit f7132a48d9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/domain/navigation/index.ts
View File

@ -205,7 +205,7 @@ export function stringifyPath(path: Path<SegmentType>): string {
const encodedSegmentValue = encodeSegmentValue(segment.value);
switch (segment.type) {
case "rooms":
urlPath += `/rooms/${(encodedSegmentValue as string[]).join(",")}`;
urlPath += `/rooms/${encodedSegmentValue}`;
break;
case "empty-grid-tile":
urlPath += `/${encodedSegmentValue}`;
@ -224,7 +224,7 @@ export function stringifyPath(path: Path<SegmentType>): string {
continue;
default:
urlPath += `/${segment.type}`;
if (encodedSegmentValue && encodedSegmentValue !== true) {
if (encodedSegmentValue) {
urlPath += `/${encodedSegmentValue}`;
}
}
@ -233,13 +233,13 @@ export function stringifyPath(path: Path<SegmentType>): string {
return urlPath;
}
function encodeSegmentValue(value: SegmentType[keyof SegmentType]) {
if (typeof value === "boolean") {
function encodeSegmentValue(value: SegmentType[keyof SegmentType]): string {
if (value === true) {
// Nothing to encode for boolean
return value;
return "";
}
else if (Array.isArray(value)) {
return value.map(v => encodeURIComponent(v));
return value.map(v => encodeURIComponent(v)).join(",");
}
else {
return encodeURIComponent(value);