zizia 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ce3c9e0a30e76c3f33a6341945b902801c6ef1efbc131e0c8a19182f71eb71
-  data.tar.gz: 37c8b43375005b6e247b87341309e9d45146bf0aebb4297bcd8efb8ccc7128a8
+  metadata.gz: 7fdda0863d2774964998749599636d9f063f890c02c6458741c617669d54ee35
+  data.tar.gz: a354eba60184b5c0c8e855eff44a8175072078373df2ddf77830fa9b200b1c60
 SHA512:
-  metadata.gz: 970072b31940c2bacfaaa46f5889d334dffc699a4c3bbfd539994ed035bf674717e612b32a798b514ea028e7523b4df79ae7f7618ecba656572141d2a9923325
-  data.tar.gz: 6d895774afd95f9ef4a1ef90944212be27627ff70ddde86562d0471dc00c62d705c162410530836587421e1ce4d0c18fb6ca413f1af2b9721259a49d2b87367d
+  metadata.gz: 29b861f2b65d2c96c9479ab62476ea6c9d660f26dc8ddf37422d06fd53cf6d65ed15ea01bb52c017d4be3af8f99c8a23fc0e1d91b5d3fb1a53187280f674fb20
+  data.tar.gz: 2e5143ea56f9a584f2a3e8ac7fc4f4ba4dd38c7514678e9a149371fb474b03e494617fa7638b95e011c4c05f94864405e623ba133d5d960da71d6686eb472702

data/CHANGELOG.md

@@ -1,15 +1,37 @@
 # Changelog
 
-## [5.1.0](https://github.com/curationexperts/zizia/tree/5.1.0) (2019-11-04)
+## [5.1.0](https://github.com/curationexperts/zizia/tree/5.1.0) (2019-11-11)
 
-[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.0.1...5.1.0)
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.2.0...5.1.0)
+
+**Merged pull requests:**
+
+- Toggle files table [\#63](https://github.com/curationexperts/zizia/pull/63) ([little9](https://github.com/little9))
+- Paginate PreIngestWorks [\#62](https://github.com/curationexperts/zizia/pull/62) ([little9](https://github.com/little9))
+- Change count language on preview screen [\#61](https://github.com/curationexperts/zizia/pull/61) ([little9](https://github.com/little9))
+
+## [v5.2.0](https://github.com/curationexperts/zizia/tree/v5.2.0) (2019-11-06)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.1.0...v5.2.0)
+
+**Merged pull requests:**
+
+- Update README to include requiring zizia in the application.rb file [\#60](https://github.com/curationexperts/zizia/pull/60) ([little9](https://github.com/little9))
+- Remove contrainst from dedupekey [\#59](https://github.com/curationexperts/zizia/pull/59) ([little9](https://github.com/little9))
+- Make deduplication\_key a unique field in the database [\#57](https://github.com/curationexperts/zizia/pull/57) ([little9](https://github.com/little9))
+- Add works to batch UI [\#56](https://github.com/curationexperts/zizia/pull/56) ([little9](https://github.com/little9))
+- Update test solr & fedora to latest known good versions [\#55](https://github.com/curationexperts/zizia/pull/55) ([mark-dce](https://github.com/mark-dce))
+
+## [v5.1.0](https://github.com/curationexperts/zizia/tree/v5.1.0) (2019-11-04)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.0.1...v5.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))
+- WIP: 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))

data/app/controllers/zizia/csv_import_details_controller.rb

@@ -2,7 +2,6 @@
 module Zizia
   class CsvImportDetailsController < ApplicationController
     helper_method :sort_column, :sort_direction, :user
-
     load_and_authorize_resource
     with_themed_layout 'dashboard'
 
@@ -20,6 +19,7 @@ module Zizia
     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/views/zizia/csv_import_details/_pre_ingest_files_table.html.erb

@@ -1,24 +1,29 @@
-<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>
     </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>
+      </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%>
@@ -33,4 +33,5 @@
     </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/lib/zizia/version.rb

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

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,6 +25,8 @@ 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
 
@@ -113,4 +117,21 @@ 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')
+    click_on '4'
+    expect(page).to have_content 'Next'
+    click_on 'Next'
+    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

data/spec/dummy/spec/system/import_csv_with_warnings_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe 'Importing records from a CSV file', type: :system, js: true do
       # We expect to see the title of the collection on the page
       expect(page).to have_content 'Testing Collection'
 
-      expect(page).to have_content 'This import will create or update 3 records.'
+      expect(page).to have_content 'This import will process 3 row(s).'
 
       # There is a link so the user can cancel.
       expect(page).to have_link 'Cancel', href: '/csv_imports/new?locale=en'

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

@@ -54,7 +54,7 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
       # We expect to see the title of the collection on the page
       expect(page).to have_content 'Testing Collection'
 
-      expect(page).to have_content 'This import will create or update 1 records.'
+      expect(page).to have_content 'This import will process 1 row(s).'
 
       # There is a link so the user can cancel.
       expect(page).to have_link 'Cancel', href: '/csv_imports/new?locale=en'
@@ -116,7 +116,7 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
       # We expect to see the title of the collection on the page
       expect(page).to have_content 'Testing Collection'
 
-      expect(page).to have_content 'This import will create or update 1 records.'
+      expect(page).to have_content 'This import will process 1 row(s).'
       # There is a link so the user can cancel.
       expect(page).to have_link 'Cancel', href: '/csv_imports/new?locale=en'
 
@@ -171,7 +171,7 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
       # We expect to see the title of the collection on the page
       expect(page).to have_content 'Testing Collection'
 
-      expect(page).to have_content 'This import will create or update 2 records.'
+      expect(page).to have_content 'This import will process 2 row(s).'
 
       # There is a link so the user can cancel.
       expect(page).to have_link 'Cancel', href: '/csv_imports/new?locale=en'
@@ -218,8 +218,7 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
       # We expect to see the title of the collection on the page
       expect(page).to have_content 'Testing Collection'
 
-      expect(page).to have_content 'This import will create or update 1 records.'
-
+      expect(page).to have_content 'This import will process 1 row(s).'
       # There is a link so the user can cancel.
       expect(page).to have_link 'Cancel', href: '/csv_imports/new?locale=en'
 
@@ -247,6 +246,7 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
       visit "/csv_import_details/index"
       expect(page).to have_content('Total Size')
       click_on '4'
+      click_on 'View Files'
       expect(page).to have_content('dog.jpg')
       expect(page).to have_content('cat.jpg')
       expect(page).to have_content('5.74 MB')

data/spec/factories/pre_ingest_work.rb

@@ -2,7 +2,6 @@
 # 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 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora