hyrax 4.0.0 → 5.0.0.rc1

data/app/services/hyrax/workflow/actionable_objects.rb

@@ -20,11 +20,27 @@ module Hyrax
       # @!attribute [rw] user
       #   @return [::User]
       attr_accessor :user
+      ##
+      # @!attribute [rw] workflow_state_filter
+      #   @return [String]
+      attr_accessor :workflow_state_filter
+      ##
+      # @!attribute [rw] page of results to return, 1 based
+      #   @return [Integer]
+      attr_accessor :page
+      ##
+      # @!attribute [rw] per_page number of results in the page
+      #   @return [Integer]
+      attr_accessor :per_page
 
       ##
       # @param [::User] user the user whose
-      def initialize(user:)
+      # @param [String] optional filter by workstate name
+      def initialize(user:, workflow_state_filter: nil)
         @user = user
+        @workflow_state_filter = workflow_state_filter
+        @page = 1
+        @per_page = 10
       end
 
       ##
@@ -34,7 +50,8 @@ module Hyrax
         ids_and_states = id_state_pairs
         return if ids_and_states.none?
 
-        docs = Hyrax::SolrQueryService.new.with_ids(ids: ids_and_states.map(&:first)).solr_documents
+        docs = Hyrax::SolrQueryService.new.with_ids(ids: ids_and_states.map(&:first))
+                                      .solr_documents(page: @page, rows: @per_page, sort: 'system_create_dtsi ASC')
 
         docs.each do |solr_doc|
           object = ObjectInWorkflowDecorator.new(solr_doc)
@@ -46,6 +63,13 @@ module Hyrax
         end
       end
 
+      ##
+      # @return [Integer] total number of entities selected
+      def total_count
+        PermissionQuery.scope_entities_for_the_user(user: user, workflow_state_filter: workflow_state_filter)
+                       .count
+      end
+
       private
 
       ##
@@ -53,7 +77,8 @@ module Hyrax
       # @return [Array[String, Sipity::WorkflowState]]
       def id_state_pairs
         gids_and_states = PermissionQuery
-                          .scope_entities_for_the_user(user: user)
+                          .scope_entities_for_the_user(user: user, page: page, per_page: per_page, workflow_state_filter: workflow_state_filter)
+                          .order(created_at: :asc)
                           .pluck(:proxy_for_global_id, :workflow_state_id)
 
         return [] if gids_and_states.none?

data/app/services/hyrax/workflow/grant_edit_to_depositor.rb

@@ -11,7 +11,7 @@ module Hyrax
         return true unless target.try(:depositor)
 
         model = target.try(:model) || target # get the model if target is a ChangeSet
-        model.edit_users = model.edit_users.to_a + Array.wrap(target.depositor) # += works in Ruby 2.6+
+        model.edit_users += Array.wrap(target.depositor)
         model.try(:permission_manager)&.acl&.save
 
         # If there are a lot of members, granting access to each could take a

data/app/services/hyrax/workflow/grant_read_to_depositor.rb

@@ -12,7 +12,7 @@ module Hyrax
         return true unless target.try(:depositor)
 
         model = target.try(:model) || target # get the model if target is a ChangeSet
-        model.read_users = model.read_users.to_a + Array.wrap(target.depositor) # += works in Ruby 2.6+
+        model.read_users += Array.wrap(target.depositor)
         model.try(:permission_manager)&.acl&.save
 
         # If there are a lot of members, granting access to each could take a

data/app/services/hyrax/workflow/permission_query.rb

@@ -194,7 +194,7 @@ module Hyrax
       # @return [ActiveRecord::Relation<Sipity::Entity>]
       #
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      def scope_entities_for_the_user(user:)
+      def scope_entities_for_the_user(user:, page: 1, per_page: nil, workflow_state_filter: nil)
         entities = Sipity::Entity.arel_table
         workflow_state_actions = Sipity::WorkflowStateAction.arel_table
         workflow_states = Sipity::WorkflowState.arel_table
@@ -227,13 +227,34 @@ module Hyrax
         entity_specific_where = where_builder.call(entity_responsibilities).and(
           entities[:id].eq(entity_responsibilities[:entity_id])
         )
