Merge pull request #37 from prysmex/v0.15.27

add disableScoring to form, deprecate response enableScore, remove ti…

Author: patodevilla

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-03-21 00:10:36 UTC using RuboCop version 1.62.1.
+# on 2024-03-26 21:34:19 UTC using RuboCop version 1.62.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -144,14 +144,14 @@ Metrics/BlockNesting:
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 1010
+  Max: 1025
 
-# Offense count: 24
+# Offense count: 26
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 31
 
-# Offense count: 100
+# Offense count: 101
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 207
@@ -166,7 +166,7 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Max: 8
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 32
@@ -486,14 +486,6 @@ Style/SymbolProc:
   Exclude:
     - 'lib/jsf/forms/response_set.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
-  Exclude:
-    - 'lib/jsf/forms/form.rb'
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/ZeroLengthPredicate:

Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    json_schema_form (0.15.26)
+    json_schema_form (0.15.27)
       activesupport (~> 6)
       dry-schema (~> 1.13)
       json_schemer (= 2.1.1)

lib/jsf/forms/concerns/display_properties.rb

@@ -84,6 +84,19 @@ def component
           dig(:displayProperties, :component)
         end
 
+        # @return [void]
+        def compress!
+          delete(:extra) if self[:extra]&.sort == %w[notes pictures reports]
+
+          d_p = self[:displayProperties]
+          return unless d_p
+
+          d_p.delete(:hidden) if d_p[:hidden] == false
+          d_p.delete(:hideOnCreate) if d_p[:hideOnCreate] == false
+          d_p.delete(:pictures) if d_p[:pictures] == []
+          d_p.compact!
+        end
+
       end
     end
   end

lib/jsf/forms/field/checkbox.rb

@@ -38,7 +38,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               optional(:responseSetFilters).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               optional(:unansweredBehavior).value(included_in?: %w[disable show_all])

lib/jsf/forms/field/date_input.rb

@@ -34,7 +34,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:visibility).hash do
                 required(:label).filled(:bool)

lib/jsf/forms/field/file_input.rb

@@ -32,7 +32,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:visibility).hash do
                 required(:label).filled(:bool)

lib/jsf/forms/field/geo_points.rb

@@ -32,7 +32,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:visibility).hash do
                 required(:label).filled(:bool)

lib/jsf/forms/field/markdown.rb

@@ -33,7 +33,7 @@ def dry_schema(passthru)
                 end
               end
               required(:kind).maybe(:string)
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:visibility).hash do
                 required(:label).filled(:bool)

lib/jsf/forms/field/number_input.rb

@@ -32,7 +32,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:visibility).hash do
                 required(:label).filled(:bool)

lib/jsf/forms/field/select.rb

@@ -42,7 +42,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               optional(:responseSetFilters).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               optional(:unansweredBehavior).value(included_in?: %w[disable show_all])

lib/jsf/forms/field/shared.rb

@@ -37,7 +37,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:visibility).hash do
                 required(:label).filled(:bool)

lib/jsf/forms/field/signature.rb

@@ -61,7 +61,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:component).value(eql?: 'signature')
               required(:visibility).hash do

lib/jsf/forms/field/slider.rb

@@ -49,7 +49,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:visibility).hash do
                 required(:label).filled(:bool)

lib/jsf/forms/field/switch.rb

@@ -43,7 +43,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:visibility).hash do
                 required(:label).filled(:bool)

lib/jsf/forms/field/text_input.rb

@@ -32,7 +32,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:textarea).filled(:bool)
               required(:visibility).hash do

lib/jsf/forms/field/time_input.rb

@@ -34,7 +34,7 @@ def dry_schema(passthru)
                   end
                 end
               end
-              required(:pictures).value(:array?).array(:str?)
+              optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:visibility).hash do
                 required(:label).filled(:bool)

lib/jsf/forms/field/video.rb

@@ -33,7 +33,7 @@ def dry_schema(passthru)
                 end
               end
               required(:url).filled(:string)
-              # required(:pictures).value(:array?).array(:str?)
+              # optional(:pictures).value(:array?).array(:str?)
               required(:sort).filled(:integer)
               required(:visibility).hash do
                 required(:label).filled(:bool)

lib/jsf/forms/fixtures/field/date_input.json

