geoblacklight_admin 0.5.0 → 0.6.0

data/app/views/admin/document_distributions/import.html.erb

@@ -0,0 +1,80 @@
+<p id="notice"><%= notice %></p>
+
+<h1 style="width:100%; border-bottom:dotted;" class="mb-4">
+  Document &middot; Distributions
+  <% if params[:document_id] %>
+    <%= link_to '+ New Distribution', new_admin_document_document_distribution_path(@document), { class: 'btn btn-primary float-right' } %>
+  <% end %>
+</h1>
+
+<div class="row">
+  <div class="col-4">
+    <% if params[:document_id] %>
+      <h2 class='h3'><%= @document.title %></h2>
+    <% else %>
+      <h2 class='h3'>Import for Multiple Documents</h2>
+    <% end %>
+
+    <p class="alert alert-info" role="alert">
+      <strong>Note:</strong> New Distributions will be created. Existing Distributions will be updated per the CSV file.
+    </p>
+
+    <h3 class="h4">Upload a CSV File</h3>
+    <%= simple_form_for DocumentDistribution.new, url: import_admin_document_distributions_path, method: :post, multipart: true do |f| %>
+      <div class="form-inputs">
+        <%= f.simple_fields_for :distributions do |distribution_fields| %>
+          <%= distribution_fields.input :file, as: :file, input_html: {} %>
+        <%- end %>
+      </div>
+
+      <div class="form-actions">
+        <%= submit_tag "+ Import CSV", {class: 'btn btn-primary'} %>
+      </div>
+    <% end %>
+  </div>
+  <div class="col-8">
+    <h4>Example CSV File</h4>
+    <table class="table table-bordered">
+      <thead>
+        <tr>
+          <th>friendlier_id</th>
+          <th>reference_type</th>
+          <th>distribution_url</th>
+          <th>label</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>00add5b8-a7b1-42d4-b4de-ca99716a5096</td>
+          <td>download</td>
+          <td>https://s3.amazonaws.com/holc/tiles/WI/Madison/1937/rectified.zip</td>
+          <td>GeoTIFF</td>
+        </tr>
+        <tr>
+          <td>00add5b8-a7b1-42d4-b4de-ca99716a5096</td>
+          <td>download</td>
+          <td>https://s3.amazonaws.com/holc/tiles/WI/Madison/1937/holc-scan.jpg</td>
+          <td>JPEG</td>
+        </tr>
+        <tr>
+          <td>...</td>
+          <td>...</td>
+          <td>...</td>
+          <td>...</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <h5>CSV File Column Definitions</h5>
+    <dl>
+      <dt>friendlier_id</dt>
+      <dd>The associated document's friendlier id</dd>
+      <dt>reference_type</dt>
+      <dd>The name of the reference type</dd>
+      <dt>distribution_url</dt>
+      <dd>The URL for the distribution</dd>
+      <dt>label</dt>
+      <dd>The label for the distribution, if the reference type is labeled</dd>
+    </dl>
+  </div>
+</div>

data/app/views/admin/document_distributions/index.html.erb