+        entity_specific_where = filter_by_workflow_state(entity_specific_where, workflow_states, workflow_state_filter) if workflow_state_filter
         workflow_specific_where = where_builder.call(workflow_responsibilities)
+        workflow_specific_where = filter_by_workflow_state(workflow_specific_where, workflow_states, workflow_state_filter) if workflow_state_filter
 
-        Sipity::Entity.where(
+        result = Sipity::Entity.where(
           entities[:id].in(entity_specific_joins.where(entity_specific_where))
           .or(entities[:id].in(workflow_specific_joins.where(workflow_specific_where)))
         )
+        # Apply paging if provided
+        if per_page.nil?
+          result
+        else
+          result.page(page).per(per_page)
+        end
       end
+
+      # @api private
+      #
+      # Append a filter by workflow state name to the provided where builder.
+      # If the filter begins with a !, it will filter to states not equal to the filter.
+      def filter_by_workflow_state(where_builder, workflow_states, filter)
+        if filter.start_with?('!')
+          where_builder.and(workflow_states[:name].not_eq(filter[1..]))
+        else
+          where_builder.and(workflow_states[:name].eq(filter))
+        end
+      end
+
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       # @api public

data/app/views/hyrax/admin/workflows/_tabs.html.erb

@@ -0,0 +1,9 @@
+<ul class="nav nav-tabs" id="my_nav" role="list">
+  <li<%= ' class="nav-item"'.html_safe if @response.viewing_under_review? %>>
+      <%= link_to t('hyrax.admin.workflows.index.tabs.under_review'),
+        hyrax.admin_workflows_path(state: 'under-review'), class: "nav-link#{' active' if @response.viewing_under_review?}" %>
+  </li>
+  <li<%= ' class="nav-item"'.html_safe if !@response.viewing_under_review? %>>
+    <%= link_to t('hyrax.admin.workflows.index.tabs.published'), hyrax.admin_workflows_path(state: 'published'), class: "nav-link#{' active' if !@response.viewing_under_review?}" %>
+  </li>
+</ul>

data/app/views/hyrax/admin/workflows/index.html.erb

@@ -4,87 +4,64 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="card tabs">
-      <ul class="nav nav-tabs" role="tablist">
-        <li class="nav-item">
-          <a class="nav-link active" href="#under-review" role="tab" data-toggle="tab"><%= t('.tabs.under_review') %></a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="#published" role="tab" data-toggle="tab"><%= t('.tabs.published') %></a>
-        </li>
-      </ul>
-      <div class="tab-content">
-        <div id="under-review" class="tab-pane show active">
-          <div class="card labels">
-            <div class="card-body">
-              <div class="table-responsive">
-                <table class="table table-sm table-striped datatable">
-                  <thead>
-                    <tr>
-                      <th width="40%">Work</th>
-                      <th width="20%">Depositor</th>
-                      <th width="20%">Submission Date</th>
-                      <th width="20%">Status</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <% @status_list.each do |document| %>
-                      <tr>
-                        <td>
-                          <%= link_to document, [main_app, document] %>
-                        </td>
-                        <td>
-                          <%= safe_join(document.creator, tag(:br)) %>
-                        </td>
-                        <td>
-                          <%= document.date_modified %>
-                        </td>
-                        <td>
-                          <span class="state state-pending"><%= document.workflow_state %></span>
-                        </td>
-                      </tr>
-                    <% end %>
-                  </tbody>
-                </table>
-              </div>
-            </div>
-          </div>
+    <div class="tabs">
+      <%= render 'tabs' %>
+      <div class="card">
+        <div class="card-header">
+          <span class="count-display">
+            <% if @response.viewing_under_review? %>
+              <%= I18n.t('hyrax.admin.workflows.index.works_under_review', total_count: @response.total_count).html_safe %>
+            <% else %>
+              <%= I18n.t('hyrax.admin.workflows.index.works_published', total_count: @response.total_count).html_safe %>
+            <% end %>
+          </span>
         </div>
-        <div id="published" class="tab-pane">
-          <div class="card labels">
-            <div class="card-body">
-              <div class="table-responsive">
-                <table class="table table-sm table-striped datatable">
-                  <thead>
-                    <tr>
-                      <th width="40%">Work</th>
-                      <th width="20%">Depositor</th>
-                      <th width="20%">Submission Date</th>
-                      <th width="20%">Status</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <% @published_list.each do |document| %>
-                      <tr>
-                        <td>
-                          <%= link_to document, [main_app, document] %>
-                        </td>
-                        <td>
-                          <%= safe_join(document.creator, tag(:br)) %>
-                        </td>
-                        <td>
-                          <%= document.date_modified %>
-                        </td>
-                        <td>
-                          <span class="state state-pending"><%= document.workflow_state %></span>
-                        </td>
-                      </tr>
+        <div class="card-body">
+          <div class="row">
+            <div class="col-sm-12">
+              <div class="sort-toggle mt-2">
+                <%= form_tag hyrax.admin_workflows_path, method: :get, class: 'per_page' do %>
+                  <fieldset class="col-12">
+                    <legend class="sr-only"><%= t('hyrax.dashboard.my.sr.results_per_page') %></legend>
+                    <%= label_tag :per_page do %>
+                        Show <%= select_tag :per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page.map(&:to_s), h(params[:per_page])), title: "entries" %> per page
                     <% end %>
