geoblacklight_admin 0.8.0 → 0.9.0

data/app/models/document.rb

@@ -27,12 +27,8 @@ class Document < Kithe::Work
     inverse_of: :document
 
   # Document Collections
-  # - DocumentAccesses
-  has_many :document_accesses, primary_key: "friendlier_id", foreign_key: "friendlier_id", autosave: false, dependent: :destroy,
-    inverse_of: :document
-
-  # - DocumentDownloads
-  has_many :document_downloads, primary_key: "friendlier_id", foreign_key: "friendlier_id", autosave: false, dependent: :destroy,
+  # - DocumentLicensedAccesses
+  has_many :document_licensed_accesses, primary_key: "friendlier_id", foreign_key: "friendlier_id", autosave: false, dependent: :destroy,
     inverse_of: :document
 
   # - DocumentDataDictionaries
@@ -94,7 +90,7 @@ class Document < Kithe::Work
 
   # Downloadable Resouce
   def a_downloadable_resource?
-    distributions_json.include?("downloadUrl")
+    json_attributes["dct_references_s"]&.any? { |ref| ref.category == "download" }
   end
 
   validates_with Document::DateValidator
@@ -118,53 +114,16 @@ class Document < Kithe::Work
   attr_json :dct_references_s, Document::Reference.to_type, array: true, default: -> { [] }
 
   # Distributions
-  # - BEFORE DocumentDistributions
-  #   - Use dct_references_s
-  #   - Use multiple downloads
-  #   - Use distributable assets
-  # - AFTER DocumentDistributions
-  #   - Use document_distributions
-  #   - Use distributable assets
-  # @TODO: Remove BEFORE path once we've migrated to DocumentDistributions
   def distributions
-    distributions = {}
-
-    logger.debug("Document#distributions > ENV['GBL_ADMIN_REFERENCES_MIGRATED']: #{ENV["GBL_ADMIN_REFERENCES_MIGRATED"]}")
-
-    # AFTER - Add DocumentDistributions to distributions
-    if ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "true"
-      distributions = document_distributions.to_aardvark_distributions
-
-      logger.debug("Document#distributions > document_distributions: #{distributions}")
-    else
-      # BEFORE - Prep value arrays
-      # @TODO: Remove this once we've migrated to DocumentDistributions
-      send(GeoblacklightAdmin::Schema.instance.solr_fields[:reference]).each do |ref|
-        if ref.category.present?
-          distributions[Document::Reference::REFERENCE_VALUES[ref.category.to_sym][:uri]] = []
-        end
-      end
-
-      # BEFORE - Seed value arrays
-      # @TODO: Remove this once we've migrated to DocumentDistributions
-      send(GeoblacklightAdmin::Schema.instance.solr_fields[:reference]).each do |ref|
-        if ref.category.present?
-          distributions[Document::Reference::REFERENCE_VALUES[ref.category.to_sym][:uri]] << ref.value
-        end
-      end
-      logger.debug("\n\nDocument#distributions > seeded: #{distributions}")
+    # Add DocumentDistributions to distributions
+    distributions = document_distributions.to_aardvark_distributions
+    logger.debug("Document#distributions > document_distributions: #{distributions}")
 
-      # BEFORE - Apply Multiple Downloads
-      # @TODO: Remove this once we've migrated to DocumentDistributions
-      distributions = apply_downloads(distributions)
-      logger.debug("Document#distributions > downloads: #{distributions}")
-    end
-
-    # BEFORE & AFTER - Apply Distributable Assets
+    # Apply Distributable Assets
     distributions = apply_assets(distributions)
     logger.debug("Document#distributions > assets: #{distributions}")
 
-    # Need to flatten the arrays here to avoid the following potential error:
+    # Flatten the arrays here to avoid the following potential error:
     # - ArgumentError: Please use symbols for polymorphic route arguments.
     # - Via: app/helpers/geoblacklight_helper.rb:224:in `render_references_url'
     distributions.each do |key, value|
@@ -180,17 +139,10 @@ class Document < Kithe::Work
   # Distributions JSON
   # - Indexes to Solr as dct_distributions_s
   def distributions_json
