PersistenceTransforms for date in datePickerRange and datePickerSingle #1376
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -265,10 +265,22 @@ const noopTransform = { | |||||
| apply: (storedValue, _propValue) => storedValue, | ||||||
| }; | ||||||
|
|
||||||
|
There was a problem hiding this comment. Old logic checks for just |
||||||
| const getTransform = (element, propName, propPart) => { | ||||||
| if (typeof element.persistenceTransforms !== 'undefined') { | ||||||
|
There was a problem hiding this comment. Here you can simplify the top level check to:
Suggested change
any truth-y value will pass the test (https://dorey.github.io/JavaScript-Equality-Table/) |
||||||
| if ( | ||||||
| Object.getOwnPropertyNames(element.persistenceTransforms).includes( | ||||||
|
There was a problem hiding this comment. Can be simplified to |
||||||
| propName | ||||||
| ) | ||||||
| ) { | ||||||
| if (propPart) { | ||||||
| return element.persistenceTransforms[propName][propPart]; | ||||||
| } | ||||||
| return element.persistenceTransforms[propName]; | ||||||
| } | ||||||
| return noopTransform; | ||||||
| } | ||||||
| return noopTransform; | ||||||
| }; | ||||||
|
|
||||||
| const getValsKey = (id, persistedProp, persistence) => | ||||||
| `${stringifyId(id)}.${persistedProp}.${JSON.stringify(persistence)}`; | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,12 @@ | |
| import dash_html_components as html | ||
| import dash_table as dt | ||
|
|
||
| from datetime import datetime | ||
| from datetime import timedelta as td | ||
|
|
||
|
|
||
| from selenium.webdriver.common.action_chains import ActionChains | ||
|
|
||
|
|
||
| @pytest.fixture(autouse=True) | ||
| def clear_storage(dash_duo): | ||
|
|
@@ -526,3 +532,189 @@ def set_out(val): | |
| dash_duo.wait_for_text_to_equal(".out", "") | ||
|
|
||
| dash_duo.find_element("#btn").click() | ||
|
|
||
|
|
||
|
There was a problem hiding this comment. Test persistence for DatePickerSingle and DatePicker range in callbacks, in conjunction with plotly/dash-core-components#848. There was a problem hiding this comment. While I think it's good to have at least one test that checks that persistence works as expected with and without a There was a problem hiding this comment. We could create a new test component similar to https://github.com/plotly/dash/tree/dev/%40plotly/dash-generator-test-component-standard that has both (1) prop part, (2) no prop part for two different persisted props, and we can validate the behavior against that component instead. |
||
| def test_rdps013_persisted_dps(dash_duo): | ||
| app = dash.Dash(__name__) | ||
| app.layout = html.Div( | ||
| [ | ||
| html.Button("fire callback", id="btn"), | ||
| html.Div( | ||
| children=[ | ||
| dcc.DatePickerSingle( | ||
| id="dps1", | ||
| date=datetime.today(), | ||
| persistence=True, | ||
| persistence_type="session", | ||
| ), | ||
| html.P("dps1", id="dps1-p"), | ||
| html.Div(id="container"), | ||
| html.P("dps2", id="dps2-p"), | ||
| ] | ||
| ), | ||
| ] | ||
| ) | ||
|
|
||
| @app.callback(Output("container", "children"), [Input("btn", "n_clicks")]) | ||
| def update_output(value): | ||
| return dcc.DatePickerSingle( | ||
| id="dps2", | ||
| date=datetime.today(), | ||
| persistence=True, | ||
| persistence_type="session", | ||
| ) | ||
|
|
||
| @app.callback(Output("dps1-p", "children"), [Input("dps1", "date")]) | ||
| def display_dps1(value): | ||
| print(value) | ||
|
|
||
| return value | ||
|
|
||
| @app.callback(Output("dps2-p", "children"), [Input("dps2", "date")]) | ||
| def display_dps2(value): | ||
| return value | ||
|
|
||
| dash_duo.start_server(app) | ||
| dps1 = dash_duo.find_element("#dps1") | ||
| dps2 = dash_duo.find_element("#dps2") | ||
|
|
||
| ( | ||
| ActionChains(dash_duo.driver) | ||
| .move_to_element(dps1) | ||
| .pause(0.2) | ||
| .click(dps1) | ||
| .send_keys(Keys.END) | ||
| .key_down(Keys.SHIFT) | ||
| .send_keys(Keys.HOME) | ||
| .key_up(Keys.SHIFT) | ||
| .send_keys(Keys.DELETE) | ||
| .send_keys("01/01/2020") | ||
| .send_keys(Keys.ENTER) | ||
| ).perform() | ||
|
|
||
| dash_duo.wait_for_text_to_equal("#dps1-p", "2020-01-01") | ||
|
|
||
| ( | ||
| ActionChains(dash_duo.driver) | ||
| .move_to_element(dps2) | ||
| .pause(0.2) | ||
| .click(dps2) | ||
| .send_keys(Keys.END) | ||
| .key_down(Keys.SHIFT) | ||
| .send_keys(Keys.HOME) | ||
| .key_up(Keys.SHIFT) | ||
| .send_keys(Keys.DELETE) | ||
| .send_keys("01/01/2020") | ||
| .send_keys(Keys.ENTER) | ||
|
There was a problem hiding this comment. DRY 🌴🐫 def set_date(target, date): |
||
| ).perform() | ||
|
|
||
| dash_duo.wait_for_text_to_equal("#dps2-p", "2020-01-01") | ||
|
|
||
| dash_duo.find_element("#btn").click() | ||
|
|
||
| dash_duo.wait_for_text_to_equal("#dps1-p", "2020-01-01") | ||
| dash_duo.wait_for_text_to_equal("#dps2-p", "2020-01-01") | ||
|
|
||
|
|
||
| def test_rdps014_persisted_dpr(dash_duo): | ||
| app = dash.Dash(__name__) | ||
| app.layout = html.Div( | ||
| [ | ||
| html.Button("fire callback", id="btn"), | ||
| html.Div( | ||
| children=[ | ||
| dcc.DatePickerRange( | ||
| id="dpr1", | ||
| start_date=datetime.today() - td(days=3), | ||
| end_date=datetime.today(), | ||
| persistence=True, | ||
| persistence_type="session", | ||
| ), | ||
| html.P("dpr1", id="dpr1-p-start"), | ||
| html.P("dpr1", id="dpr1-p-end"), | ||
| html.Div(id="container"), | ||
| html.P("dpr2", id="dpr2-p-start"), | ||
| html.P("dpr2", id="dpr2-p-end"), | ||
| ] | ||
| ), | ||
| ] | ||
| ) | ||
|
|
||
| @app.callback(Output("container", "children"), [Input("btn", "n_clicks")]) | ||
| def update_output(value): | ||
| return dcc.DatePickerRange( | ||
| id="dpr2", | ||
| start_date=datetime.today() - td(days=3), | ||
| end_date=datetime.today(), | ||
| persistence=True, | ||
| persistence_type="session", | ||
| ) | ||
|
|
||
| @app.callback(Output("dpr1-p-start", "children"), [Input("dpr1", "start_date")]) | ||
| def display_dps1(value): | ||
| print(value) | ||
|
|
||
| return value | ||
|
|
||
| @app.callback(Output("dpr1-p-end", "children"), [Input("dpr1", "end_date")]) | ||
| def display_dps1(value): | ||
| print(value) | ||
|
|
||
| return value | ||
|
|
||
| @app.callback(Output("dpr2-p-start", "children"), [Input("dpr2", "start_date")]) | ||
| def display_dps2(value): | ||
| return value | ||
|
|
||
| @app.callback(Output("dpr2-p-end", "children"), [Input("dpr2", "end_date")]) | ||
| def display_dps2(value): | ||
| return value | ||
|
|
||
| dash_duo.start_server(app) | ||
| dpr1 = dash_duo.find_element("div#dpr1 div div div div .DateInput_input") | ||
| dpr2 = dash_duo.find_element("div#dpr2 div div div div .DateInput_input") | ||
|
|
||
| ( | ||
| ActionChains(dash_duo.driver) | ||
| .move_to_element(dpr1) | ||
| .click(dpr1) | ||
| .send_keys(Keys.END) | ||
| .key_down(Keys.SHIFT) | ||
| .send_keys(Keys.HOME) | ||
| .key_up(Keys.SHIFT) | ||
| .send_keys("01/01/2020") | ||
| .pause(0.2) | ||
| .send_keys(Keys.END) | ||
| .key_down(Keys.SHIFT) | ||
| .send_keys(Keys.HOME) | ||
| .key_up(Keys.SHIFT) | ||
| .send_keys("01/02/2020") | ||
| ).perform() | ||
|
|
||
| dash_duo.wait_for_text_to_equal("#dpr1-p-start", "2020-01-01") | ||
| dash_duo.wait_for_text_to_equal("#dpr1-p-end", "2020-01-02") | ||
|
|
||
| ( | ||
| ActionChains(dash_duo.driver) | ||
| .move_to_element(dpr2) | ||
| .click(dpr2) | ||
| .send_keys(Keys.END) | ||
| .key_down(Keys.SHIFT) | ||
| .send_keys(Keys.HOME) | ||
| .key_up(Keys.SHIFT) | ||
| .send_keys("01/01/2020") | ||
| .pause(0.2) | ||
| # .send_keys("01/02/2020") | ||
| .send_keys(Keys.END) | ||
| .key_down(Keys.SHIFT) | ||
| .send_keys(Keys.HOME) | ||
| .key_up(Keys.SHIFT) | ||
| .send_keys("01/02/2020") | ||
|
There was a problem hiding this comment. DRY 🌴🐫 def set_date_range(target, start_date, end_date): There was a problem hiding this comment. There's also |
||
| ).perform() | ||
|
|
||
| dash_duo.wait_for_text_to_equal("#dpr2-p-start", "2020-01-01") | ||
| dash_duo.wait_for_text_to_equal("#dpr2-p-end", "2020-01-02") | ||
|
|
||
| dash_duo.find_element("#btn").click() | ||
|
|
||
| dash_duo.wait_for_text_to_equal("#dpr1-p-start", "2020-01-01") | ||
| dash_duo.wait_for_text_to_equal("#dpr1-p-end", "2020-01-02") | ||
| dash_duo.wait_for_text_to_equal("#dpr2-p-start", "2020-01-01") | ||
| dash_duo.wait_for_text_to_equal("#dpr2-p-end", "2020-01-02") | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These should be unnecessary now that we test against a custom-made component