update

bigomics · Apr 19, 2024 · 02ec23b · 02ec23b
1 parent 335510a
commit 02ec23b
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v3.3.2-master240416
+v3.3.2-new-bc240419
diff --git a/components/app/R/www/styles.min.css b/components/app/R/www/styles.min.css
diff --git a/components/board.loading/R/loading_ui.R b/components/board.loading/R/loading_ui.R
@@ -43,7 +43,7 @@ LoadingUI <- function(id) {
       div(
       shiny::actionButton(
         ns("loadbutton"),
-        label = "Analyze dataset",
+        label = "Load selected",
         icon = icon("file-import"),
         class = "btn btn-primary",
         width = NULL

diff --git a/components/board.upload/R/upload_module_preview.R b/components/board.upload/R/upload_module_preview.R
@@ -1,3 +1,7 @@
+##---------------------------------------------------
+## COUNTS
+##---------------------------------------------------
+
 upload_table_preview_counts_ui <- function(id) {
 
   ns <- shiny::NS(id)
@@ -229,6 +233,10 @@ upload_table_preview_counts_server <- function(
   }) ## end of moduleServer
 } ## end of server
 
+##---------------------------------------------------
+## SAMPLES
+##---------------------------------------------------
+
 upload_table_preview_samples_ui <- function(id) {
   ns <- shiny::NS(id)
   uiOutput(ns("table_samples"), fill=TRUE)
@@ -426,6 +434,10 @@ upload_table_preview_samples_server <- function(
   })
 }
 
+##---------------------------------------------------
+## CONTRASTS
+##---------------------------------------------------
+
 upload_table_preview_contrasts_ui <- function(id) {
   ns <- shiny::NS(id)
   uiOutput(ns("table_contrasts"), fill = TRUE)
@@ -839,4 +851,4 @@ writeLines('
   con = icon_file
 )
 
-icon_encoded <- xfun::base64_uri(icon_file)
+icon_encoded <- xfun::base64_uri(icon_file)
diff --git a/components/board.upload/R/upload_server.R b/components/board.upload/R/upload_server.R
@@ -636,11 +636,10 @@ UploadBoard <- function(id,
         }
     })
 
-
     # lock wizard at Comparison step
     observeEvent(
       list(input$upload_wizard, modified_ct()),{
-        req(input$upload_wizard == "Step 3: Comparison")
+        req(input$upload_wizard == "Step 3: Comparisons")
         if (is.null(modified_ct()) || ncol(modified_ct()) == 0 || is.null(checked_contrasts()) || is.null(checked_samples()) || is.null(checked_counts())){
           wizardR::lock("upload_wizard")
         } else {

diff --git a/components/board.upload/R/upload_ui.R b/components/board.upload/R/upload_ui.R
@@ -22,11 +22,11 @@ UploadUI <- function(id) {
   )
 
   contrasts_ui <- wizardR::wizard_step(
-    step_title = "Step 3: Comparison",
+    step_title = "Step 3: Comparisons",
     upload_table_preview_contrasts_ui(
       ns("contrasts_preview")
-        )
     )
+  )
 
   # comparisons_panel <- wizardR::wizard_step(
   #   step_title = "Comparison Builder",

diff --git a/scss/components/_wizard.scss b/scss/components/_wizard.scss
@@ -17,4 +17,10 @@
 
 // .modal-body {
 //   margin-top: 1.5vh;
-// }
+// }
+
+.wizard .wizard-nav.dots .wizard-step .dot {
+    top: -25px;
+    height: 18px;
+    width: 18px;
+}