geoblacklight_admin 0.6.3 → 0.7.1

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

@@ -0,0 +1,121 @@
+<%= link_to 'Edit Import Distribution', edit_admin_import_distribution_path(@import_distribution) %> |
+<%= link_to 'Back', admin_import_distributions_path %>
+
+<div class="row">
+  <div class="col-md-6">
+    <h1>Import Distribution</h1>
+    <p>
+      <strong>Name:</strong>
+      <%= @import_distribution.name %>
+    </p>
+
+    <p>
+      <strong>Filename:</strong>
+      <a href="<%= rails_blob_path(@import_distribution.csv_file, disposition: "attachment")%>">
+        <%= @import_distribution.filename %>
+      </a> (<%= @import_distribution.content_type %>)
+    </p>
+
+    <p>
+      <strong>State:</strong>
+      <%= @import_distribution.state_machine.current_state %>
+    </p>
+
+    <p>
+      <strong>Source:</strong>
+      <%= @import_distribution.source %>
+    </p>
+
+    <p>
+      <strong>Description:</strong>
+      <%= @import_distribution.description %>
+    </p>
+  </div>
+  <div class="col-md-3">
+    <div class="card">
+      <div class="card-header text-center">
+        <h3 class="h5">CSV Row Count</h3>
+      </div>
+      <ul class="list-group list-group-flush">
+        <li class="list-group-item text-center">
+          <%= @import_distribution.row_count %>
+        </li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="col-md-3">
+    <div class="card">
+      <div class="card-header text-center">
+        <h3 class="h5">Imported Distributions</h3>
+      </div>
+      <ul class="list-group list-group-flush">
+        <li class="list-group-item">
+          <% if @import_distribution.state_machine.current_state == 'created' %>
+            <%= form_tag run_admin_import_distribution_path(@import_distribution), method: :patch do -%>
+              <%= hidden_field_tag :run, true -%>
+              <%= submit_tag '+ Run Distribution Import', class: 'btn btn-primary btn-block' -%>
+            <%- end -%>
+          <% end %>
+          <% if @import_distribution.state_machine.current_state == 'imported' %>
+            <table class="table table-sm table-bordered import-documents">
+              <thead>
+                <tr>
+                  <th>State</th>
+                  <th>Distribution Count</th>
+                </tr>
+              </thead>
+              <tbody>
+              <tr>
+                <td>Success</td>
+                <td><%= @pagy_success.count %></td>
+              </tr>
+              <tr>
+                <td>Failed</td>
+                <td><%= @pagy_failed.count %></td>
+              </tr>
+              </tbody>
+              <tfoot>
+                <tr>
+                  <th>Total</th>
+                  <td><%= @pagy_success.count + @pagy_failed.count %></td>
+                </tr>
+              </tfoot>
+            </table>
+          <% end %>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+<nav>
+  <div class="nav nav-tabs" id="import-tabs" role="tablist">
+    <a class="nav-item nav-link <%= @import_distribution.state_machine.current_state == 'imported' ? 'active' : '' %>" id="import-results-tab" data-toggle="tab" href="#import-results" role="tab" aria-controls="import-results"
+      aria-selected="true">Import Results</a>
+  </div>
+</nav>
+
+  <div class="tab-pane fade <%= @import_distribution.state_machine.current_state == 'imported' ? 'show active' : '' %>" id="import-results" role="tabpanel" aria-labelledby="import-results-tab">
+    <h3 class="sr-only">Import Results</h3>
+
+    <br/>
+
+    <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-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" id="import-state-failed" role="tabpanel" aria-labelledby="import-state-failed-tab">
+        <%= render partial: 'show_failed_tab' %>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+json.partial! "import_distributions/import_distribution", import_distribution: @import_distribution

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

@@ -3,8 +3,8 @@
 <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' } %>
+      Import Documents
+      <%= link_to '+ New Documents Import', new_admin_import_path, { class: 'btn btn-primary float-right' } %>
     </h1>
 
     <h6>

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

@@ -46,14 +46,14 @@
         <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 "Imports", admin_imports_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'} %>
           <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'} %>
           <%= link_to "Distributions", admin_document_distributions_path, {class: 'dropdown-item'} %>
-          <%= link_to "Download Links", admin_document_downloads_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/app/views/catalog/_facet_pagination.html.erb

@@ -0,0 +1,6 @@
+<div class="prev_next_links btn-group pagy">
+  <%== pagy_prev_a(@pagy, text: "« Previous", anchor_string: 'class="btn btn-link" data-blacklight-modal="preserve" rel="prev"') %>
+  <%== pagy_next_a(@pagy, text: "Next »", anchor_string: 'class="btn btn-link" data-blacklight-modal="preserve" rel="next"') %>
+</div>
+
+<%= local_facet_sort_buttons(@display_facet.name) %>

data/app/views/catalog/_gbl_admin_data_dictionaries.html.erb

@@ -0,0 +1,3 @@
+<% if document.kithe_model.document_data_dictionaries.present? %>
+  <%= link_to "Data Dictionary", data_dictionaries_solr_document_path(document.id), id: "dataDictionariesLink", class: "nav-link", data: { blacklight_modal: "trigger", turbo: false } %>
+<% end %>

data/app/views/catalog/_paginate_compact.html.erb

@@ -0,0 +1,9 @@
+<% if @pagy.pages > 1 %>
+  <section class="pagination">
+    <div class="page-links">
+      <%== pagy_prev_a(@pagy, text: "« Previous") %>
+      <%= "&nbsp; | &nbsp;<strong>#{number_with_delimiter(@pagy.from)} - #{number_with_delimiter(@pagy.to)}</strong>&nbsp; of &nbsp;<strong>#{number_with_delimiter(@pagy.count)}</strong>&nbsp;| &nbsp;".html_safe %>
+      <%== pagy_next_a(@pagy, text: "Next »") %>
+    </div>
+  </section>
+<% end %>

data/app/views/catalog/_results_pagination.html.erb

@@ -0,0 +1,9 @@
+<% if show_pagination? and @response.total_pages > 1 %>
+  <div class="row record-padding">
+    <div class="col-md-12">
+      <section class="pagination">
+        <%= pagy_bootstrap_nav(@pagy).html_safe if @pagy.pages > 1 %>
+      </section>
+    </div>
+  </div>
+<% end %>

data/app/views/catalog/_show_gbl_admin_data_dictionaries.html.erb

@@ -0,0 +1,44 @@
+<% if document&.kithe_model&.document_data_dictionaries.present? %>
+  <% document.kithe_model.document_data_dictionaries.each do |dictionary| %>
+    <h3><%= dictionary.name %></h3>
+    <table class="table table-striped table-bordered">
+      <thead class="thead-dark">
+        <tr>
+          <th class="header">Field Name</th>
+          <th class="header">Field Type</th>
+          <th class="header">Value(s)</th>
+          <th class="header">Definition</th>
+          <th class="header">Definition Source</th>
+        </tr>
+      </thead>
+      <% dictionary.document_data_dictionary_entries.order(:position).each do |entry| %>
+        <% next if entry.parent_field_name.present? %>
+        <tr>
+          <td><%= entry.field_name %></td>
+          <td><%= entry.field_type %></td>
+          <td><%= entry.values %></td>
+          <td><%= entry.definition %></td>
+          <td><%= entry.definition_source %></td>
+        </tr>
+        <% if dictionary.document_data_dictionary_entries.where(parent_field_name: entry.field_name).present? %>
+          <% sub_entries = dictionary.document_data_dictionary_entries.where(parent_field_name: entry.field_name) %>
+          <tr>
+            <td colspan="5">
+              <table>
+                <% sub_entries.each do |sub_entry| %>
+                  <tr>
+                    <td><%= sub_entry.field_name %></td>
+                    <td><%= sub_entry.field_type %></td>
+                    <td><%= sub_entry.values %></td>
+                    <td><%= sub_entry.definition %></td>
+                    <td><%= sub_entry.definition_source %></td>
+                  </tr>
+                <% end %>
+              </table>
+            </td>
+          </tr>
+        <% end %>
+      <% end %>
+    </table>
+  <% end %>
+<% end %>

data/app/views/catalog/data_dictionaries.html.erb

@@ -0,0 +1,12 @@
+<div class="modal-header">
+  <h3 class="modal-title">Data Dictionary</h3>
+  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="Close">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body metadata-body">
+  <%= render partial: 'show_gbl_admin_data_dictionaries', locals: { document: @documents.first } %>
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-default hide-without-js" data-dismiss="modal">Close</button>
+</div>

data/db/migrate/20241204163117_create_document_data_dictionaries.rb

@@ -0,0 +1,14 @@
+class CreateDocumentDataDictionaries < ActiveRecord::Migration[7.2]
+  def change
+    create_table :document_data_dictionaries do |t|
+      t.string :friendlier_id
+      t.string :name
+      t.text :description
+      t.text :staff_notes
+      t.string :tags, limit: 4096, default: "", null: false
+      t.integer :position
+      
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20241218174455_create_document_data_dictionary_entries.rb

@@ -0,0 +1,17 @@
+class CreateDocumentDataDictionaryEntries < ActiveRecord::Migration[7.2]
+  def change
+    create_table :document_data_dictionary_entries do |t|
+      t.references :document_data_dictionary, null: false, foreign_key: true
+      t.string :friendlier_id
+      t.string :field_name
+      t.string :field_type
+      t.string :values
+      t.string :definition
+      t.string :definition_source
+      t.string :parent_field_name
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250113213655_import_distributions.rb

