zizia 4.3.1.alpha.01 → 4.4.0.alpha.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7738ad4f5ddf617123e02b0c30426c937b8a6e1a9ac343cdc1f526db6022977
-  data.tar.gz: 11ef2ee8fd0f01df8a430847383a3f1aff3d2c5c026d30fab2892a00d183bad6
+  metadata.gz: 5d6cb2fdcaac771b4c720b937920c89af5cef59a765f49a4a85341b62583ebdc
+  data.tar.gz: 98f4e13cdebe4e66978e061f6b44a445bc6bb8d4012e4ffa001ad65924858cf6
 SHA512:
-  metadata.gz: 9a83df339c9be7d6aba456040d7c9be5cc260a825f0c46ff0a5daffdef9b1f57046289da88cadaae9c89ce01b6cfc46b099fd138740f32f4d794a0aef228f420
-  data.tar.gz: 69269d92ffc9743b271e53b5d9886b1408c125b0d6d5fdbb0650032c563644dfffdfe7225295c8c7fc47cd6e06ed4070af4b1f3954f79c9fa9224db5f810afda
+  metadata.gz: 4aadd2145031bee0548b90678d89be2138cf3ae0b4b2d14907706da2b361f34da1387fc6c419da79a346f33747077eedb6f39391d541335c1336d1d44611845b
+  data.tar.gz: e910f466363fec180fdbdb7fb11cd73f4eb248151d9bb5eb1f194ca21a60c4ed4922a0e6cd10adc771a89950410d5bf525aa73f7e3650ed840748b299c4e423c

data/app/controllers/zizia/csv_import_details_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+module Zizia
+  class CsvImportDetailsController < ApplicationController
+    def index
+      @csv_import_details = Zizia::CsvImportDetail.order(:id).page csv_import_detail_params[:page]
+    end
+
+    def show
+      @csv_import_detail = Zizia::CsvImportDetail.find(csv_import_detail_params["id"])
+    end
+
+    private
+
+      def csv_import_detail_params
+        params.permit(:id, :page)
+      end
+  end
+end

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

@@ -0,0 +1,26 @@
+<h3>CSV Imports</h3>
+<table class="table table-striped">
+  <tr>
+    <th>ID</th>
+    <th>Associated User</th>
+    <th>CSV File</th>
+    <th>Total Size in Bytes</th>
+  </tr>
+  <% @csv_import_details.each do |csv_import_detail| %>
+    <tr>
+      <td>
+        <%= link_to csv_import_detail.id, url_for(csv_import_detail) %>
+      </td>
+      <td>
+        <%= User.find(csv_import_detail.csv_import.user_id).email %>
+      </td>
+      <td>
+        <%= csv_import_detail.csv_import.manifest %>
+      </td>
+      <td>
+        <%= csv_import_detail.total_size %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+<%= paginate @csv_import_details %>

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

@@ -0,0 +1,33 @@
+<div>
+  <h3>About the Import:</h3>
+  <ul>
+    <li>Import created by: <%= User.find(@csv_import_detail.csv_import.user_id) %>
+    </li>
+    <li>CSV File: <%= @csv_import_detail.csv_import.manifest %></li>
+    <li>Total Size in Bytes: <%= @csv_import_detail.total_size %></li>
+  </ul>
+
+  <h3>Files</h3>
+  <table id="files-table" class="dataTable display responsive nowrap table table-striped works-list" style="width:100%">
+    <tr>
+      <th>Filename</th>
+      <th>Size in Bytes</th>
+      <th>Row Number</th>
+    </tr>
+
+    <% @csv_import_detail.pre_ingest_files.each do |pre_ingest_file| %>
+      <tr>
+        <td>
+          <%= pre_ingest_file.filename %>
+        </td>
+        <td>
+          <%= pre_ingest_file.size %>
+        </td>
+        <td>
+          Row number:
+          <%= pre_ingest_file.row_number %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+</div>

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

@@ -22,7 +22,7 @@
       <div class="col-md-6">
         <div class='well'>
           <p> Your records will be imported in the background.  To check the current status, please check the background job status page. </p><br />
-          <div class="text-center"> <%= link_to 'Background Job Status', '/sidekiq', class: "btn btn-primary btn-lg" %> </div>
+          <div class="text-center"> <%= link_to 'Background Job Status', '/csv_import_details/index', class: "btn btn-primary btn-lg" %> </div>
         </div>
       </div>
     </div>

data/config/routes.rb

