hyrax 3.0.0 → 3.2.0

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

@@ -4,21 +4,21 @@
     <div class="panel panel-default tabs" role="main">
       <!-- Nav tabs -->
       <ul class="nav nav-tabs" role="tablist">
-        <% tabs.each_with_index do | tab, i | %>
+        <% (tabs - ['share']).each_with_index do | tab, i | %>
           <% if i == 0 %>
             <li role="presentation" class="active">
           <% else %>
             <li role="presentation">
           <% end %>
               <a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
-                <%= t("hyrax.works.form.tab.#{tab}") %>
+                <%= form_tab_label_for(form: f.object, tab: tab) %>
               </a>
             </li>
         <% end %>
 
         <li role="presentation" id="tab-share" class="hidden">
           <a href="#share" aria-controls="share" role="tab" data-toggle="tab">
-            <%= t("hyrax.works.form.tab.share") %>
+            <%= form_tab_label_for(form: f.object, tab: 'share') %>
           </a>
         </li>
       </ul>

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

@@ -2,7 +2,7 @@
   <% if defined?(viewer) && viewer %>
     <%= iiif_viewer_display presenter %>
   <% else %>
-    <%= media_display presenter.representative_presenter %>
+    <%= render media_display_partial(presenter.representative_presenter), file_set: presenter.representative_presenter  %>
   <% end %>
 <% else %>
   <%= image_tag 'default.png', class: "canonical-image", alt: 'default representative image' %>

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

@@ -27,7 +27,7 @@
   <div class="col-sm-6 text-right">
     <% if presenter.editor? && !workflow_restriction?(presenter) %>
       <%= link_to t('.edit'), edit_polymorphic_path([main_app, presenter]), class: 'btn btn-default' %>
-      <% if presenter.member_presenters.size > 1 %>
+      <% if presenter.member_count > 1 %>
           <%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-default' %>
       <% end %>
       <% if presenter.valid_child_concerns.length > 0 %>
@@ -37,7 +37,7 @@
             <ul class="dropdown-menu">
               <% presenter.valid_child_concerns.each do |concern| %>
                 <li>
-                  <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular], parent_id: presenter.id) %>
+                  <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
                 </li>
               <% end %>
             </ul>

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

@@ -12,7 +12,7 @@
             <ul class="dropdown-menu">
               <% presenter.valid_child_concerns.each do |concern| %>
                 <li>
-                  <%= link_to t(".attach", type: concern.human_readable_type), polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular], parent_id: presenter.id) %>
+                  <%= link_to t(".attach", type: concern.human_readable_type), polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
                 </li>
               <% end %>
             </ul>

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

@@ -7,7 +7,7 @@
   <% provide :files_tab do %>
     <p class="instructions"><%= t("hyrax.batch_uploads.files.instructions") %></p>
     <p class="switch-upload-type"><%= t("hyrax.batch_uploads.files.upload_type_instructions") %>
-      <%= link_to t("hyrax.batch_uploads.files.button_label"), [main_app, :new, Hyrax.primary_work_type.model_name.singular_route_key] %>
+      <%= link_to t("hyrax.batch_uploads.files.button_label"), [main_app, :new, Hyrax.primary_work_type.model_name.singular_route_key.to_sym] %>
     </p>
   <% end %>
   <%= render 'hyrax/base/guts4form', f: f, tabs: form_tabs_for(form: f.object) %>

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

@@ -3,7 +3,7 @@
   <div class="row hyc-header">
     <div class="col-md-12">
 
-      <% unless @presenter.banner_file.blank? %>
+      <% if @presenter.banner_file.present? %>
           <div class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
       <% else %>
           <div class="hyc-generic">

data/app/views/hyrax/dashboard/collections/_collection_title.html.erb

@@ -3,7 +3,7 @@
 <section class="collection-title-row-wrapper"
   data-source="my"
   data-id="<%= id %>"
-  data-colls-hash="<%= presenter.available_parent_collections(scope: controller) %>"
+  data-colls-hash="<%= available_parent_collections_data(collection: presenter) %>"
   data-post-url="<%= hyrax.dashboard_create_nest_collection_within_path(id) %>"
   data-post-delete-url="<%= hyrax.dashboard_collection_path(id) %>">
 