@@ -0,0 +1,143 @@
+<%- @page_title = "GBL♦Admin - Document - Distributions" %>
+
+<div class="row mb-2">
+  <div class="col">
+    <h1 style="width:100%;">
+      Document &middot; Distributions
+
+      <% if params[:document_id] %>
+        <%= link_to '+ Import CSV', import_admin_document_document_distributions_path(@document), { class: 'btn btn-primary float-right' } %>
+
+        <%= link_to '+ New Distribution', new_admin_document_document_distribution_path(@document), { class: 'btn btn-primary float-right mr-2' } %>
+      <% else %>
+        <%= link_to '- Delete CSV', destroy_all_admin_document_distributions_path, { class: 'btn btn-danger float-right' } %>
+        <%= link_to '+ Import CSV', import_admin_document_distributions_path, { class: 'btn btn-primary float-right mr-4' } %>
+      <% end %>
+    </h1>
+
+    <% if params[:document_id] %>
+    <h2 class='h3'>
+      <%= link_to(@document.title, admin_document_path(@document)) %>
+      &middot;
+      <%= @document_distributions.count %> distributions
+    </h2>
+    <% else %>
+      <h2 class='h3'>Distributions</h2>
+    <% end %>
+
+    <!-- Tab navigation -->
+    <ul class="nav nav-tabs" id="documentTab" role="tablist">
+      <li class="nav-item">
+        <a class="nav-link active" id="html-tab" data-toggle="tab" href="#html" role="tab" aria-controls="html" aria-selected="true">HTML</a>
+      </li>
+      <% if params[:document_id] %>
+        <li class="nav-item">
+          <a class="nav-link" id="json-tab" data-toggle="tab" href="#json" role="tab" aria-controls="json" aria-selected="false">JSON</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" id="csv-tab" data-toggle="tab" href="#csv" role="tab" aria-controls="csv" aria-selected="false">CSV</a>
+        </li>
+      <% end %>
+    </ul>
+
+    <!-- Tab content -->
+    <div class="tab-content" id="documentTabContent">
+      <div class="tab-pane fade show active" id="html" role="tabpanel" aria-labelledby="html-tab">
+        <br />
+        <!-- HTML content -->
+
+        <% if @pagy %>
+          <h6>
+            <span class='float-left mt-3'>
+              <%== pagy_info(@pagy) %>
+            </span>
+            <span class='float-right'>
+              <%== pagy_bootstrap_nav(@pagy) %>
+            </span>
+          </h6>
+        <% end %>
+
+        <% if @document %>
+          <h3>External – Document Distributions</h3>
+        <% end %>
+
+        <table class="table table-striped table-bordered sortable">
+          <thead class="thead-dark">
+            <tr>
+              <th class="header">Layer Slug</th>
+              <th class="header">Type</th>
+              <th class="header">URI</th>
+              <th class="header">Value</th>
+              <th class="header">Label</th>
+              <th class="header" colspan="2">Actions</th>
+            </tr>
+          </thead>
+
+          <tbody>
+            <% @document_distributions.each do |document_distribution| %>
+              <tr>
+                <td><%= link_to document_distribution.friendlier_id, admin_document_path(document_distribution.document) %></td>
+                <td><%= document_distribution.reference_type.reference_type %></td>
+                <td><%= document_distribution.reference_type.reference_uri %></td>
+                <td><%= link_to document_distribution.url, document_distribution.url, target: '_blank' %></td>
+                <td><%= document_distribution.label %></td>
+                <td><%= link_to 'Edit', edit_admin_document_document_distribution_path(document_distribution.document, document_distribution) %></td>
+                <td><%= link_to 'Destroy', admin_document_document_distribution_path(document_distribution.document, document_distribution), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+
+        <% if @pagy %>
+          <h6>
+            <span class='float-left mt-3'>
+              <%== pagy_info(@pagy) %>
+            </span>
+            <span class='float-right'>
+              <%== pagy_bootstrap_nav(@pagy) %>
+            </span>
+          </h6>
+        <% end %>
+
+        <% if @document && @document.distributable_assets.any? %>
+          <h3>Internal – Distributable Assets</h3>
+          <%= render partial: 'admin/document_assets/assets_table', locals: { document_assets: @document.document_assets } %>
+        <% end %>
+      </div>
+
+      <% if params[:document_id] %>
+        <div class="tab-pane fade" id="json" role="tabpanel" aria-labelledby="json-tab">
+          <h3 class="mt-4">Ruby Hash</h3>
+          <%= ap(@document.distributions).html_safe %>
+          <h3 class="mt-4">JSON</h3>
+          <%= ap(@document.distributions.to_json).html_safe %>
+        </div>
+
+        <div class="tab-pane fade" id="csv" role="tabpanel" aria-labelledby="csv-tab">
+          <br />
+
+          <!-- CSV content -->
+          <table class="table table-striped table-bordered sortable">
+          <thead class="thead-dark">
+            <tr>
+              <th class="header">Layer Slug</th>
+              <th class="header">Type</th>
+              <th class="header">Value</th>
+              <th class="header">Label</th>
+            </tr>
+          </thead>
+          <tbody>
+            <% @document.distributions_csv.each do |row| %>
+              <tr>
+                <% row.each do |value| %>
+                  <td><%= value %></td>
+                <% end %>
+              </tr>
+            <% end %>
+            </tbody>
+          </table>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/admin/document_distributions/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @document_distributions, partial: "document_distributions/document_distribution", as: :document_distribution