-                  </tbody>
-                </table>
+                    <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:per_page, :sort, :utf8)) %>
+                  </fieldset>
+                <% end %>
               </div>
             </div>
           </div>
+          <h2 class="sr-only"><%= t('.works_listing') %></h2>
+          <table class="table table-sm table-striped works-list">
+            <thead>
+              <tr>
+                <th width="40%"><%= t(".heading.work") %></th>
+                <th width="20%"><%= t(".heading.depositor") %></th>
+                <th width="20%"><%= t(".heading.submission_date") %></th>
+                <th width="20%"><%= t(".heading.status") %></th>
+              </tr>
+            </thead>
+            <tbody>
+              <% @response.docs.each do |document| %>
+                <tr>
+                  <td>
+                    <%= link_to document, [main_app, document] %>
+                  </td>
+                  <td>
+                    <%= safe_join(document.creator, tag(:br)) %>
+                  </td>
+                  <td>
+                    <%= document.date_modified %>
+                  </td>
+                  <td>
+                    <span class="state state-pending"><%= document.workflow_state %></span>
+                  </td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+          <%= render 'hyrax/my/results_pagination' %>
         </div>
       </div>
     </div>

data/app/views/hyrax/base/_file_manager_members.html.erb

@@ -2,10 +2,10 @@
                 id: "sortable",
                 class: "list-unstyled grid d-flex flex-wrap clearfix",
                 data: {
-                  id: @form.id,
+                  id: @form.id.to_s,
                   "class-name" => @form.model_name.plural,
                   "singular-class-name" => @form.model_name.singular,
-                  version: @form.version
+                  "sort_property" => @form.valkyrie_presenter? ? "member_ids" : "ordered_member_ids"
                 } do %>
   <% @form.member_presenters.each do |member| %>
     <%= render "file_manager_member", node: member %>

data/app/views/hyrax/base/_form.html.erb

@@ -4,16 +4,6 @@
                               'param-key' => @form.model_name.param_key },
                       multipart: true
                     } do |f| %>
-  <% if f.object.errors.any? %>
-    <div class="alert alert-danger alert-dismissable" role="alert">
-      <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-      <%= f.object.errors.full_messages_for(:base).send(SimpleForm.error_method) %>
-      <%= render 'form_in_works_error', f: f %>
-      <%= render 'form_ordered_members_error', f: f %>
-      <%= render 'form_collections_error', f: f %>
-      <%= render 'form_visibility_error', f: f %>
-    </div>
-  <% end %>
   <% if Flipflop.batch_upload? && !f.object.persisted? %>
     <% provide :metadata_tab do %>
       <p class="switch-upload-type"><%= t('.batch_upload_hint') %> <%= link_to t('.batch_link'), hyrax.new_batch_upload_path(payload_concern: @form.model.class) %></p>