@@ -0,0 +1,56 @@
+class ImportDistributions < ActiveRecord::Migration[7.2]
+  def change
+    add_column :document_distributions, :import_distribution_id, :bigint
+    
+    create_table :import_distributions do |t|
+      t.string :name
+      t.string :source
+      t.text :description
+      t.string :filename
+      t.integer :row_count
+      t.text :headers, default: [], array: true
+      t.string :encoding
+      t.string :content_type
+      t.string :extension
+      t.boolean :validity, default: false
+      t.text :validation_result
+
+      t.timestamps
+    end
+
+    create_table :import_distribution_transitions do |t|
+      t.string :to_state, null: false
+      t.text :metadata, default: "{}"
+      t.integer :sort_key, null: false
+      t.integer :import_distribution_id, null: false
+      t.boolean :most_recent, null: false
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.index ["import_distribution_id", "most_recent"], name: "index_import_distribution_transitions_parent_most_recent", unique: true, where: "most_recent"
+      t.index ["import_distribution_id", "sort_key"], name: "index_import_distribution_transitions_parent_sort", unique: true
+    end
+
+    create_table :import_document_distributions do |t|
+      t.string :friendlier_id
+      t.string :reference_type
+      t.text :distribution_url
+      t.string :label
+      t.bigint :import_distribution_id, null: false
+      t.index ["import_distribution_id"], name: "index_import_distributions_on_import_distribution_id"
+
+      t.timestamps
+    end
+
+    create_table :import_document_distribution_transitions do |t|
+      t.string :to_state, null: false
+      t.text :metadata, default: "{}"
+      t.integer :sort_key, null: false
+      t.integer :import_document_distribution_id, null: false
+      t.boolean :most_recent, null: false
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.index ["import_document_distribution_id", "most_recent"], name: "index_import_doc_distribution_transitions_parent_most_recent", unique: true, where: "most_recent"
+      t.index ["import_document_distribution_id", "sort_key"], name: "index_import_doc_distribution_transitions_parent_sort", unique: true
+    end
+  end
+end

data/lib/generators/geoblacklight_admin/config_generator.rb

@@ -129,6 +129,12 @@ module GeoblacklightAdmin
             patch :run, on: :member
           end
 
+          # Import Distributions
+          resources :import_distributions do
+            resources :import_document_distributions, only: [:show]
+            patch :run, on: :member
+          end
+
           # Elements
           resources :elements do
             post :sort, on: :collection
@@ -205,6 +211,25 @@ module GeoblacklightAdmin
               end
             end
 
+            # Data Dictionaries
+            resources :document_data_dictionaries, path: "data_dictionaries" do
+              collection do
+                get "import"
+                post "import"
+
+                get "destroy_all"
+                post "destroy_all"
+              end
+
+              resources :document_data_dictionary_entries, path: "entries" do
+                collection do
+                  post "sort"
+                  get "destroy_all"
+                  post "destroy_all"
+                end
+              end
+            end
+
             # DocumentDownloads
             resources :document_downloads, path: "downloads" do
               collection do
@@ -222,9 +247,6 @@ module GeoblacklightAdmin
                 get "display_attach_form"
                 post "attach_files"
 
-                get "import"
-                post "import"
-
                 get "destroy_all"
                 post "destroy_all"
               end
@@ -310,6 +332,16 @@ module GeoblacklightAdmin
       inject_into_file "config/routes.rb", gbl_admin_routes, before: /^end/
     end
 
+    def add_gbl_admin_data_dictionariesable
+      inject_into_file "config/routes.rb", before: /^end/ do
+        "\n        concern :gbl_admin_data_dictionariesable, GeoblacklightAdmin::Routes::DataDictionariesable.new
+        resources :solr_documents, only: [:show], path: '/catalog', controller: 'catalog' do
+          concerns :gbl_admin_data_dictionariesable
+        end
+        \n\n"
+      end
+    end
+
     def set_development_mailer_host
       mailer_host = "\n  config.action_mailer.default_url_options = { :host => 'localhost:3000' }\n"
       inject_into_file "config/environments/development.rb", mailer_host, after: "config.action_mailer.perform_caching = false"
@@ -386,9 +418,32 @@ module GeoblacklightAdmin
       end
     end
 
+    def add_show_gbl_admin_data_dictionaries
+      inject_into_file "app/controllers/catalog_controller.rb", after: "# Custom tools for GeoBlacklight" do
+        "\n   config.add_show_tools_partial :gbl_admin_data_dictionaries, partial: 'gbl_admin_data_dictionaries', if: proc { |_context, _config, options| options[:document] && options[:document]&.kithe_model&.document_data_dictionaries&.present? }"
+      end
+    end
+
+    def add_data_dictionaries_action
+      inject_into_file "app/controllers/catalog_controller.rb", before: "\nend" do
+        "\n  def data_dictionaries
+          \n    @response, @documents = action_documents
+          \n    respond_to do |format|
+          \n      format.html do
+          \n        return render layout: false if request.xhr?
+          \n        # Otherwise draw the full page
+          \n      end
+          \n    end
+          \n  end"
+      end
+    end
+
     def add_kithe_model_to_solr_document
       inject_into_file "app/models/solr_document.rb", after: "include Geoblacklight::SolrDocument" do