@@ -6,4 +6,7 @@ Zizia::Engine.routes.draw do
 
   get 'importer_documentation/guide', to: 'metadata_details#show'
   get 'importer_documentation/profile', to: 'metadata_details#profile'
+
+  get 'csv_import_details/index'
+  get 'csv_import_details/show/:id', to: 'csv_import_details#show', as: 'csv_import_detail'
 end

data/lib/zizia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zizia
-  VERSION = '4.3.1.alpha.01'
+  VERSION = '4.4.0.alpha.01'
 end

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

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+RSpec.describe 'viewing the csv import detail page' do
+  let(:user) { FactoryBot.create(:user) }
+  let(:csv_import) { FactoryBot.create(:csv_import) }
+  let(:csv_import_detail) { FactoryBot.create(:csv_import_detail) }
+
+  it 'displays the metadata when you visit the page' do
+    user.save
+    csv_import.user_id = user.id
+    csv_import.save
+    csv_import_detail.save
+    visit ('/csv_import_details/index')
+    expect(page).to have_content('CSV Imports ID')
+    click_on '1'
+    expect(page).to have_content('Total Size in Bytes')
+  end
+end

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

@@ -237,6 +237,13 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
       work = Work.where(title: "*haberdashery*").first
       expect(work.title.first).to match(/Interior/)
       expect(work.file_sets.first.label).to eq('cat.jpg')
+
+
+      # Viewing additional details after an import
+      visit "/csv_import_details/index"
+      expect(page).to have_content('Total Size in Bytes')
+      find(:xpath, '//*[@id="content-wrapper"]/table/tbody/tr[2]/td[1]/a').click
+      expect(page).to have_content('dog.jpg')
     end
   end
 end

data/spec/factories/csv_import.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# This will guess the User class
+FactoryBot.define do
+  factory :csv_import, class: Zizia::CsvImport do
+    id { 1 }
+    user_id { 1 }
+    created_at { Time.current }
+    updated_at { Time.current }
+    manifest { Rails.root.join('spec', 'fixtures', 'csv_imports', 'good', 'all_fields.csv') }
+    fedora_collection_id { '1' }
+    update_actor_stack { 'HyraxDefault' }
+  end
+end

data/spec/factories/csv_import_detail.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+# This will guess the User class
+FactoryBot.define do
+  factory :csv_import_detail, class: Zizia::CsvImportDetail do
+    csv_import_id { 1 }
+    created_at { Time.current }
+    updated_at { Time.current }
+    depositor_id { FactoryBot.build(:user).id }
+    collection_id { '1' }
+    batch_id { '1' }
+    success_count { 1 }
+    failure_count { 0 }
+    deduplication_field { 'identifier' }
+    update_actor_stack { 'HyraxDefault' }
+  end
+end

data/zizia.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.3.4'
 
   gem.add_dependency 'active-fedora'
+  gem.add_dependency 'kaminari'
   gem.add_dependency 'rails', '~> 5.1.4'
   gem.add_dependency 'carrierwave'
   gem.add_dependency 'rails-controller-testing'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 4.3.1.alpha.01
+  version: 4.4.0.alpha.01
 platform: ruby
 authors:
 - Data Curation Experts
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -644,6 +658,7 @@ files:
 - app/assets/stylesheets/zizia/application.css
 - app/assets/stylesheets/zizia/zizia.scss
 - app/config/usage.yml
+- app/controllers/zizia/csv_import_details_controller.rb
 - app/controllers/zizia/csv_imports_controller.rb
 - app/controllers/zizia/metadata_details_controller.rb
 - app/helpers/zizia/application_helper.rb
@@ -661,6 +676,8 @@ 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/index.html.erb
+- app/views/zizia/csv_import_details/show.html.erb
 - app/views/zizia/csv_imports/_actions.html.erb
 - app/views/zizia/csv_imports/_collection_selection.html.erb
 - app/views/zizia/csv_imports/_error.html.erb
@@ -1437,6 +1454,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/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
 - spec/dummy/spec/system/import_from_csv_with_errors_spec.rb
@@ -1458,6 +1476,8 @@ files:
 - spec/dummy/test/test_helper.rb
 - spec/dummy/vendor/.keep
 - spec/factories/collection.rb
+- spec/factories/csv_import.rb
+- spec/factories/csv_import_detail.rb
 - spec/factories/user.rb
 - spec/fixtures/bad_example.csv
 - spec/fixtures/csv_import/csv_files_with_problems/extra - headers.csv