data/app/views/admin/document_distributions/new.html.erb

@@ -0,0 +1,11 @@
+<% content_for :title, "New document distribution" %>
+
+<h1>New document distribution</h1>
+
+<%= render "form", document_distribution: @document_distribution %>
+
+<br>
+
+<div>
+  <%= link_to "Back to document distributions", admin_document_document_distributions_path(@document) %>
+</div>

data/app/views/admin/document_distributions/show.html.erb

@@ -0,0 +1,10 @@
+<p style="color: green"><%= notice %></p>
+
+<%= render @document_distribution %>
+
+<div>
+  <%= link_to "Edit this document distribution", edit_admin_document_document_distribution_path(@document, @document_distribution) %> |
+  <%= link_to "Back to document distributions", admin_document_document_distributions_path(@document) %>
+
+  <%= button_to "Destroy this document distribution", admin_document_document_distribution_path(@document, @document_distribution), method: :delete %>
+</div>

data/app/views/admin/document_distributions/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "document_distributions/document_distribution", document_distribution: @document_distribution

data/app/views/admin/documents/_document.html.erb

@@ -8,9 +8,7 @@
         <% @document = Document.find_by(friendlier_id: document.friendlier_id) %>
         <% if thumb_to_render?(@document) %>
           <%= link_to edit_admin_document_path(document.friendlier_id) do %>
-            <% if @document.thumbnail.file_derivatives[:thumb_standard_2X].exists? %>
-              <%= image_tag(@document.thumbnail.file_url(:thumb_standard_2X), class: "thumbnail") %>
-            <% end %>
+            <%= image_tag(thumbnail_to_render(@document), class: "thumbnail") %>
           <% end %>
         <% end %>
       </div>

data/app/views/admin/documents/_form.html.erb

@@ -8,11 +8,9 @@
           <h1 class="h5">
             <% if @document.persisted? %>
               <div class="row">
-                <% if @document.thumbnail.present? %>
+                <% if thumb_to_render?(@document) %>
                   <div class="thumbnail col-2">
-                    <% unless @document&.thumbnail&.file_url(:thumb_mini).nil? %>
-                      <%= image_tag @document&.thumbnail&.file_url(:thumb_mini) %>
-                    <% end %>
+                    <%= image_tag thumbnail_to_render(@document), class: "thumbnail" %>
                   </div>
                 <% end %>
                 <div class="col">

data/app/views/admin/documents/_form_control.html.erb

@@ -37,8 +37,11 @@
 
 <% # References are a special, special case %>
 <% elsif element.solr_field == 'dct_references_s' %>
-  <%= f.repeatable_attr_input(element.solr_field.to_sym, build: :at_least_one, html_attributes: options[:html_attributes], simple_form_input_args: { label: element.label }) do |sub_form| %>
-    <%= category_and_value(sub_form, category_list: Document::Reference::REFERENCE_VALUES.keys) %>
+  <% unless ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "true" %>
+    <%- Rails.logger.warn("Deprecation warning: AttrJSON-based dct_references_s will not be supported soon.") %>
+    <%= f.repeatable_attr_input(element.solr_field.to_sym, build: :at_least_one, html_attributes: options[:html_attributes], simple_form_input_args: { label: element.label }) do |sub_form| %>
+        <%= category_and_value(sub_form, category_list: Document::Reference::REFERENCE_VALUES.keys) %>
+    <% end %>
   <% end %>
 
 <% elsif element.repeatable? %>