data/app/views/hyrax/base/_form_permission_embargo.html.erb

@@ -1,6 +1,6 @@
 <div class="form-inline">
   <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO) %>
   <%= f.input :visibility_during_embargo, wrapper: :inline, collection: visibility_options(:restrict), include_blank: false %>
-  <%= f.input :embargo_release_date, wrapper: :inline, input_html: { value: f.object.embargo_release_date || Date.tomorrow, class: 'datepicker' } %>
+  <%= f.input :embargo_release_date, wrapper: :inline, input_html: { value: f.object.embargo_release_date&.to_date || Date.tomorrow, class: 'datepicker' } %>
   <%= f.input :visibility_after_embargo, wrapper: :inline, collection: visibility_options(:loosen), include_blank: false %>
 </div>

data/app/views/hyrax/base/_form_permission_lease.html.erb

@@ -1,6 +1,6 @@
 <div class="form-inline">
   <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE) %>
   <%= f.input :visibility_during_lease, wrapper: :inline, collection: visibility_options(:loosen), include_blank: false %>
-  <%= f.input :lease_expiration_date, wrapper: :inline, input_html: { value: f.object.lease_expiration_date || Date.tomorrow, class: 'datepicker' } %>
+  <%= f.input :lease_expiration_date, wrapper: :inline, input_html: { value: f.object.lease_expiration_date&.to_date || Date.tomorrow, class: 'datepicker' } %>
   <%= f.input :visibility_after_lease, wrapper: :inline, collection: visibility_options(:restrict), include_blank: false %>
 </div>

data/app/views/hyrax/base/_form_visibility_component.html.erb

@@ -39,7 +39,7 @@
               <div class="form-inline">
                 <%= f.input :visibility_during_embargo, wrapper: :inline, collection: visibility_options(:restrict), include_blank: false %>
                 <%= t('hyrax.works.form.visibility_until') %>
-                <%= f.date_field :embargo_release_date, wrapper: :inline, value: f.object.embargo_release_date || Date.tomorrow, class: 'datepicker form-control' %>
+                <%= f.date_field :embargo_release_date, wrapper: :inline, value: f.object.embargo_release_date&.to_date || Date.tomorrow, class: 'datepicker form-control' %>
                 <%= f.input :visibility_after_embargo, wrapper: :inline, collection: visibility_options(:loosen), include_blank: false %>
               </div>
             </div>
@@ -55,7 +55,7 @@
               <div class="form-inline">
                 <%= f.input :visibility_during_lease, wrapper: :inline, collection: visibility_options(:loosen), include_blank: false %>
                 <%= t('hyrax.works.form.visibility_until') %>
-                <%= f.date_field :lease_expiration_date, wrapper: :inline, value: f.object.lease_expiration_date || Date.tomorrow, class: 'datepicker form-control' %>
+                <%= f.date_field :lease_expiration_date, wrapper: :inline, value: f.object.lease_expiration_date&.to_date || Date.tomorrow, class: 'datepicker form-control' %>
                 <%= f.input :visibility_after_lease, wrapper: :inline, collection: visibility_options(:restrict), include_blank: false %>
               </div>
             </div>

data/app/views/hyrax/base/_items.html.erb

@@ -1,6 +1,6 @@
 
 <%  array_of_ids = presenter.list_of_item_ids_to_display %>
-<%  members = presenter.member_presenters_for(array_of_ids) %>
+<%  members = presenter.member_presenters(array_of_ids) %>
 <% if members.present? %>
   <table class="table table-striped related-files">
     <thead>

data/app/views/hyrax/base/file_manager.html.erb

@@ -5,7 +5,7 @@
   </li>
 </ul>
 
-<% if !@form.member_presenters.empty? %>
+<% if !@form.member_presenters.blank? %>
   <div class="row" data-action="file-manager">
     <div class="col-lg-3" id="file-manager-tools">
       <h2><%= t('.toolbar') %></h2>

