blacklight-spotlight 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2148d0879e24d68085e54c6fb9569af9900383d7bdb12c00f1568cf846e6b3c0
-  data.tar.gz: e2ff46720e4f722e64a47eeb29ceaf4cc7a981731942134b81ae0f94eb376b02
+  metadata.gz: 39211a3860e438e3c2e28f6bacc050376b3ab2d27e541050b76a59a17848a553
+  data.tar.gz: 6902e8411a19aa2832a6a839bab19b74782644e35359d54f3151df6e898c1333
 SHA512:
-  metadata.gz: 9a8590c2c12ab0c5df2e61ea8e5608a465564dd33ee7b6fb849578f98fb5aa5116b7706240ec2955065b6e0d1c65d1db4fa0837e2d73083fc4a0cf06cff7c0b6
-  data.tar.gz: 290494323ae7ccb37ccfd9e80df582df82814f6129025bc95d42dad2611ed7d105cb3cdc0c1cd40239edb05aa3dff4177ee784980209e8100cb0bf82351aba58
+  metadata.gz: dfdcfb3f10e852a74e960f51cf5b360897dac4279bfc8c0cede9a869595e49688ea596a802b0227b11c3459fc30d227de59e3210e9baa14e23a0813804c6a227
+  data.tar.gz: e57d609f2125a8042835d0d78950c67b94992f22ba1e38664301acc05bb9617374b513ce654b9b73b0a883719d2dec5b4e337dfe8908be1e71969dc7ae1b2b11

data/app/controllers/spotlight/admin_users_controller.rb

@@ -6,6 +6,8 @@ module Spotlight
   class AdminUsersController < Spotlight::ApplicationController
     before_action :authenticate_user!
     before_action :load_site
+    before_action :load_users
+
     load_and_authorize_resource :site, class: 'Spotlight::Site'
 
     def index; end
@@ -17,6 +19,19 @@ module Spotlight
       else
         flash[:error] = t('spotlight.admin_users.create.error')
       end
+
+      redirect_to spotlight.admin_users_path
+    end
+
+    def update
+      user = Spotlight::Engine.user_class.find(params[:id])
+      if user
+        Spotlight::Role.create(user_key: user.email, role: 'admin', resource: @site).save
+        flash[:notice] = t('spotlight.admin_users.create.success')
+      else
+        flash[:error] = t('spotlight.admin_users.create.error')
+      end
+
       redirect_to spotlight.admin_users_path
     end
 
@@ -32,6 +47,10 @@ module Spotlight
 
     private
 
+    def load_users
+      @users ||= ::User.all.reject(&:guest?)
+    end
+
     def load_site
       @site ||= Spotlight::Site.instance
     end

data/app/presenters/spotlight/iiif_manifest_presenter.rb

@@ -76,7 +76,8 @@ module Spotlight
     def iiif_url
       Spotlight::Engine.config.iiif_url_helpers.info_url(
         uploaded_resource.upload.id,
-        host: controller.request.host_with_port
+        host: controller.request.host_with_port,
+        protocol: controller.request.protocol
       ).sub(%r{/info\.json\Z}, '')
     end
   end

data/app/views/spotlight/admin_users/index.html.erb

@@ -1,7 +1,7 @@
 <div id="content" class="col-md-9 admin-users">
   <%= page_title(t('.section'), t('.page_title')) %>
   <%= bootstrap_form_for Spotlight::Engine.user_class.new, url: spotlight.admin_users_path do |f| %>
-    <p class="instructions"><%= t :'.instructions' %></p>
+    <h3 class="instructions"><%= t :'.instructions' %></h3>
     <table class="table table-striped ">
       <thead>
         <tr>
@@ -43,20 +43,50 @@
 
     <div class="form-actions">
       <div class="primary-actions">
-        <%= link_to(t('.add'), 'javascript:;', class: 'btn btn-default', data: { behavior: 'new-user' }) %>
+        <%= link_to(t('.create'), 'javascript:;', class: 'btn btn-default', data: { behavior: 'new-user' }) %>
       </div>
     </div>
-  <% end %>
 
-  <p class="instructions"><%= t :'.all_users' %></p>
-  <div id="all_users" class="well well-sm">
+    <h3 class="instructions"><%= t :'.admins_curators' %></h3>
+    <div id="admins_curators" class="well well-sm">
       <div class='btn-toolbar pull-right'>
