geoblacklight_admin 0.8.0 → 0.9.0

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

@@ -15,19 +15,10 @@
     <% end %>
 
     <%- 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>
+      <%= link_to admin_document_document_licensed_accesses_url(@document), class: "ml-2" do %>
+        Licensed Access
+        <span class="badge badge-light"><%= @document.document_licensed_accesses.count %></span>
       <% end %>
-      
-      <%- 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>

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

@@ -23,10 +23,6 @@
 
     <% if @document.persisted? %>
       <%= link_to "Institutional Access Links", admin_document_document_accesses_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/_result_selected_options.html.erb

@@ -14,23 +14,19 @@
     </button>
     <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
       <a class="dropdown-item" data-action="click->results#exportCSV" href="javascript:void(0);">
-        CSV
-      </a>
-      <div class="dropdown-divider"></div>
-      <a class="dropdown-item" data-action="click->results#exportJsonFile" href="javascript:void(0);">JSON (Single File)</a>
-      <a class="dropdown-item" data-action="click->results#exportJsonAardvark" href="javascript:void(0);">JSON (Tree Directory)</a>
-      <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
+        CSV - Primary
       </a>
       <a class="dropdown-item" data-action="click->results#exportCsvDocumentDistributions" href="javascript:void(0);">
-        CSV - Document Distributions
+        CSV - Distributions
+      </a>
+      <a class="dropdown-item" data-action="click->results#exportCsvDocumentLicensedAccessLinks" href="javascript:void(0);">
+        CSV - Licensed Access
       </a>
+      <div class="dropdown-divider"></div>
+      <a class="dropdown-item" data-action="click->results#exportJsonFile" href="javascript:void(0);">JSON - Single File</a>
+      <a class="dropdown-item" data-action="click->results#exportJsonAardvark" href="javascript:void(0);">JSON - Tree Directory</a>
+      <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>
   </span>
 
@@ -41,11 +37,11 @@
     </button>
     <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
         <h6 class="dropdown-header">Publication State</h6>
-        <a class="dropdown-item" data-action="click->results#setPubFieldNameValue" href="javascript:void(0);">Published</a>
-        <a class="dropdown-item" data-action="click->results#setPubFieldNameValue" href="javascript:void(0);">Unpublished</a>
-        <a class="dropdown-item" data-action="click->results#setPubFieldNameValue" href="javascript:void(0);">Draft</a>
+        <a class="dropdown-item" data-action="click->results#setPubFieldNameValue" href="javascript:void(0);">Publish</a>
+        <a class="dropdown-item" data-action="click->results#setPubFieldNameValue" href="javascript:void(0);">Unpublish</a>
+        <a class="dropdown-item" data-action="click->results#setPubFieldNameValue" href="javascript:void(0);">Set as Draft</a>
         <div class="dropdown-divider"></div>
-        <h6 class="dropdown-header">Imagery</h6>
+        <h6 class="dropdown-header">Thumbnail Images</h6>
         <a class="dropdown-item" data-action="click->results#harvestThumbnails" href="javascript:void(0);">Harvest Thumbnails</a>
         <a class="dropdown-item" data-action="click->results#deleteThumbnails" href="javascript:void(0);">Delete Thumbnails</a>
     </div>

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

@@ -1,23 +1,21 @@
-<% 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">
+<%- 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>
-        <th class="header">Type</th>
-        <th class="header">Value</th>
-        <th class="header">Label</th>
+        <td><%= document_distribution.reference_type.name %></td>
+        <td><%= document_distribution.url %></td>
+        <td><%= document_distribution.label %></td>
       </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 %>
+    </tbody>
+  </table>
 <% end %>

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

@@ -0,0 +1,3 @@
+<% if @document.persisted? %>
+  <%= link_to "Licensed Access", admin_document_document_licensed_accesses_url(@document) %>
+<% end %>

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

@@ -9,15 +9,6 @@
 
     <p class="alert alert-warning"><strong>Notice</strong> - This table defines the application's metadata schema fields. To add a new field to your <%= link_to 'Document', new_admin_document_path %> form, edit your <%=link_to 'Form Elements', admin_form_elements_path %>.</p>
 
-    <h6>
-      <span class='float-left mt-3'>
-        <%== pagy_info(@pagy) %>
-      </span>
-      <span class='float-right'>
-        <%== pagy_bootstrap_nav(@pagy) %>
-      </span>
-    </h6>
-
     <table class="table table-striped table-bordered sortable">
       <thead class="thead-dark">
         <tr>
@@ -49,15 +40,6 @@
         <% end %>
       </tbody>
     </table>
-
-    <h6>
-      <span class='float-left mt-3'>
-        <%== pagy_info(@pagy) %>
-      </span>
-      <span class='float-right'>
-        <%== pagy_bootstrap_nav(@pagy) %>
-      </span>
-    </h6>
   </div>
 </div>
 

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

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

