copilot comments

Author: mikesndrs

app/dictionaries/dictionary.rb

@@ -78,7 +78,11 @@ def keys
   private
 
   def load_dictionary
-    YAML.safe_load(File.read(dictionary_filepath)).with_indifferent_access
+    if File.exist?(dictionary_filepath)
+      YAML.safe_load(File.read(dictionary_filepath)).with_indifferent_access
+    else
+      {}
+    end
   end
 
   def get_file_path(config_file, default_file)

app/dictionaries/keywords_dictionary.rb

@@ -3,8 +3,6 @@ class KeywordsDictionary < Dictionary
 
   DEFAULT_FILE = 'keywords.yml'
 
-  private
-
   def dictionary_filepath
     get_file_path 'keywords', DEFAULT_FILE
   end

app/dictionaries/target_audience_dictionary.rb

@@ -3,8 +3,6 @@ class TargetAudienceDictionary < Dictionary
 
   DEFAULT_FILE = 'target_audience.yml'
 
-  private
-
   def dictionary_filepath
     get_file_path 'target_audience', DEFAULT_FILE
   end

app/helpers/application_helper.rb

@@ -362,6 +362,7 @@ def field_lock(name, _options = {})
     def dropdown(name, options = {})
       existing_values = object.send(name.to_sym)
       existing = options[:options].select { |_label, value| existing_values.include?(value) }
+      visibility_toggle = options[:visibility_toggle] || []
       @template.render(partial: 'common/dropdown', locals: { field_name: name, f: self,
                                                              model_name: options[:model_name],
                                                              resource: object,
@@ -370,7 +371,8 @@ def dropdown(name, options = {})
                                                              field_label: options[:label],
                                                              required: options[:required],
                                                              errors: options[:errors],
-                                                             title: options[:title] })
+                                                             title: options[:title] },
+                                                             hidden: hidden?(name, visibility_toggle) })
     end
 
     def hidden?(name, visibility_toggle)

app/views/common/_dropdown.html.erb

@@ -46,7 +46,7 @@ render :partial => 'common/dropdown',
 
 %>
 
-<div class="form-group<%= ' has-error' if errors.size > 0 %>">
+<div class="form-group<%= ' has-error' if errors.size > 0 %><%= ' hidden' if hidden %>">
 
   <% if required %><label class="control-label string required"><abbr title="required">*</abbr></label><% end %>
   <%= f.label field_label, class: 'control-label' %>

app/views/events/_form.html.erb

@@ -90,10 +90,10 @@
                     title: t('events.hints.hosts') %>
 
   <!-- Field: Keywords -->
-  <% if TeSS::Config.feature['controlled_vocabulary_vars'].include? 'keywords' %>
+  <% if TeSS::Config.feature['controlled_vocabulary_vars'].include? 'keywords' && File.exist?(KeywordsDictionary.instance.dictionary_filepath) %>
     <%= f.dropdown :keywords,
                   options: KeywordsDictionary.instance.options_for_select,
-                  label: t('activerecord.attributes.event.keywords'),
+                  label: t('activerecord.attributes.event.keywords', default: 'Keywords'),
                   errors: @event.errors[:keywords],
                   title: t('events.hints.keywords') %>
   <% else %>
@@ -113,7 +113,7 @@
   <% end %>
 
   <!-- Field: Target Audience -->
-  <% if TeSS::Config.feature['controlled_vocabulary_vars'].include? 'target_audience' %>
+  <% if TeSS::Config.feature['controlled_vocabulary_vars'].include? 'target_audience' && File.exist?(TargetAudienceDictionary.instance.dictionary_filepath) %>
     <%= f.dropdown :target_audience,
                   options: TargetAudienceDictionary.instance.options_for_select,
                   label: 'Target audiences',

app/views/materials/_form.html.erb

@@ -40,9 +40,9 @@
   <% if TeSS::Config.feature['controlled_vocabulary_vars'].include? 'keywords' %>
     <%= f.dropdown :keywords,
                   options: KeywordsDictionary.instance.options_for_select,
-                  label: t('activerecord.attributes.event.keywords'),
+                  label: t('activerecord.attributes.event.keywords', default: 'Keywords'),
                   errors: @material.errors[:keywords],
-                  title: t('events.hints.keywords'),
+                  title: t('materials.hints.keywords'),
                   visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
   <% else %>
     <%= f.multi_input :keywords, title: t('materials.hints.keywords'), visibility_toggle: TeSS::Config.feature['materials_disabled'] %>