Location (#110)

* Display edit form label on documentation page, order by label

* For the template, return the csv headers rather than the attributes

app/lib/zizia/metadata_details.rb

@@ -10,6 +10,7 @@ def details(work_attributes:)
       detail_list = work_attributes.properties.sort.map { |p| definition_hash_for(p, validators) }
       detail_list << visibility_definition
       detail_list << file_definition
+      detail_list.sort_by { |prop| prop[:label] }
     end
 
     def to_csv(work_attributes:)
@@ -57,12 +58,12 @@ def validator_to_string(validator:)
 
       def definition_hash_for(field_properties, validators)
         Hash[
+          label: I18n.t("simple_form.labels.defaults.#{field_properties[0]}"),
           attribute: field_properties[0],
           predicate: field_properties[1].predicate.to_s,
           multiple: field_properties[1].try(:multiple?).to_s,
           type: type_to_s(field_properties[1].type),
           validator: validator_to_string(validator: validators[field_properties[0].to_sym][0]),
-          label: I18n.t("simple_form.labels.defaults.#{field_properties[0]}"),
           csv_header: csv_header(field_properties[0]),
           required_on_form: required_on_form_to_s(field_properties[0]),
           usage: MetadataUsage.instance.usage[field_properties[0]]
@@ -76,7 +77,7 @@ def file_definition
           multiple: 'true',
           type: 'String',
           validator: 'Required, must name a file on the server',
-          label: 'Items (listed at bottom of page)',
+          label: 'Files',
           csv_header: 'files',
           required_on_form: 'true',
           usage: MetadataUsage.instance.usage['files']

app/views/zizia/metadata_details/show.html.erb

@@ -18,8 +18,12 @@
     <% @details.each do |detail| %>
       <div class="metadata-field <%= system_field(detail) %>" <%= hide_system_field(detail) %>>
         <h2 class="field-label">
-          <%= detail[:attribute] %>
+          <%= detail[:label] %>
         </h2>
+        <div>
+          <b>Attribute:</b>
+          <%= detail[:attribute] %>
+        </div>
         <div>
           <b>Predicate:</b>
           <a href="<%= detail[:predicate] %>"><%= detail[:predicate] %></a>

lib/zizia/csv_template.rb

@@ -3,7 +3,7 @@
 module Zizia
   class CsvTemplate
     def to_s
-      Zizia.config.metadata_mapper_class.new.fields.join(',')
+      Zizia.config.metadata_mapper_class.new.headers.join(',')
     end
   end
 end

lib/zizia/hyrax/hyrax_basic_metadata_mapper.rb

@@ -34,6 +34,12 @@ def fields
       core_fields + basic_fields + [:visibility, :files] + zizia_fields
     end
 
+    def headers
+      fields.map do |field|
+        Zizia::HyraxBasicMetadataMapper.csv_header(field)
+      end
+    end
+
     # Properties defined with `multiple: false` in
     # Hyrax should return a single value instead of
     # an Array of values.
@@ -112,7 +118,9 @@ def map_field(name)
     end
 
     def self.csv_header(field)
-      CSV_HEADERS[field.to_sym]
+      header = CSV_HEADERS[field.to_sym]
+      return header if header
+      field
     end
 
     protected

spec/zizia/csv_template_spec.rb

@@ -7,9 +7,12 @@
 
   before do
     Zizia.config.metadata_mapper_class = Zizia::HyraxBasicMetadataMapper
+    # rubocop:disable RSpec/AnyInstance
+    allow_any_instance_of(Zizia::HyraxBasicMetadataMapper).to receive(:fields).and_return([:based_near, :resource_type, :description])
+    # rubocop:enable RSpec/AnyInstance
   end
 
   it 'returns a CSV string based on the headers in the Hyrax mapper' do
-    expect(csv_template.to_s).to eq(Zizia::HyraxBasicMetadataMapper.new.fields.join(','))
+    expect(csv_template.to_s).to eq("location,resource type,abstract or summary")
   end
 end