data/app/views/admin/documents/_form_nav.html.erb

@@ -1,7 +1,7 @@
 <div class="make-me-sticky mt-4 ml-4">
   <nav class="nav flex-column ml-4 mt-6">
     <% if @document.persisted? %>
-      <strong class="mb-4"><%= link_to "GBL♦Admin | View in GeoBlacklight", solr_document_url(@document), { class: 'btn btn-warning' } %></strong>
+      <strong class="mb-4"><%= link_to "GBL♦Admin | View in GeoBlacklight", solr_document_url(@document), { class: 'btn btn-gbl-admin btn-warning' } %></strong>
     <% end %>
 
     <%- form_elements = FormElement.all.order(position: :asc) %>
@@ -14,19 +14,28 @@
       <% end %>
     <% end %>
 
-    <% if @document.persisted? %>
+    <%- if @document.persisted? %>
       <%= link_to admin_document_document_accesses_url(@document), class: "ml-2" do %>
         Institutional Access Links
         <span class="badge badge-light"><%= @document.document_accesses.count %></span>
       <% end %>
-      <%= link_to admin_document_document_downloads_url(@document), class: "ml-2" do %>
-        Multiple Download Links
-        <span class="badge badge-light"><%= @document.document_downloads.count %></span>
+      
+      <%- if ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "false" %>
+        <%- Rails.logger.warn("Deprecation warning: Multiple Download Links will not be supported soon.") %>
+        <%= link_to admin_document_document_downloads_url(@document), class: "ml-2" do %>
+          Multiple Download Links
+          <span class="badge badge-light"><%= @document.document_downloads.count %></span>
+        <% end %>
       <% end %>
+      
       <%= link_to admin_document_document_assets_url(@document), class: "ml-2" do %>
         Additional Assets 
         <span class="badge badge-light"><%= @document.document_assets.count %></span>
       <% end %>
+      <%= link_to admin_document_document_distributions_url(@document), class: "ml-2" do %>
+        Distributions
+        <span class="badge badge-light"><%= @document.distributions.size %></span>
+      <% end %>
     <% end %>
   </nav>
 </div>

data/app/views/admin/documents/_form_nav_kithe.html.erb

@@ -23,7 +23,10 @@
 
     <% if @document.persisted? %>
       <%= link_to "Institutional Access Links", admin_document_document_accesses_url(@document), class: "ml-2" %>
-      <%= link_to "Multiple Download Links", admin_document_document_downloads_url(@document), class: "ml-2" %>
+      <% if ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "false" %>
+        <%= Rails.logger.warn("Deprecation warning: Multiple Download Links will not be supported soon.") %>
+        <%= link_to "Multiple Download Links", admin_document_document_downloads_url(@document), class: "ml-2" %>
+      <% end %>
       <%= link_to "Additional Assets", admin_document_document_assets_url(@document), class: "ml-2" %>
     <% end %>
   </nav>

data/app/views/admin/documents/_json_aardvark.jbuilder

@@ -38,7 +38,7 @@ json.dct_accessRights_s no_json_blanks document.send(GeoblacklightAdmin::Schema.
 json.dct_format_s no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:format])
 json.gbl_fileSize_s no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:file_size])
 json.gbl_wxsIdentifier_s no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:wxs_identifier])
-json.dct_references_s no_json_blanks document.references_json
+json.dct_references_s no_json_blanks document.distributions_json
 json.id no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:id])
 json.dct_identifier_sm no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:identifier])
 json.gbl_mdModified_dt no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:updated_at])

data/app/views/admin/documents/_json_gbl_v1.jbuilder

@@ -18,7 +18,7 @@ json.dc_creator_sm no_json_blanks document.send(GeoblacklightAdmin::Schema.insta
 json.dc_description_s no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:description]).join("|")
 json.dc_format_s no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:format])
 json.dc_subject_sm no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:subject])