data/app/views/hyrax/dashboard/collections/_form.html.erb

@@ -5,17 +5,17 @@
       <a href="#description" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.description') %></a>
     </li>
     <% if @form.persisted? %>
-      <% if @collection.brandable? %>
+      <% if collection_brandable?(collection: @collection) %>
       <li>
         <a href="#branding" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.branding') %></a>
       </li>
       <% end %>
-      <% if @collection.discoverable? %>
+      <% if collection_discoverable?(collection: @collection) %>
       <li>
         <a href="#discovery" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.discovery') %></a>
       </li>
       <% end %>
-      <% if @collection.sharable? %>
+      <% if collection_sharable?(collection: @collection) %>
       <li>
         <a href="#sharing" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.sharing') %></a>
       </li>
@@ -37,7 +37,7 @@
               <% if f.object.persisted? %>
                 <%# we're loading these values dynamically to speed page load %>
                 <%= f.input :thumbnail_id,
-                            input_html: { data: { text: f.object.thumbnail_title } } %>
+                    input_html: { data: { text: thumbnail_label_for(object: f.object) } } %>
               <% end %>
             </div>
             <% if f.object.display_additional_fields? %>

data/app/views/hyrax/dashboard/collections/_form_branding.html.erb

@@ -60,7 +60,7 @@
             <div class="banner-image">
               <i><%= image_tag(f.object.banner_info[:relative_path],
                                size: "800x100",
-                               alt: "Unable to display banner: #{f.object.banner_info[:file]}") %></i>
+                               alt: f.object.banner_info[:alttext].presence || f.object.banner_info[:file]) %></i>
             </div>
             <% end %>
           </div> <!-- end banner -->

data/app/views/hyrax/dashboard/collections/_list_collections.html.erb

@@ -2,7 +2,7 @@
 <% id = collection_presenter.id %>
 <tr id="document_<%= id %>"
   data-id="<%= id %>"
-  data-colls-hash="<%= collection_presenter.available_parent_collections(scope: controller) %>"
+  data-colls-hash="<%= available_parent_collections_data(collection: collection_presenter) %>"
   data-post-url="<%= hyrax.dashboard_create_nest_collection_within_path(id) %>"
   data-post-delete-url="<%= is_admin_set ? hyrax.admin_admin_set_path(id) : hyrax.dashboard_collection_path(id) %>">
 

data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb

@@ -23,7 +23,7 @@
              <button class="btn btn-info"><span class="glyphicon glyphicon-refresh"></span> <%= t('helpers.action.refresh') %></button>
            </fieldset>
            <div class="col-sm-3">
-             <%= render 'view_type_group' %>
+             <%= render 'hyrax/collections/view_type_group' %>
            </div>
          </div>
        <% end %>

data/app/views/hyrax/dashboard/collections/edit.html.erb

@@ -1,7 +1,9 @@
-<% provide :page_title, construct_page_title( t('.header', type_title: @collection.collection_type.title, title: @form.title.first) ) %>
+<% type_title = collection_type_label_for(collection: @collection) %>
+
+<% provide :page_title, construct_page_title( t('.header', type_title: type_title, title: @form.title.first) ) %>
 
 <% provide :page_header do %>
-  <h1><span class="fa fa-edit" aria-hidden="true"></span><%= t('.header', type_title: @collection.collection_type.title, title: @form.title.first) %></h1>
+  <h1><span class="fa fa-edit" aria-hidden="true"></span><%= t('.header', type_title: type_title, title: @form.title.first) %></h1>
 <% end %>
 
 <div class="row">

data/app/views/hyrax/dashboard/collections/new.html.erb

@@ -1,6 +1,8 @@
-<% provide :page_title, construct_page_title( t('.header', type_title: @collection.collection_type.title) ) %>
+<% type_title = collection_type_label_for(collection: @collection) %>
+
+<% provide :page_title, construct_page_title( t('.header', type_title: type_title)) %>
 <% provide :page_header do %>
-  <h1><span class="fa fa-edit" aria-hidden="true"></span> <%= t('.header', type_title: @collection.collection_type.title) %> </h1>
+  <h1><span class="fa fa-edit" aria-hidden="true"></span> <%= t('.header', type_title: type_title) %> </h1>
 <% end %>
 
 <div class="row">