@@ -17,6 +17,6 @@
     }
   },
   "format": "date-time",
-  "title": "fecha3182",
+  // "title": "date_input",
   "type": "string"
 }

lib/jsf/forms/fixtures/field/file_input.json

@@ -21,8 +21,8 @@
     "format": "uri",
     "pattern": "^http"
   },
-  "maxItems": 5,
-  "title": "file_input",
+  // "maxItems": 5,
+  // "title": "file_input",
   "type": "array",
   "uniqueItems": true
 }

lib/jsf/forms/fixtures/field/geo_points.json

@@ -26,6 +26,6 @@
   },
   // "maxItems": 3
   // "maxItems": 1
-  "title": "geopoints_input",
+  // "title": "geopoints",
   "type": "array"
 }

lib/jsf/forms/fixtures/field/markdown.json

@@ -18,6 +18,6 @@
     }
   },
   "format": "date-time",
-  "title": "neutral6664",
+  // "title": "markdown",
   "type": "string"
 }

lib/jsf/forms/fixtures/field/number_input.json

@@ -16,6 +16,6 @@
       "label": true
     }
   },
-  "title": "number_input",
+  // "title": "number_input",
   "type": "number"
 }

lib/jsf/forms/fixtures/field/select.json

@@ -16,6 +16,6 @@
     "visibility": {
       "label": true
     }
-  },
-  "title": "dropdown5353"
+  }
+  // "title": "select"
 }

lib/jsf/forms/fixtures/field/shared.json

@@ -16,6 +16,6 @@
     "visibility": {
       "label": true
     }
-  },
-  "title": "shared"
+  }
+  // "title": "shared"
 }

lib/jsf/forms/fixtures/field/signature.json

@@ -35,6 +35,6 @@
   },
   "additionalProperties": false,
   "required": [],
-  "title": "firma9386",
+  // "title": "signature",
   "type": "object"
 }

lib/jsf/forms/fixtures/field/slider.json

@@ -42,6 +42,6 @@
     9,
     10
   ],
-  "title": "min_5_max_10_inc_15081",
+  // "title": "slider",
   "type": "number"
 }

lib/jsf/forms/fixtures/field/static.json

@@ -6,6 +6,6 @@
     // "hideOnCreate": false,
     "sort": 0
   },
-  "title": "Description",
+  // "title": "static",
   "type": "null"
 }

lib/jsf/forms/fixtures/field/switch.json

@@ -25,6 +25,6 @@
       "label": true
     }
   },
-  "title": "switch8196",
+  // "title": "switch",
   "type": "boolean"
 }

lib/jsf/forms/fixtures/field/text_input.json

@@ -17,6 +17,6 @@
       "label": true
     }
   },
-  "title": "text_area",
+  // "title": "text_input",
   "type": "string"
 }

lib/jsf/forms/fixtures/field/time_input.json

@@ -17,6 +17,6 @@
     }
   },
   "pattern": "^(?:(?:[0-1][0-9])|(?:[2][0-4])):[0-5][0-9](?::[0-5][0-9])?$",
-  "title": "text_area",
+  // "title": "time_input",
   "type": "string"
 }

lib/jsf/forms/fixtures/field/video.json

@@ -16,7 +16,7 @@
       "label": true
     }
   },
-  "title": "video123",
+  // "title": "video",
   // "max": 100,
   "min": 0,
   "type": "number"

lib/jsf/forms/fixtures/form.json

@@ -7,6 +7,6 @@
   "properties": {},
   "required": [],
   // "schemaFormVersion": null,
-  "title": "",
+  // "title": "form",
   "type": "object"
 }

lib/jsf/forms/fixtures/response/scoring.json

@@ -7,7 +7,6 @@
       "es": "score_1_es"
     }
   },
-  "enableScore": true,
   "score": null,
   "type": "string"
 }

lib/jsf/forms/fixtures/response/scoring_and_failing.json

@@ -7,7 +7,6 @@
       "es": "score_1_es"
     }
   },
-  "enableScore": true,
   "failed": false,
   "score": null,
   "type": "string"

lib/jsf/forms/fixtures/section.json

@@ -18,6 +18,6 @@
   },
   "items": {},
   // "maxItems": 1,
-  // "title": "seccion5201",
+  // "title": "section",
   "type": "array"
 }