data/app/views/admin/import_distributions/_show_queued_tab.html.erb

@@ -0,0 +1,36 @@
+<h6>
+  <span class='float-left mt-3'>
+    <%== pagy_info(@pagy_queued) %>
+  </span>
+  <span class='float-right'>
+    <%== pagy_bootstrap_nav(@pagy_queued) %>
+  </span>
+</h6>
+
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>State</th>
+      <th>Title</th>
+      <th>Identifier</th>
+      <th>Reason</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @import_queued_distributions.each_with_index do |distribution, index| %>
+      <tr>
+        <td>
+          <span class="badge badge-danger">
+            <%= distribution.state_machine.current_state %>
+          </span>
+        </td>
+        <td><%= distribution.friendlier_id %></td>
+        <td>
+          <%= link_to admin_import_distribution_path(@import_distribution, distribution) do %>
+            <%= distribution.state_machine&.last_transition&.metadata %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -1,10 +1,10 @@
-<%- @page_title = "GBL♦Admin - Import Distributions" %>
+<%- @page_title = "GBL♦Admin - Distribution Imports" %>
 
 <div class="row mb-2">
   <div class="col">
     <h1 style="width:100%;">
-      Import Distributions
-      <%= link_to '+ New Distributions Import', new_admin_import_distribution_path, { class: 'btn btn-primary float-right' } %>
+      Distribution Imports
+      <%= link_to '+ New Distribution Import', new_admin_import_distribution_path, { class: 'btn btn-primary float-right' } %>
     </h1>
 
     <h6>

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

@@ -1,4 +1,6 @@
-<h1>New Import Distribution</h1>
+<%- @page_title = "GBL♦Admin - New Distribution Import" %>
+
+<h1>New Distribution Import</h1>
 
 <%= simple_form_for(@import_distribution.becomes(ImportDistribution), url: admin_import_distributions_path) do |f| %>
   <%= render 'form', import_distribution: @import_distribution, f: f %>

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

@@ -104,6 +104,7 @@
     <nav>
       <div class="nav nav-tabs" id="import-state-tabs" role="tablist">
         <a class="nav-item nav-link active" id="import-success-tab" data-toggle="tab" href="#import-state-success" role="tab" aria-controls="import-state-success" aria-selected="true">Success <span class="badge badge-success"><%= @pagy_success.count %></span></a>
+        <a class="nav-item nav-link" id="import-queued-tab" data-toggle="tab" href="#import-state-queued" role="tab" aria-controls="import-state-queued" aria-selected="false">Queued <span class="badge badge-warning"><%= @pagy_queued.count %></span></a>
         <a class="nav-item nav-link" id="import-failed-tab" data-toggle="tab" href="#import-state-failed" role="tab" aria-controls="import-state-failed" aria-selected="false">Failed <span class="badge badge-danger"><%= @pagy_failed.count %></span> </a>
       </div>
     </nav>
@@ -113,6 +114,10 @@
         <%= render partial: 'show_success_tab' %>
       </div>
 
+      <div class="tab-pane fade show" id="import-state-queued" role="tabpanel" aria-labelledby="import-state-queued-tab">
+        <%= render partial: 'show_queued_tab' %>
+      </div>
+
       <div class="tab-pane fade" id="import-state-failed" role="tabpanel" aria-labelledby="import-state-failed-tab">
         <%= render partial: 'show_failed_tab' %>
       </div>

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

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

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

@@ -0,0 +1,31 @@
+<h6>
+  <span class='float-left mt-3'>
+    <%== pagy_info(@pagy_queued) %>
+  </span>
+  <span class='float-right'>
+    <%== pagy_bootstrap_nav(@pagy_queued) %>
+  </span>
+</h6>
+
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>State</th>
+      <th>Title</th>
+      <th>Identifier</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @import_queued_documents.each_with_index do |doc, index| %>
+      <tr>
+        <td>
+          <span class="badge badge-warning">
+            <%= doc.state_machine.current_state %>
+          </span>
+        </td>
+        <td><%= doc.title %></td>
+        <td><%= doc.friendlier_id %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -1,10 +1,10 @@
-<%- @page_title = "GBL♦Admin - Imports" %>
+<%- @page_title = "GBL♦Admin - Primary Imports" %>
 
 <div class="row mb-2">
   <div class="col">
     <h1 style="width:100%;">
-      Import Documents
-      <%= link_to '+ New Documents Import', new_admin_import_path, { class: 'btn btn-primary float-right' } %>
+      Primary Imports
+      <%= link_to '+ New Primary Import', new_admin_import_path, { class: 'btn btn-primary float-right' } %>
     </h1>
 
     <h6>

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

