zizia 5.2.0 → 6.0.1

data/app/controllers/zizia/csv_import_details_controller.rb

@@ -2,24 +2,24 @@
 module Zizia
   class CsvImportDetailsController < ApplicationController
     helper_method :sort_column, :sort_direction, :user
-
     load_and_authorize_resource
     with_themed_layout 'dashboard'
 
     def index
       @csv_import_details = if csv_import_detail_params[:user] && user_id
                               Zizia::CsvImportDetail
-                                .order(sort_column + ' ' + sort_direction)
+                                .order("#{sort_column} #{sort_direction}, id DESC")
                                 .where(depositor_id: user_id).page csv_import_detail_params[:page]
                             else
                               Zizia::CsvImportDetail
-                                .order(sort_column + ' ' + sort_direction).page csv_import_detail_params[:page]
+                                .order("#{sort_column} #{sort_direction}, id DESC").page csv_import_detail_params[:page]
                             end
     end
 
     def show
       @csv_import_detail = Zizia::CsvImportDetail
                            .find(csv_import_detail_params[:id])
+      @pre_ingest_works = Kaminari.paginate_array(@csv_import_detail.pre_ingest_works, total_count: @csv_import_detail.pre_ingest_works.count).page(csv_import_detail_params[:page]).per(10)
     end
 
     private

data/app/helpers/zizia/application_helper.rb

@@ -30,5 +30,11 @@ module Zizia
     def collections?
       !ActiveFedora::SolrService.query('has_model_ssim:Collection').empty?
     end
+
+    def status_icon(status)
+      # rubocop:disable Rails/OutputSafety
+      return "<span class='glyphicon glyphicon-ok-sign text-success' aria-label='Status: Complete'></span>".html_safe if status == 'attached'
+      "<span class='glyphicon glyphicon-question-sign' aria-label='Status: Unknown'></span>".html_safe
+    end
   end
 end

data/app/importers/modular_importer.rb

@@ -39,12 +39,16 @@ class ModularImporter
       pre_ingest_work = Zizia::PreIngestWork.find_or_create_by(deduplication_key: record.mapper.metadata['deduplication_key'])
       pre_ingest_work.csv_import_detail_id = csv_import_detail.id
       record.mapper.files.each do |child_file|
-        full_path = Dir.glob("#{ENV['IMPORT_PATH']}/**/#{child_file}").first
-        pre_ingest_file = Zizia::PreIngestFile.new(row_number: index + 1,
-                                                   pre_ingest_work: pre_ingest_work,
-                                                   filename: child_file,
-                                                   size: File.size(full_path))
-        pre_ingest_file.save
+        begin
+          full_path = Dir.glob("#{ENV['IMPORT_PATH']}/**/#{child_file}").first
+          pre_ingest_file = Zizia::PreIngestFile.new(row_number: index + 1,
+                                                     pre_ingest_work: pre_ingest_work,
+                                                     filename: child_file,
+                                                     size: File.size(full_path))
+          pre_ingest_file.save
+        rescue
+          Rails.logger.error "Error: Could not create Zizia::PreIngestFile for #{child_file}"
+        end
       end
       pre_ingest_work.save
     end

data/app/lib/zizia/metadata_details.rb

@@ -71,28 +71,28 @@ module Zizia
 
       def file_definition
         {
-          attribute:  'files',
-          predicate:  'n/a',
-          multiple: 	'true',
-          type:       'String',
-          validator: 	'Required, must name a file on the server',
-          label: 	    'Items (listed at bottom of page)',
+          attribute: 'files',
+          predicate: 'n/a',
+          multiple: 'true',
+          type: 'String',
+          validator: 'Required, must name a file on the server',
+          label: 'Items (listed at bottom of page)',
           csv_header: 'files',
-          required_on_form: 	'true',
+          required_on_form: 'true',
           usage: MetadataUsage.instance.usage['files']
         }
       end
 
       def visibility_definition
         {
-          attribute:  'visibility',
-          predicate:  'n/a',
-          multiple: 	'false',
-          type:       'String',
-          validator: 	'Required, must exist in the application\'s controlled vocabulary for visiblity levels.',
-          label: 	    'Visibility',
+          attribute: 'visibility',
+          predicate: 'n/a',
+          multiple: 'false',
+          type: 'String',
+          validator: 'Required, must exist in the application\'s controlled vocabulary for visiblity levels.',
+          label: 'Visibility',
           csv_header: 'visibility',
-          required_on_form: 	'true',
+          required_on_form: 'true',
           usage: MetadataUsage.instance.usage['visibility']
         }
       end

