zizia 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 453482e76b8537954045a40a8e65140314b14433043612350b1785947ff721f7
-  data.tar.gz: 2aa440442e200025b76818b22de7a82a837352fb1c3d4b848e9fbda46dd84d08
+  metadata.gz: 0c996cb008f5c2688ad0268f351e7ece835fa9822c6b1d95cee5744df9efead9
+  data.tar.gz: dd746445e693cc7a941f0670cfc3eb6e0ef0c674d0844975825a94673150e097
 SHA512:
-  metadata.gz: 3f68482a59065494e37f1d252bd3ec90e889683882400d6f69b9ac7e851d6d288725e6d82b55d961c7298285add26e3265ddd2d27db8670dd5332a3414a7b99d
-  data.tar.gz: 1933dca096dc18ad15011fb216d436a06377e15e042e4336799d5582fc0dfe66aef1307af312fe1bd48dab47c8500c754479419f5372641579bb38e6baf8afb1
+  metadata.gz: c9094c26f6385c215dc138d8a50495cc08f5962b732d3ba483de63d9c055a1ebebee7d7a01c5b33bb948c983777ebd2eee5b16abf0d7402e03cbe3940f7be16a
+  data.tar.gz: b595f80d8f66d3fbd0e46a14a7b2baeab74f6feccfafd7f4aa14d249f4fb7c5a01da001848bb652b0b70f17b49d03c089845edca30485ab569456621b891deef

data/.github_changelog_generator

@@ -0,0 +1,2 @@
+unreleased=true
+future-release=5.1.0

data/CHANGELOG.md

