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

Feat/34 enable parameter parsing #47

Merged
merged 34 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
331a6aa
Increment version number to 0.0.0.9007
AlexAxthelm Dec 10, 2024
91f8504
Enable param parsing in script
AlexAxthelm Dec 11, 2024
57ca87f
Use arguments for directories, rather than reassign
AlexAxthelm Dec 11, 2024
8a309ee
Use params for report params, and add simple logging
AlexAxthelm Dec 11, 2024
dafd6aa
Git keep default dev output dir
AlexAxthelm Dec 11, 2024
0ec48f2
Output manifest and update param names
AlexAxthelm Dec 11, 2024
0caccfd
Add function to run full workflow
AlexAxthelm Dec 12, 2024
c8d63d0
Local build with pacta-data
AlexAxthelm Dec 12, 2024
d6beb73
disable GH-pages preview
AlexAxthelm Dec 12, 2024
f69fd9f
Add GH test workflow and update configs
AlexAxthelm Dec 12, 2024
45f01e9
read pacta-data and benchmarks from blob, not file share
AlexAxthelm Dec 12, 2024
22b3cd8
Move pactadata and benchmarks to correct directories
AlexAxthelm Dec 12, 2024
a3229da
Fix path (un-concat 2 absolute paths)
AlexAxthelm Dec 12, 2024
b2ad02b
Upload built dashboard as artifact
AlexAxthelm Dec 12, 2024
79b6763
tar artifact before upload
AlexAxthelm Dec 12, 2024
4dfc1f2
Reenable GH-pages preview
AlexAxthelm Dec 12, 2024
a97ac8d
Update gh pasges action
AlexAxthelm Dec 12, 2024
61b2f72
Add wildcard to artifact pattern
AlexAxthelm Dec 12, 2024
bd60385
Don't store full dir structure in tarfile
AlexAxthelm Dec 12, 2024
e06e061
Increment version number to 0.0.0.9008
AlexAxthelm Dec 13, 2024
011f67f
Let GH action handle making archive
AlexAxthelm Dec 13, 2024
b850c5d
Show files (debug step)
AlexAxthelm Dec 13, 2024
50aede3
Do not merge multiple artifacts
AlexAxthelm Dec 13, 2024
9c666b3
Add (very simple) landing pages for PR preview
AlexAxthelm Dec 13, 2024
e8bd34f
update pr landing page generation
AlexAxthelm Dec 13, 2024
f1c86b8
Apply suggestions from code review: Update dates for 22Q4
AlexAxthelm Dec 13, 2024
7e09a38
Clean gh-pages workflow
AlexAxthelm Dec 13, 2024
a426a64
Clean test workflow file
AlexAxthelm Dec 13, 2024
c0c6807
Update and render Docs
AlexAxthelm Dec 13, 2024
782ae74
Update Scenario references
AlexAxthelm Dec 13, 2024
dff0d53
Merge pull request #49 from RMI-PACTA/integrate-workflow-pacta
AlexAxthelm Dec 13, 2024
2904e0a
use porfolio schema from `workflow.pacta`
AlexAxthelm Dec 13, 2024
eb8d23e
Use local variable name
AlexAxthelm Dec 13, 2024
06a57c9
Update and render docs
AlexAxthelm Dec 13, 2024
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
11 changes: 8 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: workflow.pacta.dashboard
Title: Run PACTA dashboard JSON generation
Version: 0.0.0.9006
Version: 0.0.0.9007
Authors@R:
c(person(given = "Alex",
family = "Axthelm",
Expand Down Expand Up @@ -29,11 +29,16 @@ Imports:
dplyr,
glue,
jsonlite,
logger,
magrittr,
pacta.portfolio.utils,
pacta.workflow.utils,
readr,
rlang,
stringr,
tidyr
tidyr,
workflow.pacta
Remotes:
RMI-PACTA/pacta.portfolio.utils
RMI-PACTA/pacta.portfolio.utils,
RMI-PACTA/pacta.workflow.utils,
RMI-PACTA/workflow.pacta
5 changes: 5 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ importFrom(dplyr,summarise)
importFrom(dplyr,tibble)
importFrom(dplyr,transmute)
importFrom(dplyr,ungroup)
importFrom(logger,log_debug)
importFrom(logger,log_error)
importFrom(logger,log_info)
importFrom(logger,log_trace)
importFrom(logger,log_warn)
importFrom(magrittr,"%>%")
importFrom(rlang,":=")
importFrom(rlang,.data)
Expand Down
38 changes: 38 additions & 0 deletions R/build_dashboard.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@
) {

prepare_pacta_dashboard_data(
params = params,

Check warning on line 11 in R/build_dashboard.R

View check run for this annotation

Codecov / codecov/patch

R/build_dashboard.R#L11

Added line #L11 was not covered by tests
analysis_output_dir = analysis_output_dir,
dashboard_data_dir = dashboard_data_dir,
benchmarks_dir = benchmarks_dir
)

log_info("Copying dashboard files.")

Check warning on line 17 in R/build_dashboard.R

View check run for this annotation

Codecov / codecov/patch

R/build_dashboard.R#L17

Added line #L17 was not covered by tests
dashboard_copy_success <- copy_dashboard_files(
dashboard_skeleton_files_dir = dashboard_skeleton_files_dir,
dashboard_output_dir = dashboard_output_dir
)

dashboard_output_data_dir <- file.path(dashboard_output_dir, "data")
if (dashboard_data_dir != dashboard_output_data_dir) {
log_info("Copying dashboard data to correct location.")

Check warning on line 25 in R/build_dashboard.R

View check run for this annotation

Codecov / codecov/patch

R/build_dashboard.R#L25

Added line #L25 was not covered by tests
if (!dir.exists(dashboard_output_data_dir)) {
dir.create(dashboard_output_data_dir, recursive = TRUE)
}
Expand All @@ -30,4 +33,39 @@
)
}

out <- list(
input_files = c(
list.files(
dashboard_data_dir,
full.names = TRUE,
recursive = TRUE
),
list.files(
dashboard_skeleton_files_dir,
full.names = TRUE,
recursive = TRUE
),
list.files(
analysis_output_dir,
full.names = TRUE,
recursive = TRUE
),
list.files(
benchmarks_dir,
full.names = TRUE,
recursive = TRUE
)
),
output_files = c(
list.files(
dashboard_output_dir,
full.names = TRUE,
recursive = TRUE
)
),
params = params
)

Check warning on line 67 in R/build_dashboard.R

View check run for this annotation

Codecov / codecov/patch

R/build_dashboard.R#L36-L67

Added lines #L36 - L67 were not covered by tests

return(out)

Check warning on line 69 in R/build_dashboard.R

View check run for this annotation

Codecov / codecov/patch

R/build_dashboard.R#L69

Added line #L69 was not covered by tests

}
Loading
Loading