hyrax 2.2.4 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a9306e4b4844dbd7eeca0918cc90bbd199bb3ed
-  data.tar.gz: 4872c02a907df3571ecc9e4d906fa73fcb516919
+  metadata.gz: 0df96c169892214d2f731b444c3035513aff1695
+  data.tar.gz: 929e779d5ef621a5beae5765230ff1428833dd8a
 SHA512:
-  metadata.gz: 88598e671c211babf2a3ecbb20832c5d31599f5d7d2bc1023ff09728850733313bf838c4f1ef79204aa4ee0d05327b61b9299f5c43bee69d1883973e87d83895
-  data.tar.gz: 58b7bc88ffac9e2202b22f4c3e27af8817733a99522a479d5d565d816240e4b9f86f066ac4e3f3a80c9e8f4aa08c1e0f08754b649a7f4c17bf08b9551dd97fe0
+  metadata.gz: deeaf9148d5313e84849d68e129600deb7ea9d84098c504d30f8125793cfaf971e07c6284f5efea1cfbd4425e723a75d46100a2abf9ddc13d61b46f3b5c76786
+  data.tar.gz: ecab45fc775aff812ceef8377a9d3f57bf76029b115b648a0ac99dacd02cf304f47351680601e0f113ddcd76cce97823ae9cdd3e6856aaea8eb5c098956b75a4

data/.circleci/config.yml

@@ -0,0 +1,75 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+    # legacy needed for phantomjs
+    - image: circleci/ruby:2.5.1-node-browsers-legacy
+      environment:
+        RAILS_ENV: test
+        RACK_ENV: test
+        BUNDLE_JOBS: 4
+        BUNDLE_RETRY: 3
+        NOKOGIRI_USE_SYSTEM_LIBRARIES: true
+        ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test
+        SPEC_OPTS: --format progress --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
+    - image: circleci/redis:4
+    # - image: yinlinchen/fcrepo4-docker:4.7.5
+    # - image: solr:7
+
+    # Specify service dependencies here if necessary
+    # CircleCI maintains a library of pre-built images
+    # documented at https://circleci.com/docs/2.0/circleci-images/
+    # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+
+    steps:
+    - run:
+        name: Setup Interpolated ENV Variables
+        command: |
+          echo 'export BUNDLE_PATH="$CIRCLE_WORKING_DIRECTORY/vendor/bundle"' >> $BASH_ENV
+
+    - checkout
+
+    # Download and cache dependencies
+    - restore_cache:
+        keys:
+        - v1-dependencies-
+
+    - run:
+        name: install dependencies
+        command: |
+          gem update --system
+          bundle install
+          bundle exec rake engine_cart:generate
+
+    - save_cache:
+        paths:
+        - ./Gemfile.lock
+        - ./vendor/bundle
+        - ./.internal_test_app
+        key: v1-dependencies-{{ checksum "./.internal_test_app/.generated_engine_cart" }}
+
+    - run:
+        name: Start headless Chrome
+        command: google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost
+        background: true
+
+    - run:
+        name: Run tests
+        command: |
+          mkdir /tmp/test-results
+          TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+
+          bundle exec rake ci
+
+    # collect reports
+    - store_test_results:
+        path: /tmp/test-results
+    - store_artifacts:
+        path: /tmp/test-results
+        destination: test-results

data/README.md

