geoblacklight_admin 0.4.1 → 0.5.0

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

@@ -24,7 +24,16 @@
           <% if doc.present? %>
             <%= render "document", document: doc, index: index %>
           <% else %>
-            <p><%= "#{index + 1}." %> Database is missing document <%= document['id'] %></p>
+            <li>
+              <div class="row">
+                <div class="thumbnail col-1">
+                  &nbsp;
+                </div>
+                <div class="result col">
+                  <p><%= "#{index + 1}." %> Database is missing document <%= document['id'] %></p>
+                </div>
+              </div>
+            </li>
           <% end %>
         <% end %>
       </ol>

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

@@ -34,7 +34,7 @@
                 <%- if index == 0 %>
                   <%- current = @document.json_attributes %>
                   <%- previous = version&.previous&.reify&.json_attributes %>
-                  <%- diff = Hashdiff.diff(previous,current) %>
+                  <%- diff = ::Hashdiff.diff(previous,current) %>
                   <%- changeset = version.changeset.except(:json_attributes).collect{ |change| ["+", change[0], change[1][1]] }.flatten %>
                   <%- diff << changeset %>
                   <%- diff.each do |d| %>
@@ -51,7 +51,7 @@
                 <%- elsif version.previous && version.previous.reify %>
                   <%- current = version.reify&.json_attributes %>
                   <%- previous = version.previous.reify&.json_attributes %>
-                  <%- diff = Hashdiff.diff(previous,current) %>
+                  <%- diff = ::Hashdiff.diff(previous,current) %>
                   <%- changeset = version.changeset.except(:json_attributes).collect{ |change| ["+", change[0], change[1][1]] }.flatten %>
                   <%- diff << changeset %>
                   <%- diff.each do |d| %>
@@ -75,7 +75,7 @@
                 <% else %>
                   <%- current = version.changeset %>
                   <%- previous = {} %>
-                  <%- diff = Hashdiff.diff(previous,current) %>
+                  <%- diff = ::Hashdiff.diff(previous,current) %>
                   <%- changeset = version.changeset.except(:json_attributes, :updated_at).collect{ |change| ["+", change[0], change[1][1]] }.flatten %>
 
                   <%- diff.each do |d| %>

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

@@ -1,64 +1,65 @@
 <%- @page_title = "GBL♦Admin - Elements" %>
 
-<h1 style="width:100%;">
-  Elements
-  <%= link_to '+ New Element', new_admin_element_path, { class: 'btn btn-primary float-right' } %>
-</h1>
+<div class="row mb-2">
+  <div class="col">
+    <h1 style="width:100%;">
+      Elements
+      <%= link_to '+ New Element', new_admin_element_path, { class: 'btn btn-primary float-right' } %>
+    </h1>
 
-<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>
+    <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>
+    <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>
-      <th class="header">Label</th>
-      <th class="header">Solr field</th>
-      <th class="header">Field definition</th>
-      <th class="header">Field type</th>
-      <th class="header">Required</th>
-      <th class="header">Repeatable</th>
-      <th class="header">Reorder</th>
-      <th class="header" colspan="3">Actions</th>
-    </tr>
-  </thead>
+    <table class="table table-striped table-bordered sortable">
+      <thead class="thead-dark">
+        <tr>
+          <th class="header">Label</th>
+          <th class="header">Solr field</th>
+          <th class="header">Field definition</th>
+          <th class="header">Field type</th>
+          <th class="header">Required</th>
+          <th class="header">Repeatable</th>
+          <th class="header">Reorder</th>
+          <th class="header" colspan="3">Actions</th>
+        </tr>
+      </thead>
 
-  <tbody>
-    <% @elements.each do |element| %>
-      <tr data-id="<%=element.id%>">
-        <td><%= link_to element.label, admin_element_path(element) %></td>
-        <td><%= element.solr_field %></td>
-        <td><%= element.field_definition.present? ? link_to( element.field_definition, element.field_definition) : '' %></td>
-        <td><%= element.field_type %></td>
-        <td><%= element.required %></td>
-        <td><%= element.repeatable %></td>
-        <td class="handle" style="text-align:center">&varr;</td>
-        <td><%= link_to 'Show', admin_element_path(element) %></td>
-        <td><%= link_to 'Edit', edit_admin_element_path(element) %></td>
-        <td><%= link_to 'Destroy', admin_element_path(element), method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-<br>
+      <tbody>
+        <% @elements.each do |element| %>
+          <tr data-id="<%=element.id%>">
+            <td><%= link_to element.label, admin_element_path(element) %></td>
+            <td><%= element.solr_field %></td>
+            <td><%= element.field_definition.present? ? link_to( element.field_definition, element.field_definition) : '' %></td>
+            <td><%= element.field_type %></td>
+            <td><%= element.required %></td>
+            <td><%= element.repeatable %></td>
+            <td class="handle" style="text-align:center">&varr;</td>
+            <td><%= link_to 'Show', admin_element_path(element) %></td>
+            <td><%= link_to 'Edit', edit_admin_element_path(element) %></td>
+            <td><%= link_to 'Destroy', admin_element_path(element), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
 