-    if ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "true"
-      logger.debug("Document#distributions_json > using document_distributions")
-      distributions = document_distributions.to_aardvark_distributions
-      distributions = apply_assets(distributions)
-      distributions.to_json
-    else
-      logger.debug("Document#distributions > #{distributions.inspect}")
-      logger.debug("Document#distributions_json > using distributions")
-      logger.warn("Deprecation warning: AttrJSON-based dct_references_s will not be supported soon.")
-      self.distributions.to_json
-    end
+    logger.debug("Document#distributions_json > using document_distributions")
+    distributions = document_distributions.to_aardvark_distributions
+    distributions = apply_assets(distributions)
+    distributions.to_json
   end
 
   def distributions_csv
@@ -248,51 +200,6 @@ class Document < Kithe::Work
     distributions
   end
 
-  # BEFORE - Apply Downloads
-  # @TODO: Remove this once we've migrated to DocumentDistributions
-  # 1. Native Aardvark Downloads
-  # 2. Multiple Document Download Links
-  # 3. Downloadable Document Assets
-  def apply_downloads(distributions)
-    multiple_downloads = []
-
-    dct_downloads = distributions["http://schema.org/downloadUrl"]
-
-    logger.debug("Document#dct_downloads > init: #{dct_downloads}\n\n")
-
-    # Native Aardvark Downloads
-    # - Via CSV Import or via the webform
-    if dct_downloads.present?
-      dct_downloads.each do |download|
-        multiple_downloads << {label: download_text(send(GeoblacklightAdmin::Schema.instance.solr_fields[:format])),
-                              url: download}
-      end
-    end
-
-    logger.debug("Document#multiple_downloads > aardvark: #{multiple_downloads.inspect}\n\n")
-
-    # Multiple Document Download Links
-    # - Via DocumentDownloads
-    if document_downloads.present?
-      multiple_downloads_array.each do |download|
-        multiple_downloads << download
-      end
-    end
-
-    logger.debug("Document#dct_downloads > document_downloads: #{multiple_downloads.inspect}\n\n")
-
-    multiple_downloads = multiple_downloads.uniq { |d| [d[:label], d[:url]] } unless multiple_downloads.empty?
-
-    distributions["http://schema.org/downloadUrl"] = multiple_downloads.flatten unless multiple_downloads.empty?
-    distributions
-  end
-
-  # BEFORE - Multiple Downloads Array
-  # @TODO: Remove this once we've migrated to DocumentDistributions
-  def multiple_downloads_array
-    document_downloads.collect { |d| {label: d.label, url: d.value} }
-  end
-
   ### From GBL
   ##
   # Looks up properly formatted names for formats
@@ -497,7 +404,7 @@ class Document < Kithe::Work
 
   # Institutional Access URLs
   def access_urls
-    DocumentAccess.where(friendlier_id: friendlier_id).order(institution_code: :asc)
+    DocumentLicensedAccess.where(friendlier_id: friendlier_id).order(institution_code: :asc)
   end
 
   def derive_locn_geometry
@@ -567,6 +474,13 @@ class Document < Kithe::Work
   private
 
   def transition_publication_state
-    state_machine.transition_to!(publication_state.downcase) if publication_state_changed?
+    logger.debug("Document#transition_publication_state > publication_state: #{publication_state}")
+    logger.debug("Document#transition_publication_state > b1g_publication_state_s: #{b1g_publication_state_s}")
+
+    if publication_state_changed?
+      state_machine.transition_to!(publication_state.downcase)
+    elsif b1g_publication_state_s_changed?
+      state_machine.transition_to!(b1g_publication_state_s.downcase)
+    end
   end
 end

data/app/models/{document_access.rb → document_licensed_access.rb}

@@ -2,20 +2,22 @@
 
 require "csv"
 
-# DocumentAccess
-class DocumentAccess < ApplicationRecord
+# DocumentLicensedAccess
+class DocumentLicensedAccess < ApplicationRecord
   belongs_to :document, foreign_key: :friendlier_id, primary_key: :friendlier_id
   after_save :reindex_document
 
   # Validations
-  validates :institution_code, :access_url, presence: true
+  validates :access_url, presence: true
+  validates :institution_code, presence: true
+  validates :institution_code, uniqueness: {scope: :friendlier_id}
 
   def self.import(file)
     logger.debug("CSV Import")
     ::CSV.foreach(file.path, headers: true) do |row|
       logger.debug("CSV Row: #{row.to_hash}")