data/app/views/hyrax/dashboard/collections/show.html.erb

@@ -96,7 +96,7 @@
 
 <% if @presenter.collection_type_is_nestable? && !collection_search_parameters? %>
   <%= render 'hyrax/my/collections/modal_add_to_collection', source: 'show' %>
-  <%= render 'hyrax/my/collections/modal_add_subcollection', id: @presenter.id, source: 'show' %>
+  <%= render 'hyrax/my/collections/modal_add_subcollection', id: @presenter.id, presenter: @presenter, source: 'show' %>
   <%= render 'hyrax/dashboard/collections/modal_parent_collection_remove_deny', source: 'show' %>
 <% end %>
 

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

@@ -1,4 +1,13 @@
 <% if (can?(:download, file_set.id) || can?(:destroy, file_set.id) || can?(:edit, file_set.id)) && !workflow_restriction?(file_set.parent) %>
+  <% if can?(:download, file_set.id) && !(can?(:edit, file_set.id) || can?(:destroy, file_set.id)) %>
+  <%= link_to t('.download'),
+              hyrax.download_path(file_set),
+              class: 'btn btn-default btn-sm',
+              title: t('.download_title', file_set: file_set),
+              target: "_blank",
+              id: "file_download",
+              data: { label: file_set.id } %>
+  <% else %>
   <div class="btn-group">
     <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= file_set.id %>" aria-haspopup="true" aria-expanded="false">
       <span class="sr-only"><%= t('.press_to') %> </span>
@@ -40,4 +49,5 @@
 
     </ul>
   </div>
+  <% end %>
 <% end %>

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

@@ -6,7 +6,7 @@
 
 <div class="row">
   <div class="col-xs-12 col-sm-4">
-    <%= media_display curation_concern.to_presenter %>
+    <%= render media_display_partial(curation_concern.to_presenter), file_set: curation_concern.to_presenter %>
   </div>
   <div class="col-xs-12 col-sm-8">
     <div class="panel panel-default tabs">

data/app/views/hyrax/file_sets/media_display/_audio.html.erb

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+<% if display_media_download_link?(file_set: file_set) %>
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <audio controls="controls" class="audiojs" style="width:100%" controlsList="nodownload" preload="auto">

data/app/views/hyrax/file_sets/media_display/_default.html.erb

@@ -1,6 +1,6 @@
 <div class="no-preview">
   <%= t('hyrax.works.show.no_preview') %>
-  <% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+  <% if display_media_download_link?(file_set: file_set) %>
     <p /><%= link_to t('hyrax.file_set.show.download'),
       hyrax.download_path(file_set),
       id: "file_download",

data/app/views/hyrax/file_sets/media_display/_image.html.erb

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? && can?(:download, file_set.id) && !workflow_restriction?(file_set.try(:parent)) %>
+<% if display_media_download_link?(file_set: file_set) %>
     <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <%= image_tag thumbnail_url(file_set),

data/app/views/hyrax/file_sets/media_display/_office_document.html.erb

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+<% if display_media_download_link?(file_set: file_set) %>
     <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <%= image_tag thumbnail_url(file_set),

data/app/views/hyrax/file_sets/media_display/_pdf.html.erb

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+<% if display_media_download_link?(file_set: file_set) %>
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <%= image_tag thumbnail_url(file_set),

data/app/views/hyrax/file_sets/media_display/_video.html.erb

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+<% if display_media_download_link?(file_set: file_set) %>
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <video controls="controls" class="video-js vjs-default-skin" style="width:100%" data-setup="{}" controlsList="nodownload" preload="auto">

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

@@ -2,7 +2,7 @@
 <div class="container-fluid">
   <div class="row">
     <div class="col-xs-12 col-sm-4">
-      <%= media_display @presenter %>
+      <%= render media_display_partial(@presenter), file_set: @presenter %>
       <%= render 'show_actions', presenter: @presenter %>
       <%= render 'single_use_links', presenter: @presenter if @presenter.editor? %>
     </div>

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

@@ -1,6 +1,6 @@
 <% provide :page_title, application_name %>
 
-<% if @presenter.display_share_button? %>
+<% if @presenter.display_share_button? && !Flipflop.read_only? %>
 <div class="home-share-work text-center">
   <% if signed_in? %>
     <% if @presenter.create_many_work_types? %>

data/app/views/hyrax/my/_admin_set_action_menu.html.erb

@@ -41,16 +41,5 @@
         <%= t("hyrax.dashboard.my.action.delete_admin_set") %>
       <% end %>
     </li>
-    <% if Hyrax::CollectionType.any_nestable? %>
-        <li role="menuitem" tabindex="-1">
-          <%= link_to "#",
-                      class: 'itemicon add-to-collection',
-                      title: t("hyrax.dashboard.my.action.add_to_collection"),
-                      data: { nestable: false,
-                              hasaccess: (can?(:deposit, admin_set_presenter.solr_document)) } do %>
-              <%= t("hyrax.dashboard.my.action.add_to_collection") %>
-          <% end %>
-        </li>
-    <% end %>
   </ul>
 </div>

data/app/views/hyrax/my/_collection_action_menu.html.erb

@@ -6,7 +6,6 @@
     <span class="sr-only"><%= t("hyrax.dashboard.my.sr.press_to") %> </span>
     <%= t("hyrax.dashboard.my.action.select") %> <span class="caret" aria-hidden="true"></span>
   </button>
-
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
     <li role="menuitem" tabindex="-1">
       <%= link_to hyrax.dashboard_collection_path(id),
@@ -43,7 +42,7 @@
       <% end %>
     </li>
 
-    <% if Hyrax::CollectionType.any_nestable? %>
+    <% if collection_presenter.collection_type_is_nestable? %>
       <% # The user should have deposit access to the parent we are adding, and read access to the child (the collection we are linking here). %>
       <li role="menuitem" tabindex="-1">
         <%= link_to "#",

data/app/views/hyrax/my/collections/_list_collections.html.erb

@@ -4,7 +4,7 @@
 <tr id="document_<%= id %>"
   data-source="my"
   data-id="<%= id %>"
-  data-colls-hash="<%= collection_presenter.available_parent_collections(scope: controller) %>"
+  data-colls-hash="<%= available_parent_collections_data(collection: collection_presenter) %>"
   data-post-url="<%= hyrax.dashboard_create_nest_collection_within_path(id) %>"
   data-post-delete-url="<%= is_admin_set ? hyrax.admin_admin_set_path(id) : hyrax.dashboard_collection_path(id) %>">
 

data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb

@@ -1,5 +1,4 @@
 <div class="modal fade disable-unless-selected" id="add-subcollection-modal-<%= id %>" tabindex="-1" role="dialog" aria-labelledby="add-subcollection-label">
-<% collection = ::Collection.find id %>
   <div class="modal-dialog" role="document">
     <div class="modal-content">
 
@@ -14,10 +13,9 @@
         <input type="hidden" name="source" value="<%= source %>" />
         <select name="child_id">
           <option value="none"><%= t("hyrax.dashboard.my.action.select") %></option>
-          <% colls = Hyrax::Collections::NestedCollectionQueryService.available_child_collections(parent: collection, scope: controller, limit_to_id: nil) %>
-          <% colls.each {|coll| %>
+          <% available_child_collections(collection: presenter).each do |coll| %>
             <option value="<%= coll.id %>"><%= coll.title.first %></option>
-          <% } %>
+          <% end %>
         </select>
       </div>
 
@@ -28,7 +26,7 @@
           disabled
           type="button"
           class="btn btn-primary modal-add-button modal-submit-button"
-          data-post-url="<%= dashboard_create_nest_collection_under_path(collection.id) %>"
+          data-post-url="<%= dashboard_create_nest_collection_under_path(presenter.id) %>"
           data-source="<%= source %>">
           <%= t('hyrax.collection.actions.nest_collections.button_label') %>
         </button>

data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb

@@ -12,7 +12,7 @@
           <% @collection_type_list_presenter.each do |row_presenter| %>
             <div class="radio radio-button-list">
               <label>
-                <input type="radio" name="collection_type"
+                <input type="radio" name="collection_type" value="<%= row_presenter.title.gsub(/\s+/, '') %>"
                 <% if row_presenter.admin_set? %>
                   data-path="<%= new_admin_admin_set_path %>"
                 <% else %>

