Browse code

Updated vignette, documentation and NEWS file, corrected some messages and warnings.

Robert Castelo authored on 18/05/2021 21:31:15
Showing 1 changed files
... ...
@@ -7,12 +7,12 @@ geneSetsUI <- function(id){
7 7
                    "From workspace" = "varGeneset")),
8 8
     conditionalPanel(
9 9
       condition = "input.genesetSourceType == 'fileGeneset'", ns = ns,
10
-      fileInput(ns("genesetFile"), "Choose GeneSet file:",
10
+      fileInput(ns("genesetFile"), "Choose gene sets file:",
11 11
                 accept = c(".gmt", "text/csv", ".csv"))
12 12
     ),
13 13
     conditionalPanel(
14 14
       condition = "input.genesetSourceType == 'varGeneset'", ns = ns, 
15
-      selectInput(ns("genesetVar"), "Choose GeneSet var:",
15
+      selectInput(ns("genesetVar"), "Choose gene sets object:",
16 16
                   ls(envir=.GlobalEnv))
17 17
     )
18 18
   )
... ...
@@ -42,4 +42,4 @@ geneSetsServer <- function(id){
42 42
       }
43 43
     })
44 44
   })
45
-}
46 45
\ No newline at end of file
46
+}
Browse code

new css changes in dashboard

pablo-rodr-bio2 authored on 17/05/2021 17:29:04
Showing 1 changed files
... ...
@@ -1,8 +1,9 @@
1 1
 geneSetsUI <- function(id){
2 2
   ns <- NS(id)
3 3
   div( id = ns("genesets-input"),
4
-    radioButtons(ns("genesetSourceType"), "Select Gene Sets:",
5
-                 c("From file" = "fileGeneset",
4
+    radioButtons(ns("genesetSourceType"), 
5
+                 label = h5("GENE SETS", style="font-weight: bold"),
6
+                 choices = c("From file" = "fileGeneset",
6 7
                    "From workspace" = "varGeneset")),
7 8
     conditionalPanel(
8 9
       condition = "input.genesetSourceType == 'fileGeneset'", ns = ns,
Browse code

beautifying UI

pablo-rodr-bio2 authored on 14/05/2021 09:37:52
Showing 1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 geneSetsUI <- function(id){
2 2
   ns <- NS(id)
3
-  tagList(
4
-    radioButtons(ns("genesetSourceType"), "Select gene sets:",
3
+  div( id = ns("genesets-input"),
4
+    radioButtons(ns("genesetSourceType"), "Select Gene Sets:",
5 5
                  c("From file" = "fileGeneset",
6 6
                    "From workspace" = "varGeneset")),
7 7
     conditionalPanel(
Browse code

added shinytest

pablo-rodr-bio2 authored on 23/04/2021 10:14:15
Showing 1 changed files
... ...
@@ -7,7 +7,7 @@ geneSetsUI <- function(id){
7 7
     conditionalPanel(
8 8
       condition = "input.genesetSourceType == 'fileGeneset'", ns = ns,
9 9
       fileInput(ns("genesetFile"), "Choose GeneSet file:",
10
-                accept = ".gmt")
10
+                accept = c(".gmt", "text/csv", ".csv"))
11 11
     ),
12 12
     conditionalPanel(
13 13
       condition = "input.genesetSourceType == 'varGeneset'", ns = ns, 
... ...
@@ -22,7 +22,12 @@ geneSetsServer <- function(id){
22 22
     geneSets <- reactive({
23 23
       if(input$genesetSourceType == "fileGeneset"){
24 24
         if(is.null(input$genesetFile)) return(NULL) #this is in order to disable "run" btn
25
-        genesets <- getGmt(input$genesetFile$datapath)
25
+        ext <- tools::file_ext(input$genesetFile$name)
26
+        genesets <- 
27
+          switch(ext,
28
+                 csv = as.list(read.csv(input$genesetFile$datapath)),
29
+                 gmt = getGmt(input$genesetFile$datapath)
30
+        )
26 31
       } else {
27 32
         if(is.null(input$genesetVar)) return(NULL)
28 33
         genesets <- get(input$genesetVar)
Browse code

adding comments to code

pablo-rodr-bio2 authored on 20/04/2021 13:46:22
Showing 1 changed files
... ...
@@ -21,7 +21,7 @@ geneSetsServer <- function(id){
21 21
   moduleServer( id, function(input, output, session){
22 22
     geneSets <- reactive({
23 23
       if(input$genesetSourceType == "fileGeneset"){
24
-        if(is.null(input$genesetFile)) return(NULL)
24
+        if(is.null(input$genesetFile)) return(NULL) #this is in order to disable "run" btn
25 25
         genesets <- getGmt(input$genesetFile$datapath)
26 26
       } else {
27 27
         if(is.null(input$genesetVar)) return(NULL)
Browse code

modules in shinyApp

pablo-rodr-bio2 authored on 12/04/2021 19:41:34
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,39 @@
1
+geneSetsUI <- function(id){
2
+  ns <- NS(id)
3
+  tagList(
4
+    radioButtons(ns("genesetSourceType"), "Select gene sets:",
5
+                 c("From file" = "fileGeneset",
6
+                   "From workspace" = "varGeneset")),
7
+    conditionalPanel(
8
+      condition = "input.genesetSourceType == 'fileGeneset'", ns = ns,
9
+      fileInput(ns("genesetFile"), "Choose GeneSet file:",
10
+                accept = ".gmt")
11
+    ),
12
+    conditionalPanel(
13
+      condition = "input.genesetSourceType == 'varGeneset'", ns = ns, 
14
+      selectInput(ns("genesetVar"), "Choose GeneSet var:",
15
+                  ls(envir=.GlobalEnv))
16
+    )
17
+  )
18
+}
19
+
20
+geneSetsServer <- function(id){
21
+  moduleServer( id, function(input, output, session){
22
+    geneSets <- reactive({
23
+      if(input$genesetSourceType == "fileGeneset"){
24
+        if(is.null(input$genesetFile)) return(NULL)
25
+        genesets <- getGmt(input$genesetFile$datapath)
26
+      } else {
27
+        if(is.null(input$genesetVar)) return(NULL)
28
+        genesets <- get(input$genesetVar)
29
+      }
30
+      genesets
31
+    }) %>% bindCache({
32
+      if(input$genesetSourceType == "fileGeneset"){
33
+        input$genesetFile$name
34
+      } else {
35
+        input$genesetVar
36
+      }
37
+    })
38
+  })
39
+}
0 40
\ No newline at end of file