-      document_access = DocumentAccess.find_or_initialize_by(friendlier_id: row[0], institution_code: row[1])
-      document_access.update!(row.to_hash)
+      document_licensed_access = DocumentLicensedAccess.find_or_initialize_by(friendlier_id: row[0], institution_code: row[1])
+      document_licensed_access.update!(row.to_hash)
     end
     true
   end
@@ -24,7 +26,7 @@ class DocumentAccess < ApplicationRecord
     logger.debug("CSV Destroy")
     ::CSV.foreach(file.path, headers: true) do |row|
       logger.debug("CSV Row: #{row.to_hash}")
-      DocumentAccess.destroy_by(id: row[0], friendlier_id: row[1])
+      DocumentLicensedAccess.destroy_by(id: row[0], friendlier_id: row[1])
     end
     true
   end

data/app/models/geoblacklight_admin/schema.rb

@@ -31,11 +31,6 @@ module GeoblacklightAdmin
         }
       end
 
-      unless ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "true"
-        Rails.logger.warn("Deprecation warning: AttrJSON-based dct_references_s will not be supported soon.")
-        @fields = @fields.merge(dct_references_import_mappings)
-      end
-
       @fields
     end
 
@@ -67,11 +62,6 @@ module GeoblacklightAdmin
         }
       }
 
-      unless ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "true"
-        Rails.logger.warn("Deprecation warning: AttrJSON-based dct_references_s will not be supported soon.")
-        @fields = @fields.merge(dct_references_import_mappings)
-      end
-
       @fields = @fields.merge(object_metadata)
       @fields
     end

data/app/models/import_document.rb

@@ -21,6 +21,11 @@ class ImportDocument < ApplicationRecord
       import_id: import_id
     }
 
+    # Set publication state if it exists in json_attributes
+    if json_attributes["b1g_publication_state_s"].present?
+      data_hash[:publication_state] = json_attributes["b1g_publication_state_s"]
+    end
+
     append_created_at(data_hash)
     append_updated_at(data_hash)
   end

data/app/services/export_csv_document_distributions_service.rb

@@ -11,7 +11,11 @@ class ExportCsvDocumentDistributionsService
   #
   # @return [String] the short name of the service.
   def self.short_name
-    "Document Distributions"
+    "Distributions"
+  end
+
+  def self.include_distributions?
+    false
   end
 
   # Initiates the CSV export process for the given document IDs.
@@ -45,10 +49,10 @@ class ExportCsvDocumentDistributionsService
         slice.each do |doc_id|
           doc = Document.find_by(friendlier_id: doc_id)
 
-          Rails.logger.debug { "\n\nDocDistributions: #{doc.document_distributions.size}\n\n" }
+          Rails.logger.debug { "\n\nDocDistributions: #{doc.distributions_csv.size}\n\n" }
 
-          doc.document_distributions.each do |distribution|
-            csv_file << distribution.to_csv
+          doc.distributions_csv.each do |distribution|
+            csv_file << distribution
           end
         rescue NoMethodError
           Rails.logger.debug { "\n\nExport Failed: #{doc_id.inspect}\n\n" }

data/app/services/export_csv_document_licensed_access_links_service.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "csv"
+
+class ExportCsvDocumentLicensedAccessLinksService
+  def self.short_name
+    "Licensed Access"
+  end
+
+  def self.include_distributions?
+    false
+  end
+
+  def self.call(document_ids)
+    Rails.logger.debug { "\n\nExportCsvDocumentLicensedAccessLinksService: #{document_ids.inspect}\n\n" }
+
+    csv_file = []
+    csv_file << DocumentLicensedAccess.column_names
+    records = DocumentLicensedAccess.where(friendlier_id: document_ids)
+    Rails.logger.debug { "Found #{records.count} records" }
+    records.find_each do |access|
+      csv_file << access.attributes.values
+    end
+
+    csv_file
+  end
+end

data/app/services/export_csv_service.rb

@@ -5,7 +5,11 @@ require "csv"
 # ExportCsvService
 class ExportCsvService
   def self.short_name
-    "Documents"
+    "Primary"
+  end
+
+  def self.include_distributions?
+    false
   end
 
   def self.call(document_ids)

data/app/views/admin/document_assets/_assets_table.html.erb