data/app/uploaders/zizia/csv_manifest_validator.rb

@@ -63,7 +63,7 @@ module Zizia
          'publisher', 'date created', 'subject',
          'language', 'identifier', 'location',
          'related url', 'bibliographic_citation',
-         'source', 'visibility']
+         'source', 'visibility', 'deduplication_key', 'type']
       end
 
       def parse_csv
@@ -82,7 +82,7 @@ module Zizia
       end
 
       def required_headers
-        ['title', 'creator', 'keyword', 'rights statement', 'visibility', 'files']
+        ['title', 'creator', 'keyword', 'rights statement', 'visibility', 'files', 'deduplication_key']
       end
 
       def duplicate_headers

data/app/views/zizia/csv_import_details/_pre_ingest_files_table.html.erb

@@ -1,24 +1,33 @@
-<table id="files-table" class="dataTable display responsive nowrap table table-striped works-list" style="width:100%">
-  <tr>
-    <th>Filename</th>
-    <th>Size</th>
-    <th>Row Number</th>
-    <th>Date Created</th>
-  </tr>
-  <% pre_ingest_work.pre_ingest_files.each do |pre_ingest_file| %>
+<div class="pre-ingest-file-table">
+  <a class="btn btn-primary" data-toggle="collapse" href="#files-table-<%= pre_ingest_work.id %>" role="button" aria-expanded="false" aria-controls="files-table-<%= pre_ingest_work.id %>">
+    View Files
+  </a>
+  <table id="files-table-<%= pre_ingest_work.id %>" class="responsive collapse nowrap table table-striped works-list">
     <tr>
-      <td>
-        <%= pre_ingest_file.basename %>
-      </td>
-      <td>
-        <%= number_to_human_size(pre_ingest_file.size) %>
-      </td>
-      <td>
-        <%= pre_ingest_file.row_number %>
-      </td>
-      <td>
-        <%= pre_ingest_file.created_at.strftime("%B %-d, %Y %H:%M") %>
-      </td>
+      <th>Filename</th>
+      <th>Size</th>
+      <th>Row Number</th>
+      <th>Date Created</th>
+      <th>Status</th>
     </tr>
-  <% end %>
-</table>
+    <% pre_ingest_work.pre_ingest_files.each do |pre_ingest_file| %>
+      <tr>
+        <td>
+          <%= pre_ingest_file.basename %>
+        </td>
+        <td>
+          <%= number_to_human_size(pre_ingest_file.size) %>
+        </td>
+        <td>
+          <%= pre_ingest_file.row_number %>
+        </td>
+        <td>
+          <%= pre_ingest_file.created_at.strftime("%B %-d, %Y %H:%M") %>
+        </td>
+        <td>
+          <%= status_icon(pre_ingest_file.status) %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+</div>

data/app/views/zizia/csv_import_details/show.html.erb

@@ -16,7 +16,7 @@
       <th>Files</th>
       <th>Date</th>
     </tr>
-  <% @csv_import_detail.pre_ingest_works.each do |pre_ingest_work| %>
+  <% @pre_ingest_works.each do |pre_ingest_work| %>
     <tr>
       <td>
         <%= pre_ingest_work.deduplication_key%>
@@ -30,7 +30,11 @@
       <td>
         <%= pre_ingest_work.created_at.strftime("%B %-d, %Y %H:%M") %>
       </td>
+      <td>
+        <%= status_icon(pre_ingest_work.status) %>
+      </td>
     </tr>
   <% end %>
   </table>
