mystiq/hydrogen-web
Archived
4
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make defaultSessionId optional

Browse source
This commit is contained in:
RMidhunSuresh 2022-02-22 13:26:59 +05:30
parent f28dfc6964
commit 76d04ee277
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/domain/navigation/URLRouter.ts
View file

@ -19,7 +19,7 @@ import type {Navigation, Segment, Path, OptionalValue} from "./Navigation";
import type {SubscriptionHandle} from "../../observable/BaseObservable"; import type {SubscriptionHandle} from "../../observable/BaseObservable";
import type {SegmentType} from "./index"; import type {SegmentType} from "./index";
type ParseURLPath<T> = (urlPath: string, currentNavPath: Path<T>, defaultSessionId: string | null) => Segment<T>[]; type ParseURLPath<T> = (urlPath: string, currentNavPath: Path<T>, defaultSessionId?: string) => Segment<T>[];
type StringifyPath<T> = (path: Path<T>) => string; type StringifyPath<T> = (path: Path<T>) => string;
export class URLRouter<T extends SegmentType> { export class URLRouter<T extends SegmentType> {
@ -30,7 +30,7 @@ export class URLRouter<T extends SegmentType> {
private _subscription?: SubscriptionHandle; private _subscription?: SubscriptionHandle;
private _pathSubscription?: SubscriptionHandle; private _pathSubscription?: SubscriptionHandle;
private _isApplyingUrl: boolean = false; private _isApplyingUrl: boolean = false;
private _defaultSessionId: string | null; private _defaultSessionId?: string;
constructor(history: History, navigation: Navigation<T>, parseUrlPath: ParseURLPath<T>, stringifyPath: StringifyPath<T>) { constructor(history: History, navigation: Navigation<T>, parseUrlPath: ParseURLPath<T>, stringifyPath: StringifyPath<T>) {
this._history = history; this._history = history;
@ -40,13 +40,13 @@ export class URLRouter<T extends SegmentType> {
this._defaultSessionId = this._getLastSessionId(); this._defaultSessionId = this._getLastSessionId();
} }
_getLastSessionId(): string | null { _getLastSessionId(): string | undefined {
const navPath = this._urlAsNavPath(this._history.getLastUrl() || ""); const navPath = this._urlAsNavPath(this._history.getLastUrl() || "");
const sessionId = navPath.get("session")?.value; const sessionId = navPath.get("session")?.value;
if (typeof sessionId === "string") { if (typeof sessionId === "string") {
return sessionId; return sessionId;
} }
return null; return undefined;
} }
attach(): void { attach(): void {

24
src/domain/navigation/index.ts
View file

@ -124,7 +124,7 @@ export function addPanelIfNeeded<T extends SegmentType>(navigation: Navigation<T
return _path; return _path;
} }
export function parseUrlPath(urlPath: string, currentNavPath: Path<SegmentType>, defaultSessionId: string | null): Segment<SegmentType>[] { export function parseUrlPath(urlPath: string, currentNavPath: Path<SegmentType>, defaultSessionId?: string): Segment<SegmentType>[] {
// substr(1) to take of initial / // substr(1) to take of initial /
const parts = urlPath.substring(1).split("/"); const parts = urlPath.substring(1).split("/");
const iterator = parts[Symbol.iterator](); const iterator = parts[Symbol.iterator]();
@ -267,14 +267,14 @@ export function tests() {
}, },
"Parse loginToken query parameter into SSO segment": assert => { "Parse loginToken query parameter into SSO segment": assert => {
const path = createEmptyPath(); const path = createEmptyPath();
const segments = parseUrlPath("?loginToken=a1232aSD123", path, ""); const segments = parseUrlPath("?loginToken=a1232aSD123", path);
assert.equal(segments.length, 1); assert.equal(segments.length, 1);
assert.equal(segments[0].type, "sso"); assert.equal(segments[0].type, "sso");
assert.equal(segments[0].value, "a1232aSD123"); assert.equal(segments[0].value, "a1232aSD123");
}, },
"parse grid url path with focused empty tile": assert => { "parse grid url path with focused empty tile": assert => {
const path = createEmptyPath(); const path = createEmptyPath();
const segments = parseUrlPath("/session/1/rooms/a,b,c/3", path, ""); const segments = parseUrlPath("/session/1/rooms/a,b,c/3", path);
assert.equal(segments.length, 3); assert.equal(segments.length, 3);
assert.equal(segments[0].type, "session"); assert.equal(segments[0].type, "session");
assert.equal(segments[0].value, "1"); assert.equal(segments[0].value, "1");
@ -285,7 +285,7 @@ export function tests() {
}, },
"parse grid url path with focused room": assert => { "parse grid url path with focused room": assert => {
const path = createEmptyPath(); const path = createEmptyPath();
const segments = parseUrlPath("/session/1/rooms/a,b,c/1", path, ""); const segments = parseUrlPath("/session/1/rooms/a,b,c/1", path);
assert.equal(segments.length, 3); assert.equal(segments.length, 3);
assert.equal(segments[0].type, "session"); assert.equal(segments[0].type, "session");
assert.equal(segments[0].value, "1"); assert.equal(segments[0].value, "1");
@ -296,7 +296,7 @@ export function tests() {
}, },
"parse empty grid url": assert => { "parse empty grid url": assert => {
const path = createEmptyPath(); const path = createEmptyPath();
const segments = parseUrlPath("/session/1/rooms/", path, ""); const segments = parseUrlPath("/session/1/rooms/", path);
assert.equal(segments.length, 3); assert.equal(segments.length, 3);
assert.equal(segments[0].type, "session"); assert.equal(segments[0].type, "session");
assert.equal(segments[0].value, "1"); assert.equal(segments[0].value, "1");
@ -307,7 +307,7 @@ export function tests() {
}, },
"parse empty grid url with focus": assert => { "parse empty grid url with focus": assert => {
const path = createEmptyPath(); const path = createEmptyPath();
const segments = parseUrlPath("/session/1/rooms//1", path, ""); const segments = parseUrlPath("/session/1/rooms//1", path);
assert.equal(segments.length, 3); assert.equal(segments.length, 3);
assert.equal(segments[0].type, "session"); assert.equal(segments[0].type, "session");
assert.equal(segments[0].value, "1"); assert.equal(segments[0].value, "1");
@ -323,7 +323,7 @@ export function tests() {
new Segment("rooms", ["a", "b", "c"]), new Segment("rooms", ["a", "b", "c"]),
new Segment("room", "b") new Segment("room", "b")
]); ]);
const segments = parseUrlPath("/session/1/open-room/d", path, ""); const segments = parseUrlPath("/session/1/open-room/d", path);
assert.equal(segments.length, 3); assert.equal(segments.length, 3);
assert.equal(segments[0].type, "session"); assert.equal(segments[0].type, "session");
assert.equal(segments[0].value, "1"); assert.equal(segments[0].value, "1");
@ -339,7 +339,7 @@ export function tests() {
new Segment("rooms", ["a", "b", "c"]), new Segment("rooms", ["a", "b", "c"]),
new Segment("room", "b") new Segment("room", "b")
]); ]);
const segments = parseUrlPath("/session/1/open-room/a", path, ""); const segments = parseUrlPath("/session/1/open-room/a", path);
assert.equal(segments.length, 3); assert.equal(segments.length, 3);
assert.equal(segments[0].type, "session"); assert.equal(segments[0].type, "session");
assert.equal(segments[0].value, "1"); assert.equal(segments[0].value, "1");
@ -357,7 +357,7 @@ export function tests() {
new Segment("right-panel", true), new Segment("right-panel", true),
new Segment("details", true) new Segment("details", true)
]); ]);
const segments = parseUrlPath("/session/1/open-room/a", path, ""); const segments = parseUrlPath("/session/1/open-room/a", path);
assert.equal(segments.length, 5); assert.equal(segments.length, 5);
assert.equal(segments[0].type, "session"); assert.equal(segments[0].type, "session");
assert.equal(segments[0].value, "1"); assert.equal(segments[0].value, "1");
@ -379,7 +379,7 @@ export function tests() {
new Segment("right-panel", true), new Segment("right-panel", true),
new Segment("members", true) new Segment("members", true)
]); ]);
const segments = parseUrlPath("/session/1/open-room/a/member/foo", path, ""); const segments = parseUrlPath("/session/1/open-room/a/member/foo", path);
assert.equal(segments.length, 5); assert.equal(segments.length, 5);
assert.equal(segments[0].type, "session"); assert.equal(segments[0].type, "session");
assert.equal(segments[0].value, "1"); assert.equal(segments[0].value, "1");
@ -399,7 +399,7 @@ export function tests() {
new Segment("rooms", ["a", "b", "c"]), new Segment("rooms", ["a", "b", "c"]),
new Segment("empty-grid-tile", 4) new Segment("empty-grid-tile", 4)
]); ]);
const segments = parseUrlPath("/session/1/open-room/d", path, ""); const segments = parseUrlPath("/session/1/open-room/d", path);
assert.equal(segments.length, 3); assert.equal(segments.length, 3);
assert.equal(segments[0].type, "session"); assert.equal(segments[0].type, "session");
assert.equal(segments[0].value, "1"); assert.equal(segments[0].value, "1");
@ -410,7 +410,7 @@ export function tests() {
}, },
"parse session url path without id": assert => { "parse session url path without id": assert => {
const path = createEmptyPath(); const path = createEmptyPath();
const segments = parseUrlPath("/session", path, ""); const segments = parseUrlPath("/session", path);
assert.equal(segments.length, 1); assert.equal(segments.length, 1);
assert.equal(segments[0].type, "session"); assert.equal(segments[0].type, "session");
assert.strictEqual(segments[0].value, true); assert.strictEqual(segments[0].value, true);