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.

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

Configure document-title during updates #1315

Merged
merged 17 commits into from
Jul 9, 2020
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## Unreleased
### Added
- [#1315](https://github.com/plotly/dash/pull/1315) Add `update_title` parameter to set or disable the "Updating...." document title during updates. Closes [#856](https://github.com/plotly/dash/issues/856) and [#732](https://github.com/plotly/dash/issues/732)

## [1.13.4] - 2020-06-25
### Fixed
- [#1310](https://github.com/plotly/dash/pull/1310) Fix a regression since 1.13.0 preventing more than one loading state from being shown at a time.
Expand Down
8 changes: 6 additions & 2 deletions dash-renderer/src/components/core/DocumentTitle.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ import PropTypes from 'prop-types';
class DocumentTitle extends Component {
constructor(props) {
super(props);
const {update_title} = props.config;
this.state = {
initialTitle: document.title,
update_title,
};
}

UNSAFE_componentWillReceiveProps(props) {
if (props.isLoading) {
document.title = 'Updating...';
Copy link
Collaborator

Choose a reason for hiding this comment

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

@Marc-Andre-Rivet as we were discussing the other day - the renderer no longer holds this default value at all. That means when the R and Julia implementations update to include this functionality in their renderer, they will need to add this option to the back end at the same time or the default behavior will change to no title changes ever.

if (this.state.update_title && props.isLoading) {
document.title = this.state.update_title;
} else {
document.title = this.state.initialTitle;
}
Expand All @@ -29,8 +31,10 @@ class DocumentTitle extends Component {

DocumentTitle.propTypes = {
isLoading: PropTypes.bool.isRequired,
config: PropTypes.shape({update_title: PropTypes.string}),
};

export default connect(state => ({
isLoading: state.isLoading,
config: state.config,
}))(DocumentTitle);
3 changes: 3 additions & 0 deletions dash/dash.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ def __init__(
prevent_initial_callbacks=False,
show_undo_redo=False,
plugins=None,
update_title="Updating...",
**obsolete
):
_validate.check_obsolete(obsolete)
Expand Down Expand Up @@ -299,6 +300,7 @@ def __init__(
),
prevent_initial_callbacks=prevent_initial_callbacks,
show_undo_redo=show_undo_redo,
update_title=update_title,
)
self.config.set_read_only(
[
Expand Down Expand Up @@ -506,6 +508,7 @@ def _config(self):
"props_check": self._dev_tools.props_check,
"show_undo_redo": self.config.show_undo_redo,
"suppress_callback_exceptions": self.config.suppress_callback_exceptions,
"update_title": self.config.update_title,
}
if self._dev_tools.hot_reload:
config["hot_reload"] = {
Expand Down
45 changes: 45 additions & 0 deletions tests/integration/renderer/test_loading_states.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from multiprocessing import Lock

import pytest
import dash
from dash.dependencies import Input, Output
from dash.testing.wait import until

import dash_core_components as dcc
import dash_html_components as html
Expand Down Expand Up @@ -167,3 +169,46 @@ def find_text(spec):

find_spinners()
find_text({1: 1, 2: 1, 3: 1, 4: 1})


@pytest.mark.parametrize(
"kwargs, expected_update_title",
[
({}, "Updating..."),
({"update_title": None}, "Dash"),
({"update_title": ""}, "Dash"),
({"update_title": "Hello World"}, "Hello World"),
]
)
def test_rdls003_update_title(dash_duo, kwargs, expected_update_title):
app = dash.Dash("Dash", **kwargs)
lock = Lock()

app.layout = html.Div(
children=[
html.H3("Press button see document title updating"),
html.Div(id="output"),
html.Button("Update", id="button", n_clicks=0),
]
)

@app.callback(
Output("output", "children"),
[Input("button", "n_clicks")]
)
def update(n):
with lock:
# check for update-title while processing callback
until(lambda: dash_duo.driver.title == expected_update_title, timeout=1)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Interesting... this appears to work but I'm kind of surprised it does - it might actually be waiting for the timeout period and then throwing an error silently. That's because the server and the browser side are running in different processes (hence the need for Lock).

I'd remove the title check inside the callback, and just put it at the very end of the test, after #button.click() (but still inside the with lock: block)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@alexcjohnson

I'd remove the title check inside the callback, and just put it at the very end of the test, after #button.click() (but still inside the with lock: block)

This was my first shot but that didn't work at that time because I missed the lock inside the callback. Now this works like a charm. I also added the check on startup again.

return n

with lock:
dash_duo.start_server(app)
# check for update-title on load
until(lambda: dash_duo.driver.title == expected_update_title, timeout=1)

# check for original title after loading
until(lambda: dash_duo.driver.title == "Dash", timeout=1)

with lock:
dash_duo.find_element("#button").click()