@@ -6,6 +6,7 @@
         <th>Preview</th>
         <th>Title</th>
         <th>Label</th>
+        <th>File Size</th>
         <th>MimeType</th>
         <th>Reference URI Type</th>
         <th colspan="2">Actions</th>
@@ -29,6 +30,9 @@
           </td>
           <td><%= link_to(document_asset.title, document_asset.file.url) %></td>
           <td><%= document_asset.label %></td>
+          <td>
+            <%= number_to_human_size(document_asset.file_data["metadata"]["size"]) %>
+          </td>
           <td>
             <%= document_asset.file_data["metadata"]["mime_type"] %>
             <span class="sr-only"><%= document_asset.inspect %></span>

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

@@ -13,7 +13,9 @@
       <h2 class='h3'>
         <%= link_to(@document.title, admin_document_path(@document)) %>
         &middot;
-        <%= @document_assets.count %> assets
+        <%= @document_assets.count %> assets 
+        &middot;
+        <%= number_to_human_size(@document.gbl_fileSize_s) %>
       </h2>
     <% else %>
       <h2 class='h3'>Assets</h2>

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

@@ -1,7 +1,7 @@
 <p id="notice"><%= notice %></p>
 
 <h1 style="width:100%; border-bottom:dotted;" class="mb-4">
-  Document &middot; Destroy Distributions
+  Destroy Distributions
   <% if params[:document_id] %>
     <%= link_to '+ New Distribution', new_document_document_distribution_path(@document), { class: 'btn btn-primary float-right' } %>
   <% end %>

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

@@ -1,9 +1,9 @@
-<%- @page_title = "GBL♦Admin - Document - Distributions" %>
+<%- @page_title = "GBL♦Admin - Distributions" %>
 
 <div class="row mb-2">
   <div class="col">
     <h1 style="width:100%;">
-      Document &middot; Distributions
+      Distributions
 
       <% if params[:document_id] %>
         <%= link_to '+ Import CSV', new_admin_import_distribution_path, { class: 'btn btn-primary float-right' } %>
@@ -16,11 +16,9 @@
     </h1>
 
     <% if params[:document_id] %>
-    <h2 class='h3'>
-      <%= link_to(@document.title, admin_document_path(@document)) %>
-    </h2>
-    <% else %>
-      <h2 class='h3'>Distributions</h2>
+      <h2 class='h3'>
+        <%= link_to(@document.title, admin_document_path(@document)) %>
+      </h2>
     <% end %>
 
     <!-- Tab navigation -->

data/app/views/admin/document_licensed_accesses/_document_licensed_access.json.jbuilder

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+json.extract! document_licensed_access, :id, :kithe_model_id, :institution_code, :access_url, :created_at, :updated_at
+json.url document_licensed_access_url(document_licensed_access, format: :json)

data/app/views/admin/{document_accesses → document_licensed_accesses}/_form.html.erb

@@ -1,5 +1,4 @@
-
-<%= simple_form_for [:admin, @document, @document_access] do |f| %>
+<%= simple_form_for [:admin, @document, @document_licensed_access] do |f| %>
   <%= f.error_notification %>
   <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
 
@@ -8,10 +7,10 @@
 
     <%= f.input :institution_code, collection: b1g_institution_codes,  label_method: ->(obj){ "#{obj[0]} - #{obj[1]}" }, value_method: :first, include_blank: true, input_html: { autofocus: true } %>
 
-    <%= f.input :access_url %>
+    <%= f.input :access_url, label: 'Licensed Access URL' %>
   </div>
 
   <div class="form-actions">
-    <%= f.button :submit, 'Create Access URL', {class: 'btn btn-primary'} %>
+    <%= f.button :submit, @document_licensed_access.new_record? ? 'Create Licensed Access' : 'Update Licensed Access', class: 'btn btn-primary' %>
   </div>
-<% end %>
+<% end %>

data/app/views/admin/{document_accesses → document_licensed_accesses}/destroy_all.html.erb

@@ -1,9 +1,9 @@
 <p id="notice"><%= notice %></p>
 
 <h1 style="width:100%; border-bottom:dotted;" class="mb-4">
-  Document &middot; Destroy Document Access Links
+  Document &middot; Destroy Document Licensed Access
   <% if params[:document_id] %>
