Skip to content

Support for index page templating #168

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

Merged
merged 35 commits into from
Feb 11, 2020
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
f6c13a9
Dash for R v0.2.0 (#162)
rpkyle Jan 4, 2020
f81fcb5
Update README.md
rpkyle Jan 5, 2020
a58d4f2
Added initial implementation of index customization with strings
HammadTheOne Jan 9, 2020
4d72243
Fixed issue with `collect_assets` being undefined
HammadTheOne Jan 10, 2020
30251cf
Added description and details.
HammadTheOne Jan 10, 2020
3346a93
Added description
HammadTheOne Jan 14, 2020
2e58b37
Added error messages and warnings.
HammadTheOne Jan 14, 2020
0984660
Merge branch 'dev' into 42-index-page-templating
HammadTheOne Jan 14, 2020
3aa0f50
Updated version to 0.3.0
HammadTheOne Jan 16, 2020
a2410d5
Added CRLF
HammadTheOne Jan 16, 2020
a158a37
Updated environment variable names to `dev` versions.
HammadTheOne Jan 17, 2020
1138e4c
Improved error message function, made parity changes for index keys.
HammadTheOne Jan 17, 2020
fd67f8a
Added available keys to description.
HammadTheOne Jan 17, 2020
17a61d1
Parity changes to `app_entry` and `config` keys
HammadTheOne Jan 17, 2020
13ebec4
Cleaned up description.
HammadTheOne Jan 17, 2020
ab54aa0
Added `interpolate_str` helper function to `utils.R`
HammadTheOne Jan 17, 2020
ce4a8b6
Changes to default index, consolidating `_dash-config`
HammadTheOne Jan 17, 2020
036e4e5
Added template index and logic for choosing correct index.
HammadTheOne Jan 19, 2020
09b0851
Added description for `interpolate_index`.
HammadTheOne Jan 19, 2020
4023b67
Updated glue arguments in `index_string` method, added example index.
HammadTheOne Jan 27, 2020
8e98370
Update to `interpolate_index` to reflect changes to `index_string`.
HammadTheOne Jan 27, 2020
0ce3158
Bugfix, referenced correct private variable.
HammadTheOne Jan 27, 2020
7fd1ebe
Update R/dash.R
rpkyle Feb 6, 2020
a0c2f7e
:hocho: cat(template)
Feb 6, 2020
5ae7549
:camel: make concise
Feb 6, 2020
79b0faa
replace = with <-
Feb 6, 2020
39d52e0
:dromedary_camel: DRY up key validation logic
Feb 6, 2020
8b71875
:black_large_square: use invisible
Feb 6, 2020
f3dbfb9
use latest pkgs
Feb 11, 2020
e3a40c3
update package docs
Feb 11, 2020
df3d780
update docs; remove name, add title
Feb 11, 2020
84f8464
note title method
Feb 11, 2020
5bbba6e
:see_no_evil: need default app name
Feb 11, 2020
2aef1f3
:rotating_light: add integration tests
Feb 11, 2020
56904ba
fix ref for dcc
Feb 11, 2020
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
33 changes: 24 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ jobs:
working_directory: ~/dashr
docker:
- image: byronz/dashr:ci
environment:
PERCY_PARALLEL_TOTAL: '-1'
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 'True'

steps:
- checkout
Expand All @@ -22,25 +25,37 @@ jobs:
echo "JOB PARALLELISM: ${CIRCLE_NODE_TOTAL}"
echo "CIRCLE_REPOSITORY_URL: ${CIRCLE_REPOSITORY_URL}"
echo $CIRCLE_JOB > circlejob.txt
git rev-parse HEAD | tr -d '\n' > commit.txt

- run:
name: 🚧 install R dependencies
command: |
sudo Rscript -e 'install.packages("remotes")'
sudo R -e "remotes::install_github('plotly/dash-core-components', dependencies=TRUE)"
sudo R -e "remotes::install_github('plotly/dash-html-components', dependencies=TRUE)"
sudo R -e "remotes::install_github('plotly/dash-table', dependencies=TRUE)"
sudo R CMD INSTALL .
sudo Rscript -e 'commit_hash <- readChar("commit.txt", file.info("commit.txt")$size); message("Preparing to install plotly/dashR ", commit_hash, " ..."); install.packages("remotes"); remotes::install_github("plotly/dashR", upgrade=TRUE, ref=commit_hash, force=TRUE)'

- run:
name: ⚙️ run integration test
name: ⚙️ Integration tests
command: |
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git
cd dash && pip install -e .[testing] --quiet && cd ..
pip install -e git+https://github.com/plotly/dash.git#egg=dash[testing]
export PATH=$PATH:/home/circleci/.local/bin/
pytest tests/integration/
pytest --log-cli-level DEBUG --nopercyfinalize --junitxml=test-reports/dashr.xml tests/integration/
- store_artifacts:
path: test-reports
- store_test_results:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts

- run:
name: 🦔 percy finalize
command: npx percy finalize --all
when: always

- run:
name: 🔎 Unit tests
command: |
sudo Rscript -e 'testthat::test_dir("tests/")'

workflows:
version: 2
Expand Down
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence
@alexcjohnson @Marc-Andre-Rivet @rpkyle
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
# Change Log for Dash for R
All notable changes to this project will be documented in this file.

## [0.2.0] - 2020-01-03
### Added
- Support for asynchronous/dynamic loading of dependencies, resource caching, and asset fingerprinting [#157](https://github.com/plotly/dashR/pull/157)
- Compression of text resources using `brotli`, `gzip`, or `deflate` [#157](https://github.com/plotly/dashR/pull/157)
- Support for adding `<meta>` tags to index [#142](https://github.com/plotly/dashR/pull/142)
- Hot reloading now supported in debug mode [#127](https://github.com/plotly/dashR/pull/127)
- Support for displaying Dash for R applications within RStudio's viewer pane when `use_viewer = TRUE`
- Clientside callbacks written in JavaScript are now supported [#130](https://github.com/plotly/dashR/pull/130)
- Multiple outputs are now supported [#119](https://github.com/plotly/dashR/pull/119)
- Selective callback updates to properties now supported with `dashNoUpdate()` [#111](https://github.com/plotly/dashR/pull/111)
- Additional line number context inserted when available within stack traces [#133](https://github.com/plotly/dashR/pull/133)
- Integration and unit tests are now performed when commits are made to open pull requests
- Support returning asset URLs via `app$get_asset_url` when app is loaded via `source()` or `APP_ROOT_PATH` environment variable is defined [#160](https://github.com/plotly/dashR/pull/160)
- `url_base_pathname` added; mimics functionality in Dash for Python, sets defaults for `routes_pathname_prefix` and `requests_pathname_prefix` when not otherwise provided [#161](https://github.com/plotly/dashR/pull/161)

### Changed
- `dash-renderer` updated to v1.2.2 [#137](https://github.com/plotly/dashR/pull/137)
- Dash for R no longer requires forked `reqres`, patch applied upstream [thomasp85/reqres#9](https://github.com/thomasp85/reqres/pull/9)
- The `pruned_errors` parameter has been renamed to `dev_tools_prune_errors` [#113](https://github.com/plotly/dashR/pull/113)

### Fixed
- Stack traces now display properly within viewer pane when `debug = TRUE` and `use_viewer = TRUE` [#137](https://github.com/plotly/dashR/pull/137)
- Patch for `reqres` package to handle cookies containing multiple "=" [#122](https://github.com/plotly/dashR/pull/122)
- Handling for user-defined errors in callbacks implemented [#116](https://github.com/plotly/dashR/pull/116)
- Fixes for hot reloading interval handling and refreshing apps within viewer pane [#148](https://github.com/plotly/dashR/pull/148)
- `get_asset_url` checks `getAppPath()` as well as `DASH_APP_ROOT_PATH` environment variable when invoked [#161](https://github.com/plotly/dashR/pull/161)

## [0.1.0] - 2019-07-10
### Added
- Initial release
Expand Down
18 changes: 9 additions & 9 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Package: dash
Title: An Interface to the Dash Ecosystem for Authoring Reactive Web Applications
Version: 0.1.0
Version: 0.2.0
Authors@R: c(person("Chris", "Parmer", role = c("aut"), email = "[email protected]"), person("Ryan Patrick", "Kyle", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-5829-9867"), email = "[email protected]"), person("Carson", "Sievert", role = c("aut"), comment = c(ORCID = "0000-0002-4958-2844")), person(family = "Plotly Technologies", role = "cph"))
Description: A framework for building analytical web applications, Dash offers a pleasant and productive development experience. No JavaScript required.
Depends:
R (>= 3.0.2)
Imports:
dashHtmlComponents (== 1.0.0),
dashCoreComponents (== 1.0.0),
dashTable (== 4.0.2),
dashHtmlComponents (== 1.0.2),
dashCoreComponents (== 1.6.0),
dashTable (== 4.5.1),
R6,
fiery (> 1.0.0),
routr (> 0.2.0),
plotly,
reqres,
reqres (>= 0.2.3),
jsonlite,
htmltools,
assertthat,
Expand All @@ -31,13 +31,13 @@ Collate:
'imports.R'
'print.R'
'internal.R'
Remotes: plotly/dash-html-components@17da1f4,
plotly/dash-core-components@cc1e654,
plotly/dash-table@042ad65,
plotly/reqres@55072ab
Remotes: plotly/dash-html-components@55c3884,
plotly/dash-core-components@c107e0f,
plotly/dash-table@3058bd5
License: MIT + file LICENSE
Encoding: UTF-8
LazyData: true
KeepSource: true
RoxygenNote: 6.1.1
Roxygen: list(markdown = TRUE)
URL: https://github.com/plotly/dashR
Expand Down
3 changes: 2 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

S3method(print,dash_component)
export(Dash)
export(clientsideFunction)
export(dashNoUpdate)
export(input)
export(output)
Expand All @@ -26,4 +27,4 @@ importFrom(routr,RouteStack)
importFrom(routr,ressource_route)
importFrom(stats,setNames)
importFrom(tools,file_ext)
importFrom(utils,getFromNamespace)
importFrom(utils,getFromNamespace)
Copy link
Contributor

Choose a reason for hiding this comment

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

@HammadTheOne Watch out for the lack of CRLF at EOF, as denoted by the 🚫 above. We'll want to restore this (might have been my accidental doing, but would need to check the history).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in a2410d.

Loading