data/app/views/layouts/hyrax/dashboard.html.erb

@@ -27,6 +27,7 @@
         <% end %>
 
           <a name="skip-to-content" id="skip-to-content"></a>
+          <%= render 'shared/read_only' if Flipflop.read_only? %>
           <%= content_for?(:content) ? yield(:content) : yield %>
 
       </div>

data/app/views/layouts/hyrax.html.erb

@@ -24,6 +24,7 @@
       <% end %>
 
       <a name="skip-to-content" id="skip-to-content"></a>
+      <%= render 'shared/read_only' if Flipflop.read_only? %>
       <%= content_for?(:content) ? yield(:content) : yield %>
     </div><!-- /#content-wrapper -->
     <%= render 'shared/footer' %>

data/app/views/shared/_read_only.html.erb

@@ -0,0 +1,5 @@
+<div class="row">
+    <div class="col-md-12 read-only text-center alert alert-warning">
+        <%= t('hyrax.read_only') %>
+    </div>
+</div>

data/bin/db-migrate-seed.sh

@@ -5,7 +5,9 @@ db-wait.sh "$DB_HOST:$DB_PORT"
 bundle exec rails db:create
 bundle exec rails db:migrate
 
-db-wait.sh "$FCREPO_HOST:$FCREPO_PORT"
+if [ "$FCREPO_HOST" ]; then
+  db-wait.sh "$FCREPO_HOST:$FCREPO_PORT"
+fi
 db-wait.sh "$SOLR_HOST:$SOLR_PORT"
 
 bundle exec rails db:seed

data/bin/hyrax-entrypoint.sh

@@ -1,20 +1,6 @@
 #!/bin/sh
 set -e
 
