130 composant implementation de fileinput

.gitignore

@@ -1,4 +1,3 @@
-
 !.github/*/*
 docs
 .Rproj.user
@@ -9,3 +8,4 @@ docs
 inst/doc
 rsconnect
 deliverables
+zz_rsconnect*

DESCRIPTION

@@ -11,6 +11,7 @@ Authors@R: c(
            comment = c(ORCID = "0000-0002-4816-4624")),
     person("Yohann", "Mansiaux", , "yohann@thinkr.fr", role = "aut",
            comment = c(ORCID = "0000-0002-8905-6603")),
+    person("Jean-Daniel", "LOMENEDE", role = "aut"),
     person("David", "Granjon", role = "ctb"),
     person("Alan", "Dipert", role = "ctb")
   )
@@ -31,6 +32,7 @@ Imports:
     purrr (>= 0.3.4),
     shiny (>= 1.7.1),
     stringr (>= 1.4.0),
+    tools,
     utils,
     XML (>= 3.99.0.10)
 Suggests:

NAMESPACE

@@ -7,6 +7,7 @@ export(checkboxGroupInput_dsfr)
 export(checkboxInput_dsfr)
 export(column_dsfr)
 export(convert_to_dsfr)
+export(fileInput_dsfr)
 export(dateRangeInput_dsfr)
 export(fluidPage_dsfr)
 export(fluidRow_dsfr)
@@ -25,6 +26,7 @@ export(selectInput_dsfr)
 export(showModal_dsfr)
 export(sliderInput_dsfr)
 export(tabPanel_dsfr)
+export(tableOutput_dsfr)
 export(tabsetPanel_dsfr)
 export(toggleSwitch_dsfr)
 export(updateCheckboxGroupInput_dsfr)

R/actionbutton_dsfr.R

@@ -1,4 +1,4 @@
-# WARNING - Generated by {fusen} from dev/flat_composants/flat_actionButton.Rmd: do not edit by hand
+# WARNING - Generated by {fusen} from /dev/flat_composants/flat_actionButton.Rmd: do not edit by hand
 
 #' actionButton_dsfr
 #'
@@ -14,7 +14,7 @@
 #' if (interactive()) {
 #'   library(shiny)
 #'   library(shinygouv)
-#'
+#' 
 #'   ui <- fluidPage_dsfr(
 #'     header = header_dsfr(
 #'       intitule = "Intitule",
@@ -38,13 +38,13 @@
 #'       paste("Vous avez cliqu\u00e9", input$test, "fois sur le bouton")
 #'     })
 #'   }
-#'
+#' 
 #'   shinyApp(ui, server)
 #' }
 actionButton_dsfr <- function(
-  inputId,
-  label,
-  class = NULL
+    inputId,
+    label,
+    class = "fr-p-1w"
     ) {
   actionButton_dsfr_template(
     inputId,

R/fileinput_dsfr.R

@@ -0,0 +1,63 @@
+# WARNING - Generated by {fusen} from /dev/flat_composants/flat_fileInput.Rmd: do not edit by hand
+
+#' fileInput_dsfr
+#'
+#'
+#' @param inputId id de l'input
+#' @param label etiquette du bouton d'import, par exemple "choisir fichier"
+#' @param message eventuelles indications complementaires, par exemple "fichier images de moins de 2 Mo"
+#'
+#' @return html
+#' @importFrom assertthat assert_that
+#' @export
+#'
+#' @examples
+#' 
+#' if (interactive()) {
+#'   ui <- fluidPage_dsfr(
+#'     fluidRow_dsfr(
+#'       column_dsfr(width = 4, 
+#'         fileInput_dsfr(inputId = "file1", label = "Importez vos données", message = "seul le format csv est pris en charge"),
+#'         br(),
+#'         checkboxInput_dsfr(inputId = "header", label = "Utiliser les en-tetes du fichier")
+#'       ),
+#'       column_dsfr(width = 8,
+#'         tableOutput_dsfr("contenu")("contenu")
+#'       )
+#'     )
+#'   )
+#'   
+#'   server <- function(input, output) {
+#'     output$contenu <- renderTable({
+#'       file <- input$file1
+#'       ext <- tools::file_ext(file$datapath)
+#'       
+#'       req(file)
+#'       validate(need(ext == "csv", "Veuillez choisir un fichier csv svp"))
+#'       
+#'       read.csv2(file$datapath, header = input$header, nrows = 12)
+#'     })
+#'   }
+#'   
+#'   shinyApp(ui, server)
+#' }
+#' 
+#' 
+fileInput_dsfr <- function(
+                inputId,
+                label,
+                message
+                ) {
+
+  assertthat::assert_that(is.character(inputId))
+  assertthat::assert_that(is.character(label))
+  assertthat::assert_that(is.character(message))
+
+  fileInput_dsfr_template(
+    inputId = inputId,
+    label = label,
+    message = message
+  ) %>%
+    parse_html()
+
+}

R/fileinput_dsfr_template.R

@@ -0,0 +1,28 @@
+# WARNING - Generated by {fusen} from /dev/flat_composants/flat_fileInput.Rmd: do not edit by hand
+
+#' template pour fileInput_dsfr
+#'
+#' @param inputId id de l'input
+#' @param label etiquette du bouton d'import, par exemple "choisir fichier"
+#' @param message eventuelles indications complementaires, par exemple "seuls les fichiers csv sont acceptes"
+#' @importFrom htmltools htmlTemplate
+#' @return html
+#' @noRd
+fileInput_dsfr_template <- function(
+                inputId,
+                label,
+                message
+) {
+
+  htmltools::htmlTemplate(
+    filename = system.file(
+      get_dsfr_version(with_v = TRUE),
+      "composant",
+      "fileInput.html",
+      package = "shinygouv"
+    ),
+    inputId = inputId,
+    label = label,
+    message = message
+  )
+}

R/mod_input_actions.R

@@ -78,7 +78,33 @@ mod_input_actions_ui <- function(id){
           label = "Afficher le spinner pendant 5 secondes"
         )
       )
-    )
+    ),
+
+    tags$br(),
+    tags$hr(),
+
+    fluidRow_dsfr(
+      column_dsfr(
+        12,
+        h3("Demo fileInput_dsfr()"),
+        # Adding space to the column
+        # https://www.systeme-de-design.gouv.fr/elements-d-interface/fondamentaux-techniques/espacement
+        extra_class = "fr-my-2w"
+      ),
+      column_dsfr(width = 4,
+                  fileInput_dsfr(inputId = ns("user_file"), label = "Importez vos donn\u00e9es", message = "Seul le format csv est pris en charge."),
+                  br(),
+                  checkboxInput_dsfr(inputId = ns("header_csv"), label = "Utiliser les en-tetes du fichier", value = TRUE),
+                  extra_class = "fr-px-1w"),
+      column_dsfr(width = 8,
+                  tableOutput_dsfr(outputId = ns("contenu")),
+                  extra_class = "fr-px-1w"
+      )
+    ),
+
+    tags$br(),
+    tags$hr()
+
 
   )
 }
@@ -130,7 +156,16 @@ mod_input_actions_server <- function(id){
       }
     )
 
+  output$contenu <- renderTable({
+    req(input$user_file)
+    user_file <- input$user_file
+    ext <- tools::file_ext(user_file$datapath)
+    validate(need(ext == "csv", "Veuillez choisir un fichier csv svp"))
+    read.csv2(user_file$datapath, header = input$header_csv, nrows = 5)
   })
+
+  })
+
 }
 
 ## To be copied in the UI

R/tableoutput_dsfr.R

@@ -0,0 +1,30 @@
+# WARNING - Generated by {fusen} from /dev/flat_composants/flat_tableOutput.Rmd: do not edit by hand
+
+#' tableOutput_dsfr
+#'
+#' @param outputId 	nom d'output a partir duquel lire la table
+#' @return html
+#'
+#' @export
+#'
+#' @examples
+#' 
+#' if (interactive()) {
+#'   # table example
+#'   shinyApp(
+#'     ui = fluidPage_dsfr(
+#'       fluidRow_dsfr(
+#'         column_dsfr(12,
+#'           tableOutput_dsfr('table')
+#'         )
+#'       )
+#'     ),
+#'     server = function(input, output) {
+#'       output$table <- renderTable(iris)
+#'     }
+#'   )
+#' }
+tableOutput_dsfr <- function (outputId) {
+  assertthat::assert_that(is.character(outputId))
+  shiny::div(id = outputId, class = "fr-table shiny-html-output")
+  }

dev/flat_composants/flat_actionButton.Rmd

@@ -146,7 +146,7 @@ test_that("actionButton_dsfr_template works", {
 actionButton_dsfr <- function(
     inputId,
     label,
-    class = NULL
+    class = "fr-p-1w"
     ) {
   actionButton_dsfr_template(
     inputId,