-<h6>
-  <span class='float-left mt-3'>
-    <%== pagy_info(@pagy) %>
-  </span>
-  <span class='float-right'>
-    <%== pagy_bootstrap_nav(@pagy) %>
-  </span>
-</h6>
-
-<br/>
+    <h6>
+      <span class='float-left mt-3'>
+        <%== pagy_info(@pagy) %>
+      </span>
+      <span class='float-right'>
+        <%== pagy_bootstrap_nav(@pagy) %>
+      </span>
+    </h6>
+  </div>
+</div>
 
 <script>
   GBLADMIN.SortElements(

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

@@ -1,45 +1,48 @@
 <%- @page_title = "GBL♦Admin - Form Elements" %>
 
-<h1 style="width:100%;">
-  Form Elements
-  <%= link_to '+ New Form Element', new_admin_form_element_path, { class: 'btn btn-primary float-right' } %>
-</h1>
+<div class="row mb-2">
+  <div class="col">
+    <h1 style="width:100%;">
+      Form Elements
+      <%= link_to '+ New Form Element', new_admin_form_element_path, { class: 'btn btn-primary float-right' } %>
+    </h1>
 
-<p class="alert alert-warning"><strong>Notice</strong> - This table defines the headings and fields on the <%= link_to 'Document', new_admin_document_path %> form. To add a new field to your metadata schema, define an <%= link_to 'Element', admin_elements_path %>.</p>
+    <p class="alert alert-warning"><strong>Notice</strong> - This table defines the headings and fields on the <%= link_to 'Document', new_admin_document_path %> form. To add a new field to your metadata schema, define an <%= link_to 'Element', admin_elements_path %>.</p>
 
-<table class="table table-striped table-bordered sortable">
-  <thead class="thead-dark">
-    <tr>
-      <th class="header">Type</th>
-      <th class="header">Label</th>
-      <th class="header">Element</th>
-      <th class="header">Reorder</th>
-      <th class="header" colspan="3"></th>
-    </tr>
-  </thead>
+    <table class="table table-striped table-bordered sortable">
+      <thead class="thead-dark">
+        <tr>
+          <th class="header">Type</th>
+          <th class="header">Label</th>
+          <th class="header">Element</th>
+          <th class="header">Reorder</th>
+          <th class="header" colspan="2">Actions</th>
+        </tr>
+      </thead>
 
-  <tbody>
-    <% @form_elements.order(:position => :asc).each do |form_element| %>
-      <tr data-id="<%=form_element.id%>">
-        <td><%= form_element.type %></td>
-        <td><%= form_element.label %></td>
-        <td>
-          <%- if form_element.element_solr_field.present? %>
-            <%= Element.find_by(solr_field: form_element.element_solr_field)&.label %>
-          <%- end %>
-        </td>
-        <td class="handle" style="text-align:center">&varr;</td>
-        <td><%= link_to 'Show', admin_form_element_path(form_element) %></td>
-        <td><%= link_to 'Edit', edit_admin_form_element_path(form_element) %></td>
-        <td><%= link_to 'Destroy', admin_form_element_path(form_element), method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+      <tbody>
+        <% @form_elements.order(:position => :asc).each do |form_element| %>
+          <tr data-id="<%=form_element.id%>">
+            <td><%= form_element.type %></td>
+            <td><%= form_element.label %></td>
+            <td>
+              <%- if form_element.element_solr_field.present? %>
+                <%= Element.find_by(solr_field: form_element.element_solr_field)&.label %>
+              <%- end %>
+            </td>
+            <td class="handle" style="text-align:center">&varr;</td>
+            <td><%= link_to 'Edit', edit_admin_form_element_path(form_element) %></td>
+            <td><%= link_to 'Destroy', admin_form_element_path(form_element), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
 
-<br>
+    <br>
 
-<%= link_to '+ New Form Element', new_admin_form_element_path, { class: 'btn btn-primary' } %>
+    <%= link_to '+ New Form Element', new_admin_form_element_path, { class: 'btn btn-primary' } %>
+  </div>
+</div>
 
 <script>
   GBLADMIN.SortElements(

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

@@ -1,56 +1,58 @@
 <%- @page_title = "GBL♦Admin - Imports" %>
 
-<h1 style="width:100%;">
-  Imports
-  <%= link_to '+ New Import', new_admin_import_path, { class: 'btn btn-primary float-right' } %>
-</h1>
+<div class="row mb-2">
+  <div class="col">
+    <h1 style="width:100%;">
+      Imports
+      <%= link_to '+ New Import', new_admin_import_path, { class: 'btn btn-primary float-right' } %>
+    </h1>
 
-<h6>
-  <span class='float-left mt-3'>
-    <%== pagy_info(@pagy) %>
-  </span>
-  <span class='float-right'>
-    <%== pagy_bootstrap_nav(@pagy) %>
-  </span>
-</h6>
+    <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>
-      <th class="header">Name</th>
-      <th class="header">Filename</th>
-      <th class="header">Source</th>
-      <th class="header">Description</th>
-      <th class="header">Row count</th>
-      <th class="header">Date</th>
-      <th class="header" colspan="3"></th>
-    </tr>
-  </thead>
+    <table class="table table-striped table-bordered sortable">
+      <thead class="thead-dark">
+        <tr>
+          <th class="header">Name</th>
+          <th class="header">Filename</th>
+          <th class="header">Source</th>
+          <th class="header">Description</th>
+          <th class="header">Row count</th>
+          <th class="header">Date</th>
+          <th class="header" colspan="3">Actions</th>
+        </tr>
+      </thead>
 
-  <tbody>
-    <% @imports.each do |import| %>
-      <tr>
-        <td><%= import.name %></td>
-        <td><%= import.filename %></td>
-        <td><%= import.source %></td>
-        <td><%= import.description %></td>
-        <td><%= import.row_count %></td>
-        <td><%= import.created_at %></td>
-        <td><%= link_to 'Show', admin_import_path(import) %></td>
-        <td><%= link_to 'Edit', edit_admin_import_path(import) %></td>
-        <td><%= link_to 'Destroy', admin_import_path(import), method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+      <tbody>
+        <% @imports.each do |import| %>
+          <tr>
+            <td><%= import.name %></td>
+            <td><%= import.filename %></td>
+            <td><%= import.source %></td>
+            <td><%= import.description %></td>
+            <td><%= import.row_count %></td>
+            <td><%= import.created_at %></td>
+            <td><%= link_to 'Show', admin_import_path(import) %></td>
+            <td><%= link_to 'Edit', edit_admin_import_path(import) %></td>
+            <td><%= link_to 'Destroy', admin_import_path(import), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
 
-<h6>
-  <span class='float-left mt-3'>
-    <%== pagy_info(@pagy) %>
-  </span>
-  <span class='float-right'>
-    <%== pagy_bootstrap_nav(@pagy) %>
-  </span>
-</h6>
-
-<br/>
+    <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/layouts/application.html.erb

@@ -6,8 +6,11 @@
     <%= csp_meta_tag %>
 
     <%= stylesheet_link_tag "application", media: "all" %>
-    <%= javascript_include_tag "geoblacklight_admin", "data-turbolinks-track": "reload" %>
-    <%= javascript_pack_tag "application", "data-turbolinks-track": "reload" %>
+    <%= javascript_include_tag "application", "data-turbolinks-track": "reload" %>
+
+    <!-- Vite -->
+    <%= vite_client_tag %>
+    <%= vite_javascript_tag 'application', media: 'all' %>
     
     <script src="https://unpkg.com/@popperjs/core@2"></script>
     <script type="text/javascript" src="https://cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
@@ -18,12 +21,12 @@
 
   <body data-locale="en">
     <%= render "admin/shared/navbar" %>
-    <div class="container-fluid">
+    <main class="container-fluid">
       <%= render "admin/shared/schema_timestamp" %>
       <%= render "admin/shared/flash_messages" %>
       <div id="toast-wrapper" aria-live="polite" aria-atomic="true"></div>
       <%= yield %>
-    </div>
+    </main>
     <%= render "admin/shared/footer" %>
     <%= render "admin/shared/js_behaviors" %>
   </body>

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

@@ -112,9 +112,12 @@
       row.appendChild(document.createElement("td")).innerText = size;
 
       // Storage type control, put in params keyed by file ID
+      // Removed - we are always using public storage for now
+
+      // References control, put in params keyed by file ID
       row.appendChild(document.createElement("td")).innerHTML =
-        "<select name='storage_type_for[" + shrineHash.id + "]' class='form-control derivative-storage-type'>" +
-          "<option>public</option><option>restricted</option>" +
+        "<select name='dct_references_for[" + shrineHash.id + "]' class='form-control dct-references-s'>" +
+          "<%= assets_dct_references_options %>" +
         "</select>";
 
       row.appendChild(document.createElement("td")).innerHTML =
@@ -144,4 +147,4 @@
       console.log('Upload complete! We’ve uploaded these files:', result.successful)
     })
   }