@@ -1,4 +1,6 @@
-<h1>New Import</h1>
+<%- @page_title = "GBL♦Admin - New Primary Import" %>
+
+<h1>New Primary Import</h1>
 
 <%= simple_form_for(@import.becomes(Import), url: admin_imports_path) do |f| %>
   <%= render 'form', import: @import, f: f %>

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

@@ -132,15 +132,21 @@
     <nav>
       <div class="nav nav-tabs" id="import-state-tabs" role="tablist">
         <a class="nav-item nav-link active" id="import-success-tab" data-toggle="tab" href="#import-state-success" role="tab" aria-controls="import-state-success" aria-selected="true">Success <span class="badge badge-success"><%= @pagy_success.count %></span></a>
+        <a class="nav-item nav-link" id="import-queued-tab" data-toggle="tab" href="#import-state-queued" role="tab" aria-controls="import-state-queued" aria-selected="false">Queued <span class="badge badge-warning"><%= @pagy_queued.count %></span></a>
         <a class="nav-item nav-link" id="import-failed-tab" data-toggle="tab" href="#import-state-failed" role="tab" aria-controls="import-state-failed" aria-selected="false">Failed <span class="badge badge-danger"><%= @pagy_failed.count %></span> </a>
       </div>
     </nav>
 
     <div class="tab-content" id="import-states">
+
       <div class="tab-pane fade show active" id="import-state-success" role="tabpanel" aria-labelledby="import-state-success-tab">
         <%= render partial: 'show_success_tab' %>
       </div>
 
+      <div class="tab-pane fade show" id="import-state-queued" role="tabpanel" aria-labelledby="import-state-queued-tab">
+        <%= render partial: 'show_queued_tab' %>
+      </div>  
+
       <div class="tab-pane fade" id="import-state-failed" role="tabpanel" aria-labelledby="import-state-failed-tab">
         <%= render partial: 'show_failed_tab' %>
       </div>

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

@@ -10,7 +10,6 @@
     %td
       %strong
         = message.length > 1 ? message[0] : "CSV"
-        = t('dictionary.download')
     %td
       = message.length > 1 ? message[1] : message[0]
     %td

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

@@ -1,7 +1,7 @@
-<%- @page_title = "GBL♦Admin - Notifications" %>
+<%- @page_title = "GBL♦Admin - Exports" %>
 
 <h1 style="width:100%;">
-  <%= t('dictionary.notifications') %>
+  <%= t('dictionary.exports') %>
 
   <%= link_to('+ Mark All Read', batch_admin_notifications_path(params: {read: 'all'}), {method: 'put', class: "btn btn-primary float-right mr-2"}) %>
 </h1>

data/app/views/admin/notifications/update.js.erb

@@ -1,5 +1,5 @@
 // Toast
-$("#toast-wrapper").html('<%= j render partial: "shared/toast", locals: { toast: @toast } %>');
+$("#toast-wrapper").html('<%= j render partial: "admin/shared/toast", locals: { toast: @toast } %>');
 $('.toast').toast('show');
 
 // Notifications badge

data/app/views/admin/shared/_navbar.html.erb

@@ -35,7 +35,7 @@
       <% if user_signed_in? %>
         <li class="nav-item">
           <%= link_to admin_notifications_url, { class: 'nav-link' } do %>
-            <%= "Notifications #{notifications_badge}".html_safe %>
+            <%= "Exports #{notifications_badge}".html_safe %>
           <% end %>
         </li>
       <% end %>
@@ -45,15 +45,16 @@
         </a>
         <div class="dropdown-menu" aria-labelledby="navbarDropdown">
           <h6 class="dropdown-header">Data Management</h6>
-          <%= link_to "Documents", admin_documents_path, {class: 'dropdown-item'} %>
-          <%= link_to "Import Documents", admin_imports_path, {class: 'dropdown-item'} %>
-          <%= link_to "Import Distributions", admin_import_distributions_path, {class: 'dropdown-item'} %>
-          <%= link_to "Bulk Actions", admin_bulk_actions_path, {class: 'dropdown-item'} %>
+          <%= link_to "Import Primary", new_admin_import_path, {class: 'dropdown-item'} %>
+          <%= link_to "Import Distributions", new_admin_import_distribution_path, {class: 'dropdown-item'} %>
+          <%= link_to "Import Licensed Accesses", import_admin_document_licensed_accesses_path, {class: 'dropdown-item'} %>
           <div class="dropdown-divider"></div>
-          <h6 class="dropdown-header">Document Relationships</h6>
-          <%= link_to "Access Links", admin_document_accesses_path, {class: 'dropdown-item'} %>
-          <%= link_to "Assets", admin_assets_path, {class: 'dropdown-item'} %>
+          <h6 class="dropdown-header">View Results</h6>
+          <%= link_to "Primary Imports", admin_imports_path, {class: 'dropdown-item'} %>
+          <%= link_to "Distribution Imports", admin_import_distributions_path, {class: 'dropdown-item'} %>
           <%= link_to "Distributions", admin_document_distributions_path, {class: 'dropdown-item'} %>