@@ -0,0 +1,254 @@
+# Changelog
+
+## [5.1.0](https://github.com/curationexperts/zizia/tree/5.1.0) (2019-11-04)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.0.1...5.1.0)
+
+**Merged pull requests:**
+
+- Add ability to toggle your imports [\#54](https://github.com/curationexperts/zizia/pull/54) ([little9](https://github.com/little9))
+- Add deduplication\_key to Zizia::PreIngestWork model [\#53](https://github.com/curationexperts/zizia/pull/53) ([bess](https://github.com/bess))
+- Initial batch sorting [\#52](https://github.com/curationexperts/zizia/pull/52) ([little9](https://github.com/little9))
+- Show more info on batch page [\#51](https://github.com/curationexperts/zizia/pull/51) ([little9](https://github.com/little9))
+- Only show the basename for PreIngestFile [\#50](https://github.com/curationexperts/zizia/pull/50) ([little9](https://github.com/little9))
+- Add Date to details page [\#49](https://github.com/curationexperts/zizia/pull/49) ([little9](https://github.com/little9))
+- Set import details pagination to 10 [\#48](https://github.com/curationexperts/zizia/pull/48) ([little9](https://github.com/little9))
+- Use DCE's standard caypbara config [\#47](https://github.com/curationexperts/zizia/pull/47) ([little9](https://github.com/little9))
+- Update README.md [\#46](https://github.com/curationexperts/zizia/pull/46) ([little9](https://github.com/little9))
+
+## [v5.0.1](https://github.com/curationexperts/zizia/tree/v5.0.1) (2019-10-23)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.0.0...v5.0.1)
+
+**Merged pull requests:**
+
+- Change glyphicons on import form [\#45](https://github.com/curationexperts/zizia/pull/45) ([little9](https://github.com/little9))
+- Add font-family to submit button [\#44](https://github.com/curationexperts/zizia/pull/44) ([little9](https://github.com/little9))
+
+## [v5.0.0](https://github.com/curationexperts/zizia/tree/v5.0.0) (2019-10-16)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.6.0.alpha01...v5.0.0)
+
+**Merged pull requests:**
+
+- Update headers for the downloadable CSV template [\#43](https://github.com/curationexperts/zizia/pull/43) ([mark-dce](https://github.com/mark-dce))
+- Update design of new CSV import page [\#42](https://github.com/curationexperts/zizia/pull/42) ([mark-dce](https://github.com/mark-dce))
+- Update to correct spelling for keyword field [\#41](https://github.com/curationexperts/zizia/pull/41) ([mark-dce](https://github.com/mark-dce))
+- Use yes/no language in the metadata guide [\#40](https://github.com/curationexperts/zizia/pull/40) ([bess](https://github.com/bess))
+
+## [v4.6.0.alpha01](https://github.com/curationexperts/zizia/tree/v4.6.0.alpha01) (2019-10-15)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.5.4.alpha.01...v4.6.0.alpha01)
+
+**Merged pull requests:**
+
+- Add dashboard layout to csv import screens [\#39](https://github.com/curationexperts/zizia/pull/39) ([bess](https://github.com/bess))
+- Update Usage data for the metadata field guide [\#38](https://github.com/curationexperts/zizia/pull/38) ([mark-dce](https://github.com/mark-dce))
+- Update language for multiple values on metadata field guide [\#37](https://github.com/curationexperts/zizia/pull/37) ([bess](https://github.com/bess))
+- Add intro header for metadata field guide [\#36](https://github.com/curationexperts/zizia/pull/36) ([bess](https://github.com/bess))
+- Add field definitions for 'files' and 'visibility' to the field guide [\#35](https://github.com/curationexperts/zizia/pull/35) ([mark-dce](https://github.com/mark-dce))
+- Label and hide system fields [\#34](https://github.com/curationexperts/zizia/pull/34) ([bess](https://github.com/bess))
+
+## [v4.5.4.alpha.01](https://github.com/curationexperts/zizia/tree/v4.5.4.alpha.01) (2019-10-04)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.5.3.alpha.01...v4.5.4.alpha.01)
+
+**Merged pull requests:**
+
+- Remove 'in Bytes' from import table headers [\#33](https://github.com/curationexperts/zizia/pull/33) ([little9](https://github.com/little9))
+
+## [v4.5.3.alpha.01](https://github.com/curationexperts/zizia/tree/v4.5.3.alpha.01) (2019-10-03)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.5.2.alpha.01...v4.5.3.alpha.01)
+
+**Merged pull requests:**
+
+- Add files count to import details page [\#32](https://github.com/curationexperts/zizia/pull/32) ([little9](https://github.com/little9))
+
+## [v4.5.2.alpha.01](https://github.com/curationexperts/zizia/tree/v4.5.2.alpha.01) (2019-10-03)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.5.1.alpha.01...v4.5.2.alpha.01)
+
+**Merged pull requests:**
+
+- Explicitly include JS for the import UI [\#31](https://github.com/curationexperts/zizia/pull/31) ([little9](https://github.com/little9))
+
+## [v4.5.1.alpha.01](https://github.com/curationexperts/zizia/tree/v4.5.1.alpha.01) (2019-10-02)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.4.1.alpha.01...v4.5.1.alpha.01)
+
+**Merged pull requests:**
+
+- Correct path to generate file size and change row count [\#30](https://github.com/curationexperts/zizia/pull/30) ([little9](https://github.com/little9))
+
+## [v4.4.1.alpha.01](https://github.com/curationexperts/zizia/tree/v4.4.1.alpha.01) (2019-10-02)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.4.0.alpha.01...v4.4.1.alpha.01)
+
+**Merged pull requests:**
+
+- Rename CSV Template link and filename [\#29](https://github.com/curationexperts/zizia/pull/29) ([little9](https://github.com/little9))
+
+## [v4.4.0.alpha.01](https://github.com/curationexperts/zizia/tree/v4.4.0.alpha.01) (2019-10-02)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.3.1.alpha.01...v4.4.0.alpha.01)
+
+**Merged pull requests:**
+
+- Add CSV Import Detail pages from dlp-curate [\#28](https://github.com/curationexperts/zizia/pull/28) ([little9](https://github.com/little9))
+
+## [v4.3.1.alpha.01](https://github.com/curationexperts/zizia/tree/v4.3.1.alpha.01) (2019-10-02)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.2.0.alpha.01...v4.3.1.alpha.01)
+
+**Merged pull requests:**
+
+- Return attrs from process\_attrs method [\#27](https://github.com/curationexperts/zizia/pull/27) ([little9](https://github.com/little9))
+- Add create\_date usage and remove erroneous pre-import message [\#26](https://github.com/curationexperts/zizia/pull/26) ([little9](https://github.com/little9))
+
+## [v4.2.0.alpha.01](https://github.com/curationexperts/zizia/tree/v4.2.0.alpha.01) (2019-10-01)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.1.0.alpha.01...v4.2.0.alpha.01)
+
+**Merged pull requests:**
+
+- Add dynamically generated metadata guide [\#25](https://github.com/curationexperts/zizia/pull/25) ([little9](https://github.com/little9))
+
+## [v4.1.0.alpha.01](https://github.com/curationexperts/zizia/tree/v4.1.0.alpha.01) (2019-09-30)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4...v4.1.0.alpha.01)
+
+**Merged pull requests:**
+
+- Check for existing roles [\#24](https://github.com/curationexperts/zizia/pull/24) ([little9](https://github.com/little9))
+- Revert "Update coverage formatter for CI environments" [\#23](https://github.com/curationexperts/zizia/pull/23) ([mark-dce](https://github.com/mark-dce))
+- Update coverage formatter for CI environments [\#22](https://github.com/curationexperts/zizia/pull/22) ([mark-dce](https://github.com/mark-dce))
+
+## [v4](https://github.com/curationexperts/zizia/tree/v4) (2019-09-25)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.0.2.alpha.01...v4)
+
+## [v4.0.2.alpha.01](https://github.com/curationexperts/zizia/tree/v4.0.2.alpha.01) (2019-09-25)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v4.0.0.alpha.01...v4.0.2.alpha.01)
+
+## [v4.0.0.alpha.01](https://github.com/curationexperts/zizia/tree/v4.0.0.alpha.01) (2019-09-25)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v3.1.0.alpha.01...v4.0.0.alpha.01)
+
+**Merged pull requests:**
+
+- Additional coveralls config [\#21](https://github.com/curationexperts/zizia/pull/21) ([little9](https://github.com/little9))
+- Add additional updaters [\#20](https://github.com/curationexperts/zizia/pull/20) ([little9](https://github.com/little9))
+- Add ability to choose between files or no files during import [\#19](https://github.com/curationexperts/zizia/pull/19) ([little9](https://github.com/little9))
+- Add full Hyrax dummy [\#18](https://github.com/curationexperts/zizia/pull/18) ([little9](https://github.com/little9))
+
+## [v3.1.0.alpha.01](https://github.com/curationexperts/zizia/tree/v3.1.0.alpha.01) (2019-09-12)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v3.0.0.alpha.01...v3.1.0.alpha.01)
+
+**Merged pull requests:**
+
+- Add CsvImportDetail model and associated models [\#17](https://github.com/curationexperts/zizia/pull/17) ([little9](https://github.com/little9))
+- Allow upload and cache path for CSV to be changed [\#16](https://github.com/curationexperts/zizia/pull/16) ([little9](https://github.com/little9))
+
+## [v3.0.0.alpha.01](https://github.com/curationexperts/zizia/tree/v3.0.0.alpha.01) (2019-08-23)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.09...v3.0.0.alpha.01)
+
+**Merged pull requests:**
+
+- Let's not reinvent logging [\#15](https://github.com/curationexperts/zizia/pull/15) ([bess](https://github.com/bess))
+
+## [v2.1.0.alpha.09](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.09) (2019-08-23)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.08...v2.1.0.alpha.09)
+
+**Merged pull requests:**
+
+- Update CI badge [\#14](https://github.com/curationexperts/zizia/pull/14) ([bess](https://github.com/bess))
+- Make zizia events easier to find in logs [\#13](https://github.com/curationexperts/zizia/pull/13) ([bess](https://github.com/bess))
+
+## [v2.1.0.alpha.08](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.08) (2019-08-16)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.07...v2.1.0.alpha.08)
+
+**Merged pull requests:**
+
+- Generate CSV Template from configured metadata mapper [\#12](https://github.com/curationexperts/zizia/pull/12) ([little9](https://github.com/little9))
+
+## [v2.1.0.alpha.07](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.07) (2019-08-07)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.06...v2.1.0.alpha.07)
+
+**Merged pull requests:**
+
+- Fixes for path settings [\#11](https://github.com/curationexperts/zizia/pull/11) ([little9](https://github.com/little9))
+
+## [v2.1.0.alpha.06](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.06) (2019-08-06)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.05...v2.1.0.alpha.06)
+
+**Merged pull requests:**
+
+- Move importer\_documentation views [\#10](https://github.com/curationexperts/zizia/pull/10) ([little9](https://github.com/little9))
+
+## [v2.1.0.alpha.05](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.05) (2019-08-01)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.04...v2.1.0.alpha.05)
+
+**Merged pull requests:**
+
+- Change paths in CSS and JS to work in parent Rails app [\#9](https://github.com/curationexperts/zizia/pull/9) ([little9](https://github.com/little9))
+
+## [v2.1.0.alpha.04](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.04) (2019-08-01)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.03...v2.1.0.alpha.04)
+
+## [v2.1.0.alpha.03](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.03) (2019-08-01)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.02...v2.1.0.alpha.03)
+
+**Merged pull requests:**
+
+- Add missing assets [\#8](https://github.com/curationexperts/zizia/pull/8) ([little9](https://github.com/little9))
+- Coveralls [\#7](https://github.com/curationexperts/zizia/pull/7) ([bess](https://github.com/bess))
+
+## [v2.1.0.alpha.02](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.02) (2019-07-30)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2...v2.1.0.alpha.02)
+
+**Merged pull requests:**
+
+- Rename database migrations [\#6](https://github.com/curationexperts/zizia/pull/6) ([little9](https://github.com/little9))
+
+## [v2](https://github.com/curationexperts/zizia/tree/v2) (2019-07-29)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.01...v2)
+
+## [v2.1.0.alpha.01](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.01) (2019-07-29)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v2.0.0.alpha.01...v2.1.0.alpha.01)
+
+**Merged pull requests:**
+
+- Fixes to allow compatibility with Tenejo [\#5](https://github.com/curationexperts/zizia/pull/5) ([little9](https://github.com/little9))
+- Add rake task to zizia docs [\#4](https://github.com/curationexperts/zizia/pull/4) ([bess](https://github.com/bess))
+
+## [v2.0.0.alpha.01](https://github.com/curationexperts/zizia/tree/v2.0.0.alpha.01) (2019-07-27)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v1.0.1...v2.0.0.alpha.01)
+
+**Merged pull requests:**
+
+- Upgrade dependencies [\#3](https://github.com/curationexperts/zizia/pull/3) ([bess](https://github.com/bess))
+- Easily override default metadata mapping [\#2](https://github.com/curationexperts/zizia/pull/2) ([bess](https://github.com/bess))
+- Initial Engine [\#1](https://github.com/curationexperts/zizia/pull/1) ([little9](https://github.com/little9))
+
+## [v1.0.1](https://github.com/curationexperts/zizia/tree/v1.0.1) (2019-07-25)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/3d82f40f28eb65607837bd832c3dd46e3a305361...v1.0.1)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/README.md

@@ -82,6 +82,19 @@ You can find [an example csv file for import to Hyrax](https://github.com/curati
 with a heading of `files`, and the location of the files should be specified via an
 environment variables called `IMPORT_PATH`. If `IMPORT_PATH` is not set, `HyraxRecordImporter` will look in `/opt/data` by default.
 
+## Testing
+
+To run Solr and Fedora for testing purposes: 
+
+`solr_wrapper --config spec/dummy/config/solr_wrapper_test.yml`
+`fcrepo_wrapper --config spec/dummy/config/fcrepo_wrapper_test.yml`
+
+After this you can run the whole suite, or individual specs. System specs are located
+in the `spec/dummy/spec/system` folder:
+
+`bundle exec rspec spec/dummy/spec/system/csv_import_details_page_spec.rb`
+
+
 ## Customizing
 To input any kind of file other than CSV, you need to provide a `Parser` (out of the box, we support simple CSV import with `CsvParser`). We will be writing guides about
 how to support custom mappers (for metadata outside of Hyrax's core and basic metadata fields).

data/app/assets/stylesheets/zizia/_import_table.scss

@@ -0,0 +1,10 @@
+.desc::after {
+  content: ' ▾'
+}
+.asc::after {
+  content: ' ▴'
+}
+
+.toggle-imports {
+  margin-bottom: 1em;
+}

data/app/assets/stylesheets/zizia/zizia.scss

@@ -1,6 +1,7 @@
 @import 'file_upload';
 @import 'field_guide';
 @import 'new';
+@import 'import_table';
 
 .btn {
     white-space:normal !important;

data/app/controllers/zizia/csv_import_details_controller.rb

@@ -1,21 +1,43 @@
 # frozen_string_literal: true
 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 = Zizia::CsvImportDetail.order(:id).page csv_import_detail_params[:page]
+      @csv_import_details = if csv_import_detail_params[:user] && user_id
+                              Zizia::CsvImportDetail
+                                .order(sort_column + ' ' + sort_direction)
+                                .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]
+                            end
     end
 
     def show
-      @csv_import_detail = Zizia::CsvImportDetail.find(csv_import_detail_params["id"])
+      @csv_import_detail = Zizia::CsvImportDetail
+                           .find(csv_import_detail_params[:id])
     end
 
     private
 
+      def user_id
+        User.find_by(email: csv_import_detail_params[:user]).id
+      end
+
+      def sort_column
+        Zizia::CsvImportDetail.column_names.include?(params[:sort]) ? params[:sort] : 'created_at'
+      end
+
+      def sort_direction
+        %w[asc desc].include?(params[:direction]) ? params[:direction] : 'desc'
+      end
+
       def csv_import_detail_params
-        params.permit(:id, :page)
+        params.permit(:id, :page, :sort, :direction, :user)
       end
   end
 end

data/app/helpers/zizia/application_helper.rb

@@ -1,6 +1,26 @@
 # frozen_string_literal: true
 module Zizia
   module ApplicationHelper
+    def human_update_actor_stack(update_actor_stack)
+      case update_actor_stack
+      when 'HyraxDelete'
+        'Overwrite All Files & Metadata'
+      when 'HyraxMetadataOnly'
+        'Update Existing Metadata, create new works'
+      when 'HyraxOnlyNew'
+        'Ignore Existing Works, new works only'
+      else
+        'Unknown'
+      end
+    end
+
+    def sortable(column, title = nil)
+      title ||= column.titleize
+      css_class = column == sort_column ? "current #{sort_direction}" : nil
+      direction = column == sort_column && sort_direction == 'asc' ? 'desc' : 'asc'
+      link_to title, { sort: column, direction: direction }, class: css_class
+    end
+
     def collections_for_select
       ActiveFedora::SolrService.query('has_model_ssim:Collection').map do |c|
         [c['title_tesim'][0], c['id']]

data/app/importers/modular_importer.rb

@@ -35,7 +35,7 @@ class ModularImporter
     importer = Zizia::Importer.new(parser: Zizia::CsvParser.new(file: file), record_importer: Zizia::HyraxRecordImporter.new(attributes: attrs))
 
     importer.records.each_with_index do |record, index|
-      pre_ingest_work = Zizia::PreIngestWork.new(csv_import_detail_id: csv_import_detail.id)
+      pre_ingest_work = Zizia::PreIngestWork.new(csv_import_detail_id: csv_import_detail.id, deduplication_key: record.mapper.metadata["deduplication_key"])
 
       record.mapper.files.each do |child_file|
         full_path = Dir.glob("#{ENV['IMPORT_PATH']}/**/#{child_file}").first

data/app/models/zizia/csv_import_detail.rb

@@ -1,12 +1,18 @@
 # frozen_string_literal: true
 module Zizia
   class CsvImportDetail < ::ApplicationRecord
+    paginates_per 10
+
     after_initialize :set_defaults, unless: :persisted?
 
     belongs_to :csv_import
     has_many :pre_ingest_works
     has_many :pre_ingest_files, through: :pre_ingest_works
 
+    def status
+      'undetermined'
+    end
+
     def total_size
       return 0 if pre_ingest_files.empty?
       pre_ingest_files.map(&:size).sum

data/app/models/zizia/pre_ingest_file.rb

@@ -2,5 +2,9 @@
 module Zizia
   class PreIngestFile < ::ApplicationRecord
     belongs_to :pre_ingest_work
+
+    def basename
+      File.basename(filename)
+    end
   end
 end

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

@@ -0,0 +1,7 @@
+<div class="btn-group" role="group" aria-label="Table Visibility Controls">
+  <% if request.params[:user] %>
+    <%= link_to 'View All Imports', request.params.except(:user), class: 'btn btn-default toggle-imports view-all-imports' %>
+  <% else %>
+    <%= link_to 'View My Imports', request.params.merge(user: current_user.email), class: 'btn btn-default toggle-imports view-my-imports' %>
+  <% end %>
+</div>

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

@@ -1,12 +1,16 @@
 <h3>CSV Imports</h3>
+<%= render 'toggle_my_imports' %>
 <table class="table table-striped">
   <tr>
-    <th>ID</th>
+    <th><%= sortable 'id', 'ID' %></th>
     <th>Associated User</th>
+    <th><%= sortable 'created_at', 'Date' %></th>
     <th>CSV File</th>
     <th>Number of Works</th>
     <th>Number of Files</th>
     <th>Total Size</th>
+    <th>Status</th>
+    <th>Overwrite Behavior Type</th>
   </tr>
   <% @csv_import_details.each do |csv_import_detail| %>
     <tr>
@@ -17,7 +21,10 @@
         <%= User.find(csv_import_detail.csv_import.user_id).email %>
       </td>
       <td>
-        <%= csv_import_detail.csv_import.manifest %>
+        <%= csv_import_detail.created_at.strftime("%B %-d, %Y %H:%M") %>
+      </td>
+      <td>
+        <%= File.basename(csv_import_detail.csv_import.manifest.to_s) %>
       </td>
       <td>
         <%= csv_import_detail.pre_ingest_works.count  %>
@@ -28,6 +35,12 @@
       <td>
         <%= number_to_human_size(csv_import_detail.total_size) %>
       </td>
+      <td>
+        <%= csv_import_detail.status %>
+      </td>
+      <td>
+        <%= human_update_actor_stack(csv_import_detail.update_actor_stack) %>
+      </td>
     </tr>
   <% end %>
 </table>

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

@@ -18,7 +18,7 @@
     <% @csv_import_detail.pre_ingest_files.each do |pre_ingest_file| %>
       <tr>
         <td>
-          <%= pre_ingest_file.filename %>
+          <%= pre_ingest_file.basename %>
         </td>
         <td>
           <%= number_to_human_size(pre_ingest_file.size) %>

data/db/migrate/20191029162902_add_status_to_csv_import_detail.rb

@@ -0,0 +1,5 @@
+class AddStatusToCsvImportDetail < ActiveRecord::Migration[5.1]
+  def change
+    add_column :zizia_csv_import_details, :status, :string
+  end
+end

data/db/migrate/20191031131041_add_deduplication_key_to_pre_ingest_work.rb

@@ -0,0 +1,6 @@
+class AddDeduplicationKeyToPreIngestWork < ActiveRecord::Migration[5.1]
+  def change
+    add_column :zizia_pre_ingest_works, :deduplication_key, :string
+    add_index :zizia_pre_ingest_works, :deduplication_key
+  end
+end

data/lib/zizia/version.rb

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

data/spec/dummy/db/schema.rb

@@ -573,6 +573,7 @@ ActiveRecord::Schema.define(version: 201901241536542) do
     t.integer "failure_count"
     t.string "deduplication_field"
     t.string "update_actor_stack"
+    t.string "status"
     t.index ["csv_import_id"], name: "index_zizia_csv_import_details_on_csv_import_id"
   end
 
@@ -602,7 +603,9 @@ ActiveRecord::Schema.define(version: 201901241536542) do
     t.integer "csv_import_detail_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "deduplication_key"
     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
 
 end

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

@@ -1,2 +1,2 @@
-identifier,license,visibility,location,keyword,rights statement,creator,title,files
-abc/123,https://creativecommons.org/licenses/by/4.0/,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,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

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

@@ -1,2 +1,2 @@
-identifier,license,visibility,location,keyword,rights statement,creator,title,files
-abc/123,https://creativecommons.org/licenses/by/4.0/,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",cat.jpg
+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",cat.jpg

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

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

@@ -1,3 +1,3 @@
-identifier,license,visibility,location,keyword,rights statement,creator,title,files
-abc/123,https://creativecommons.org/licenses/by/4.0/,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
-abc/456,https://creativecommons.org/licenses/by/4.0/,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 patisserie designed by Julius Ralph Davidson, Los Angeles, circa 1929",cat.jpg
+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
+abc/456,https://creativecommons.org/licenses/by/4.0/,abc/456,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 patisserie designed by Julius Ralph Davidson, Los Angeles, circa 1929",cat.jpg

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Setup chrome headless driver
+Capybara.server = :puma, { Silent: true }
+
+Capybara.register_driver :chrome_headless do |app|
+  options = ::Selenium::WebDriver::Chrome::Options.new
+
+  options.add_argument('--headless')
+  options.add_argument('--no-sandbox')
+  options.add_argument('--disable-dev-shm-usage')
+  options.add_argument('--window-size=1400,1400')
+
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
+end
+
+Capybara.javascript_driver = :chrome_headless
+
+# Setup rspec
+RSpec.configure do |config|
+  config.before(:each, type: :system) do
+    driven_by :rack_test
+  end
+
+  config.before(:each, type: :system, js: true) do
+    driven_by :chrome_headless
+  end
+end

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

@@ -2,34 +2,114 @@ require 'rails_helper'
 include Warden::Test::Helpers
 
 RSpec.describe 'viewing the csv import detail page' 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) }
-  let(:csv_import_detail) { FactoryBot.create(:csv_import_detail) }
-  let(:user) { FactoryBot.create(:admin) }
+  let(:second_csv_import) { FactoryBot.create(:csv_import, id: 2, user_id: 2) }
+  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) }
 
-  it 'displays the metadata when you visit the page' do
+  before do
     user.save
+    second_user.save
+
     csv_import.user_id = user.id
     csv_import.save
-    csv_import_detail.save
+
+    second_csv_import.user_id = second_user.id
+    second_csv_import.save
+
+    csv_import_detail.each(&:save)
+    csv_import_detail_second.save
+    csv_import_detail_third.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('CSV Imports ID')
+    expect(page).to have_content('ID')
+    expect(page).to have_content('Status')
+    expect(page).to have_content('undetermined')
     click_on '1'
     expect(page).to have_content('Total Size')
   end
 
-  it 'has the dashboard layout' do
-    user.save
-    csv_import.user_id = user.id
-    csv_import.save
-    csv_import_detail.save
-    login_as user
+  it 'has links to sort' do
+    visit ('/csv_import_details/index')
+    expect(page).to have_content ('Unknown')
+    click_on('Date')
+    expect(page.current_url).to match(/index\?direction\=asc\&locale\=en\&sort\=created_at/)
+    expect(page).not_to have_content('Unknown')
+    visit('/csv_import_details/index?direction=desc&locale=en&sort=created_at')
+    expect(page).to have_content('Unknown')
+  end
+
+  it 'has a sortable id' do
+    visit('/csv_import_details/index?direction=desc&locale=en&sort=id')
+    expect(page).to have_link '13'
+  end
+
+  it 'has a sortable status' do
+    pending 'status is always undetermined currently'
+    visit('/csv_import_details/index?direction=asc&locale=en&sort=status')
+    expect(page).to have_content 'zippy'
+  end
+
+  it 'has a sortable date' do
+    visit('/csv_import_details/index?direction=desc&locale=en&sort=created_at')
+    expect(page).to have_content 'October 31'
+  end
 
+  it 'displays the metadata when you visit the page' do
+    visit ('/csv_import_details/index')
+    expect(page).to have_content('ID')
+    click_on '1'
+    expect(page).to have_content('Total Size')
+  end
+
+  it 'displays the created_at date' do
+    visit ('/csv_import_details/index')
+    expect(page).to have_content('Date')
+    expect(page).to have_content('October 29, 2019 14:20')
+  end
+
+  it 'displays undetermined for the status' do
+    visit ('/csv_import_details/index')
+    expect(page).to have_content('Status')
+    expect(page).to have_content('undetermined')
+  end
+
+  it 'displays the overwrite behavior type' do
+    visit ('/csv_import_details/index')
+    expect(page).to have_content('Overwrite Behavior Type')
+    expect(page).to have_content('Update Existing Metadata, create new works')
+  end
+
+  it 'has the dashboard layout' do
     visit ('/csv_import_details/index')
     expect(page).to have_content('Your activity')
     visit ('csv_import_details/show/1')
     expect(page).to have_content('About the Import')
     expect(page).to have_content('Your activity')
+
+    visit('/csv_import_details/index')
+    expect(page).to have_content('Next')
+
+  end
+
+  it 'has pagination at 10' do
+    visit('/csv_import_details/index')
+    expect(page).to have_content('Next')
+    click_on 'Next'
+    expect(page).to have_content('Previous')
+  end
+
+  it 'allows you to view only your imports' do
+    visit('/csv_import_details/index')
+    click_on 'View My Imports'
+    expect(page).not_to have_content('user@curationexperts.com')
+    click_on 'View All Imports'
+    expect(page).to have_content('user@curationexperts.com')
   end
 end

data/spec/dummy/spec/system/import_from_csv_spec.rb

@@ -246,7 +246,7 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
       # Viewing additional details after an import
       visit "/csv_import_details/index"
       expect(page).to have_content('Total Size')
-      find(:xpath, '//*[@id="content-wrapper"]/div[2]/table/tbody/tr[2]/td[1]/a').click
+      find(:xpath, '//*[@id="content-wrapper"]/div[2]/table/tbody/tr[3]/td[1]/a').click
       expect(page).to have_content('dog.jpg')
       expect(page).to have_content('5.74 MB')
     end

data/spec/factories/csv_import_detail.rb

@@ -11,6 +11,6 @@ FactoryBot.define do
     success_count { 1 }
     failure_count { 0 }
     deduplication_field { 'identifier' }
-    update_actor_stack { 'HyraxDefault' }
+    update_actor_stack { 'HyraxMetadataOnly' }
   end
 end

data/spec/factories/pre_ingest_file.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# This will guess the User class
+FactoryBot.define do
+  factory :pre_ingest_file, class: Zizia::PreIngestFile do
+    pre_ingest_work_id { 1 }
+    created_at { Time.current }
+    updated_at { Time.current }
+    row_number { 1 }
+    row { 'sample,row' }
+    filename { '/a/path/to/my.csv' }
+    size { 100_203_424 }
+  end
+end

data/spec/factories/pre_ingest_work.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+# This will guess the User class
+FactoryBot.define do
+  factory :pre_ingest_work, class: Zizia::PreIngestWork do
+    id { 1 }
+    created_at { Time.current }
+    updated_at { Time.current }
+    csv_import_detail_id { 1 }
+    sequence(:deduplication_key) { |n| "zyx321cba#{n}" }
+  end
+end

data/spec/models/zizia/csv_import_detail_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+RSpec.describe Zizia::CsvImportDetail do
+  it 'can instantiate' do
+    cid = described_class.new
+    expect(cid.class).to eq described_class
+  end
+end

data/spec/models/zizia/pre_ingest_file_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+RSpec.describe Zizia::PreIngestFile do
+  let(:pre_ingest_work) { FactoryBot.create(:pre_ingest_work) }
+  let(:pre_ingest_file) { FactoryBot.create(:pre_ingest_file, pre_ingest_work_id: pre_ingest_work.id) }
+  let(:basename) { 'my.csv' }
+
+  it 'can get the basename for the file' do
+    expect(pre_ingest_file.basename).to eq(basename)
+  end
+end

data/spec/models/zizia/pre_ingest_work_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+RSpec.describe Zizia::PreIngestWork do
+  let(:pre_ingest_work) { FactoryBot.create(:pre_ingest_work, deduplication_key: "42") }
+  it 'has a deduplication_key' do
+    expect(pre_ingest_work.deduplication_key).to eq "42"
+  end
+end

data/spec/rails_helper.rb

@@ -11,6 +11,7 @@ require 'ffaker'
 require 'hydra-role-management'
 require 'byebug'
 require 'rails-controller-testing'
+require 'selenium-webdriver'
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -640,12 +640,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github_changelog_generator"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".solr_wrapper"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -656,6 +658,7 @@ files:
 - app/assets/javascripts/zizia/zizia.js
 - app/assets/stylesheets/zizia/_field_guide.scss
 - app/assets/stylesheets/zizia/_file_upload.scss
+- app/assets/stylesheets/zizia/_import_table.scss
 - app/assets/stylesheets/zizia/_new.scss
 - app/assets/stylesheets/zizia/application.css
 - app/assets/stylesheets/zizia/zizia.scss
@@ -679,6 +682,7 @@ files:
 - app/uploaders/zizia/csv_manifest_uploader.rb
 - app/uploaders/zizia/csv_manifest_validator.rb
 - app/views/layouts/zizia/application.html.erb
+- app/views/zizia/csv_import_details/_toggle_my_imports.html.erb
 - app/views/zizia/csv_import_details/index.html.erb
 - app/views/zizia/csv_import_details/show.html.erb
 - app/views/zizia/csv_imports/_actions.html.erb
@@ -714,6 +718,8 @@ files:
 - db/migrate/20190921154038_add_failure_count_to_csv_import_detail.rb
 - db/migrate/20190921154221_add_deduplication_field_to_csv_import_detail.rb
 - db/migrate/20190923182946_add_update_actor_stack_to_csv_import_detail.rb
+- db/migrate/20191029162902_add_status_to_csv_import_detail.rb
+- db/migrate/20191031131041_add_deduplication_key_to_pre_ingest_work.rb
 - docs/_config.yml
 - docs/customizing_metadata.md
 - docs/index.md
@@ -1470,6 +1476,7 @@ files:
 - spec/dummy/spec/models/qa/local_authority_spec.rb
 - spec/dummy/spec/rails_helper.rb
 - spec/dummy/spec/spec_helper.rb
+- spec/dummy/spec/support/capybara.rb
 - spec/dummy/spec/system/csv_import_details_page_spec.rb
 - spec/dummy/spec/system/import_csv_with_warnings_spec.rb
 - spec/dummy/spec/system/import_from_csv_spec.rb
@@ -1494,6 +1501,8 @@ files:
 - spec/factories/collection.rb
 - spec/factories/csv_import.rb
 - spec/factories/csv_import_detail.rb
+- spec/factories/pre_ingest_file.rb
+- spec/factories/pre_ingest_work.rb
 - spec/factories/user.rb
 - spec/fixtures/bad_example.csv
 - spec/fixtures/csv_import/csv_files_with_problems/extra - headers.csv
@@ -1511,6 +1520,9 @@ files:
 - spec/integration/csv_import_detail_spec.rb
 - spec/integration/import_hyrax_csv.rb
 - spec/models/csv_import_spec.rb
+- spec/models/zizia/csv_import_detail_spec.rb
+- spec/models/zizia/pre_ingest_file_spec.rb
+- spec/models/zizia/pre_ingest_work_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
@@ -1551,7 +1563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Hyrax importers.