data/app/views/hyrax/base/show.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-@curation_concern = Wings::ActiveFedoraConverter.convert(resource: @curation_concern) if
-  @curation_concern.is_a? Hyrax::Resource
+@curation_concern = ::Wings::ActiveFedoraConverter.convert(resource: @curation_concern) if
+  @curation_concern.is_a?(Hyrax::Resource) && Object.const_defined?("Wings")
 
 json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.reject { |f| [:has_model].include? f }
 json.version @curation_concern.try(:etag)

data/app/views/hyrax/file_sets/show.html.erb

@@ -11,8 +11,10 @@
         <%= render 'file_set_title', presenter: @presenter %>
       </header>
 
-      <%# TODO: render 'show_descriptions' See https://github.com/samvera/hyrax/issues/1481 %>
-      <%= render 'show_details' %>
+      <% @presenter.show_partials.each do |partial_path| %>
+      <%= render partial_path %>
+      <% end %>
+
       <%= render 'hyrax/users/activity_log', events: @presenter.events %>
     </div><!-- /columns second -->
   </div> <!-- /.row -->
@@ -22,4 +24,4 @@
   <span class='hide analytics-event' data-category="file-set-in-collection" data-action="file-set-in-collection-view" data-name="<%= collection_id %>" >
 <% end %>
 <span class='hide analytics-event' data-category="file-set-in-work" data-action="file-set-in-work-view" data-name="<%= @presenter.parent.id %>" >
-<span class='hide analytics-event' data-category="file-set" data-action="file-set-view" data-name="<%= @presenter.id %>" >
+<span class='hide analytics-event' data-category="file-set" data-action="file-set-view" data-name="<%= @presenter.id %>" >

data/app/views/hyrax/homepage/_explore_collections.html.erb

@@ -23,7 +23,7 @@
 <ul class="list-inline collection-highlights-list">
   <li class="list-inline-item">
     <%= link_to t('hyrax.homepage.admin_sets.link'),
-                main_app.search_catalog_path(f: { human_readable_type_sim: ["Collection"]}),
+                main_app.search_catalog_path(f: { generic_type_sim: ["Collection"]}),
                 class: 'btn btn-secondary' %>
   </li>
 </ul>

data/chart/hyrax/Chart.yaml

@@ -2,34 +2,38 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 3.1.0
+version: 3.3.0
 appVersion: 3.3.0
 dependencies:
   - name: fcrepo
-    version: 0.8.0
+    version: 1.0.0
     repository: oci://ghcr.io/samvera
     condition: fcrepo.enabled
   - name: memcached
-    version: 6.3.13
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 6.6.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: memcached.enabled
   - name: minio
-    version: 12.1.14
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 12.8.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: minio.enabled
   - name: postgresql
-    version: 12.2.5
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 12.9.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: postgresql.enabled
   - name: redis
-    version: 17.8.7
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 17.16.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: redis.enabled
   - name: solr
-    version: 7.2.1
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 8.0.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: solr.enabled
   - name: nginx
-    version: 13.2.30
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 15.2.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: nginx.enabled
+  - name: fits
+    version: 0.1.0
+    repository:  https://samvera-labs.github.io/fits-charts
+    condition: fits.enabled

data/chart/hyrax/README.md

@@ -35,28 +35,30 @@ production environments.
 
 The chart populates the following environment variables:
 