+          <%= link_to "Licensed Accesses", admin_document_licensed_accesses_path, {class: 'dropdown-item'} %>
+          <%= link_to "Assets", admin_assets_path, {class: 'dropdown-item'} %>
           <div class="dropdown-divider"></div>
           <h6 class="dropdown-header">Business Intelligence</h6>
           <%= link_to "Blazer", '/admin/blazer', {class: 'dropdown-item', data: { turbolinks: false }} %>

data/config/routes.rb

@@ -81,11 +81,10 @@ GeoblacklightAdmin::Engine.routes.draw do
       get "versions"
       get "admin"
 
-      resources :document_accesses, path: "access" do
+      resources :document_licensed_accesses, path: "licensed_access" do
         collection do
           get "import"
           post "import"
-
           get "destroy_all"
           post "destroy_all"
         end
@@ -125,32 +124,10 @@ GeoblacklightAdmin::Engine.routes.draw do
       end
     end
 
-    resources :document_accesses, path: "access" do
-      collection do
-        get "import"
-        post "import"
-
-        get "destroy_all"
-        post "destroy_all"
-      end
-    end
-
-    resources :document_downloads, path: "downloads" do
+    resources :document_licensed_accesses, path: "licensed_access" do
       collection do
         get "import"
         post "import"
-
-        get "destroy_all"
-        post "destroy_all"
-      end
-    end
-
-    # Document References
-    resources :document_references, path: "references" do
-      collection do
-        get "import"
-        post "import"
-
         get "destroy_all"
         post "destroy_all"
       end

data/db/migrate/20240321000000_rename_document_accesses_to_document_licensed_accesses.rb

@@ -0,0 +1,5 @@
+class RenameDocumentAccessesToDocumentLicensedAccesses < ActiveRecord::Migration[7.0]
+  def change
+    rename_table :document_accesses, :document_licensed_accesses
+  end
+end 

data/db/seeds_form_elements.csv

@@ -43,7 +43,6 @@ FormControl,,gbl_georeferenced_b,41
 FormGroup,Links,,42
 FormControl,,dct_references_s,43
 FormControl,,b1g_image_ss,44
-FormFeature,Multiple Download Links,,45
 FormHeader,Administrative,,46
 FormGroup,Codes,,47
 FormControl,,geomg_id_s,48
@@ -69,4 +68,4 @@ FormControl,,b1g_child_record_b,67
 FormControl,,b1g_dct_mediator_sm,68
 FormControl,,b1g_access_s,69
 FormHeader,Related Items,,70
-FormFeature,Institutional Access Links,,71
+FormFeature,Licensed Access,,71

data/lib/generators/geoblacklight_admin/config_generator.rb

@@ -189,8 +189,8 @@ module GeoblacklightAdmin
               get "fetch"
             end
 
-            # DocumentAccesses
-            resources :document_accesses, path: "access" do
+            # DocumentLicensedAccesses
+            resources :document_licensed_accesses, path: "licensed_access" do
               collection do
                 get "import"
                 post "import"
@@ -230,17 +230,6 @@ module GeoblacklightAdmin
               end
             end
 
-            # DocumentDownloads
-            resources :document_downloads, path: "downloads" do
-              collection do
-                get "import"
-                post "import"
-
-                get "destroy_all"
-                post "destroy_all"
-              end
-            end
-
             # Document Distributions
             resources :document_distributions, path: "distributions" do
               collection do
@@ -253,19 +242,8 @@ module GeoblacklightAdmin
             end
           end
 
-          # Document Accesses
-          resources :document_accesses, path: "access" do
-            collection do
-              get "import"
-              post "import"
-
-              get "destroy_all"
-              post "destroy_all"
-            end
-          end
-
-          # Document Downloads
-          resources :document_downloads, path: "downloads" do
+          # Document Licensed Accesses
+          resources :document_licensed_accesses, path: "licensed_access" do
             collection do
               get "import"
               post "import"

data/lib/generators/geoblacklight_admin/templates/config/initializers/mime_types.rb

@@ -12,5 +12,5 @@ Mime::Type.register "application/json", :json_gbl_v1
 Mime::Type.register "application/json", :json
 
 Mime::Type.register "text/csv", :csv_document_downloads
-Mime::Type.register "text/csv", :csv_document_access_links
+Mime::Type.register "text/csv", :csv_document_licensed_access_links
 Mime::Type.register "text/csv", :csv_document_distributions

data/lib/geoblacklight_admin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoblacklightAdmin
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end