Merge pull request #113 from nycrecords/develop

Author: joelbcastillo

.env.example

@@ -1,5 +1,6 @@
 # Rails Settings
 RAILS_HOST=<RAILS HOST>
+APP_NAME=<APPLICATION NAME>
 SECRET_KEY_BASE=<SECRET_KEY>
 PORT=<RAILS PORT>
 

app/assets/javascripts/app.js.erb

@@ -5,3 +5,6 @@ Hyrax.workEditor = function () {
         new Editor(element).init();
     }
 }
+
+// Override sortAndPerPage to not auto reload on change
+Hyrax.sortAndPerPage = function () {}

app/assets/javascripts/required_reports_filters.js

@@ -0,0 +1,23 @@
+'use strict';
+
+$(document).ready(function () {
+    // Get current values from URL query string
+    let agencyFilter = $('#agency-filter');
+    let url = new URL(window.location.href);
+    let params = new URLSearchParams(url.search);
+    let agency = params.get('agency') || 'All';
+
+    // Initialize select2 and set initial value
+    agencyFilter.select2();
+    agencyFilter.select2('val', agency);
+    $('#s2id_agency-filter').attr('aria-label', 'Filter required reports by agency');
+
+    // Handle change of agency event
+    agencyFilter.on('change', function (data) {
+        agency = data.val;
+        params.set('agency', agency);
+        params.delete('page');
+        url.search = params.toString();
+        window.location.href = url.toString();
+    })
+});

app/assets/stylesheets/gpp.scss

@@ -244,4 +244,59 @@ body.gpp-dashboard {
     max-width: 250px;
     word-wrap: break-word;
   }
+}
+
+.gpp-nav-link {
+  color: black !important;
+}
+
+#required-report-filters {
+  text-align: center;
+  padding-bottom: 10px;
+}
+
+.agency-filter {
+  text-align: left;
+  padding-right: 10px;
+  min-width: 20%;
+}
+
+.center {
+  text-align: center;
+}
+
+.underline-link {
+  text-decoration: underline;
+  color: #036 !important;
+}
+
+.navbar-link {
+  text-decoration: underline;
+}
+
+a.gpp-nav-link:hover, a.gpp-nav-link:focus {
+  text-decoration: underline !important;
+}
+
+// Adds underline to links on the view submissions page
+li.attribute a {
+  text-decoration: underline;
+  color: #036 !important;
+}
+
+// Adds underline to links on the search results page
+dl.dl-horizontal dd a {
+  text-decoration: underline;
+  color: #036 !important;
+}
+
+// Adds underline to links in the user activity table on file details page
+table#activity a {
+  text-decoration: underline;
+  color: #036 !important;
+}
+
+// Changes color of focus outline globally
+:focus{
+  outline: 2px solid #337ab7 !important;
 }

app/controllers/required_reports_controller.rb

@@ -8,7 +8,21 @@ class RequiredReportsController < ApplicationController
   # GET /required_reports
   # GET /required_reports.json
   def index
-    @required_reports = RequiredReport.all
+    if params[:per_page].nil?
+      params[:per_page] = 20
+    end
+
+    if params[:agency].nil?
+      params[:agency] = 'All'
+    end
+
+    if params[:agency] == 'All' or params[:agency].nil?
+      @required_reports = RequiredReport.all.order(agency_name: :asc, name: :asc).page(params[:page]).per(params[:per_page])
+    else
+      @required_reports = RequiredReport.where(agency_name: params[:agency]).order(name: :asc).page(params[:page]).per(params[:per_page])
+    end
+
+    @agencies = Agency.all.order(name: :asc)
   end
 
   # GET /required_reports/1
@@ -94,7 +108,21 @@ def agency_required_reports
 
   # GET /required_reports/public_list
   def public_list
-    @required_reports = RequiredReport.all.order(agency_name: :asc, name: :asc)
+    if params[:per_page].nil?
+      params[:per_page] = 20
+    end
+
+    if params[:agency].nil?
+      params[:agency] = 'All'
+    end
+
+    if params[:agency] == 'All' or params[:agency].nil?
+      @required_reports = RequiredReport.all.order(agency_name: :asc, name: :asc).page(params[:page]).per(params[:per_page])
+    else
+      @required_reports = RequiredReport.where(agency_name: params[:agency]).order(name: :asc).page(params[:page]).per(params[:per_page])
+    end
+
+    @agencies = Agency.all.order(name: :asc)
     @search_url = [
         root_url(locale: nil) + 'catalog?utf8=%E2%9C%93&locale=en&agency=',
         '&required_report_name=',

app/controllers/users/omniauth_callbacks_controller.rb

@@ -16,6 +16,12 @@ def saml
     end
 
     user_json = nycidwebservices.search_user(saml_attrs[:GUID])
+    if user_json['nycEmployee'] == false
+      flash[:notice] = "Looks like you logged in with a public user account. That isn't needed to search reports so we've logged you out."
+      gpp_collection = Collection.where(title: 'Government Publications').first
+      path = gpp_collection.present? ? hyrax.collection_path(gpp_collection) : root_path
+      redirect_to path and return
+    end
     @user = User.from_omniauth(user_json)
     last_login_datetime = @user.last_sign_in_at