-| Variable          | Description                    | Condition              |
-|-------------------|--------------------------------|------------------------|
-| DB_PASSWORD       | Postgresql password            | n/a                    |
-| DB_PORT           | Postgresql service port        | n/a                    |
-| DB_HOST           | Postgresql hostname            | n/a                    |
-| DB_USERNAME       | Postgresql username            | n/a                    |
-| MEMCACHED_HOST    | Memcached host                 | `memcached.enabled`    |
-| RACK_ENV          | app environment ('production') | n/a                    |
-| RAILS_ENV         | app environment ('production') | n/a                    |
-| REDIS_HOST        | Redis service host             | `redis.enabled`        |
-| FCREPO_BASE_PATH  | Fedora Commons root path       | n/a                    |
-| FCREPO_HOST       | Fedora Commons host            | n/a                    |
-| FCREPO_PORT       | Fedora Commons port            | n/a                    |
-| FCREPO_REST_PATH  | Fedora Commons REST endpoint   | n/a                    |
-| SKIP_HYRAX_ENGINE_SEED   | Flag to load Hyrax engine seed file | n/a                    |
-| SOLR_ADMIN_USER   | Solr user for basic auth       | n/a                    |
-| SOLR_ADMIN_PASSWORD | Solr password for basic auth | n/a                    |
-| SOLR_COLLECTION_NAME | The name of the solr collection to use | n/a         |
+| Variable          | Description                    | Condition                                |
+|-------------------|--------------------------------|------------------------------------------|
+| CH12N_TOOL        | Tool for characterization      | `fits.enabled` or `externalFits.enabled` |
+| DB_PASSWORD       | Postgresql password            | n/a                                      |
+| DB_PORT           | Postgresql service port        | n/a                                      |
+| DB_HOST           | Postgresql hostname            | n/a                                      |
+| DB_USERNAME       | Postgresql username            | n/a                                      |
+| MEMCACHED_HOST    | Memcached host                 | `memcached.enabled`                      |
+| RACK_ENV          | app environment ('production') | n/a                                      |
+| RAILS_ENV         | app environment ('production') | n/a                                      |
+| REDIS_HOST        | Redis service host             | `redis.enabled`                          |
+| FCREPO_BASE_PATH  | Fedora Commons root path       | n/a                                      |
+| FCREPO_HOST       | Fedora Commons host            | n/a                                      |
+| FCREPO_PORT       | Fedora Commons port            | n/a                                      |
+| FCREPO_REST_PATH  | Fedora Commons REST endpoint   | n/a                                      |
+| FITS_SERVLET_URL  | URL for FITS servlet           | `fits.enabled` or `externalFits.enabled` |
+| SKIP_HYRAX_ENGINE_SEED   | Flag to load Hyrax engine seed file | n/a                          |
+| SOLR_ADMIN_USER   | Solr user for basic auth       | n/a                                      |
+| SOLR_ADMIN_PASSWORD | Solr password for basic auth | n/a                                      |
+| SOLR_COLLECTION_NAME | The name of the solr collection to use | n/a                           |
 | SOLR_CONFIGSET_NAME | The name of the solr configset to use for config management tasks | n/a |
-| SOLR_HOST         | Solr service host              | n/a                    |
-| SOLR_PORT         | Solr service port              | n/a                    |
-| SOLR_URL          | Solr service full URL          | n/a                    |
+| SOLR_HOST         | Solr service host              | n/a                                      |
+| SOLR_PORT         | Solr service port              | n/a                                      |
+| SOLR_URL          | Solr service full URL          | n/a                                      |
 
 ## With an external SolrCloud
 
@@ -89,6 +91,17 @@ To use an existing or external `fcrepo` instance, use the chart values:
   - `fcrepo.enabled`: false
   - `externalFcrepoHost`: "myfedora.hostname.example.com"
 