-    <%= link_to '+ New Access URL', new_admin_document_document_access_path(@document), { class: 'btn btn-primary float-right' } %>
+    <%= link_to '+ New Licensed Access', new_admin_document_document_licensed_access_path(@document), { class: 'btn btn-primary float-right' } %>
   <% end %>
 </h1>
 
@@ -12,15 +12,15 @@
     <% if params[:document_id] %>
       <h2 class='h3'><%= @document.title %></h2>
     <% else %>
-      <h2 class='h3'>Destroy Multiple Document Access Links</h2>
+      <h2 class='h3'>Destroy Multiple Document Licensed Access</h2>
     <% end %>
 
     <p class="alert alert-danger" role="alert">
-      <strong>Warning:</strong> All matching Document Access Links will be destroyed. There is <strong>NO UNDO</strong> here.
+      <strong>Warning:</strong> All matching Document Licensed Access will be destroyed. There is <strong>NO UNDO</strong> here.
     </p>
     <h3 class='h4'>Upload a CSV File</h3>
 
-    <%= simple_form_for DocumentAccess.new, url: destroy_all_admin_document_accesses_path, method: :post, multipart: true do |f| %>
+    <%= simple_form_for DocumentLicensedAccess.new, url: destroy_all_admin_document_licensed_accesses_path, method: :post, multipart: true do |f| %>
       <div class="form-group">
         <div class="form-inputs">
           <%= f.simple_fields_for :assets do |asset_fields| %>
@@ -64,7 +64,7 @@
       <dt>id</dt>
       <dd>The database table row identifier</dd>
       <dt>friendlier_id</dt>
-      <dd>The associated GBLADMIN document's friendlier id</dd>
+      <dd>The associated GBL ADMIN document's friendlier id</dd>
     </dl>
   </div>
-</div>
+</div>

data/app/views/admin/document_licensed_accesses/edit.html.erb

@@ -0,0 +1,5 @@
+<h1>Editing Document Licensed Access</h1>
+
+<%= render 'form', document_licensed_access: @document_licensed_access %>
+
+<%= link_to 'Back', admin_document_document_licensed_accesses_path(@document) %>

data/app/views/admin/{document_accesses → document_licensed_accesses}/import.html.erb

@@ -1,9 +1,12 @@
+<%- @page_title = "GBL♦Admin - New Licensed Access Import" %>
+
 <p id="notice"><%= notice %></p>
 
 <h1 style="width:100%; border-bottom:dotted;" class="mb-4">
-  Document &middot; Institutional Access
+  New Licensed Access Import
+
   <% if params[:document_id] %>
-    <%= link_to '+ New Access URL', new_admin_document_document_access_path(@document), { class: 'btn btn-primary float-right' } %>
+    <%= link_to '+ New Licensed Access', new_admin_document_document_licensed_access_path(@document), { class: 'btn btn-primary float-right' } %>
   <% end %>
 </h1>
 
@@ -12,15 +15,15 @@
     <% if params[:document_id] %>
       <h2 class='h3'><%= @document.title %></h2>
     <% else %>
-      <h2 class='h3'>Import for Multiple Documents</h2>
+      <h2 class='h3'>Import for Multiple Items</h2>
     <% end %>
 
     <p class="alert alert-info" role="alert">
-      <strong>Note:</strong> New Institutional Access URLs will be created. Existing Institutional Access URLs will be updated per the CSV file.
+      <strong>Note:</strong> New Licensed Access URLs will be created. Existing Licensed Access URLs will be updated per the CSV file.
     </p>
 
     <h3 class='h4'>Upload a CSV File</h3>
-    <%= simple_form_for DocumentAccess.new, url: import_admin_document_accesses_path, method: :post, multipart: true do |f| %>
+    <%= simple_form_for DocumentLicensedAccess.new, url: import_admin_document_licensed_accesses_path, method: :post, multipart: true do |f| %>
       <div class="form-inputs">
         <%= f.simple_fields_for :assets do |asset_fields| %>
           <%= asset_fields.input :file, as: :file, input_html: {} %>
@@ -28,7 +31,7 @@
       </div>
 
       <div class="form-actions">
