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

Support for index page templating #168

Merged
merged 35 commits into from
Feb 11, 2020
Merged

Support for index page templating #168

merged 35 commits into from
Feb 11, 2020

Conversation

HammadTheOne
Copy link
Contributor

@HammadTheOne HammadTheOne commented Jan 14, 2020

This PR adds in custom index functionality by adding in a method to the Dash class which takes in an HTML index string with some necessary defaults, and whatever custom additions or changes a user wants to make, and then renders it above or below the app based on where the code is added. Custom meta_tags, title, and scripts like the Google Tag Manager analytics can be added to the index body and loaded with the script tag.

This functionality brings Dash for R to parity with the major feature set of Dash for Python.

An example of a custom string is below:

string <-
"<!DOCTYPE html>
        <html>
          <head>
            {meta_tags}
            <title>{private$name}</title>
            {favicon}
            {css_tags}
            <script type ='text/javascript' src='googleanalytics.js'></script>
          </head>
          <body>
            <p>'This is a custom string!'</p>
            <!-- Google Tag Manager (noscript) -->
              <noscript><iframe src='https://www.googletagmanager.com/ns.html?id=GTM-XXXXXXX'
              height='0' width='0' style='display:none;visibility:hidden'></iframe></noscript>
          <!-- End Google Tag Manager (noscript) -->
            <div id='react-entry-point'>
              <div class='_dash-loading'>Loading...</div>
            </div>
            <footer>
              <script id='_dash-config' type='application/json'> {to_JSON(self$config)} </script>
              {scripts_tags}
            </footer>
          </body>
        </html>"

Closes #42

rpkyle and others added 7 commits January 4, 2020 12:33
* Provide support for no_update in Dash for R (#111)

* Use dev_tools_prune_errors instead of pruned_errors (#113)

* Better handling for user-defined error conditions in debug mode (#116)

* Provide support for multiple outputs (#119)

* Provide support for hot reloading in Dash for R (#127)

* Implement support for clientside callbacks in Dash for R (#130)

* Add line number context to stack traces when srcrefs are available (#133)

* Update dash-renderer to 1.2.2 and fix dev tools UI display of stack traces (#137)

* Support for meta tags in Dash for R (#142)

* Fixes for hot reloading interval handling and refreshing apps within viewer pane (#148)

* Support for asynchronous loading/compression in Dash for R (#157)

* Support returning asset URLs via public method within Dash class (#160)

* Minor fix for get_asset_url + docs, add url_base_pathname (#161)
@rpkyle rpkyle self-requested a review January 14, 2020 19:31
@rpkyle rpkyle changed the title 42 index page templating Support for index page templating Jan 14, 2020
Copy link
Contributor

@rpkyle rpkyle left a comment

Choose a reason for hiding this comment

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

@HammadTheOne This is well on the way to the final solution, but I think we want to resolve a few things first, namely:

  • adding support for interpolation keys, as outlined in Assets files & index customizations dash#286
  • providing similar context in the R online help for the index_string method as we provide in Python
  • using the same interface (in terms of argument names/syntax) for index_string as in Python
  • throwing a similar error message in R as we do in Python, so the user can see right away all the keys which are undefined
  • removing the name argument and adding a helpful warning when it is used, for parity with Dash for Python, since title is now available through index customization
  • 🚨 implementing integration tests for the new feature (can borrow heavily from the existing tests on the Python side (e.g. check out the use of index_string in https://github.com/plotly/dash/blob/dev/tests/integration/test_integration.py) to ensure that the index template is properly applied when serving the index

.circleci/config.yml Outdated Show resolved Hide resolved
.github/CODEOWNERS Outdated Show resolved Hide resolved
DESCRIPTION Outdated Show resolved Hide resolved
DESCRIPTION Show resolved Hide resolved
DESCRIPTION Show resolved Hide resolved
R/dash.R Show resolved Hide resolved
R/dash.R Outdated Show resolved Hide resolved
R/dash.R Show resolved Hide resolved
R/dash.R Outdated Show resolved Hide resolved
R/dash.R Outdated
if (!is.null(private$custom_index)) {
interpolated_index <- glue::glue(private$custom_index)

private$.index <- interpolated_index
Copy link
Contributor

Choose a reason for hiding this comment

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

One thing I don't think I see here that we likely want to implement are the interpolation keys -- see the comments in this merged PR for more info:

plotly/dash#286

Let me know if I can help with anything here, but the general goal is to make the implementation as similar as we can to what currently exists on the Python side (within reason!).

Copy link
Contributor Author

@HammadTheOne HammadTheOne Jan 19, 2020

Choose a reason for hiding this comment

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

Implemented in 036e4e5. It's not as clean as I'd want it to be, but I'd be interested to hear your thoughts on it.

Copy link
Contributor

Choose a reason for hiding this comment

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

I've tried to make the implementation a little more concise while aiming for 🌴 code, in 5ae7549 and 39d52e0.

Copy link
Contributor

@rpkyle rpkyle left a comment

Choose a reason for hiding this comment

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

💃 Pending minor comments, and the addition of tests. I can try to help a bit with the latter today, unless you're ready to tackle those. Nice work on tackling this feature, once this is merged, Dash for R will be just about at parity with all major functionality in Dash for Python! 🏆

R/dash.R Outdated Show resolved Hide resolved
R/dash.R Outdated Show resolved Hide resolved
R/dash.R Outdated

requiredKeys <- c("app_entry", "config", "scripts")

checks <- sapply(requiredKeys, function(x) grepl(x, names(kwargs)))
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice, this is creative -- I wouldn't have thought of doing it this way.

I wonder if this might be a little more succinct, though; you try something like

        stop(sprintf("Did you forget to include %s in your index string?", 
                     paste(setdiff(required_keys, names(kwargs)), collapse = ", ")))

For generating the vector of booleans (logicals), I'd suggest using vapply instead of sapply; I try to avoid the latter when writing package code since it is not type-safe.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think I found a way to make this a little more concise in 5ae7549.

@rpkyle rpkyle added this to the Dash Q1/2020 milestone Feb 6, 2020
DESCRIPTION Outdated Show resolved Hide resolved
@rpkyle rpkyle merged commit 3733ead into dev Feb 11, 2020
@rpkyle rpkyle deleted the 42-index-page-templating branch February 11, 2020 22:27
This was referenced Feb 12, 2020
rpkyle added a commit that referenced this pull request Feb 13, 2020
* Autoset routes and requests pathname prefixes (#165)

* Inspect environment variables for host & port (#167)

* Support for index page templating (#168)

* Add support for config-aware relative paths (#172)

* Add unit tests for index customization (#176)

* Send status code of 1 when unit tests fail (#177)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants