Merge branch 'dev' into cleaned-pmc

Author: alexcjohnson

CHANGELOG.md

@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## [Unreleased]
 
 ### Changed
+- [#1876](https://github.com/plotly/dash/pull/1876) Delays finalizing `Dash.config` attributes not used in the constructor until `init_app()`.
 - [#1869](https://github.com/plotly/dash/pull/1869), [#1873](https://github.com/plotly/dash/pull/1873) Upgrade Plotly.js to v2.8.3. This includes:
   - [Feature release 2.5.0](https://github.com/plotly/plotly.js/releases/tag/v2.5.0):
     - 3D traces are now compatible with `no-unsafe-eval` CSP rules.
@@ -29,6 +30,9 @@ This project adheres to [Semantic Versioning](https://semver.org/).
     - `dash[ci]`: mainly for internal use, these are additional requirements for the Dash CI tests, exposed for other component libraries to use a matching configuration.
 
 ### Added
+- [#1883](https://github.com/plotly/dash/pull/1883) in DataTable added `page_current` to `persisted_props` as requested in [#1860](https://github.com/plotly/dash/issues/1860)
+
+
 
 - [#1763](https://github.com/plotly/dash/pull/1763):
     ## Dash and Dash Renderer
@@ -183,6 +187,9 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - [#1779](https://github.com/plotly/dash/pull/1779):
     - Clean up our handling of serialization problems, including fixing `orjson` for Python 3.6
     - Added the ability for `dash.testing` `percy_snapshot` methods to choose widths to generate.
+  
+- [#1778](https://github.com/plotly/dash/pull/1778) DataTable: Fix React warnings stating
+  that each child in a list should have a unique "key" prop
 
 ## [2.0.0] - 2021-08-03
 

components/dash-core-components/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Change Log for dash-core-components
+### NOTE: as of v2.0, changes in dash-core-component are all being recorded in the main dash changelog.
+### This file is kept only for historical purposes.
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 

components/dash-html-components/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Change Log for dash-html-components
+### NOTE: as of v2.0, changes in dash-html-components are all being recorded in the main dash changelog.
+### This file is kept only for historical purposes.
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 

components/dash-table/CHANGELOG.md

@@ -1,11 +1,9 @@
 # Change Log for dash-table
+### NOTE: as of v2.0, changes in dash-table are all being recorded in the main dash changelog.
+### This file is kept only for historical purposes.
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
-### Fixed
-- [#1778](https://github.com/plotly/dash/pull/1778) Fix React warnings stating
-  that each child in a list should have a unique "key" prop
 
 ## [4.12.0] - 2021-07-09
 ### Fixed

components/dash-table/src/dash-table/dash/DataTable.js

@@ -101,6 +101,7 @@ export const defaultProps = {
         'columns.name',
         'filter_query',
         'hidden_columns',
+        'page_current',
         'selected_columns',
         'selected_rows',
         'sort_by'
@@ -1537,6 +1538,7 @@ export const propTypes = {
             'data',
             'filter_query',
             'hidden_columns',
+            'page_current',
             'selected_columns',
             'selected_rows',
             'sort_by'

dash/_utils.py

@@ -137,23 +137,37 @@ def __getattr__(self, key):
         raise AttributeError(key)
 
     def set_read_only(self, names, msg="Attribute is read-only"):
-        object.__setattr__(self, "_read_only", names)
-        object.__setattr__(self, "_read_only_msg", msg)
+        """
+        Designate named attributes as read-only with the corresponding msg
+
+        Method is additive. Making additional calls to this method will update
+        existing messages and add to the current set of _read_only names.
+        """
+        new_read_only = {name: msg for name in names}
+        if getattr(self, "_read_only", False):
+            self._read_only.update(new_read_only)
+        else:
+            object.__setattr__(self, "_read_only", new_read_only)
 
     def finalize(self, msg="Object is final: No new keys may be added."):
         """Prevent any new keys being set."""
         object.__setattr__(self, "_final", msg)
 
     def __setitem__(self, key, val):
-        if key in self.__dict__.get("_read_only", []):
-            raise AttributeError(self._read_only_msg, key)
+        if key in self.__dict__.get("_read_only", {}):
+            raise AttributeError(self._read_only[key], key)
 
         final_msg = self.__dict__.get("_final")
         if final_msg and key not in self:
             raise AttributeError(final_msg, key)
 
         return super().__setitem__(key, val)
 
+    def update(self, other):
+        # Overrides dict.update() to use __setitem__ above
+        for k, v in other.items():
+            self[k] = v
+
     # pylint: disable=inconsistent-return-statements
     def first(self, *names):
         for name in names:

dash/dash.py

@@ -356,9 +356,6 @@ def __init__(
                 "assets_folder",
                 "assets_url_path",
                 "eager_loading",
-                "url_base_pathname",
-                "routes_pathname_prefix",
-                "requests_pathname_prefix",
                 "serve_locally",
                 "compress",
             ],
@@ -427,8 +424,19 @@ def __init__(
 
         self.logger.setLevel(logging.INFO)
 
-    def init_app(self, app=None):
+    def init_app(self, app=None, **kwargs):
         """Initialize the parts of Dash that require a flask app."""
+
+        self.config.update(kwargs)
+        self.config.set_read_only(
+            [
+                "url_base_pathname",
+                "routes_pathname_prefix",
+                "requests_pathname_prefix",
+            ],
+            "Read-only: can only be set in the Dash constructor or during init_app()",
+        )
+
         config = self.config
 
         if app is not None:

tests/unit/dash/test_utils.py

@@ -24,12 +24,13 @@ def test_ddut001_attribute_dict():
     assert a.k == 2
     assert a["k"] == 2
 
-    a.set_read_only(["k", "q"], "boo")
+    a.set_read_only(["k"], "boo")
 
     with pytest.raises(AttributeError) as err:
         a.k = 3
     assert err.value.args == ("boo", "k")
     assert a.k == 2
+    assert a._read_only == {"k": "boo"}
 
     with pytest.raises(AttributeError) as err:
         a["k"] = 3
@@ -38,13 +39,11 @@ def test_ddut001_attribute_dict():
 
     a.set_read_only(["q"])
 
-    a.k = 3
-    assert a.k == 3
-
     with pytest.raises(AttributeError) as err:
         a.q = 3
     assert err.value.args == ("Attribute is read-only", "q")
     assert "q" not in a
+    assert a._read_only == {"k": "boo", "q": "Attribute is read-only"}
 
     a.finalize("nope")
 

tests/unit/test_configs.py

@@ -370,3 +370,19 @@ def test_title():
     assert "<title>Hello World</title>" in app.index()
     app = Dash(title="Custom Title")
     assert "<title>Custom Title</title>" in app.index()
+
+
+def test_app_delayed_config():
+    app = Dash(server=False)
+    app.init_app(app=Flask("test"), requests_pathname_prefix="/dash/")
+
+    assert app.config.requests_pathname_prefix == "/dash/"
+
+    with pytest.raises(AttributeError):
+        app.config.name = "cannot update me"
+
+
+def test_app_invalid_delayed_config():
+    app = Dash(server=False)
+    with pytest.raises(AttributeError):
+        app.init_app(app=Flask("test"), name="too late 2 update")