@@ -41,6 +41,7 @@ Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samv
   * [License](#license)
   * [Contributing](#contributing)
   * [Development](#development)
+    * [Security](#reporting-security-issues)
     * [Workflow Relationship Diagram](#workflow-relationship-diagram)
   * [Release process](#release-process)
   * [Acknowledgments](#acknowledgments)
@@ -62,7 +63,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v2.2.4__. If you are looking for instructions on installing a different
+v2.3.0__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -161,7 +162,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.2.4/template.rb
+rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.3.0/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
@@ -326,6 +327,10 @@ If you'd like to help the development effort and you're not sure where to get st
 
 The [Hyrax Development Guide](https://github.com/samvera/hyrax/wiki/Hyrax-Development-Guide) is for people who want to modify Hyrax itself, not an application that uses Hyrax.
 
+## Reporting Security Issues
+
+To report a security vulnerability, email [samvera-steering@googlegroups.com](mailto:samvera-steering@googlegroups.com) and the Steering Group will coordinate the community response. In your message, please document to the best of your ability cases (relevant software versions, conditions, etc.) where the vulnerability is applicable, the potential negative effects, and any known workarounds or fixes to mitigate the risk. Steering will communicate this to the Partners and the rest of the community in a timely fashion.
+
 ## Workflow Relationship Diagram
 
 * [Entity Relationship Diagram](./artifacts/entity-relationship-diagram.pdf)

data/app/assets/javascripts/hyrax/batch_select_all.js

@@ -75,6 +75,11 @@ Blacklight.onLoad(function() {
 
   // check all check boxes
   $("#check_all").bind('click', check_all_page);
+  
+  // select/deselect all check boxes 
+  $("#checkAllBox").change(function () {
+    $("input:checkbox").prop('checked', $(this).prop("checked"));
+  });
 
   // toggle button on or off based on boxes being clicked
   $(".batch_document_selector").bind('click', function(e) {

data/app/assets/stylesheets/hyrax/_forms.scss

@@ -164,3 +164,10 @@ form.button-to {
   margin-bottom: 0;
   padding: 7px 15px;
 }
+
+.search-form {
+
+  .form-group {
+    margin: 0;
+  }
+}

data/app/assets/stylesheets/hyrax/_header.scss

@@ -17,6 +17,10 @@ header > .navbar {
 
 .searchbar-right {
   margin-right: 0;
+
+  label {
+    color: #ffffff;
+  }
 }
 
 // We need these ancestor selectors to override Bootstrap and push

data/app/presenters/hyrax/dashboard/user_presenter.rb

@@ -42,7 +42,7 @@ module Hyrax
       end
 
       def link_to_manage_proxies
-        link_to t('hyrax.dashboard.manage_proxies'), hyrax.depositors_path
+        link_to t('hyrax.dashboard.manage_proxies'), hyrax.depositors_path, aria: { label: t('hyrax.dashboard.manage_proxies') }
       end
 
       private

data/app/services/hyrax/admin_set_service.rb

@@ -33,10 +33,11 @@ module Hyrax
       results = ActiveFedora::SolrService.instance.conn.get(
         ActiveFedora::SolrService.select_path,
         params: { fq: query,
+                  rows: 0,
                   'facet.field' => join_field }
       )
       counts = results['facet_counts']['facet_fields'][join_field].each_slice(2).to_h
-      file_counts = count_files(results)
+      file_counts = count_files(admin_sets)
       admin_sets.map do |admin_set|
         SearchResultForWorkCount.new(admin_set, counts[admin_set.id].to_i, file_counts[admin_set.id].to_i)
       end
@@ -50,14 +51,18 @@ module Hyrax
       end
 
       # Count number of files from admin set works
-      # @param [Array] results Solr search result
+      # @param [Array] AdminSets to count files in
       # @return [Hash] admin set id keys and file count values
-      def count_files(results)
+      def count_files(admin_sets)
         file_counts = Hash.new(0)
-        results['response']['docs'].each do |doc|
-          doc['isPartOf_ssim'].each do |id|
-            file_counts[id] += doc.fetch('file_set_ids_ssim', []).length
-          end
+        admin_sets.each do |admin_set|
+          query = "{!join from=file_set_ids_ssim to=id}isPartOf_ssim:#{admin_set.id}"
+          file_results = ActiveFedora::SolrService.instance.conn.get(
+            ActiveFedora::SolrService.select_path,
+            params: { fq: [query, "has_model_ssim:FileSet"],
+                      rows: 0 }
+          )
+          file_counts[admin_set.id] = file_results['response']['numFound']
         end
         file_counts
       end

data/app/views/_controls.html.erb

@@ -1,17 +1,17 @@
 <nav class="navbar navbar-default navbar-static-top" role="navigation">
   <div class="container-fluid">
     <div class="row">
-      <ul class="nav navbar-nav col-sm-5 col-md-6">
+      <ul class="nav navbar-nav col-sm-5">
         <li <%= 'class=active' if current_page?(hyrax.root_path) %>>
-          <%= link_to t(:'hyrax.controls.home'), hyrax.root_path %></li>
+          <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
         <li <%= 'class=active' if current_page?(hyrax.about_path) %>>
-          <%= link_to t(:'hyrax.controls.about'), hyrax.about_path %></li>
+          <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
         <li <%= 'class=active' if current_page?(hyrax.help_path) %>>
-          <%= link_to t(:'hyrax.controls.help'), hyrax.help_path %></li>
+          <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
         <li <%= 'class=active' if current_page?(hyrax.contact_path) %>>
-          <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path %></li>
+          <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
       </ul><!-- /.nav -->
-      <div class="searchbar-right navbar-right col-sm-7 col-md-6">
+      <div class="searchbar-right navbar-right col-sm-7">
         <%= render partial: 'catalog/search_form' %>
       </div>
     </div>

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

@@ -1,40 +1,45 @@
-<%= form_tag search_form_action, method: :get, id: "search-form-header", role: "search" do %>
+<%= form_tag search_form_action, method: :get, class: "form-horizontal search-form", id: "search-form-header", role: "search" do %>
   <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
   <%= hidden_field_tag :search_field, 'all_fields' %>
-  <div class="input-group">
+  <div class="form-group">
 
-    <label class="sr-only" for="search-field-header"><%= t("hyrax.search.form.q.label", application_name: application_name) %></label>
-    <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
+    <label class="control-label col-sm-3" for="search-field-header">
+      <%= t("hyrax.search.form.q.label", application_name: application_name) %>
+    </label>
 
-    <div class="input-group-btn">
-      <button type="submit" class="btn btn-primary" id="search-submit-header">
-        <%= t('hyrax.search.button.html') %>
-      </button>
-      <% if current_user %>
-        <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+    <div class="input-group">
+      <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
 
-          <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
-          <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
-          <span class="caret"></span>
+      <div class="input-group-btn">
+        <button type="submit" class="btn btn-primary" id="search-submit-header">
+          <%= t('hyrax.search.button.html') %>
         </button>
+        <% if current_user %>
+          <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
 
-        <ul class="dropdown-menu pull-right">
-          <li>
-            <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
-                data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
-          </li>
-          <li>
-            <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
-                data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
-          </li>
-          <li>
-            <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
-                data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
-          </li>
-        <% end %>
+            <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
+            <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
+            <span class="caret"></span>
+          </button>
 
-      </ul>
-    </div><!-- /.input-group-btn -->
+          <ul class="dropdown-menu pull-right">
+            <li>
+              <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
+                  data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
+            </li>
+            <li>
+              <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
+                  data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
+            </li>
+            <li>
+              <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
+                  data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
+            </li>
+          <% end %>
 
-  </div><!-- /.input-group -->
+        </ul>
+      </div><!-- /.input-group-btn -->
+    </div><!-- /.input-group -->
+    
+  </div><!-- /.form-group -->
 <% end %>

data/app/views/hyrax/batch_select/_add_button.html.erb

@@ -1,3 +1,3 @@
 <div data-behavior="batch-add-button">
-  <%= check_box_tag "batch_document_ids[]", document.id, true, class:"batch_document_selector", id: "batch_document_#{document.id}" %>
-</div>
+  <%= check_box_tag "batch_document_ids[]", document.id, false, class:"batch_document_selector", id: "batch_document_#{document.id}" %>
+</div>

data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb

@@ -1,17 +1,15 @@
-<div class="clearfix proxy-rights">
-  <div class="row">
-    <div class="col-xs-6">
-      <table class="table table-condensed table-striped" id="authorizedProxies">
-        <tbody>
-        <% if user.can_receive_deposits_from.count == 0 %>
-          <%= t('hyrax.dashboard.no_proxies') %>
-        <% else %>
-          <% user.can_receive_deposits_from.each do |depositor| %>
-            <tr><td class="depositor-name"><%= depositor.name %></td></tr>
-          <% end %>
+<div class="row proxy-rights">
+  <div class="col-xs-6">
+    <table class="table table-condensed table-striped" id="authorizedProxies">
+      <tbody>
+      <% if user.can_receive_deposits_from.count == 0 %>
+        <%= t('hyrax.dashboard.no_proxies') %>
+      <% else %>
+        <% user.can_receive_deposits_from.each do |depositor| %>
+          <tr><td class="depositor-name"><%= depositor.name %></td></tr>
         <% end %>
-        </tbody>
-      </table>
-    </div>
+      <% end %>
+      </tbody>
+    </table>
   </div>
 </div>

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

@@ -0,0 +1,30 @@
+<div class="panel-heading">
+  <h3 class="panel-title"><%= t('.title') %></h3>
+  <div><%= t('.subtitle') %></div>
+</div>
+<div class="panel-body text-center">
+  <% repository_growth = @presenter.repository_growth.to_json %>
+  <div id="dashboard-growth" aria-hidden="true" style="height: 200px"><script>
+//<![CDATA[
+Hyrax.statistics.repositoryGrowth = <%== repository_growth %>
+//]]>
+</script></div>
+  <table aria-label="<%= t('.title') %>, <%= t('.subtitle') %>" class="table table-striped sr-only text-left">
+    <thead>
+      <tr>
+        <th><%= t('.date') %></th>
+        <th><%= t('.objects') %></th>
+        <th><%= t('.collections') %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% JSON.parse(repository_growth).each do |row| %>
+        <tr>
+          <td><%= row["y"] %></td>
+          <td><%= row["a"] %></td>
+          <td><%= row["b"] %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -0,0 +1,28 @@
+<div class="panel-heading">
+  <h3 class="panel-title"><%= t('.title') %></h3>
+    <div><%= t('.subtitle') %></div>
+</div>
+<div class="panel-body text-center">
+  <% repository_objects = @presenter.repository_objects.to_json %>
+  <div id="dashboard-repository-objects" aria-hidden="true" style="height: 200px"><script>
+//<![CDATA[
+Hyrax.statistics.repositoryObjects = <%== repository_objects %>
+//]]>
+</script></div>
+  <table aria-label="<%= t('.title') %>, <%= t('.subtitle') %>" class="table table-striped sr-only text-left">
+    <thead>
+      <tr>
+        <th><%= t('.status') %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% JSON.parse(repository_objects).each do |row| %>
+        <tr>
+          <td><%= row["label"] %></td>
+          <td><%= row["value"] %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -1,19 +1,21 @@
 <% menu = Hyrax::MenuPresenter.new(self) %>
 <div class="sidebar-toggle"><span class="fa fa-chevron-circle-right"></span></div>
-<ul class="nav nav-pills nav-stacked">
-  <li>
-    <div class="profile">
-      <div class="profile-image">
-        <%= image_tag current_user.avatar.url(:thumb), width: 100 if current_user.avatar.present? %>
+<nav>
+  <ul class="nav nav-pills nav-stacked">
+    <li>
+      <div class="profile">
+        <div class="profile-image">
+          <%= image_tag current_user.avatar.url(:thumb), width: 100 if current_user.avatar.present? %>
+        </div>
+        <div class="profile-data">
+          <div class="profile-data-name"><%= current_user.name %></div>
+        </div>
       </div>
-      <div class="profile-data">
-        <div class="profile-data-name"><%= current_user.name %></div>
-      </div>
-    </div>
-  </li>
+    </li>
 
-  <%= render 'hyrax/dashboard/sidebar/activity', menu: menu %>
-  <%= render 'hyrax/dashboard/sidebar/repository_content', menu: menu %>
-  <%= render 'hyrax/dashboard/sidebar/tasks', menu: menu %>
-  <%= render 'hyrax/dashboard/sidebar/configuration', menu: menu %>
-</ul>
+    <%= render 'hyrax/dashboard/sidebar/activity', menu: menu %>
+    <%= render 'hyrax/dashboard/sidebar/repository_content', menu: menu %>
+    <%= render 'hyrax/dashboard/sidebar/tasks', menu: menu %>
+    <%= render 'hyrax/dashboard/sidebar/configuration', menu: menu %>
+  </ul>
+</nav>

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

@@ -0,0 +1,28 @@
+<div class="panel-heading">
+  <h3 class="panel-title"><%= t('.title') %></h3>
+  <div><%= t('.subtitle') %></div>
+</div>
+<div class="panel-body text-center">
+  <% user_activity = @presenter.user_activity.to_json %>
+  <div id="user-activity" aria-hidden="true" style="height: 200px"><script>
+//<![CDATA[
+Hyrax.statistics.userActivity = <%== user_activity %>
+//]]>
+</script></div>
+  <table aria-label="<%= t('.title') %>, <%= t('.subtitle') %>" class="table table-striped sr-only text-left">
+    <thead>
+      <tr>
+        <th><%= t('.date') %></th>
+        <th><%= t('.new_users') %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% JSON.parse(user_activity).each do |row| %>
+        <tr>
+          <td><%= row["y"] %></td>
+          <td><%= row["a"] %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>