-</script>
+</script>

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

@@ -1,4 +1,4 @@
-<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
+<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light pt-2 pb-2">
   <a class="navbar-brand gbl-admin" href="<%=admin_documents_url%>">
     <strong>GBL♦Admin</strong>
   </a>
@@ -48,6 +48,7 @@
           <%= link_to "Imports", admin_imports_path, {class: 'dropdown-item'} %>
           <%= link_to "Bulk Actions", admin_bulk_actions_path, {class: 'dropdown-item'} %>
           <div class="dropdown-divider"></div>
+          <%= link_to "Assets", admin_assets_path, {class: 'dropdown-item'} %>
           <%= link_to "Access Links", admin_document_accesses_path, {class: 'dropdown-item'} %>
           <%= link_to "Download Links", admin_document_downloads_path, {class: 'dropdown-item'} %>
           <div class="dropdown-divider"></div>
@@ -58,15 +59,17 @@
           <div class="dropdown-divider"></div>
           <%= link_to "Users", admin_users_index_path, {class: 'dropdown-item'} %>
         </div>
-      <li class="nav-item">
-        <%= link_to "Bookmarks", admin_bookmarks_path, {class: 'nav-link'} if current_user %>
       </li>
       <% if user_signed_in? %>
-        <li class="nav-item">
-          <%= link_to "Sign out", destroy_user_session_path, { :method => :delete, class: 'nav-link'} %>
-        </li>
-        <li class="nav-item">
-          <%= link_to(current_user.email, edit_user_registration_path, {class: 'nav-link'}) %>
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownUser" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <%= current_user.email %>
+          </a>
+          <div class="dropdown-menu" aria-labelledby="navbarDropdownUser">
+            <%= link_to "Bookmarks #{bookmarks_badge}".html_safe, admin_bookmarks_path, {class: 'dropdown-item'} %>
+            <%= link_to("Edit User Account", edit_user_registration_path, {class: 'dropdown-item'}) %>
+            <%= link_to "Sign Out", destroy_user_session_path, { :method => :delete, class: 'dropdown-item'} %>
+          </div>
         </li>
         <% else %>
         <li class="nav-item">