+
+# Optional Fits Service
+
+Running fits as a servlet will result in much faster fits responses. This is because the loading cost of the
+various Java components far out weighs the processing time of those components.
+
+To enable fits as a service:
+
+  - ``fits.enabled: true` or `externalFits.enabled: true` and specify the
+    existing `externalFits.url`
+
 ## For DevOps:
 
 For those interested in trying out or contributing to this Chart, it's helpful

data/chart/hyrax/templates/_helpers.tpl

@@ -86,6 +86,23 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end }}
 {{- end -}}
 
+
+{{/*
+Create default fully qualified service names.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "hyrax.fits.fullname" -}}
+{{- printf "%s-%s" .Release.Name "fits" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "hyrax.fits.host" -}}
+{{- if .Values.fits.enabled }}
+{{- include "hyrax.fits.fullname" . }}
+{{- else }}
+{{- .Values.externalFitsHost | default "NO_FITS_HOST_DEFINED" }}
+{{- end }}
+{{- end -}}
+
 {{- define "hyrax.memcached.fullname" -}}
 {{- printf "%s-%s" .Release.Name "memcached" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -130,6 +147,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end }}
 {{- end -}}
 
+{{- define "hyrax.postgresql.url" -}}
+{{- printf "postgresql://%s:%s@%s/%s?pool=5" ( include "hyrax.postgresql.username" . ) ( include "hyrax.postgresql.password" . ) ( include "hyrax.postgresql.host" . ) ( include "hyrax.postgresql.database" . ) -}}
+{{- end -}}
+
 {{- define "hyrax.redis.fullname" -}}
 {{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -172,7 +193,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{- define "hyrax.solr.port" -}}
-{{- .Values.externalSolrPort | default "8983" }}
+{{- if .Values.solr.enabled }}
+{{- .Values.solr.containerPorts.http | default 8983 }}
+{{- else }}
+{{- .Values.externalSolrPort }}
+{{- end }}
 {{- end -}}
 
 {{- define "hyrax.solr.url" -}}

data/chart/hyrax/templates/configmap-env.yaml

@@ -8,8 +8,13 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 data:
+  {{- if (or .Values.fits.enabled .Values.externalFits.enabled) }}
+  CH12N_TOOL: "fits_servlet"
+  {{- else }}
+  CH12N_TOOL: "fits"
+  {{- end }}
   DB_HOST: {{ template "hyrax.postgresql.host" . }}
-  DB_PORT: "5432"
+  DB_PORT: {{ .Values.postgresql.containerPorts.postgresql | default 5432 | quote }}
   DB_USERNAME: {{ template "hyrax.postgresql.database" . }}
   {{- if .Values.memcached.enabled }}
   MEMCACHED_HOST: {{ template "hyrax.memcached.fullname" . }}
@@ -29,6 +34,11 @@ data:
   FCREPO_BASE_PATH: {{ .Values.fcrepoBasePathOverride | default (printf "/%s" (include "hyrax.fullname" .)) | quote }}
   FCREPO_PORT: {{ .Values.fcrepo.servicePort | default 8080 | quote }}
   FCREPO_REST_PATH: {{ .Values.fcrepo.restPath | default "rest" }}
+  {{- if .Values.fits.enabled }}
+  FITS_SERVLET_URL: http://{{ template "hyrax.fits.host" . }}:{{ .Values.fits.servicePort | default 8080 }}{{ .Values.fits.subPath | default "/fits" }}
+  {{- else if .Values.externalFits.enabled }}
+  FITS_SERVLET_URL: {{ .Values.externalFits.url }}
+  {{- end }}
   REDIS_PROVIDER: SIDEKIQ_REDIS_URL
   {{- if .Values.minio.enabled }}
   MINIO_ENDPOINT: {{ template "hyrax.minio.fullname" . }}
@@ -38,5 +48,5 @@ data:
   SOLR_COLLECTION_NAME: {{ template "hyrax.solr.collectionName" . }}
   SOLR_CONFIGSET_NAME: {{ template "hyrax.fullname" . }}
   SOLR_HOST: {{ template "hyrax.solr.host" . }}
-  SOLR_PORT: {{ (include "hyrax.solr.port" .) | quote }}
+  SOLR_PORT: {{ include "hyrax.solr.port" . | quote}}
   SOLR_URL: {{ template "hyrax.solr.url" . }}

data/chart/hyrax/templates/secrets.yaml

@@ -8,7 +8,7 @@ type: Opaque
 data:
   SECRET_KEY_BASE: {{ randAlphaNum 20 | b64enc | quote }}
   DB_PASSWORD: {{ include "hyrax.postgresql.password" . | b64enc }}
-  DATABASE_URL: {{ printf "postgresql://%s:%s@%s/%s?pool=5" ( include "hyrax.postgresql.username" . ) ( include "hyrax.postgresql.password" . ) ( include "hyrax.postgresql.host" . ) ( include "hyrax.postgresql.database" . ) | b64enc }}
+  DATABASE_URL: {{ include "hyrax.postgresql.url" . | b64enc }}
   {{- if .Values.minio.enabled }}
   MINIO_ACCESS_KEY: {{ .Values.minio.auth.rootUser | b64enc}}
   MINIO_SECRET_KEY: {{ .Values.minio.auth.rootPassword | b64enc}}