-json.dct_references_s no_json_blanks document.references_json
+json.dct_references_s no_json_blanks document.distributions_json
 json.dct_spatial_sm no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:spatial_coverage])
 json.layer_modified_dt no_json_blanks document.send(GeoblacklightAdmin::Schema.instance.solr_fields[:updated_at])
 

data/app/views/admin/documents/_result_selected_options.html.erb

@@ -22,11 +22,14 @@
       <a class="dropdown-item" data-action="click->results#exportJsonBtaaAardvark" href="javascript:void(0);">JSON (BTAA Aardvark)</a>
       <a class="dropdown-item" data-action="click->results#exportJsonGBLv1" href="javascript:void(0);">JSON (GBL v1.0)</a>
       <div class="dropdown-divider"></div>
+      <a class="dropdown-item" data-action="click->results#exportCsvDocumentAccessLinks" href="javascript:void(0);">
+        CSV - Document Access Links
+      </a>
       <a class="dropdown-item" data-action="click->results#exportCsvDocumentDownloads" href="javascript:void(0);">
         CSV - Document Downloads
       </a>
-      <a class="dropdown-item" data-action="click->results#exportCsvDocumentAccessLinks" href="javascript:void(0);">
-        CSV - Document Access Links
+      <a class="dropdown-item" data-action="click->results#exportCsvDocumentReferences" href="javascript:void(0);">
+        CSV - Document References
       </a>
     </div>
   </span>

data/app/views/admin/documents/admin.html.erb

@@ -132,12 +132,12 @@
       </div>
 
       <div class="card">
-        <div class="card-header" id="references">
-          <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#references-content" aria-controls="references-content">
-            <h3 class="mb-0">References</h3>
+        <div class="card-header" id="distributions">
+          <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#distributions-content" aria-controls="distributions-content">
+            <h3 class="mb-0">Distributions</h3>
           </button>
         </div>
-        <div id="references-content" class="collapse" aria-labelledby="references-content" data-parent="#references">
+        <div id="distributions-content" class="collapse" aria-labelledby="distributions-content" data-parent="#distributions">
           <div class="card-body">
             <table class="table responsive">
               <thead>
@@ -147,7 +147,7 @@
                 </tr>
               </thead>
               <tbody>
-                <% @document.references.each do |entry| %>
+                <% @document.distributions.each do |entry| %>
                   <tr>
                     <td><%= entry[0] %></td>
                     <td>

data/app/views/admin/documents/features/_document_references.html.erb

@@ -0,0 +1,23 @@
+<% if ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "true" %>
+  <%- if @document.persisted? %>
+    <h3 id="document-distributions"><%= link_to "Distributions", admin_document_document_distributions_url(@document) %></h3>
+    <table class="table table-striped table-bordered sortable">
+    <thead class="thead-dark">
+      <tr>
+        <th class="header">Type</th>
+        <th class="header">Value</th>
+        <th class="header">Label</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @document.document_distributions.each do |document_distribution| %>
+        <tr>
+          <td><%= document_distribution.reference_type.name %></td>
+          <td><%= document_distribution.url %></td>
+          <td><%= document_distribution.label %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  <% end %>
+<% end %>

data/app/views/admin/documents/features/_multiple_download_links.html.erb

@@ -1,27 +1,30 @@
-<%- if @document.persisted? %>
-<h3 id="multiple-download-links"><%= link_to "Multiple Download Links", admin_document_document_downloads_url(@document) %></h3>
-<div class="table-responsive">
-  <table class="table table-striped table-bordered">
-    <thead>
-      <tr>
-        <th colspan="2">Actions</th>
-        <th>Layer Slug</th>
-        <th>Download Label</th>
-        <th>Download URL</th>
-      </tr>
-    </thead>
+<% unless ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "true" %>
+  <%= Rails.logger.warn("Deprecation warning: Multiple Download Links will not be supported soon. Use DocumentReferences instead.") %>
+  <%- if @document.persisted? %>
+    <h3 id="multiple-download-links"><%= link_to "Multiple Download Links", admin_document_document_downloads_url(@document) %></h3>
+    <div class="table-responsive">
+      <table class="table table-striped table-bordered">
+        <thead>
+          <tr>
+            <th colspan="2">Actions</th>
+            <th>Layer Slug</th>
+            <th>Download Label</th>
+            <th>Download URL</th>
+          </tr>
+        </thead>
 