-        "\n\nattr_accessor :model"
+        "\n\nattr_accessor :model
+        \n def kithe_model
+          Kithe::Model.find_by_friendlier_id(self.id)
+        end\n\n"
       end
     end
 
@@ -420,6 +475,8 @@ module GeoblacklightAdmin
     # Add test fixture files - Necessary for import background job tests
     def add_test_fixture_files
       copy_file "btaa_sample_records.csv", "test/fixtures/files/btaa_sample_records.csv", force: true
+      copy_file "btaa_sample_document_distributions.csv", "test/fixtures/files/btaa_sample_document_distributions.csv", force: true
+      copy_file "btaa_sample_document_data_dictionary_entries.csv", "test/fixtures/files/btaa_sample_document_data_dictionary_entries.csv", force: true
     end
 
     # Run bundle with vite install

data/lib/generators/geoblacklight_admin/templates/btaa_sample_document_data_dictionary_entries.csv

@@ -0,0 +1,9 @@
+friendlier_id,field_name,field_type,values,definition,definition_source,parent_field_name
+35c8a641589c4e13b7aa11e37f3f00a1_0,AREA,Real,6,Area of polygon,Software generated,
+35c8a641589c4e13b7aa11e37f3f00a1_0,PERIMETER,Real,6,Perimeter of polygon,Software generated,
+35c8a641589c4e13b7aa11e37f3f00a1_0,NAME_U,String,10,County names in upper case letters,USGS 7.5-minute quadrangles,
+35c8a641589c4e13b7aa11e37f3f00a1_0,NAME_L,String,10,County names in upper and lower case letters,IGS standard,
+35c8a641589c4e13b7aa11e37f3f00a1_0,NCAPC,Integer,2,Numeric county alphabetic prefix code,Indiana Bureau of Motor Vehicles,
+35c8a641589c4e13b7aa11e37f3f00a1_0,Subtable A,String,A,Definition,Definition source,PERIMETER
+35c8a641589c4e13b7aa11e37f3f00a1_0,Subtable B,String,B,Definition,Definition Source,PERIMETER
+35c8a641589c4e13b7aa11e37f3f00a1_0,Subtable C,String,C,Definition,Definition Source,PERIMETER

data/lib/generators/geoblacklight_admin/templates/btaa_sample_document_distributions.csv

@@ -0,0 +1,17 @@
+friendlier_id,reference_type,distribution_url,label
+82784459-acde-42ed-b615-d8300577110e,documentation_external,https://gisdata.mn.gov/dataset/82784459-acde-42ed-b615-d8300577110e,
+82784459-acde-42ed-b615-d8300577110e,download,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/fgdb_water_lake_superior_basin.zip,Geodatabase
+82784459-acde-42ed-b615-d8300577110e,download,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/gpkg_water_lake_superior_basin.zip,GeoPackage
+82784459-acde-42ed-b615-d8300577110e,download,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/shp_water_lake_superior_basin.zip,Shapefile
+82784459-acde-42ed-b615-d8300577110e,full_layer_description,https://gisdata.mn.gov/dataset/82784459-acde-42ed-b615-d8300577110e,Landing Page
+82784459-acde-42ed-b615-d8300577110e,image,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/metadata/preview.jpg,Static Preview - Sample Image
+82784459-acde-42ed-b615-d8300577110e,metadata_html,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/metadata/metadata.html,Full Metadata Record
+p16022coll230:1933,documentation_external,https://umedia.lib.umn.edu/item/p16022coll230:1933,
+p16022coll230:1933,iiif_image,https://cdm16022.contentdm.oclc.org/digital/iiif/p16022coll230/1933/info.json,
+p16022coll230:1933,iiif_manifest,https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll230/1933/manifest.json,
+p16022coll230:321,documentation_external,https://umedia.lib.umn.edu/item/p16022coll230:321,
+p16022coll230:321,iiif_image,https://cdm16022.contentdm.oclc.org/digital/iiif/p16022coll230/321/info.json,
+p16022coll230:321,iiif_manifest,https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll230/321/manifest.json,
+p16022coll230:4115,documentation_external,https://umedia.lib.umn.edu/item/p16022coll230:4115,
+p16022coll230:4115,iiif_image,https://cdm16022.contentdm.oclc.org/digital/iiif/p16022coll230/4115/info.json,
+p16022coll230:4115,iiif_manifest,https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll230/4115/manifest.json,