-          <button class="btn btn-xs btn-default copy-email-addresses" data-clipboard-target="#all_users">
-              <%= t('.copy') %>
-          </button>
+        <button class="btn btn-xs btn-default copy-email-addresses" data-clipboard-target="#admins_curators">
+          <%= t('.copy') %>
+        </button>
       </div>
       <%= Spotlight::Engine.user_class.with_roles.pluck(:email).sort.join(', ') %>
-  </div>
+    </div>
+
+    <h3 class="instructions"><%= t :'.all_users' %></h3>
+    <table class="table table-striped ">
+      <thead>
+        <tr>
+          <th><%= Spotlight::Engine.user_class.human_attribute_name(:email)  %></th>
+          <th><%= Spotlight::Engine.user_class.human_attribute_name(:role)  %></th>
+        </tr>
+      </thead>
+      <tbody class="table">
+        <% @users.each do |user| %>
+          <tr>
+            <td class="<%= 'invite-pending' if user.invite_pending? %>">
+              <%= user.email %>
+              <span class='label label-warning pending-label'><%= t('.pending') %></span>
+            </td>
+            <td class="role">
+              <%= user.roles.map { |r| r.role.titleize }.uniq.join(", ") %>
+            </td>
+            <td>
+              <% if user.superadmin? %>
+                <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-danger pull-right') unless user == current_user %>
+              <% else %>
+                <%= link_to(t('.update'), admin_user_path(user), method: :patch, class: 'btn btn-default pull-right') %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% end %>
 </div>
 
 <aside class="col-md-3">

data/config/locales/spotlight.en.yml

@@ -172,20 +172,22 @@ en:
     admin_users:
       create:
         error: There was a problem adding the user as an exhibits adminstrator
-        success: Added user as an exhibits adminstrator
+        success: Added user as an adminstrator
       destroy:
         error: There was a problem removing the user from the site adminstrator role
         success: User removed from site adminstrator role
       index:
-        add: Add new administrator
-        all_users: Administrators and curators of all exhibits
+        admins_curators: Administrators and curators of all exhibits
+        all_users: All registered users
         copy: Copy
-        destroy: Remove from role
+        create: Add new administrator
+        destroy: Remove from admin role
         instructions: Existing exhibits administrators
-        page_title: Manage administrators
+        page_title: Manage users
         pending: pending
         save: Add role
         section: Manage exhibits
+        update: Make user an administrator
     appearances:
       edit:
         header: Appearance

data/config/routes.rb

@@ -16,7 +16,7 @@ Spotlight::Engine.routes.draw do
 
   get '/exhibits/edit', to: 'sites#edit_exhibits', as: 'edit_site_exhibits'
 
-  resources :admin_users, only: [:index, :create, :destroy]
+  resources :admin_users, only: [:index, :create, :update, :destroy]
 
   resources :exhibits, path: '/', except: [:show] do
     member do

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '2.10.0'
+  VERSION = '2.11.0'
 end

data/spec/controllers/spotlight/admin_users_controller_spec.rb

@@ -35,5 +35,15 @@ RSpec.describe Spotlight::AdminUsersController, type: :controller do
         expect(Spotlight::Site.instance.roles.where(user_id: user.id)).to be_none
       end
     end
+
+    describe 'PATCH update' do
+      let(:non_admin) { FactoryBot.create(:exhibit_visitor) }
+      it 'adds the site admin role to the given user' do
+        patch :update, params: { id: non_admin.id }
+        expect(response).to redirect_to(admin_users_path)
+        expect(flash[:notice]).to eq 'Added user as an adminstrator'
+        expect(non_admin.roles.map(&:role)).to eq ['admin']
+      end
+    end
   end
 end