+  <%= paginate @pre_ingest_works %>
 </div>

data/app/views/zizia/csv_imports/_record_count.html.erb

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-md-8">
     <div class="alert alert-success">
-      <p> This import will create or update <%= @csv_import.manifest_records %> records. </p>
+      <p> This import will process <%= @csv_import.manifest_records %> row(s). </p>
     </div>
   </div>
 </div>

data/config/initializers/content_deposit_event_job_prepends.rb

@@ -0,0 +1,10 @@
+module ContentDepositEventJobPrepends
+  def action
+    super
+    if repo_object.deduplication_key
+      pre_ingest_work = Zizia::PreIngestWork.find_by(deduplication_key: repo_object.deduplication_key)
+      pre_ingest_work.status = 'attached'
+      pre_ingest_work.save
+    end
+  end
+end

data/config/initializers/file_set_attached_event_job_prepends.rb

@@ -0,0 +1,12 @@
+module FileSetAttachedEventJobPrepends
+  def action
+    if repo_object.kind_of?(FileSet)
+      pre_ingest_work_id = Zizia::PreIngestWork.find_by(deduplication_key: curation_concern.deduplication_key)
+      pre_ingest_file = Zizia::PreIngestFile.find_by(size: repo_object.files.first.size,
+                                                     filename: repo_object.files.first.original_name,
+                                                     pre_ingest_work_id: pre_ingest_work_id)
+      pre_ingest_file.status = 'attached'
+      pre_ingest_file.save
+    end
+  end
+end

data/config/initializers/prepends.rb

@@ -0,0 +1,2 @@
+ContentDepositEventJob.prepend(ContentDepositEventJobPrepends)
+FileSetAttachedEventJob.prepend(FileSetAttachedEventJobPrepends)

data/db/migrate/20191114021032_add_status_to_pre_ingest_file.rb

@@ -0,0 +1,5 @@
+class AddStatusToPreIngestFile < ActiveRecord::Migration[5.1]
+  def change
+    add_column :zizia_pre_ingest_files, :status, :string, default: 'preingest'
+  end
+end

data/db/migrate/20191210223833_add_status_to_pre_ingest_work.rb

@@ -0,0 +1,5 @@
+class AddStatusToPreIngestWork < ActiveRecord::Migration[5.1]
+  def change
+    add_column :zizia_pre_ingest_works, :status, :string, default: 'preingest'
+  end
+end

data/lib/zizia/hyrax/hyrax_basic_metadata_mapper.rb

@@ -31,7 +31,7 @@ module Zizia
     ##
     # @return [Enumerable<Symbol>] The fields the mapper can process.
     def fields
-      core_fields + basic_fields + [:visibility, :files]
+      core_fields + basic_fields + [:visibility, :files] + zizia_fields
     end
 
     # Properties defined with `multiple: false` in
@@ -57,6 +57,10 @@ module Zizia
       single_value('import_url')
     end
 
+    def deduplication_key
+      single_value('deduplication_key')
+    end
+
     # We should accept visibility values that match the UI and transform them into
     # the controlled vocabulary term expected by Hyrax
     def visibility
@@ -152,5 +156,10 @@ module Zizia
          :based_near, :related_url,
          :bibliographic_citation, :source]
       end
+
+      # Properties requires for zizia
+      def zizia_fields
+        [:deduplication_key]
+      end
   end
 end

data/lib/zizia/parser.rb

@@ -83,12 +83,12 @@ module Zizia
 
       private
 
-      ##
-      # @private Register a new class when inherited
-      def inherited(subclass)
-        @@subclasses.unshift subclass
-        super
-      end
+        ##
+        # @private Register a new class when inherited
+        def inherited(subclass)
+          @@subclasses.unshift subclass
+          super
+        end
     end
 
     ##

data/lib/zizia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zizia
-  VERSION = '5.2.0'
+  VERSION = '6.0.1'
 end

data/spec/dummy/.gitignore

@@ -8,7 +8,7 @@
 /.bundle
 
 # Ignore the default SQLite database.
-/db/*.sqlite3
+/db/development.sqlite3
 /db/*.sqlite3-journal
 
 # Ignore all logfiles and tempfiles.

data/spec/dummy/app/models/work.rb

@@ -9,7 +9,7 @@ class Work < ActiveFedora::Base
   validates :title, presence: { message: 'Your work must have a title.' }
 
 
-  property :deduplication_key, predicate: 'http://metadata.example.com/vocab/predicates#deduplicationKey', multiple: false do |index|
+  property :deduplication_key, predicate: ::RDF::Vocab::BF2::identifiedBy, multiple: false do |index|
     index.as :stored_searchable
   end
   # This must be included at the end, because it finalizes the metadata

data/spec/dummy/db/schema.rb

@@ -595,6 +595,7 @@ ActiveRecord::Schema.define(version: 201901241536542) do
     t.integer "pre_ingest_work_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "status", default: "preingest"
     t.index ["pre_ingest_work_id"], name: "index_zizia_pre_ingest_files_on_pre_ingest_work_id"
   end
 
@@ -604,6 +605,7 @@ ActiveRecord::Schema.define(version: 201901241536542) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "deduplication_key"
+    t.string "status", default: "preingest"
     t.index ["csv_import_detail_id"], name: "index_zizia_pre_ingest_works_on_csv_import_detail_id"
     t.index ["deduplication_key"], name: "index_zizia_pre_ingest_works_on_deduplication_key"
   end

data/spec/dummy/spec/fixtures/csv_import/csv_files_with_problems/extra - headers.csv

@@ -1,4 +1,4 @@
-rights_statement,another_header_2,rights statement,title,files,label,relative_path,import url,resource type,creator,contributor,abstract or summary,keyword,license,publisher,date created,subject,language,identifier,location,related url,bibliographic_citation,source,visibility
-http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 1 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open
-http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 2 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open
-http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 3 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open
+deduplication_key,rights_statement,another_header_2,rights statement,title,files,label,relative_path,import url,resource type,creator,contributor,abstract or summary,keyword,license,publisher,date created,subject,language,identifier,location,related url,bibliographic_citation,source,visibility
+1,http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 1 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open
+2,http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 2 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open
+3,http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 3 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open

data/spec/dummy/spec/fixtures/csv_import/good/all_fields.csv

@@ -1,2 +1,2 @@
-identifier,license,deduplication_key,visibility,location,keyword,rights statement,creator,title,files
-abc/123,https://creativecommons.org/licenses/by/4.0/,abc/123,PUBlic,http://www.geonames.org/5667009/montana.html|~|http://www.geonames.org/6252001/united-states.html,Clothing stores $z California $z Los Angeles|~|Interior design $z California $z Los Angeles,http://rightsstatements.org/vocab/InC/1.0/,"Connell, Will, $d 1898-1961","Interior view of The Bachelors haberdashery designed by Julius Ralph Davidson, Los Angeles, circa 1929",dog.jpg
+identifier,type,license,deduplication_key,visibility,location,keyword,rights statement,creator,title,files
+abc/123,work,https://creativecommons.org/licenses/by/4.0/,abc/123,PUBlic,http://www.geonames.org/5667009/montana.html|~|http://www.geonames.org/6252001/united-states.html,Clothing stores $z California $z Los Angeles|~|Interior design $z California $z Los Angeles,http://rightsstatements.org/vocab/InC/1.0/,"Connell, Will, $d 1898-1961","Interior view of The Bachelors haberdashery designed by Julius Ralph Davidson, Los Angeles, circa 1929",dog.jpg

data/spec/dummy/spec/fixtures/csv_import/good/all_fields_multi.csv

@@ -0,0 +1,2 @@
+identifier,type,license,deduplication_key,visibility,location,keyword,rights statement,creator,title,files
+abc/123,work,https://creativecommons.org/licenses/by/4.0/,abc/123,PUBlic,http://www.geonames.org/5667009/montana.html|~|http://www.geonames.org/6252001/united-states.html,Clothing stores $z California $z Los Angeles|~|Interior design $z California $z Los Angeles,http://rightsstatements.org/vocab/InC/1.0/,"Connell, Will, $d 1898-1961","Interior view of The Bachelors haberdashery designed by Julius Ralph Davidson, Los Angeles, circa 1929",dog.jpg|~|cat.jpg

data/spec/dummy/spec/support/capybara.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+Capybara.default_max_wait_time = 20
 
 # Setup chrome headless driver
 Capybara.server = :puma, { Silent: true }

data/spec/dummy/spec/system/csv_import_details_page_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 include Warden::Test::Helpers
 
-RSpec.describe 'viewing the csv import detail page' do
+RSpec.describe 'viewing the csv import detail page', js: true do
   let(:user) { FactoryBot.create(:admin, email: 'systems@curationexperts.com')}
   let(:second_user) { FactoryBot.create(:user, email: 'user@curationexperts.com') }
   let(:csv_import) { FactoryBot.create(:csv_import) }
@@ -9,6 +9,8 @@ RSpec.describe 'viewing the csv import detail page' do
   let(:csv_import_detail) { FactoryBot.create_list(:csv_import_detail, 12, created_at: Time.parse('Tue, 29 Oct 2019 14:20:02 UTC +00:00').utc, depositor_id: user.id) }
   let(:csv_import_detail_second) { FactoryBot.create(:csv_import_detail, created_at: Time.parse('Thur, 31 Oct 2019 14:20:02 UTC +00:00').utc, status: 'zippy', update_actor_stack: 'ZiziaTesting', depositor_id: user.id)  }
   let(:csv_import_detail_third) { FactoryBot.create(:csv_import_detail, created_at: Time.parse('Wed, 30 Oct 2019 14:20:02 UTC +00:00').utc, depositor_id: second_user.id, csv_import_id: 2) }
+  let(:csv_pre_ingest_works) { FactoryBot.create_list(:pre_ingest_work, 12, csv_import_detail_id: 4) }
+  let(:csv_pre_ingest_work_second) { FactoryBot.create(:pre_ingest_work, csv_import_detail_id: 5, created_at: Time.parse('Thur, 31 Oct 2019 14:20:02 UTC +00:00').utc) }
 
   before do
     user.save
@@ -23,15 +25,16 @@ RSpec.describe 'viewing the csv import detail page' do
     csv_import_detail.each(&:save)
     csv_import_detail_second.save
     csv_import_detail_third.save
+    csv_pre_ingest_works.each(&:save)
+    csv_pre_ingest_work_second.save
     login_as user
   end
 
   it 'displays the metadata when you visit the page' do
     visit ('/csv_import_details/index')
     expect(page).to have_content('ID')
+    click_on '13'
     expect(page).to have_content('Status')
-    expect(page).to have_content('undetermined')
-    click_on '1'
     expect(page).to have_content('Total Size')
     expect(page).to have_content('Deduplication Key')
   end
@@ -65,7 +68,7 @@ RSpec.describe 'viewing the csv import detail page' do
   it 'displays the metadata when you visit the page' do
     visit ('/csv_import_details/index')
     expect(page).to have_content('ID')
-    click_on '1'
+    click_on '13'
     expect(page).to have_content('Total Size')
   end
 
@@ -113,4 +116,26 @@ RSpec.describe 'viewing the csv import detail page' do
     click_on 'View All Imports'
     expect(page).to have_content('user@curationexperts.com')
   end
+
+  it 'has pagination for PreIngestWorks at 10' do
+    visit('/csv_import_details/index')
+    sleep(2)
+    click_on 'Next'
+    sleep(2)
+    click_on '4'
+    sleep(2)
+    expect(page).to have_content 'Next'
+    click_on 'Next'
+    sleep(2)
+    expect(page).to have_content 'Previous'
+  end
+
+  it 'can hide/show a PreIngestFiles table' do
+    visit('/csv_import_details/index')
+    click_on '5'
+    expect(page).to have_content 'View Files'
+    expect(page).not_to have_content 'Row Number'
+    click_on 'View Files'
+    expect(page).to have_content 'Row Number'
+  end
 end