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

Jump to bottom

fix browser history #552

Merged
merged 3 commits into from
Mar 21, 2024
Merged

fix browser history #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec5186d
tests: rename test_0305_requests to test_0306_requests
fscherf Mar 18, 2024
9a68ca7
templating: Namespace: client_version: fix typo
fscherf Mar 18, 2024
c726709
client: fix problems with the browser history
fscherf Mar 18, 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
6 changes: 3 additions & 3 deletions lona/client/_lona/client/input-events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class LonaInputEventHandler {
event.stopPropagation();

try {
lona_window.run_view(node.href);
lona_window.run_view(node.href, {}, true);

} catch(error) {
lona_window.crash(error);
Expand Down Expand Up @@ -253,10 +253,10 @@ export class LonaInputEventHandler {
href += '?' + query;
};

lona_window.run_view(href);
lona_window.run_view(href, {}, true);

} else if(method == 'post') {
lona_window.run_view(action, form_data);
lona_window.run_view(action, form_data, true);

};

Expand Down
15 changes: 8 additions & 7 deletions lona/client/_lona/client/window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,6 @@ export class LonaWindow {
this._view_runtime_id = view_runtime_id;
this._view_running = true;

if(this.lona_context.settings.update_address_bar) {
history.pushState({}, '', this.get_url().href);
};

this._clear();
this._clear_node_cache();

Expand All @@ -285,7 +281,7 @@ export class LonaWindow {
// TODO: implement loop detection

if(this.lona_context.settings.follow_redirects) {
this.run_view(payload);
this.run_view(payload, {}, true);

} else {
console.debug(
Expand Down Expand Up @@ -355,7 +351,7 @@ export class LonaWindow {
};
};

run_view(url, post_data) {
run_view(url, post_data, add_to_history) {
// Save the requested url to only show HTML messages that are related
// to this request.
// This prevents glitches when switching urls fast.
Expand All @@ -369,6 +365,11 @@ export class LonaWindow {
this._view_runtime_id = undefined;
this._set_url(url);

// add url to history
if(this.lona_context.settings.update_address_bar && add_to_history) {
history.pushState({}, '', this.get_url().href);
};

// reset view start timeout
if(this._view_start_timeout != undefined) {
clearTimeout(this._view_start_timeout);
Expand Down Expand Up @@ -412,6 +413,6 @@ export class LonaWindow {
};

setup(url) {
this.run_view(url);
this.run_view(url, {}, false);
};
};
6 changes: 3 additions & 3 deletions lona/client2/_lona/client2/input-events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class LonaInputEventHandler {
event.stopPropagation();

try {
lona_window.run_view(node.href);
lona_window.run_view(node.href, {}, true);

} catch(error) {
lona_window.crash(error);
Expand Down Expand Up @@ -253,10 +253,10 @@ export class LonaInputEventHandler {
href += '?' + query;
};

lona_window.run_view(href);
lona_window.run_view(href, {}, true);

} else if(method == 'post') {
lona_window.run_view(action, form_data);
lona_window.run_view(action, form_data, true);

};

Expand Down
15 changes: 8 additions & 7 deletions lona/client2/_lona/client2/window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ export class LonaWindow {
this._view_runtime_id = view_runtime_id;
this._view_running = true;

if(this.lona_context.settings.update_address_bar) {
history.pushState({}, '', this.get_url().href);
};

this._rendering_engine._clear();
this._rendering_engine._clear_node_cache();

Expand All @@ -118,7 +114,7 @@ export class LonaWindow {
// TODO: implement loop detection

if(this.lona_context.settings.follow_redirects) {
this.run_view(payload);
this.run_view(payload, {}, true);

} else {
console.debug(
Expand Down Expand Up @@ -188,7 +184,7 @@ export class LonaWindow {
};
};

run_view(url, post_data) {
run_view(url, post_data, add_to_history) {
// Save the requested url to only show HTML messages that are related
// to this request.
// This prevents glitches when switching urls fast.
Expand All @@ -202,6 +198,11 @@ export class LonaWindow {
this._view_runtime_id = undefined;
this._set_url(url);

// add url to history
if(this.lona_context.settings.update_address_bar && add_to_history) {
history.pushState({}, '', this.get_url().href);
};

// reset view start timeout
if(this._view_start_timeout != undefined) {
clearTimeout(this._view_start_timeout);
Expand Down Expand Up @@ -245,6 +246,6 @@ export class LonaWindow {
};

setup(url) {
this.run_view(url);
this.run_view(url, {}, false);
};
};
2 changes: 1 addition & 1 deletion lona/templating.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def state(self):
def client_version(self):
# TODO: remove in Lona 2.0

lona.warning.remove_2_0()
lona.warnings.remove_2_0()
return get_client_version()

def load_stylesheets(self):
Expand Down
0 tests/test_0305_requests.py → tests/test_0306_requests.py
View file
Open in desktop
File renamed without changes.
94 changes: 94 additions & 0 deletions tests/test_0307_history.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import pytest


@pytest.mark.parametrize('client_version', [1, 2])
@pytest.mark.parametrize('browser_name', ['chromium', 'firefox', 'webkit'])
async def test_client_history(
browser_name,
client_version,
lona_app_context,
):

"""
This test checks if the browser history works correctly by navigating
a browser page using the back and forward "buttons".
"""

from playwright.async_api import async_playwright

from lona.html import HTML, H1, A
from lona import View

def setup_app(app):

@app.route('/<title>')
class TestView(View):
def handle_request(self, request):
return HTML(
H1(request.match_info['title']),
A('foo', href='/foo', _id='foo'),
A('bar', href='/bar', _id='bar'),
A('baz', href='/baz', _id='baz'),
)

@app.route('/')
class Index(View):
def handle_request(self, request):
return HTML(
H1('index'),
A('foo', href='/foo', _id='foo'),
A('bar', href='/bar', _id='bar'),
A('baz', href='/baz', _id='baz'),
)

context = await lona_app_context(setup_app)

async with async_playwright() as p:
browser = await p.chromium.launch()
browser_context = await browser.new_context()
page = await browser_context.new_page()

# external site, about:blank
await page.goto('about:blank')
await page.wait_for_url('about:blank')

# /
await page.goto(context.make_url('/'))
await page.wait_for_url('/')
await page.wait_for_selector('h1:has-text("index")')

# /foo
await page.click('#foo')
await page.wait_for_url('/foo')
await page.wait_for_selector('h1:has-text("foo")')

# /bar
await page.click('#bar')
await page.wait_for_url('/bar')
await page.wait_for_selector('h1:has-text("bar")')

# back to /foo
await page.go_back()
await page.wait_for_url('/foo')
await page.wait_for_selector('h1:has-text("foo")')

# forward to /bar
await page.go_forward()
await page.wait_for_url('/bar')
await page.wait_for_selector('h1:has-text("bar")')

# back to /
await page.go_back()
await page.go_back()
await page.wait_for_url('/')
await page.wait_for_selector('h1:has-text("index")')

# back to external site
await page.go_back()
await page.wait_for_url('about:blank')

# forward to /foo
await page.go_forward()
await page.go_forward()
await page.wait_for_url('/foo')
await page.wait_for_selector('h1:has-text("foo")')
Loading