-    <tbody>
-      <% @document.document_downloads.each do |document_download| %>
-        <tr>
-          <td><%= link_to 'Edit', edit_admin_document_document_download_path(document_download.document, document_download) %></td>
-          <td><%= link_to 'Destroy', admin_document_document_download_path(document_download.document, document_download), method: :delete, data: { confirm: 'Are you sure?' } %></td>
-          <td><%= link_to document_download.friendlier_id, admin_document_path(document_download.document) %></td>
-          <td><%= document_download.label %></td>
-          <td><%= link_to document_download.value %></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
-<% end %>
+        <tbody>
+          <% @document.document_downloads.each do |document_download| %>
+            <tr>
+              <td><%= link_to 'Edit', edit_admin_document_document_download_path(document_download.document, document_download) %></td>
+              <td><%= link_to 'Destroy', admin_document_document_download_path(document_download.document, document_download), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+              <td><%= link_to document_download.friendlier_id, admin_document_path(document_download.document) %></td>
+              <td><%= document_download.label %></td>
+              <td><%= link_to document_download.value %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% end %>
+<% end %>

data/app/views/admin/ids/fetch.json.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.links do
   json.self url_for(search_state.to_h.merge(only_path: false))
   json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page

data/app/views/admin/ids/index.json.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.links do
   json.self url_for(search_state.to_h.merge(only_path: false))
   json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page

data/app/views/admin/imports/_form.html.erb

@@ -23,5 +23,5 @@
 </div>
 
 <div class="form-actions">
-  <%= f.button :submit, {class: 'btn btn-primary'} %>
+  <%= f.button :submit, "+ Create Import", {class: 'btn btn-primary'} %>
 </div>

data/app/views/admin/imports/show.html.erb

@@ -54,7 +54,7 @@
           <% if @import.state_machine.current_state == 'mapped' %>
             <%= form_tag run_admin_import_path(@import), method: :patch do -%>
               <%= hidden_field_tag :run, true -%>
-              <%= submit_tag 'Run Import' -%>
+              <%= submit_tag '+ Run Import', class: 'btn btn-primary btn-block' -%>
             <%- end -%>
           <% end %>
           <% if @import.state_machine.current_state == 'imported' %>

data/app/views/admin/layouts/application.html.erb

@@ -20,8 +20,10 @@
   </head>
 
   <body data-locale="en">
-    <%= render "admin/shared/navbar" %>
-    <main class="container-fluid">
+    <header>
+      <%= render "admin/shared/navbar" %>
+    </header>
+    <main id="gbl-admin" class="container-fluid">
       <%= render "admin/shared/schema_timestamp" %>
       <%= render "admin/shared/flash_messages" %>
       <div id="toast-wrapper" aria-live="polite" aria-atomic="true"></div>

data/app/views/admin/mappings/index.html.erb

@@ -4,7 +4,7 @@
   <tbody>
     <%- if @import.mappings.size > 1 %>
       <%- @import.mappings.each do |mapping| %>
-        <%= simple_form_for [@import, mapping], :url => import_mapping_path(@import, mapping) do |f| %>
+        <%= simple_form_for [@import, mapping], :url => admin_import_mapping_path(@import, mapping) do |f| %>
           <tr>
             <td><%= f.input :source_header, :input_html => {:readonly => true} %></td>
             <td><%= f.input :destination_field, collection: attribute_collection %></td>

data/app/views/admin/notifications/_notification.html.haml

@@ -1,31 +1,32 @@
 - # Split message "Download Type|Row Count|Button Label"
-- message = notification.to_notification.params[:message].split("|")
+- message = notification&.to_notification&.params[:message]&.split("|")
 
