Fix import-related note and add a test

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: requal
 Title: Shiny Application for Computer-Assisted Qualitative Data Analysis
-Version: 1.1.3.9003
+Version: 1.1.3.9000
 Authors@R:
     c(
      person(given = "Radim",

DEV-NOTES.md

@@ -30,6 +30,7 @@ Instruction for local development of `requal` server version.
 - [x] add code
 - [x] merge codes
 - [x] delete code
+- [x] edit code
 - [x] export codebook
 
 #### Categories

R/db_logging.R

@@ -80,6 +80,14 @@ log_merge_code_record <- function(con, project_id, from, to, user_id){
                data = list(merge_from = from, merge_to = to))
 }
 
+log_edit_code_record <- function(con, project_id, changes, user_id){
+    log_action(con, 
+               user_id = user_id, 
+               project_id = project_id, 
+               action = "Edit code", 
+               data = changes)
+}
+
 log_add_segment_record <- function(con, project_id, segment, user_id){
     log_action(con, 
                user_id = user_id, 
@@ -206,4 +214,5 @@ log_change_user_permission <- function(con, project_id, permission_data, user_id
                project_id,
                action = "Change user permission", 
                data = permission_data)
-}
+}
+

R/mod_codebook_utils_codebook.R

@@ -355,9 +355,13 @@ edit_db_codes <- function(pool,
                  WHERE code_id = {edit_code_id}", .con = pool)
     DBI::dbExecute(pool, update_code_sql)
 
-    # should log action with edit ids
-    #TODO
-    # log_edit_code_record(pool, project_id = active_project, edit_code_id, user_id)
+    log_edit_code_record(pool, project_id = active_project, 
+                         changes = list(
+                             code_id = edit_code_id, 
+                             code_name = edit_code_name, 
+                             code_color = edit_code_color,
+                             code_description = edit_code_description), 
+                         user_id)
 
     rql_message(paste("Code", edit_code_name, "was updated."))
 }

R/mod_memo_utils_memo.R

@@ -133,11 +133,10 @@ export_memos <- function(pool, project) {
 
 }
 
+
 # dropdown2 function ----
 dropdownBlock2 <- function (..., id, icon = NULL, title = NULL, badgeStatus = "danger") 
 {
-    if (!is.null(badgeStatus)) 
-        shinydashboard:::validateStatus(badgeStatus)
     items <- c(list(...))
     dropdownClass <- paste0("dropdown")
     numItems <- length(items)

R/utils.R

@@ -50,6 +50,11 @@ utils::globalVariables(c("project_name",
                          "credentials"
                          ))
 
+# dummy function for satisfying checks (getting rid of Note on not used imports)
+dummy <- function(){
+  dbplyr::sql
+  RPostgreSQL::dbConnect
+}
 
 set_dashboard_body <- function() {
 

inst/test_app/tests/testthat/_snaps/app-edit-code/edit_code-001.json

@@ -0,0 +1,25 @@
+{
+  "output": {
+    "codebook_ui_1-codes_ui": {
+      "html": "<div data-code_id=\"1\" class=\"code_item\" style=\"max-width: 500px\">\n  <div class=\"box box-solid collapsed-box bg-light-blue\" id=\"1\">\n    <div class=\"box-header with-border\">\n      <h3 class=\"box-title\">Code1<\/h3>\n      <div class=\"box-tools pull-right\">\n        <span class=\"label label-warning custom_label\" style=\"background-color:rgb(255, 255, 0) !important;\">code<\/span>\n        <button class=\"btn btn-box-tool btn-md\" type=\"button\" data-widget=\"collapse\">\n          <i class=\"fas fa-plus\" role=\"presentation\" aria-label=\"plus icon\"><\/i>\n        <\/button>\n      <\/div>\n    <\/div>\n    <div class=\"box-body\">\n      Code description\n      \n    <\/div>\n  <\/div>\n  <script type=\"application/json\" data-for=\"1\">{\"title\":\"Code1\",\"solidHeader\":true,\"background\":\"light-blue\",\"collapsible\":true,\"closable\":false,\"gradient\":false}<\/script>\n<\/div>",
+      "deps": [
+        {
+          "name": "font-awesome",
+          "version": "6.4.2",
+          "src": {
+            "href": "font-awesome-6.4.2"
+          },
+          "meta": null,
+          "script": null,
+          "stylesheet": [
+            "css/all.min.css",
+            "css/v4-shims.min.css"
+          ],
+          "head": null,
+          "attachment": null,
+          "all_files": true
+        }
+      ]
+    }
+  }
+}

inst/test_app/tests/testthat/_snaps/app-edit-code/edit_code-002.json

@@ -0,0 +1,25 @@
+{
+  "output": {
+    "codebook_ui_1-codes_ui": {
+      "html": "<div data-code_id=\"1\" class=\"code_item\" style=\"max-width: 500px\">\n  <div class=\"box box-solid collapsed-box bg-light-blue\" id=\"1\">\n    <div class=\"box-header with-border\">\n      <h3 class=\"box-title\">kód<\/h3>\n      <div class=\"box-tools pull-right\">\n        <span class=\"label label-warning custom_label\" style=\"background-color:rgb(255, 255, 255) !important;\">code<\/span>\n        <button class=\"btn btn-box-tool btn-md\" type=\"button\" data-widget=\"collapse\">\n          <i class=\"fas fa-plus\" role=\"presentation\" aria-label=\"plus icon\"><\/i>\n        <\/button>\n      <\/div>\n    <\/div>\n    <div class=\"box-body\">\n      popis kódu\n      \n    <\/div>\n  <\/div>\n  <script type=\"application/json\" data-for=\"1\">{\"title\":\"kód\",\"solidHeader\":true,\"background\":\"light-blue\",\"collapsible\":true,\"closable\":false,\"gradient\":false}<\/script>\n<\/div>",
+      "deps": [
+        {
+          "name": "font-awesome",
+          "version": "6.4.2",
+          "src": {
+            "href": "font-awesome-6.4.2"
+          },
+          "meta": null,
+          "script": null,
+          "stylesheet": [
+            "css/all.min.css",
+            "css/v4-shims.min.css"
+          ],
+          "head": null,
+          "attachment": null,
+          "all_files": true
+        }
+      ]
+    }
+  }
+}

inst/test_app/tests/testthat/_snaps/mac-4.4/app-workdesk-add-segment/workdesk2-001.json

@@ -1,5 +1,5 @@
 {
   "output": {
-    "document_code_ui_1-focal_text": "<article><p class='docpar'>Lorem <b id=\"1\" class=\"segment\" style=\"padding:0; background-color:rgb(255,255,0)\" title=\"Class\">ipsum<\/b> dolor sit amet, consectetuer adipiscing elit. Integer tempor. Praesent in mauris eu tortor porttitor accumsan. Aenean fermentum risus id tortor. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Aenean vel massa quis mauris vehicula lacinia. Aliquam erat volutpat. Nullam justo enim, consectetuer nec, ullamcorper ac, vestibulum in, elit. Integer imperdiet lectus quis justo. Sed elit dui, pellentesque a, faucibus vel, interdum nec, diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Aenean id metus id velit ullamcorper pulvinar. Suspendisse nisl. Et harum quidem rerum facilis est et expedita distinctio. In dapibus augue non sapien. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Duis condimentum augue id magna semper rutrum.<\/p><\/article>"
+    "document_code_ui_1-focal_text": "<article id='article'><p class='docpar'>Lorem <b id=\"1\" class=\"segment\" style=\"padding:0; background-color:rgb(255,255,0)\" data-color=\"rgb(255,255,0)\" data-segment_start=\"7\" title=\"Class\" onclick=\"Shiny.setInputValue('document_code_ui_1-clicked_title', this.title, {priority: 'event'});\">ipsum<\/b> dolor sit amet, consectetuer adipiscing elit. Integer tempor. Praesent in mauris eu tortor porttitor accumsan. Aenean fermentum risus id tortor. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Aenean vel massa quis mauris vehicula lacinia. Aliquam erat volutpat. Nullam justo enim, consectetuer nec, ullamcorper ac, vestibulum in, elit. Integer imperdiet lectus quis justo. Sed elit dui, pellentesque a, faucibus vel, interdum nec, diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Aenean id metus id velit ullamcorper pulvinar. Suspendisse nisl. Et harum quidem rerum facilis est et expedita distinctio. In dapibus augue non sapien. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Duis condimentum augue id magna semper rutrum.<\/p><\/article>"
   }
 }

inst/test_app/tests/testthat/_snaps/mac-4.4/app-workdesk-delete-segment/workdesk2-001.json

@@ -1,5 +1,5 @@
 {
   "output": {
-    "document_code_ui_1-focal_text": "<article><p class='docpar'>Lorem <b id=\"1\" class=\"segment\" style=\"padding:0; background-color:rgb(255,255,0)\" title=\"Class\">ipsum<\/b> dolor sit amet, consectetuer adipiscing elit. Integer tempor. Praesent in mauris eu tortor porttitor accumsan. Aenean fermentum risus id tortor. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Aenean vel massa quis mauris vehicula lacinia. Aliquam erat volutpat. Nullam justo enim, consectetuer nec, ullamcorper ac, vestibulum in, elit. Integer imperdiet lectus quis justo. Sed elit dui, pellentesque a, faucibus vel, interdum nec, diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Aenean id metus id velit ullamcorper pulvinar. Suspendisse nisl. Et harum quidem rerum facilis est et expedita distinctio. In dapibus augue non sapien. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Duis condimentum augue id magna semper rutrum.<\/p><\/article>"
+    "document_code_ui_1-focal_text": "<article id='article'><p class='docpar'>Lorem <b id=\"1\" class=\"segment\" style=\"padding:0; background-color:rgb(255,255,0)\" data-color=\"rgb(255,255,0)\" data-segment_start=\"7\" title=\"Class\" onclick=\"Shiny.setInputValue('document_code_ui_1-clicked_title', this.title, {priority: 'event'});\">ipsum<\/b> dolor sit amet, consectetuer adipiscing elit. Integer tempor. Praesent in mauris eu tortor porttitor accumsan. Aenean fermentum risus id tortor. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Aenean vel massa quis mauris vehicula lacinia. Aliquam erat volutpat. Nullam justo enim, consectetuer nec, ullamcorper ac, vestibulum in, elit. Integer imperdiet lectus quis justo. Sed elit dui, pellentesque a, faucibus vel, interdum nec, diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Aenean id metus id velit ullamcorper pulvinar. Suspendisse nisl. Et harum quidem rerum facilis est et expedita distinctio. In dapibus augue non sapien. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Duis condimentum augue id magna semper rutrum.<\/p><\/article>"
   }
 }

inst/test_app/tests/testthat/_snaps/mac-4.4/app-workdesk-delete-segment/workdesk2-002.json

@@ -1,5 +1,5 @@
 {
   "output": {
-    "document_code_ui_1-focal_text": "<article><p class='document_par'>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Integer tempor. Praesent in mauris eu tortor porttitor accumsan. Aenean fermentum risus id tortor. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Aenean vel massa quis mauris vehicula lacinia. Aliquam erat volutpat. Nullam justo enim, consectetuer nec, ullamcorper ac, vestibulum in, elit. Integer imperdiet lectus quis justo. Sed elit dui, pellentesque a, faucibus vel, interdum nec, diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Aenean id metus id velit ullamcorper pulvinar. Suspendisse nisl. Et harum quidem rerum facilis est et expedita distinctio. In dapibus augue non sapien. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Duis condimentum augue id magna semper rutrum.<\/p><\/article"
+    "document_code_ui_1-focal_text": "<article id='article'><p class='docpar'>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Integer tempor. Praesent in mauris eu tortor porttitor accumsan. Aenean fermentum risus id tortor. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Aenean vel massa quis mauris vehicula lacinia. Aliquam erat volutpat. Nullam justo enim, consectetuer nec, ullamcorper ac, vestibulum in, elit. Integer imperdiet lectus quis justo. Sed elit dui, pellentesque a, faucibus vel, interdum nec, diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Aenean id metus id velit ullamcorper pulvinar. Suspendisse nisl. Et harum quidem rerum facilis est et expedita distinctio. In dapibus augue non sapien. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Duis condimentum augue id magna semper rutrum.<\/p><\/article"
   }
 }

inst/test_app/tests/testthat/_snaps/mac-4.4/app-workdesk/workdesk-001.json

@@ -1,5 +1,5 @@
 {
   "output": {
-    "document_code_ui_1-focal_text": "<article><p class='document_par'>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Integer tempor. Praesent in mauris eu tortor porttitor accumsan. Aenean fermentum risus id tortor. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Aenean vel massa quis mauris vehicula lacinia. Aliquam erat volutpat. Nullam justo enim, consectetuer nec, ullamcorper ac, vestibulum in, elit. Integer imperdiet lectus quis justo. Sed elit dui, pellentesque a, faucibus vel, interdum nec, diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Aenean id metus id velit ullamcorper pulvinar. Suspendisse nisl. Et harum quidem rerum facilis est et expedita distinctio. In dapibus augue non sapien. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Duis condimentum augue id magna semper rutrum.<\/p><\/article"
+    "document_code_ui_1-focal_text": "<article id='article'><p class='docpar'>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Integer tempor. Praesent in mauris eu tortor porttitor accumsan. Aenean fermentum risus id tortor. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Aenean vel massa quis mauris vehicula lacinia. Aliquam erat volutpat. Nullam justo enim, consectetuer nec, ullamcorper ac, vestibulum in, elit. Integer imperdiet lectus quis justo. Sed elit dui, pellentesque a, faucibus vel, interdum nec, diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Aenean id metus id velit ullamcorper pulvinar. Suspendisse nisl. Et harum quidem rerum facilis est et expedita distinctio. In dapibus augue non sapien. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Duis condimentum augue id magna semper rutrum.<\/p><\/article"
   }
 }

inst/test_app/tests/testthat/setup-shinytest2.R

@@ -6,3 +6,5 @@ devtools::load_all(pkgload::pkg_path())
 # For CMD check use
 # shinytest2::load_app_env("inst/test_app")
 
+# Load application support files into testing environment
+shinytest2::load_app_env()

inst/test_app/tests/testthat/test-app-edit-code.R

@@ -0,0 +1,31 @@
+library(shinytest2)
+
+test_that("{shinytest2} testing editing code", {
+  app <- AppDriver$new(name = "edit_code", seed = 123, 
+                       height = 789, width = 1139)
+
+  app$click("launchpad_loader_ui_1-project_load")
+  app$wait_for_idle()
+
+  app$set_inputs(tab_menu = "Codebook")
+
+  app$click("codebook_ui_1-code_create_ui-rql_button_id")
+  app$set_inputs(`codebook_ui_1-code_name` = "Code1")
+  app$set_inputs(`codebook_ui_1-code_desc` = "Code description")
+  app$click("codebook_ui_1-code_add")
+  app$click("codebook_ui_1-code_create_ui-rql_button_id")
+
+  # Codes
+  app$expect_values(output = "codebook_ui_1-codes_ui")
+
+  app$click("codebook_ui_1-code_edit_ui-rql_button_id")
+  app$set_inputs(`codebook_ui_1-code_to_edit` = "1")
+
+  app$set_inputs(`codebook_ui_1-edit_code_name` = "kód")
+  app$set_inputs(`codebook_ui_1-edit_code_desc` = "popis kódu")
+
+  app$click("codebook_ui_1-code_edit_btn")
+
+  app$expect_values(output = "codebook_ui_1-codes_ui")
+
+})

tests/testthat/test-inst-app.R

@@ -4,6 +4,7 @@ test_that("test_app works", {
     # Don't run these tests on the CRAN build servers
     skip_on_cran()
     skip_on_ci()
+    # skip()
     # skip_if_not(interactive())
 
     appdir <- system.file("test_app", package = "requal")