Merge pull request #200 from Sage-Bionetworks/dev-update-dfamodules

Dev update dfamodules version
Sage-Bionetworks · May 11, 2023 · 2bbd8c1 · 2bbd8c1
2 parents 1591709 + 3d5e458
commit 2bbd8c1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/R/app_server.R b/R/app_server.R
@@ -41,10 +41,10 @@ app_server <- function( input, output, session ) {
   dash_config <- jsonlite::read_json("inst/datatable_dashboard_config.json")
 
   # download data flow status manifest
-  synapse_manifest <- dfamodules::manifest_download(asset_view = global_config$asset_view,
-                                                    dataset_id = global_config$manifest_dataset_id,
-                                                    input_token = access_token,
-                                                    base_url = global_config$api_base_url)
+  synapse_manifest <- dfamodules::dataset_manifest_download(asset_view = global_config$asset_view,
+                                                            dataset_id = global_config$manifest_dataset_id,
+                                                            access_token = access_token,
+                                                            base_url = global_config$api_base_url)
 
   manifest_dfa <- dfamodules::prep_manifest_dfa(manifest = synapse_manifest$content,
                                                 config = dash_config)
@@ -225,15 +225,15 @@ app_server <- function( input, output, session ) {
 
   select_storage_project_out <- dfamodules::mod_select_storage_project_server(id = "select_storage_project_1",
                                                                               asset_view = global_config$asset_view,
-                                                                              input_token = access_token,
+                                                                              access_token = access_token,
                                                                               base_url = global_config$api_base_url)
 
   # DATASET SELECTION
 
   dataset_selection <- dfamodules::mod_dataset_selection_server(id = "dataset_selection_1",
                                                                 storage_project_df = select_storage_project_out,
                                                                 asset_view = global_config$asset_view,
-                                                                input_token = access_token,
+                                                                access_token = access_token,
                                                                 base_url = global_config$api_base_url)
 
   # UPDATE DATA FLOW STATUS SELECTIONS 
@@ -299,7 +299,7 @@ app_server <- function( input, output, session ) {
                                       asset_view = global_config$asset_view,
                                       dataset_id = global_config$manifest_dataset_id,
                                       manifest_dir = "./manifest",
-                                      input_token = access_token,
+                                      access_token = access_token,
                                       base_url = global_config$api_base_url,
                                       schema_url = global_config$schema_url)
 

diff --git a/renv.lock b/renv.lock
@@ -5,6 +5,10 @@
       {
         "Name": "CRAN",
         "URL": "https://cran.rstudio.com"
+      },
+      {
+        "Name": "SAGE",
+        "URL": "http://ran.synapse.org"
       }
     ]
   },
@@ -454,13 +458,13 @@
       "Package": "dcamodules",
       "Version": "0.1.0",
       "Source": "GitHub",
-      "Remotes": "Sage-Bionetworks/sagethemes",
       "RemoteType": "github",
       "RemoteHost": "api.github.com",
-      "RemoteRepo": "dcamodules",
       "RemoteUsername": "Sage-Bionetworks",
-      "RemoteRef": "HEAD",
+      "RemoteRepo": "dcamodules",
+      "RemoteRef": "main",
       "RemoteSha": "1e14dcfbdaa2913eeeacc12acaac1c8264bac1f7",
+      "Remotes": "Sage-Bionetworks/sagethemes",
       "Requirements": [
         "base64enc",
         "colourpicker",
@@ -474,7 +478,7 @@
         "shinydashboard",
         "waiter"
       ],
-      "Hash": "c27efc5d7a84072f43c242d6ffd13964"
+      "Hash": "613cdfc41c99661f9d1afe2acf4c067b"
     },
     "desc": {
       "Package": "desc",
@@ -526,14 +530,14 @@
     },
     "dfamodules": {
       "Package": "dfamodules",
-      "Version": "0.0.0.9001",
+      "Version": "0.0.0.9002",
       "Source": "GitHub",
       "RemoteType": "github",
       "RemoteHost": "api.github.com",
       "RemoteUsername": "Sage-Bionetworks",
       "RemoteRepo": "dfamodules",
       "RemoteRef": "main",
-      "RemoteSha": "97d73f09831c53e1d384fe9b202ed8b32b690397",
+      "RemoteSha": "2441a1870dcb09a26fcc619c9806c17f97993754",
       "Requirements": [
         "DT",
         "dplyr",
@@ -550,7 +554,7 @@
         "shinyjs",
         "waiter"
       ],
-      "Hash": "aa74d8b9e9a4c21a64673102c9f43eff"
+      "Hash": "b6b72de8c0e35c363724520742e5d51b"
     },
     "diffobj": {
       "Package": "diffobj",