-        <%= submit_tag "+ Import CSV", {class: 'btn btn-primary'} %>
+        <%= submit_tag "+ Create Licensed Access Import", {class: 'btn btn-primary'} %>
       </div>
     <% end %>
   </div>
@@ -64,11 +67,11 @@
     <h5>CSV File Column Definitions</h5>
     <dl>
       <dt>friendlier_id</dt>
-      <dd>The associated GEOMG document's friendlier id</dd>
+      <dd>The associated GBL ADMIN document's friendlier id</dd>
       <dt>institution_code</dt>
       <dd>The <a target="_blank" href="https://github.com/geobtaa/geomg/blob/be1b6ac6628bd8f537ab10ecb88e5f4804540e2b/app/helpers/application_helper.rb#L28-L44">code</a> for the institution</dd>
       <dt>access_url</dt>
-      <dd>The URL for the Access link</dd>
+      <dd>The URL for the Licensed Access link</dd>
     </dl>
   </div>
-</div>
+</div>

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

@@ -0,0 +1,78 @@
+<%- @page_title = "GBL♦Admin - Document - Licensed Access" %>
+
+<div class="row mb-2">
+  <div class="col">
+    <h1 style="width:100%;">
+      Document &middot; Licensed Access
+
+      <% if params[:document_id] %>
+        <%= link_to '+ Import CSV', import_admin_document_document_licensed_accesses_path(@document), { class: 'btn btn-primary float-right' } %>
+
+        <%= link_to '+ New Licensed Access', new_admin_document_document_licensed_access_path(@document), { class: 'btn btn-primary float-right mr-2' } %>
+      <% else %>
+        <%= link_to '- Delete CSV', destroy_all_admin_document_licensed_accesses_path, { class: 'btn btn-danger float-right' } %>
+        <%= link_to '+ Import CSV', import_admin_document_licensed_accesses_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_licensed_accesses.count %> urls
+      </h2>
+    <% else %>
+      <h2 class='h3'>Licensed Access</h2>
+    <% end %>
+
+    <% if @pagy %>
+    <h6>
+      <span class='float-left mt-3'>
+        <%== pagy_info(@pagy) %>
+      </span>
+      <span class='float-right'>
+        <%== pagy_bootstrap_nav(@pagy) %>
+      </span>
+    </h6>
+    <% end %>
+
+
+    <table class="table table-striped table-bordered sortable">
+      <thead class="thead-dark">
+        <tr>
+          <th class="header">id</th>
+          <th class="header">friendlier_id</th>
+          <th class="header">institution_code</th>
+          <th class="header">institution_name</th>
+          <th class="header" style="max-width:200px;">access_url</th>
+          <th class="header" colspan="2">Actions</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <% @document_licensed_accesses.each do |document_licensed_access| %>
+          <tr>  
+            <td><%= document_licensed_access.id %></td>
+            <td><%= link_to document_licensed_access.friendlier_id, admin_document_path(document_licensed_access.document) %></td>
+            <td><%= document_licensed_access.institution_code %></td>
+            <td><%= b1g_institution_codes[document_licensed_access.institution_code] %></td>
+            <td><%= link_to(document_licensed_access.access_url, document_licensed_access.access_url) %></td>
+            <td><%= link_to 'Edit', edit_admin_document_document_licensed_access_path(document_licensed_access.document, document_licensed_access) %></td>
+            <td><%= link_to 'Destroy', admin_document_document_licensed_access_path(document_licensed_access.document, document_licensed_access), 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 %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+json.array! @document_licensed_accesses, partial: "document_licensed_accesses/document_licensed_access", as: :document_licensed_access

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

@@ -0,0 +1,8 @@
+<%- @page_title = "GBL♦Admin - New Document Licensed Access" %>
+
+<h1>New Document Licensed Access</h1>
+<h2 class='h3'><%= @document.title %></h2>
+
+<%= render 'form', document_licensed_access: @document_licensed_access %>
+
+<%= link_to 'Back', admin_document_document_licensed_accesses_path(@document) %>

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

@@ -35,17 +35,7 @@
     <%= f.hidden_field :publication_state %>
   <% end %>
 
-<% # References are a special, special case %>
-<% elsif element.solr_field == 'dct_references_s' %>
-  <% 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? %>
-
   <% # Text Fields %>
   <% if element.field_type == 'text' %>
     <%= 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 |input_name, value| %>