-# Make sure common volume points have the app permission
-chown -fR app:app /app/samvera/hyrax-webapp/tmp
-chown -fR app:app /app/samvera/hyrax-webapp/public
-
-if [ -v HYRAX_DERIVITIVES_PATH ]; then
-  mkdir -p $HYRAX_DERIVITIVES_PATH
-  chown -f -R app:app $HYRAX_DERIVATIVES_PATH
-fi
-
-if [ -v HYRAX_UPLOAD_PATH ]; then
-  mkdir -p $HYRAX_UPLOAD_PATH
-  chown -f -R app:app $HYRAX_UPLOAD_PATH
-fi
-
 mkdir -p /app/samvera/hyrax-webapp/tmp/pids
 rm -f /app/samvera/hyrax-webapp/tmp/pids/*
 

data/bin/solrcloud-assign-configset.sh

@@ -5,17 +5,25 @@ if [ "$SOLR_ADMIN_USER" ]; then
   solr_user_settings="--user $SOLR_ADMIN_USER:$SOLR_ADMIN_PASSWORD"
 fi
 
+solr_config_name="${SOLR_CONFIGSET_NAME:-solrconfig}"
+solr_collection_name="${SOLR_COLLECTION_NAME:-hyrax}"
+
 # Solr Cloud Collection API URLs
 solr_collection_list_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=LIST"
-solr_collection_modify_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=MODIFYCOLLECTION&collection=$SOLR_COLLECTION_NAME&collection.configName=$SOLR_CONFIGSET_NAME"
+solr_collection_modify_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=MODIFYCOLLECTION&collection=${solr_collection_name}&collection.configName=${solr_config_name}"
 
 while [ $COUNTER -lt 30 ]; do
   if nc -z "${SOLR_HOST}" "${SOLR_PORT}"; then
-    if curl --silent $solr_user_settings "$solr_collection_list_url" | grep -q "$SOLR_COLLECTION_NAME"; then
-      echo "-- Collection ${SOLR_COLLECTION_NAME} exists; setting ${SOLR_CONFIGSET_NAME} ConfigSet ..."
+    if curl --silent $solr_user_settings "$solr_collection_list_url" | grep -q "$solr_collection_name"; then
+      echo "-- Collection ${solr_collection_name} exists; setting ${solr_config_name} ConfigSet ..."
       echo $solr_collection_modify_url
       curl $solr_user_settings "$solr_collection_modify_url"
       exit
+    else
+      echo "-- Collection ${solr_collection_name} does not exist; creating and setting ${solr_config_name} ConfigSet ..."
+      solr_collection_create_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=CREATE&name=${solr_collection_name}&collection.configName=${solr_config_name}&numShards=1"
+      curl $solr_user_settings "$solr_collection_create_url"
+      exit
     fi
   fi
   echo "-- Looking for Solr (${SOLR_HOST}:${SOLR_PORT})..."

data/bin/solrcloud-upload-configset.sh

@@ -8,20 +8,31 @@ if [ "$SOLR_ADMIN_USER" ]; then
   solr_user_settings="--user $SOLR_ADMIN_USER:$SOLR_ADMIN_PASSWORD"
 fi
 
+solr_config_name="${SOLR_CONFIGSET_NAME:-solrconfig}"
+
 # Solr Cloud ConfigSet API URLs
 solr_config_list_url="http://$SOLR_HOST:$SOLR_PORT/api/cluster/configs?omitHeader=true"
-solr_config_upload_url="http://$SOLR_HOST:$SOLR_PORT/solr/admin/configs?action=UPLOAD&name=$SOLR_CONFIGSET_NAME"
+solr_config_upload_url="http://$SOLR_HOST:$SOLR_PORT/solr/admin/configs?action=UPLOAD&name=${solr_config_name}"
 
 while [ $COUNTER -lt 30 ]; do
   echo "-- Looking for Solr (${SOLR_HOST}:${SOLR_PORT})..."
   if nc -z "${SOLR_HOST}" "${SOLR_PORT}"; then
-    if curl --silent $solr_user_settings "$solr_config_list_url" | grep -q "$SOLR_CONFIGSET_NAME"; then
-      echo "-- ConfigSet already exists; skipping creation ...";
+    # shellcheck disable=SC2143,SC2086
+    if curl --silent --user 'fake:fake' "$solr_config_list_url" | grep -q '401'; then
+      # the solr pods come up and report available before they are ready to accept trusted configs
+      # only try to upload the config if auth is on.
+      if curl --silent $solr_user_settings "$solr_config_list_url" | grep -q "$solr_config_name"; then
+        echo "-- ConfigSet already exists; skipping creation ...";
+      else
+        echo "-- ConfigSet for ${CONFDIR} does not exist; creating ..."
+        (cd "$CONFDIR" && zip -r - *) | curl -X POST $solr_user_settings --header "Content-Type:application/octet-stream" --data-binary @- "$solr_config_upload_url"
+      fi
+      exit
     else
-      echo "-- ConfigSet for ${CONFDIR} does not exist; creating ..."
-      (cd "$CONFDIR" && zip -r - *) | curl -X POST $solr_user_settings --header "Content-Type:application/octet-stream" --data-binary @- "$solr_config_upload_url"
+      echo "-- Solr at $solr_config_list_url is accepting unauthorized connections; we can't upload a trusted ConfigSet."
+      echo "--   It's possible SolrCloud is bootstrapping its configuration, so this process will retry."
+      echo "--   see: https://solr.apache.org/guide/8_6/configsets-api.html#configsets-upload"
     fi
-    exit
   fi
   COUNTER=$(( COUNTER+1 ));
   sleep 5s

data/chart/hyrax/Chart.yaml

@@ -2,17 +2,21 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 0.6.0
-appVersion: 3.0.0
+version: 1.0.0
+appVersion: 3.1.0
 dependencies:
   - name: fcrepo
-    version: 0.6.0
-    repository: https://samvera-labs.github.com/fcrepo-charts
+    version: 0.8.0
+    repository: oci://ghcr.io/samvera
     condition: fcrepo.enabled
   - name: memcached
     version: 4.2.21
     repository: https://charts.bitnami.com/bitnami
     condition: memcached.enabled
+  - name: minio
+    version: 6.7.2
+    repository: https://charts.bitnami.com/bitnami
+    condition: minio.enabled
   - name: postgresql
     version: 10.3.13
     repository: https://charts.bitnami.com/bitnami
@@ -22,6 +26,6 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
   - name: solr
-    version: 0.2.2
+    version: 1.0.1
     repository: https://charts.bitnami.com/bitnami
     condition: solr.enabled