-%tr
-  %td
-    = check_box_tag 'read', notification.read?, notification.read?,
-  onchange: "this.setAttribute('data-params', this.name + '=' + this.checked*this.checked)",
-  data: { remote: true, url: admin_notification_path(notification), method: :patch }
-  %td
-    %strong
-      = message.length > 1 ? message[0] : "CSV"
-      = t('dictionary.download')
-  %td
-    = message.length > 1 ? message[1] : message[0]
-  %td
-    - if notification.file.attached?
-      = link_to rails_blob_path(notification.file.blob, disposition: "attachment"), { class: 'btn btn-primary btn-block' } do
-        :plain
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-cloud-download" viewBox="0 0 16 16">
-            <path d="M4.406 1.342A5.53 5.53 0 0 1 8 0c2.69 0 4.923 2 5.166 4.579C14.758 4.804 16 6.137 16 7.773 16 9.569 14.502 11 12.687 11H10a.5.5 0 0 1 0-1h2.688C13.979 10 15 8.988 15 7.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 2.825 10.328 1 8 1a4.53 4.53 0 0 0-2.941 1.1c-.757.652-1.153 1.438-1.153 2.055v.448l-.445.049C2.064 4.805 1 5.952 1 7.318 1 8.785 2.23 10 3.781 10H6a.5.5 0 0 1 0 1H3.781C1.708 11 0 9.366 0 7.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383z"/>
-            <path d="M7.646 15.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 14.293V5.5a.5.5 0 0 0-1 0v8.793l-2.146-2.147a.5.5 0 0 0-.708.708l3 3z"/>
-          </svg>
-        = message.length > 1 ? message[2] : "CSV"
-        = "(#{number_to_human_size(notification.file.blob.byte_size)})"
-    - else
-      = 'N/A'
-  %td
-    %span.reldate{:data => {:asked_at => notification.created_at.to_json.gsub('"', '')}}
-      = notification.created_at
+- if message
+  %tr
+    %td
+      = check_box_tag 'read', notification.read?, notification.read?,
+    onchange: "this.setAttribute('data-params', this.name + '=' + this.checked*this.checked)",
+    data: { remote: true, url: admin_notification_path(notification), method: :patch }
+    %td
+      %strong
+        = message.length > 1 ? message[0] : "CSV"
+        = t('dictionary.download')
+    %td
+      = message.length > 1 ? message[1] : message[0]
+    %td
+      - if notification.file.attached?
+        = link_to rails_blob_path(notification.file.blob, disposition: "attachment"), { class: 'btn btn-primary btn-block' } do
+          :plain
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-cloud-download" viewBox="0 0 16 16">
+              <path d="M4.406 1.342A5.53 5.53 0 0 1 8 0c2.69 0 4.923 2 5.166 4.579C14.758 4.804 16 6.137 16 7.773 16 9.569 14.502 11 12.687 11H10a.5.5 0 0 1 0-1h2.688C13.979 10 15 8.988 15 7.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 2.825 10.328 1 8 1a4.53 4.53 0 0 0-2.941 1.1c-.757.652-1.153 1.438-1.153 2.055v.448l-.445.049C2.064 4.805 1 5.952 1 7.318 1 8.785 2.23 10 3.781 10H6a.5.5 0 0 1 0 1H3.781C1.708 11 0 9.366 0 7.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383z"/>
+              <path d="M7.646 15.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 14.293V5.5a.5.5 0 0 0-1 0v8.793l-2.146-2.147a.5.5 0 0 0-.708.708l3 3z"/>
+            </svg>
+          = message.length > 1 ? message[2] : "CSV"
+          = "(#{number_to_human_size(notification.file.blob.byte_size)})"
+      - else
+        = 'N/A'
+    %td
+      %span.reldate{:data => {:asked_at => notification.created_at.to_json.gsub('"', '')}}
+        = notification.created_at
 
-  %td= link_to 'Destroy', admin_notification_path(notification), method: :delete
+    %td= link_to 'Destroy', admin_notification_path(notification), method: :delete