data/config/locales/documents.en.yml

@@ -185,6 +185,12 @@ en:
           harvard_download: Harvard Download
           open_index_map: OpenIndexMap
           oembed: oEmbed
+          cog: Cloud Optimized GeoTIFF (COG)
+          pmtiles: PMTiles
+          xyz_tiles: XYZ Tiles (XYZ)
+          wmts: Web Map Tile Service (WMTS)
+          tile_json: TileJSON
+          tile_map_service: Tile Map Service (TMS)
 
   simple_form:
     hints:

data/config/routes.rb

@@ -74,6 +74,7 @@ GeoblacklightAdmin::Engine.routes.draw do
 
     resources :documents do
       get "versions"
+      get "admin"
 
       resources :document_accesses, path: "access" do
         collection do

data/config/vite.json

@@ -0,0 +1,14 @@
+{
+  "all": {
+    "sourceCodeDir": "app/javascript",
+    "publicOutputDir": "geoblacklight-admin",
+    "watchAdditionalPaths": []
+  },
+  "development": {
+    "autoBuild": true,
+    "port": 3037
+  },
+  "test": {
+    "autoBuild": true
+  }
+}

data/db/migrate/20240619171628_create_document_thumbnail_statesman.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class CreateDocumentThumbnailStatesman < ActiveRecord::Migration[7.0]
+  def change
+    create_table 'document_thumbnail_transitions', force: :cascade do |t|
+      t.string 'to_state', null: false
+      t.text 'metadata', default: '{}'
+      t.integer 'sort_key', null: false
+      t.uuid 'kithe_model_id', null: false
+      t.boolean 'most_recent', null: false
+      t.datetime 'created_at', precision: 6, null: false
+      t.datetime 'updated_at', precision: 6, null: false
+      t.index %w[kithe_model_id most_recent], name: 'thumbnail_transitions_parent_most_recent', unique: true,
+                                              where: 'most_recent'
+      t.index %w[kithe_model_id sort_key], name: 'thumbnail_transitions_parent_sort', unique: true
+    end
+  end
+end