data/spec/features/{site_admin_management_spec.rb → site_users_management_spec.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Site admin management', js: true do
+describe 'Site users management', js: true do
   let(:user) { FactoryBot.create(:site_admin) }
   let!(:existing_user) { FactoryBot.create(:exhibit_visitor) }
   let!(:exhibit_admin) { FactoryBot.create(:exhibit_admin) }
@@ -17,25 +17,14 @@ describe 'Site admin management', js: true do
 
   describe 'copy email addresses' do
     it 'displays only email addresses of users w/ roles' do
-      expect(page).to have_css('div#all_users', text: user.email)
-      expect(page).to have_css('div#all_users', text: exhibit_admin.email)
-      expect(page).to have_css('div#all_users', text: exhibit_curator.email)
-      expect(page).not_to have_css('div#all_users', text: existing_user.email)
+      expect(page).to have_css('div#admins_curators', text: user.email)
+      expect(page).to have_css('div#admins_curators', text: exhibit_admin.email)
+      expect(page).to have_css('div#admins_curators', text: exhibit_curator.email)
+      expect(page).not_to have_css('div#admins_curators', text: existing_user.email)
       expect(page).to have_css('button.copy-email-addresses')
     end
   end
 
-  it 'allows for existing users to be added as site adminstrators' do
-    expect(page).not_to have_css('td', text: existing_user.email)
-    click_link 'Add new administrator'
-
-    fill_in 'user_email', with: existing_user.email
-    click_button 'Add role'
-
-    expect(page).to have_content('Added user as an exhibits adminstrator')
-    expect(page).to have_css('td', text: existing_user.email)
-  end
-
   it 'allows non-existing users to be invited' do
     click_link 'Add new administrator'
 
@@ -55,15 +44,13 @@ describe 'Site admin management', js: true do
 
     expect(page).to have_css(:td, text: 'not-an-admin@example.com')
 
-    expect(page).to have_css(:a, text: 'Remove from role', count: 2)
+    expect(page).to have_css(:a, text: 'Remove from admin role', count: 4)
     within(all('table tbody tr').last) do
-      click_link 'Remove from role'
+      click_link 'Remove from admin role'
     end
 
     expect(page).to have_content 'User removed from site adminstrator role'
-    expect(page).to have_css(:a, text: 'Remove from role', count: 1)
-
-    expect(page).not_to have_css(:td, text: 'not-an-admin@example.com')
+    expect(page).to have_css(:a, text: 'Remove from admin role', count: 2)
   end
 
   it 'sends an invitation email to users who do not exist' do
@@ -82,6 +69,6 @@ describe 'Site admin management', js: true do
 
     expect(page).to have_css('td', text: user.email)
     # There are two users, the original site admin and our admin user so only one button
-    expect(page).to have_css(:a, text: 'Remove from role', count: 1)
+    expect(page).to have_css(:a, text: 'Remove from admin role', count: 2)
   end
 end

data/spec/presenters/spotlight/iiif_manifest_presenter_spec.rb

@@ -119,7 +119,8 @@ describe Spotlight::IiifManifestPresenter do
 
     describe '#iiif_url' do
       it 'returns the info_url from the Riiif engine routes, minus the trailing .json' do
-        expect(subject.send(:iiif_url)).to eq('http://localhost:3000/images/2')
+        controller.request.stub(:protocol).and_return('https')
+        expect(subject.send(:iiif_url)).to eq('https://localhost:3000/images/2')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-17 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1407,8 +1407,8 @@ files:
 - spec/features/main_navigation_spec.rb
 - spec/features/metadata_admin_spec.rb
 - spec/features/report_a_problem_spec.rb
-- spec/features/site_admin_management_spec.rb
 - spec/features/site_masthead_spec.rb
+- spec/features/site_users_management_spec.rb
 - spec/features/slideshow_spec.rb
 - spec/features/translation_scope_spec.rb
 - spec/fixtures/800x600.png
@@ -1643,7 +1643,6 @@ test_files:
 - spec/features/exhibit_themes_spec.rb
 - spec/features/exhibits_index_spec.rb
 - spec/features/add_items_spec.rb
-- spec/features/site_admin_management_spec.rb
 - spec/features/slideshow_spec.rb
 - spec/features/browse_category_admin_spec.rb
 - spec/features/item_admin_spec.rb
@@ -1660,6 +1659,7 @@ test_files:
 - spec/features/add_custom_field_metadata_spec.rb
 - spec/features/metadata_admin_spec.rb
 - spec/features/exhibit_masthead_spec.rb
+- spec/features/site_users_management_spec.rb
 - spec/features/exhibits/add_tags_spec.rb
 - spec/features/exhibits/administration_spec.rb
 - spec/features/exhibits/custom_metadata_fields_spec.rb