Are you sure?
' + button + ' No, Cancel' ).click -> diff --git a/app/assets/javascripts/direct_upload.js.coffee b/app/assets/javascripts/direct_upload.js.coffee index 71117dffae..53ff54cd0f 100644 --- a/app/assets/javascripts/direct_upload.js.coffee +++ b/app/assets/javascripts/direct_upload.js.coffee @@ -18,6 +18,7 @@ $ -> form = $(file_input.parents('form:first')) submit_button = form.find('input[type="submit"], *[data-trigger="submit"]') submit_button.on 'click', -> + form.addClass('form-disabled') $('.directupload input:file').fileupload 'send', files: $('.directupload input:file').prop('files') return false @@ -37,7 +38,6 @@ $ -> progress = parseInt(data.loaded / data.total * 100, 10) progress_bar.css('width', "#{progress}%") start: (e)-> - submit_button.prop('disabled', true) progress_bar. css('background', 'green'). css('display', 'block'). @@ -45,7 +45,7 @@ $ -> css('padding', '7px'). text("Loading...") done: (e, data)-> - submit_button.prop('disabled', false) + form.removeClass('form-disabled') progress_bar.text("Uploading done") # extract key and generate URL from response @@ -61,7 +61,7 @@ $ -> file_input.replaceWith(input) form.submit() fail: (e, data)-> - submit_button.prop('disabled', false) + form.removeClass('form-disabled') progress_bar. css("background", "red"). text("Failed") diff --git a/app/assets/javascripts/display_returned_items.js b/app/assets/javascripts/display_returned_items.js new file mode 100644 index 0000000000..8429370505 --- /dev/null +++ b/app/assets/javascripts/display_returned_items.js @@ -0,0 +1,25 @@ +/* + * Copyright 2011-2022, The Trustees of Indiana University and Northwestern + * University. Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * --- END LICENSE_HEADER BLOCK --- +*/ + +// Toggle display of returned items on checkouts page +$('#inactive_checkouts').on('change', function() { + var table = $('#checkouts-table').DataTable(); + if (this.checked) { + table.ajax.url('/checkouts.json?display_returned=true').load(); + } else { + table.ajax.url('/checkouts.json').load(); + } +}); diff --git a/app/assets/javascripts/dynamic_fields.js.coffee b/app/assets/javascripts/dynamic_fields.js.coffee index d2709edb39..fb0d4c802b 100644 --- a/app/assets/javascripts/dynamic_fields.js.coffee +++ b/app/assets/javascripts/dynamic_fields.js.coffee @@ -68,10 +68,10 @@ $ -> else current_input_group.after(new_input_group) - $(document).on 'click', '.remove-dynamic-field', (e) -> - e.preventDefault() - current_input_group = $(this).closest('.input-group') - textarea = current_input_group.data('textarea') - if typeof(textarea)!="undefined" - $(document.getElementById(textarea)).remove() - current_input_group.remove() + $(document).on 'click', '.remove-dynamic-field', (e) -> + e.preventDefault() + current_input_group = $(this).closest('.input-group') + textarea = current_input_group.data('textarea') + if typeof(textarea)!="undefined" + $(document.getElementById(textarea)).remove() + current_input_group.remove() diff --git a/app/assets/javascripts/localize_times.js b/app/assets/javascripts/localize_times.js new file mode 100644 index 0000000000..0c29368d66 --- /dev/null +++ b/app/assets/javascripts/localize_times.js @@ -0,0 +1,9 @@ +// Requires moment.js +function localize_times() { + $('*[data-utc-time]').each(function() { + $(this).text(moment($(this).data('utc-time')).format('LLL')) + }); +} + +$(document).ready(localize_times); +$(document).on('draw.dt', localize_times); diff --git a/app/assets/javascripts/media_player_wrapper/mejs4_helper_markers.es6 b/app/assets/javascripts/media_player_wrapper/mejs4_helper_markers.es6 index 49e72c39cc..7450b54e32 100644 --- a/app/assets/javascripts/media_player_wrapper/mejs4_helper_markers.es6 +++ b/app/assets/javascripts/media_player_wrapper/mejs4_helper_markers.es6 @@ -92,11 +92,12 @@ class MEJSMarkersHelper { // Show popover confirmation $button.popover({ - container: '#popover-container-' + $button[0].dataset.markerId, + container: '#popover-container-' + markerId, content: content, sanitize: false, html: true, - placement: 'top' + placement: 'top', + trigger: 'focus' }); $button.popover('show'); diff --git a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_marker_to_playlist.es6 b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_marker_to_playlist.es6 index 58e9dfa6e2..ccac158081 100644 --- a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_marker_to_playlist.es6 +++ b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_marker_to_playlist.es6 @@ -283,7 +283,7 @@ Object.assign(MediaElementPlayer.prototype, { handleControlClick: function(e) { const t = this; let addMarkerObj = t.addMarkerObj; - + // Exit full screen if(addMarkerObj.player.isFullScreen) { addMarkerObj.player.exitFullScreen(); diff --git a/app/assets/javascripts/move_section.js b/app/assets/javascripts/move_section.js index e2840dee4b..3cd0f4cf4d 100644 --- a/app/assets/javascripts/move_section.js +++ b/app/assets/javascripts/move_section.js @@ -14,7 +14,7 @@ * --- END LICENSE_HEADER BLOCK --- */ -$('#show_move_modal').on('click', function(){ +$('.show_move_modal').on('click', function(){ $('#move_modal').show(); var id = $(this).data('id'); // Set the URL for form POST action diff --git a/app/assets/stylesheets/avalon.scss b/app/assets/stylesheets/avalon.scss index e667597bce..adab8c6589 100644 --- a/app/assets/stylesheets/avalon.scss +++ b/app/assets/stylesheets/avalon.scss @@ -48,6 +48,10 @@ body { */ html { font-size: 14px; + + @include media-breakpoint-down(md) { + font-size: 12px; + } } .alert { @@ -139,6 +143,12 @@ div.alert-danger { h3 { margin-top: 0; } + + @include media-breakpoint-down(md) { + h1 { + font-size: 2rem; + } + } } // Generic content spacer @@ -399,6 +409,12 @@ a[data-trigger='submit'] { margin-top: 10px; margin-bottom: 10px; } + + @include media-breakpoint-down(sm) { + margin-top: 1rem; + padding: 0; + } + } .index_title { @@ -1095,6 +1111,11 @@ h5.card-title { padding-top: 5px; } +.form-disabled { + pointer-events: none; + opacity: 0.4; +} + .fileinput-close { padding-top: 5px; float: none; @@ -1166,4 +1187,92 @@ td { */ .irmp--transcript_nav { padding: 10px 0 0 0; -} \ No newline at end of file +} + +/* CDL controls on view page styles */ +.cdl-controls { + @include media-breakpoint-down(sm) { + margin-top: 1rem; + } + .remaining-time { + display: flex; + text-align: center; + + @include media-breakpoint-down(sm) { + margin: 0; + } + } + + .remaining-time p { + line-height: 1rem; + margin: 0.25rem; + text-align: left; + @include media-breakpoint-between(sm, md) { + padding: 0.75rem 0; + } + } + + .remaining-time span { + color: #fff; + margin-left: 0.25rem; + padding: 0.15rem 0.25rem; + border-radius: 0.15rem; + background: $primary; + font-size: small; + line-height: initial; + + @include media-breakpoint-between(sm, md) { + padding: 0.75rem 0.25rem; + } + } + + #return-btn { + @include media-breakpoint-down(sm) { + float: right; + } + } +} + +.checkout { + background-color: $dark; + color: $white; + + p { + position: relative; + text-align: center; + @include media-breakpoint-down(md) { + margin-bottom: 0; + } + } + + form { + width: fit-content; + margin: 0 auto; + } + + .centered { + margin: auto; + position: absolute; + width: 50%; + left: 25%; + } + + .centered.video { + top: 50%; + position: absolute; + margin: 0; + transform: translateY(-50%); + } +} + +.checkout.audio { + padding: 1rem; + height: 25%; +} + +.checkout.video { + padding: 3rem; + height: 50%; + position: relative; +} +/* End of CDL controls on view page styles */ diff --git a/app/assets/stylesheets/avalon/_form.scss b/app/assets/stylesheets/avalon/_form.scss index 52511a6a96..fc04d4ddb4 100644 --- a/app/assets/stylesheets/avalon/_form.scss +++ b/app/assets/stylesheets/avalon/_form.scss @@ -19,7 +19,6 @@ $border-radius-base: 4px !default; // Form-group input fields .form-group .input-group { - width: 100.5%; .form-control { border-radius: 0; @@ -53,7 +52,7 @@ $border-radius-base: 4px !default; .form-group .input-group.typed-textarea { .input-group-prepend:first-of-type { - width: 95%; + width: 96%; select { width: 100%; @@ -118,4 +117,10 @@ label { .form-label { font-weight: bold; } -} \ No newline at end of file +} + +#resource-description { + .input-group { + flex-wrap: nowrap; + } +} diff --git a/app/controllers/admin/collections_controller.rb b/app/controllers/admin/collections_controller.rb index d0bc1b6e92..21d24fc029 100644 --- a/app/controllers/admin/collections_controller.rb +++ b/app/controllers/admin/collections_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -56,6 +56,7 @@ def show @virtual_groups = @collection.default_virtual_read_groups @ip_groups = @collection.default_ip_read_groups @visibility = @collection.default_visibility + @default_lending_period = @collection.default_lending_period @addable_groups = Admin::Group.non_system_groups.reject { |g| @groups.include? g.name } @addable_courses = Course.all.reject { |c| @virtual_groups.include? c.context_id } @@ -257,6 +258,12 @@ def poster end end + rescue_from Avalon::VocabularyNotFound do |exception| + support_email = Settings.email.support + notice_text = I18n.t('errors.controlled_vocabulary_error') % [exception.message, support_email, support_email] + redirect_to root_path, flash: { error: notice_text.html_safe } + end + private def update_access(collection, params) @@ -298,6 +305,28 @@ def update_access(collection, params) collection.default_visibility = params[:visibility] unless params[:visibility].blank? collection.default_hidden = params[:hidden] == "1" + collection.cdl_enabled = params[:cdl] == "1" + if collection.cdl_enabled? + lending_period = build_default_lending_period(collection) + if lending_period.positive? + collection.default_lending_period = lending_period + elsif lending_period.zero? && params["add_lending_period_days"] && params["add_lending_period_hours"] + flash[:error] = "Lending period must be greater than 0." + end + end + end + + def build_default_lending_period(collection) + lending_period = 0 + d = params["add_lending_period_days"].to_i + h = params["add_lending_period_hours"].to_i + d.negative? ? collection.errors.add(:lending_period, "days needs to be a positive integer.") : lending_period += d.days + h.negative? ? collection.errors.add(:lending_period, "hours needs to be a positive integer.") : lending_period += h.hours + + flash[:error] = collection.errors.full_messages.join(' ') if collection.errors.present? + lending_period.to_i + rescue + 0 end def apply_access(collection, params) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7970642e36..e66b002e46 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -58,7 +58,9 @@ def rewrite_v4_ids end def store_location - store_location_for(:user, request.url) + if should_store_return_url? + store_location_for(:user, request.url) + end if request.env["omniauth.params"].present? && request.env["omniauth.params"]["login_popup"].present? session[:previous_url] = root_path + "self_closing.html" end @@ -74,7 +76,7 @@ def after_sign_in_path_for(_resource) # Used here and in omniauth_callbacks_controller def find_redirect_url(auth_type, lti_group: nil) - previous_url = session.delete :previous_url + previous_url = session.delete(:previous_url) || session.delete(:user_return_to) if params['target_id'] # Whitelist params that are allowed to be passed through via LTI objects_path(params['target_id'], params.permit('t', 'position', 'token')) @@ -101,6 +103,7 @@ def handle_api_request sign_in user, event: :authentication user_session[:json_api_login] = true user_session[:full_login] = false + user_session[:virtual_groups] = user.ldap_groups else render json: {errors: ["Permission denied."]}, status: 403 return @@ -159,7 +162,7 @@ def current_ability if request.format == :json head :unauthorized else - session[:previous_url] = request.fullpath unless request.xhr? + store_location_for(:user, request.fullpath) if should_store_return_url? render '/errors/restricted_pid', status: :unauthorized end end @@ -198,7 +201,7 @@ def authenticate_user!(_opts = {}) if request.format == :json head :unauthorized else - session[:previous_url] = request.fullpath unless request.xhr? + store_location_for(:user, request.fullpath) if should_store_return_url? render '/errors/restricted_pid', status: :unauthorized end end @@ -238,4 +241,8 @@ def strip_zero_width_chars!(obj) obj end end + + def should_store_return_url? + !(request.xhr? || request.format != "html" || request.path.start_with?("/users/") || request.path.end_with?("poster") || request.path.end_with?("thumbnail")) + end end diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index f02b325630..09d201ad65 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -189,6 +189,7 @@ class CatalogController < ApplicationController config.add_sort_field 'date_ssi desc, title_ssort asc', label: 'Date' config.add_sort_field 'creator_ssort asc, title_ssort asc', label: 'Main contributor' config.add_sort_field 'title_ssort asc, date_ssi desc', label: 'Title' + config.add_sort_field 'timestamp desc', label: 'Recently Updated', if: false # If there are more than this many search results, no spelling ("did you # mean") suggestion is offered. diff --git a/app/controllers/checkouts_controller.rb b/app/controllers/checkouts_controller.rb new file mode 100644 index 0000000000..0b0863ae8a --- /dev/null +++ b/app/controllers/checkouts_controller.rb @@ -0,0 +1,144 @@ +class CheckoutsController < ApplicationController + before_action :set_checkout, only: %i[show update destroy] + before_action :set_checkouts, only: %i[index return_all] + load_and_authorize_resource except: [:create] + + # GET /checkouts or /checkouts.json + def index + respond_to do |format| + format.html { render :index } + format.json do + response = { + "data": @checkouts.collect do |checkout| + if current_ability.is_administrator? + admin_array(checkout) + else + user_array(checkout) + end + end + } + render json: response + end + end + end + + # GET /checkouts/1.json + def show; end + + # POST /checkouts or /checkouts.json + def create + @checkout = Checkout.new(user: current_user, media_object_id: checkout_params[:media_object_id]) + + respond_to do |format| + # TODO: move this can? check into a checkout ability (can?(:create, @checkout)) + if can?(:create, @checkout) && @checkout.save + format.html { redirect_to media_object_path(checkout_params[:media_object_id]) } + format.json { render :show, status: :created, location: @checkout } + else + format.json { render json: @checkout.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /checkouts/1.json + def update + respond_to do |format| + if @checkout.update(checkout_params.slice(:return_time)) + # TODO: Change this since it will be called from the media object show page + format.json { render :show, status: :ok, location: @checkout } + else + format.json { render json: @checkout.errors, status: :unprocessable_entity } + end + end + end + + # PATCH /checkouts/1/return + def return + @checkout.update(return_time: DateTime.current) + + respond_to do |format| + format.html { redirect_back fallback_location: checkouts_url } + format.json { head :no_content } + end + end + + # PATCH /checkouts/return_all + def return_all + @checkouts.each { |c| c.update(return_time: DateTime.current) } + + respond_to do |format| + format.html { redirect_to checkouts_url } + format.json { head :no_content } + end + end + + # DELETE /checkouts/1 or /checkouts/1.json + def destroy + @checkout.destroy + flash[:notice] = "Checkout was successfully destroyed." + + respond_to do |format| + format.html { redirect_to checkouts_url, notice: flash[:notice] } + format.json { render json: flash[:notice] } + end + end + + private + + # Use callbacks to share common setup or constraints between actions. + def set_checkout + @checkout = Checkout.find(params[:id]) + end + + def set_checkouts + if params[:display_returned] == 'true' + @checkouts = if current_ability.is_administrator? + set_active_checkouts.or(Checkout.all.where("return_time <= now()")) + else + set_active_checkouts.or(Checkout.returned_for_user(current_user&.id)) + end + else + @checkouts = set_active_checkouts + end + end + + def set_active_checkouts + @checkouts = if current_ability.is_administrator? + Checkout.all.where("return_time > now()") + else + Checkout.active_for_user(current_user&.id) + end + end + + def admin_array(checkout) + [checkout.user.user_key] + user_array(checkout) + end + + def user_array(checkout) + [ + view_context.link_to(checkout.media_object.title, main_app.media_object_url(checkout.media_object)), + "", + "", + time_remaining(checkout), + checkout_actions(checkout) + ] + end + + def time_remaining(checkout) + if checkout.return_time > DateTime.current + view_context.distance_of_time_in_words(checkout.return_time - DateTime.current) + else + "-" + end + end + + def checkout_actions(checkout) + return '' unless checkout.return_time > DateTime.current + view_context.link_to('Return', return_checkout_url(checkout), class: 'btn btn-outline btn-xs', method: :patch) + end + + # Only allow a list of trusted parameters through. + def checkout_params + params.require(:checkout).permit(:media_object_id, :return_time, :display_returned) + end +end diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 3b8b2fee76..7bd7b380e1 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the diff --git a/app/controllers/derivatives_controller.rb b/app/controllers/derivatives_controller.rb index 4bc5ad8ae9..e2e8a6932d 100644 --- a/app/controllers/derivatives_controller.rb +++ b/app/controllers/derivatives_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the diff --git a/app/controllers/master_files_controller.rb b/app/controllers/master_files_controller.rb index 8357828d32..98854b85c4 100644 --- a/app/controllers/master_files_controller.rb +++ b/app/controllers/master_files_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -70,7 +70,7 @@ def show def embed if can? :read, @master_file - @stream_info = secure_streams(@master_file.stream_details) + @stream_info = secure_streams(@master_file.stream_details, @master_file.media_object_id) @stream_info['t'] = view_context.parse_media_fragment(params[:t]) # add MediaFragment from params @stream_info['link_back_url'] = view_context.share_link_for(@master_file) end @@ -411,14 +411,14 @@ def ensure_readable_filedata end def gather_hls_streams(master_file) - stream_info = secure_streams(master_file.stream_details) + stream_info = secure_streams(master_file.stream_details, master_file.media_object_id) hls_streams = stream_info[:stream_hls].reject { |stream| stream[:quality] == 'auto' } hls_streams.each { |stream| unnest_wowza_stream(stream) } if Settings.streaming.server == "wowza" hls_streams end def hls_stream(master_file, quality) - stream_info = secure_streams(master_file.stream_details) + stream_info = secure_streams(master_file.stream_details, master_file.media_object_id) hls_stream = stream_info[:stream_hls].select { |stream| stream[:quality] == quality } unnest_wowza_stream(hls_stream&.first) if Settings.streaming.server == "wowza" hls_stream diff --git a/app/controllers/media_objects_controller.rb b/app/controllers/media_objects_controller.rb index 313f08853d..4b457566ff 100644 --- a/app/controllers/media_objects_controller.rb +++ b/app/controllers/media_objects_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -30,7 +30,9 @@ class MediaObjectsController < ApplicationController before_action :load_player_context, only: [:show] def self.is_editor ctx - ctx.current_ability.is_editor_of?(ctx.instance_variable_get('@media_object').collection) + Rails.cache.fetch([ctx.hash, :is_editor], expires_in: 5.seconds) do + ctx.current_ability.is_editor_of?(ctx.instance_variable_get('@media_object').collection) + end end def self.is_lti_session ctx ctx.user_session.present? && ctx.user_session[:lti_group].present? @@ -318,7 +320,7 @@ def custom_update def index respond_to do |format| format.json { - paginate json: MediaObject.all + paginate json: MediaObject.accessible_by(current_ability, :index) } end end @@ -468,7 +470,7 @@ def manifest master_files = master_file_presenters canvas_presenters = master_files.collect do |mf| - stream_info = secure_streams(mf.stream_details) + stream_info = secure_streams(mf.stream_details, @media_object.id) IiifCanvasPresenter.new(master_file: mf, stream_info: stream_info) end presenter = IiifManifestPresenter.new(media_object: @media_object, master_files: canvas_presenters) @@ -516,6 +518,12 @@ def move_preview end end + rescue_from Avalon::VocabularyNotFound do |exception| + support_email = Settings.email.support + notice_text = I18n.t('errors.controlled_vocabulary_error') % [exception.message, support_email, support_email] + redirect_to root_path, flash: { error: notice_text.html_safe } + end + protected def master_file_presenters @@ -532,7 +540,8 @@ def master_file_presenters workflow_id: nil, comment: [], supplemental_files_json: nil - }) + }, + load_reflections: true) end def load_master_files(mode = :rw) @@ -546,7 +555,11 @@ def set_player_token def load_current_stream set_active_file set_player_token - @currentStreamInfo = @currentStream.nil? ? {} : secure_streams(@currentStream.stream_details) + @currentStreamInfo = if params[:id] + @currentStream.nil? ? {} : secure_streams(@currentStream.stream_details, params[:id]) + else + @currentStream.nil? ? {} : secure_streams(@currentStream.stream_details, @media_object.id) + end @currentStreamInfo['t'] = view_context.parse_media_fragment(params[:t]) # add MediaFragment from params @currentStreamInfo['lti_share_link'] = view_context.lti_share_url_for(@currentStream) @currentStreamInfo['link_back_url'] = view_context.share_link_for(@currentStream) diff --git a/app/controllers/playlists_controller.rb b/app/controllers/playlists_controller.rb index 04f2cc06c7..6e1215d70f 100644 --- a/app/controllers/playlists_controller.rb +++ b/app/controllers/playlists_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -63,7 +63,10 @@ def paged_index sort_column = params['order']['0']['column'].to_i rescue 0 sort_direction = params['order']['0']['dir'] rescue 'asc' session[:playlist_sort] = [sort_column, sort_direction] - if columns[sort_column] != 'size' + if columns[sort_column] == 'created_at' || columns[sort_column] == 'updated_at' + @playlists = @playlists.order("#{columns[sort_column].downcase} #{sort_direction}") + @playlists = @playlists.offset(params['start']).limit(params['length']) + elsif columns[sort_column] != 'size' @playlists = @playlists.order("lower(#{columns[sort_column].downcase}) #{sort_direction}, #{columns[sort_column].downcase} #{sort_direction}") @playlists = @playlists.offset(params['start']).limit(params['length']) else diff --git a/app/controllers/samvera/persona/users_controller.rb b/app/controllers/samvera/persona/users_controller.rb index 3ad5d7e1cd..64fc6b2889 100644 --- a/app/controllers/samvera/persona/users_controller.rb +++ b/app/controllers/samvera/persona/users_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -52,17 +52,10 @@ def paged_index # Filtering search_value = params['search']['value'] @presenter = if search_value.present? - search_role = @presenter.select { |p| p.groups.any? { |g| g.include? search_value } } - search_date = @presenter.select { |p| last_sign_in(p).to_formatted_s(:long_ordinal).include? search_value } - search_status = @presenter.select { |p| user_status(p).downcase.include? search_value.downcase } @presenter.where(%( username LIKE :search_value OR - email LIKE :search_value OR - provider LIKE :search_value + email LIKE :search_value ), search_value: "%#{search_value}%") - .or(User.where(id: search_role.map(&:id))) - .or(User.where(id: search_date.map(&:id))) - .or(User.where(id: search_status.map(&:id))) else @presenter end @@ -74,16 +67,12 @@ def paged_index sort_column = params['order']['0']['column'].to_i rescue 0 sort_direction = params['order']['0']['dir'] == 'desc' ? 'desc' : 'asc' rescue 'asc' session[:presenter_sort] = [sort_column, sort_direction] - if columns[sort_column] != 'entry' - @presenter = @presenter.order("lower(#{columns[sort_column].downcase}) #{sort_direction}, #{columns[sort_column].downcase} #{sort_direction}") - @presenter = @presenter.offset(params['start']).limit(params['length']) - else - user_roles = @presenter.collect { |p| [ p.groups, p ] } - user_roles.sort_by! { |r| [-r[0].length, r] } - @presenter = user_roles.collect { |p| p[1] } - @presenter.reverse! if sort_direction == 'desc' - @presenter = @presenter.slice(params['start'].to_i, params['length'].to_i) - end + @presenter = if columns[sort_column] == 'last_sign_in_at' + @presenter.order("#{columns[sort_column].downcase} #{sort_direction}") + elsif columns[sort_column] != 'entry' + @presenter.order("lower(#{columns[sort_column].downcase}) #{sort_direction}, #{columns[sort_column].downcase} #{sort_direction}") + end + @presenter = @presenter.offset(params['start']).limit(params['length']) # Build json response response = { @@ -98,7 +87,7 @@ def paged_index view_context.link_to('Edit', main_app.edit_persona_user_path(presenter)) end become_button = view_context.link_to('Become', main_app.impersonate_persona_user_path(presenter), method: :post) - delete_button = view_context.link_to('Delete', main_app.persona_user_path(presenter), method: :delete, class: 'btn btn-danger btn-xs action-delete', data: { confirm: "Are you sure you wish to delete the user '#{presenter.email}'? This action is irreversible." }) + delete_button = view_context.link_to('Delete', main_app.persona_user_path(presenter), method: :delete, class: 'btn btn-danger btn-sm action-delete', data: { confirm: "Are you sure you wish to delete the user '#{presenter.email}'? This action is irreversible." }) formatted_roles = format_roles(presenter.groups) sign_in = last_sign_in(presenter) [ @@ -191,7 +180,7 @@ def load_user def app_view_path my_engine_root = Samvera::Persona::Engine.root.to_s - prepend_view_path "#{my_engine_root}/app/views/#{Rails.application.class.parent_name.downcase}" + prepend_view_path "#{my_engine_root}/app/views/#{Rails.application.class.module_parent_name.downcase}" prepend_view_path Rails.root.join('app', 'views') end diff --git a/app/controllers/supplemental_files_controller.rb b/app/controllers/supplemental_files_controller.rb index 7078b0e8c7..17c516f169 100644 --- a/app/controllers/supplemental_files_controller.rb +++ b/app/controllers/supplemental_files_controller.rb @@ -145,6 +145,7 @@ def object_supplemental_file_path end def authorize_object - authorize! action_name.to_sym, @object, message: "You do not have sufficient privileges to #{action_name} this supplemental file" + action = action_name.to_sym == :show ? :show : :edit + authorize! action, @object, message: "You do not have sufficient privileges to #{action_name} this supplemental file" end end diff --git a/app/controllers/timelines_controller.rb b/app/controllers/timelines_controller.rb index 295ea38231..8b9b84be66 100644 --- a/app/controllers/timelines_controller.rb +++ b/app/controllers/timelines_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -58,7 +58,11 @@ def paged_index sort_direction = params['order']['0']['dir'] rescue 'asc' session[:timeline_sort] = [sort_column, sort_direction] - @timelines = @timelines.order("lower(#{columns[sort_column].downcase}) #{sort_direction}, #{columns[sort_column].downcase} #{sort_direction}") + @timelines = if columns[sort_column] == 'updated_at' + @timelines.order("#{columns[sort_column].downcase} #{sort_direction}") + else + @timelines.order("lower(#{columns[sort_column].downcase}) #{sort_direction}, #{columns[sort_column].downcase} #{sort_direction}") + end @timelines = @timelines.offset(params['start']).limit(params['length']) response = { "draw": params['draw'], @@ -99,13 +103,13 @@ def show authorize! :read, @timeline respond_to do |format| format.html do - url_fragment = "noHeader=true&noFooter=true&noSourceLink=false" + url_fragment = "noHeader=true&noFooter=true&noSourceLink=false&noVideo=false" if current_user == @timeline.user - url_fragment += "&resource=#{Addressable::URI.escape_component(manifest_timeline_url(@timeline, format: :json), '://?=')}" - url_fragment += "&callback=#{Addressable::URI.escape_component(manifest_timeline_url(@timeline, format: :json), '://?=')}" + url_fragment += "&resource=#{Addressable::URI.escape_component(manifest_timeline_url(@timeline, format: :json), /[:\/?=]/)}" + url_fragment += "&callback=#{Addressable::URI.escape_component(manifest_timeline_url(@timeline, format: :json), /[:\/?=]/)}" elsif current_user - url_fragment += "&resource=#{Addressable::URI.escape_component(manifest_timeline_url(@timeline, format: :json, token: @timeline.access_token), '://?=')}" - url_fragment += "&callback=#{Addressable::URI.escape_component(timelines_url, '://?=')}" + url_fragment += "&resource=#{Addressable::URI.escape_component(manifest_timeline_url(@timeline, format: :json, token: @timeline.access_token), /[:\/?=]/)}" + url_fragment += "&callback=#{Addressable::URI.escape_component(timelines_url, /[:\/?=]/)}" end @timeliner_iframe_url = timeliner_path + "##{url_fragment}" end @@ -193,12 +197,12 @@ def destroy end # GET /timelines/1/manifest.json + # GET /timelines/1/manifest def manifest authorize! :read, @timeline respond_to do |format| - format.json do - render json: @timeline.manifest - end + format.json { render json: @timeline.manifest } + format.html { render json: @timeline.manifest } end end diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 4beb1f4291..e1d65c88a1 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -87,4 +87,9 @@ def find_user(auth_type) notice_text = I18n.t('errors.deleted_auth_error') % [support_email, support_email] redirect_to root_path, flash: { error: notice_text.html_safe } end + + rescue_from OAuth::Signature::UnknownSignatureMethod do |exception| + notice_text = I18n.t('errors.general_auth_error') + redirect_to root_path, flash: { error: notice_text } + end end diff --git a/app/controllers/vocabulary_controller.rb b/app/controllers/vocabulary_controller.rb index e74f22faff..e6d75a6874 100644 --- a/app/controllers/vocabulary_controller.rb +++ b/app/controllers/vocabulary_controller.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -32,9 +32,13 @@ def update render json: {errors: ["No update value sent"]}, status: 422 and return end - v = Avalon::ControlledVocabulary.vocabulary - v[params[:id].to_sym] |= Array(params[:entry]) - result = Avalon::ControlledVocabulary.vocabulary = v + @v = Avalon::ControlledVocabulary.vocabulary + begin + build_update(@v) + rescue NoMethodError + render json: {errors: ["Update failed. Ensure that the new entry is in the proper form for the intended vocabulary."]}, status: 422 and return + end + result = Avalon::ControlledVocabulary.vocabulary = @v if result head :ok, content_type: 'application/json' else @@ -50,4 +54,16 @@ def verify_vocabulary_exists end end + def build_update(vocabulary) + if vocabulary_params[:entry].is_a?(ActionController::Parameters) + new_entry = vocabulary_params[:entry].to_hash + @v[params[:id].to_sym].merge!(new_entry) + else + @v[params[:id].to_sym] |= Array(params[:entry]) + end + end + + def vocabulary_params + params.permit(entry: {}) + end end diff --git a/app/helpers/blacklight/local_blacklight_helper.rb b/app/helpers/blacklight/local_blacklight_helper.rb index a60bc9a936..50d14df05b 100644 --- a/app/helpers/blacklight/local_blacklight_helper.rb +++ b/app/helpers/blacklight/local_blacklight_helper.rb @@ -86,4 +86,14 @@ def render_document_class(document) classes << "row" classes.join(' ') end + + # Override of blacklight for classes used for main content of Blacklight page + def main_content_classes + 'col-sm-12 col-md-8' + end + + # Override of blacklight for classes used for sidebar content of Blacklight page + def sidebar_classes + 'page-sidebar col-sm-12 col-md-4' + end end diff --git a/app/helpers/devise_helper.rb b/app/helpers/cdl_helper.rb similarity index 72% rename from app/helpers/devise_helper.rb rename to app/helpers/cdl_helper.rb index a2654dd0e9..364b0a9cf0 100644 --- a/app/helpers/devise_helper.rb +++ b/app/helpers/cdl_helper.rb @@ -1,24 +1,21 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the # specific language governing permissions and limitations under the License. # --- END LICENSE_HEADER BLOCK --- -module DeviseHelper - def devise_error_messages! - return "" if resource.errors.empty? - - flash[:error] = I18n.t("errors.messages.not_saved", - count: resource.errors.count, - resource: resource.class.model_name.human.downcase - ) + +module CdlHelper + def lending_enabled?(context) + return context&.cdl_enabled? if Avalon::Configuration.controlled_digital_lending_enabled? + false end end diff --git a/app/helpers/security_helper.rb b/app/helpers/security_helper.rb index 50bbcd110c..98bc0821cc 100644 --- a/app/helpers/security_helper.rb +++ b/app/helpers/security_helper.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -13,19 +13,31 @@ # --- END LICENSE_HEADER BLOCK --- module SecurityHelper + include CdlHelper + def add_stream_cookies(stream_info) SecurityHandler.secure_cookies(target: stream_info[:id], request_host: request.server_name).each_pair do |name, value| cookies[name] = value end end - def secure_streams(stream_info) + def secure_streams(stream_info, media_object_id) + add_stream_url(stream_info) unless not_checked_out?(media_object_id) + stream_info + end + + def add_stream_url(stream_info) add_stream_cookies(id: stream_info[:id]) [:stream_hls].each do |protocol| stream_info[protocol].each do |quality| quality[:url] = SecurityHandler.secure_url(quality[:url], session: session, target: stream_info[:id], protocol: protocol) end end - stream_info end + + private + + def not_checked_out?(media_object_id) + lending_enabled?(MediaObject.find(media_object_id)) && Checkout.checked_out_to_user(media_object_id, current_user&.id).empty? + end end diff --git a/app/javascript/components/collections/Collection.scss b/app/javascript/components/collections/Collection.scss index 481b716589..c5691361c7 100644 --- a/app/javascript/components/collections/Collection.scss +++ b/app/javascript/components/collections/Collection.scss @@ -50,16 +50,11 @@ /* Collection cards */ .collection-card { - height: 415px; + height: 95%; overflow: hidden; - // For medium screens - @media (min-width: 768px) and (max-width: 1199.98px) { - height: 420px; - } - - // For smaller screens - @media screen and (max-width: 767px) { + // For smaller screens set height to auto + @media screen and (max-width: 575.98px) { height: auto; } @@ -72,6 +67,8 @@ .card-body { padding-top: 5px; padding-bottom: 0px; + padding-right: 1rem; + padding-left: 1rem; } } @@ -81,6 +78,36 @@ .italic { font-style: italic; } + + // When `line-clamp` is used with `display: -webkit-box` + // contains text to a given amount of lines (e.g.: 2) + // Reference: https://mgearon.com/css/line-clamp-css-guide/ + h4 { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } +} + +.card-text { + font-size: 14px; + + dt, dd { + width: 100%; + padding-right: 8px; + padding-left: 8px; + } + + // Limit metadata values to 2 lines in cards + dd { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } } .search-within-facets { @@ -101,6 +128,23 @@ margin-top: 3rem; padding-left: 0; + // Using flexbox to adjust all card heights to match the tallest card height + @media screen and (min-width: 575.98px) { + display: flex; + flex-direction: row; + padding: 10px; + + li { + padding-right: 10px; + flex-grow: 1; + width: 33%; + + &:last-child { + padding-right: 0; + } + } + } + .document-thumbnail { position: relative; } @@ -205,4 +249,4 @@ display: block; width: fit-content; margin-top: 10px; -} \ No newline at end of file +} diff --git a/app/javascript/components/collections/landing/SearchResultsCard.js b/app/javascript/components/collections/landing/SearchResultsCard.js index 0fde8c633f..35ddd42276 100644 --- a/app/javascript/components/collections/landing/SearchResultsCard.js +++ b/app/javascript/components/collections/landing/SearchResultsCard.js @@ -25,9 +25,6 @@ const CardMetaData = ({ doc, fieldLabel, fieldName }) => { let value = doc.attributes[fieldName]?.attributes?.value; if (Array.isArray(value) && value.length > 1) { metaData = value.join(', '); - } else if (typeof value == 'string') { - const summary = value.substring(0, 50); - metaData = value.length >= 50 ? `${summary}...` : value; } else { metaData = value; } @@ -35,8 +32,8 @@ const CardMetaData = ({ doc, fieldLabel, fieldName }) => { if (doc.attributes[fieldName]) { return (Borrow this item to access media resources.
" + not_available_message: "This resource is currently checked out by another user. This item is due to be returned on .
" + time_remaining: "Time
remaining:
You are not signed in. You may be able to borrow this item after signing in.
" + expire: + heading: "Check Out Expired!" + message: "Your lending period has been expired. Please return the item, and check for availability later." metadata_tip: abstract: | Summary provides a space for describing the contents of the item. Examples @@ -135,6 +147,7 @@ en: grouplabel: "Avalon Group" classlabel: "External Group" ipaddresslabel: "IP Address or Range" + lending_periodlabel: "Lending Period" depositor: | Depositors add media to the collection and describe it with metadata. They can publish items but not unpublish. They can only modify or @@ -163,6 +176,9 @@ en: or ffaa:aaff:bbcc:ddee:1122:3344:5566:7777 or ffaa:aaff:bbcc:ddee:1122:3344:5566:7777/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff00 Start and end dates are not required; if included, access for the specified IP Address(es) will start at the beginning of the start date and end at the beginning of the end date. Otherwise, access will be open ended for the specified IP Address(es). + lending_period: | + Lending Period is the length of time that an item may be checked out for. + Day and Hour values must be positive integers. contact: title: 'Contact Us - %{application_name}' @@ -246,7 +262,7 @@ en: timeline: title: "Title" description: "Description" - user: + user: login: "Username or email" iiif: diff --git a/config/routes.rb b/config/routes.rb index e5ed6d1102..99a0b74db9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,6 +26,16 @@ end end + resources :checkouts, only: [:index, :create, :show, :update, :destroy], :constraints => lambda { |request| Avalon::Configuration.controlled_digital_lending_enabled? } do + collection do + patch :return_all + end + + member do + patch :return + end + end + resources :bookmarks do concerns :exportable @@ -197,7 +207,7 @@ member do patch 'regenerate_access_token' post 'manifest', to: 'timelines#manifest_update', constraints: { format: 'json' } - get 'manifest', constraints: { format: 'json' } + get 'manifest' end collection do post 'duplicate' diff --git a/config/settings.yml b/config/settings.yml index b742367789..7ae15aaeb0 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -95,4 +95,8 @@ waveform: active_storage: service: local #bucket: supplementalfiles - +controlled_digital_lending: + enable: false + # Choose whether every collection has CDL enabled or disabled by default + collections_enabled: false + default_lending_period: 'P14D' # ISO8601 duration format: P14D == 14.days, PT8H == 8.hours, etc. diff --git a/db/migrate/20220526185425_create_checkouts.rb b/db/migrate/20220526185425_create_checkouts.rb new file mode 100644 index 0000000000..01ac8c2e4c --- /dev/null +++ b/db/migrate/20220526185425_create_checkouts.rb @@ -0,0 +1,12 @@ +class CreateCheckouts < ActiveRecord::Migration[6.0] + def change + create_table :checkouts do |t| + t.references :user, foreign_key: true + t.string :media_object_id + t.datetime :checkout_time + t.datetime :return_time + + t.timestamps + end + end +end diff --git a/db/migrate/20220822170237_change_active_encode_encode_records_raw_object_to_medium_text.rb b/db/migrate/20220822170237_change_active_encode_encode_records_raw_object_to_medium_text.rb new file mode 100644 index 0000000000..939a30b946 --- /dev/null +++ b/db/migrate/20220822170237_change_active_encode_encode_records_raw_object_to_medium_text.rb @@ -0,0 +1,5 @@ +class ChangeActiveEncodeEncodeRecordsRawObjectToMediumText < ActiveRecord::Migration[6.0] + def change + change_column :active_encode_encode_records, :raw_object, :text, limit: 16777215 + end +end diff --git a/db/schema.rb b/db/schema.rb index 1081f1f488..cae4d0b097 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,14 +10,14 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_02_18_184645) do +ActiveRecord::Schema.define(version: 2022_08_22_170237) do create_table "active_encode_encode_records", force: :cascade do |t| t.string "global_id" t.string "state" t.string "adapter" t.string "title" - t.text "raw_object" + t.text "raw_object", limit: 16777215 t.datetime "created_at", null: false t.datetime "updated_at", null: false t.text "create_options" @@ -115,6 +115,16 @@ t.index ["user_id"], name: "index_bookmarks_on_user_id" end + create_table "checkouts", force: :cascade do |t| + t.integer "user_id" + t.string "media_object_id" + t.datetime "checkout_time" + t.datetime "return_time" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["user_id"], name: "index_checkouts_on_user_id" + end + create_table "courses", force: :cascade do |t| t.string "context_id" t.string "title" @@ -269,4 +279,5 @@ end add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" + add_foreign_key "checkouts", "users" end diff --git a/docker-compose.yml b/docker-compose.yml index af47c2ffe3..1038e2caaf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,7 +45,7 @@ services: image: solr:8-slim volumes: - ./solr/conf:/opt/solr/avalon_conf - - solr:/opt/solr/server/solr/mycores + - solr:/var/solr command: - solr-precreate - avalon @@ -116,7 +116,7 @@ services: - SETTINGS__DROPBOX__PATH=s3://masterfiles/dropbox/ - SETTINGS__DROPBOX__UPLOAD_URI=s3://masterfiles/dropbox/ - SETTINGS__MASTER_FILE_MANAGEMENT__PATH=s3://preserves/ - - SETTINGS__MASTER_FILE_MANAGEMENT__STRATEGY=MOVE + - SETTINGS__MASTER_FILE_MANAGEMENT__STRATEGY=move - SETTINGS__STREAMING__CONTENT_PATH=/ - SETTINGS__STREAMING__STREAM_DEFAULT_QUALITY=medium - SETTINGS__STREAMING__HTTP_BASE=http://localhost:8880/avalon @@ -186,7 +186,7 @@ services: entrypoint: > /bin/sh -c " /usr/bin/mc config host add myminio http://minio:9000 minio minio123; - /usr/bin/mc mb -p myminio/fcrepo myminio/masterfiles myminio/derivatives myminio/supplementalfiles; + /usr/bin/mc mb -p myminio/fcrepo myminio/masterfiles myminio/derivatives myminio/supplementalfiles myminio/preserves; /usr/bin/mc policy set download myminio/derivatives; /usr/bin/mc policy set download myminio/supplementalfiles; exit 0; diff --git a/lib/avalon/configuration.rb b/lib/avalon/configuration.rb index 9e6d22d106..cc4a386dc9 100644 --- a/lib/avalon/configuration.rb +++ b/lib/avalon/configuration.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -35,6 +35,11 @@ def sanitize_filename end end + # To be called as Avalon::Configuration.controlled_digital_lending_enabled? + def controlled_digital_lending_enabled? + !!Settings.controlled_digital_lending&.enable + end + private class << self def coerce(value, method) diff --git a/lib/avalon/errors.rb b/lib/avalon/errors.rb index 77983f1c57..d9c66050a1 100644 --- a/lib/avalon/errors.rb +++ b/lib/avalon/errors.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -17,4 +17,5 @@ class AvalonError < StandardError; end class BadRequest < AvalonError; end class NotFound < AvalonError; end class SaveError < AvalonError; end + class VocabularyNotFound < AvalonError; end end diff --git a/lib/day_hour_string.rb b/lib/day_hour_string.rb new file mode 100644 index 0000000000..2550144ab9 --- /dev/null +++ b/lib/day_hour_string.rb @@ -0,0 +1,31 @@ +# Copyright 2011-2022, The Trustees of Indiana University and Northwestern +# University. Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software distributed +# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +# CONDITIONS OF ANY KIND, either express or implied. See the License for the +# specific language governing permissions and limitations under the License. +# --- END LICENSE_HEADER BLOCK --- + +module DayHourString + def to_day_hour_s + d, h = (self / 3600).divmod(24) + + day_string = d.positive? ? d.to_s + ' day'.pluralize(d) : nil + hour_string = h.positive? ? h.to_s + ' hour'.pluralize(h) : nil + + if day_string.nil? + hour_string + elsif hour_string.nil? + day_string + else + day_string + ' ' + hour_string + end + end +end +ActiveSupport::Duration.prepend(DayHourString) diff --git a/package.json b/package.json index 60df154e7f..fa2041f6ef 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "babel-plugin-transform-react-remove-prop-types": "^0.4.24", "cropperjs": "^1.5.5", "hls.js": "https://github.com/avalonmediasystem/hls.js#stricter_ts_probing", + "moment": "^2.29.4", "prop-types": "^15.7.2", "react": "^16.8.4", "react-bootstrap": "^1.0.0", @@ -27,21 +28,11 @@ "webpack-dev-server": "^4.9.1" }, "resolutions": { - "elliptic": "^6.5.2", - "follow-redirects": "^1.14.9", - "fstream": "^1.0.12", - "js-yaml": "^3.13.1", - "lodash": "^4.17.19", - "lodash.template": "^4.5.0", - "lodash.mergewith": "^4.6.2", - "mixin-deep": "^1.3.2", - "node-fetch": "^2.6.7", - "serialize-javascript": "^3.1.0", - "set-value": "^4.0.1", - "tar": "^4.4.19", - "acorn": "^6.4.1", - "kind-of": "^6.0.3", - "dot-prop": "^5.2.0" + "glob-parent": "^6.0.2", + "unset-value": "^2.0.1", + "nth-check": "^2.1.1", + "set-value": "^4.1.0", + "kind-of": "^6.0.3" }, "scripts": { "start-collection-index": "webpack-dev-server --mode development --config config/webpack/collection_index.js --host 0.0.0.0", diff --git a/podman-compose.yml b/podman-compose.yml index 7fdc07de78..d4066de511 100644 --- a/podman-compose.yml +++ b/podman-compose.yml @@ -131,7 +131,7 @@ services: - SETTINGS__DROPBOX__PATH=s3://masterfiles/dropbox/ - SETTINGS__DROPBOX__UPLOAD_URI=s3://masterfiles/dropbox/ - SETTINGS__MASTER_FILE_MANAGEMENT__PATH=s3://preserves/ - - SETTINGS__MASTER_FILE_MANAGEMENT__STRATEGY=MOVE + - SETTINGS__MASTER_FILE_MANAGEMENT__STRATEGY=move - SETTINGS__STREAMING__CONTENT_PATH=/ - SETTINGS__STREAMING__STREAM_DEFAULT_QUALITY=medium - SETTINGS__STREAMING__HTTP_BASE=http://localhost:8880/avalon @@ -202,7 +202,7 @@ services: entrypoint: > /bin/sh -c " /usr/bin/mc config host add myminio http://minio:9000 minio minio123; - /usr/bin/mc mb -p myminio/fcrepo myminio/masterfiles myminio/derivatives myminio/supplementalfiles; + /usr/bin/mc mb -p myminio/fcrepo myminio/masterfiles myminio/derivatives myminio/supplementalfiles myminio/preserves; /usr/bin/mc policy set download myminio/derivatives; /usr/bin/mc policy set download myminio/supplementalfiles; exit 0; diff --git a/spec/controllers/admin_collections_controller_spec.rb b/spec/controllers/admin_collections_controller_spec.rb index f032a5cd59..db1809ef2f 100644 --- a/spec/controllers/admin_collections_controller_spec.rb +++ b/spec/controllers/admin_collections_controller_spec.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -185,6 +185,16 @@ get 'index', params: { user: 'foobar', format:'json' } expect(json.count).to eq(0) end + + context 'information is missing from the controlled vocabulary file' do + it 'should redirect to the homepage' do + allow(Avalon::ControlledVocabulary).to receive(:vocabulary).and_return({}) + login_as(:administrator) + get 'index' + expect(response).to redirect_to(root_path) + expect(flash[:error]).to be_present + end + end end describe 'pagination' do @@ -264,6 +274,34 @@ #TODO add check that mediaobject is serialized to json properly end + context 'user is a collection manager' do + let(:manager) { FactoryBot.create(:manager) } + before(:each) do + ApiToken.create token: 'manager_token', username: manager.username, email: manager.email + request.headers['Avalon-Api-Key'] = 'manager_token' + end + context 'user does not manage this collection' do + it "should return a 401 response code" do + get 'items', params: { id: collection.id, format: 'json' } + expect(response.status).to eq(401) + end + it 'should not return json for specific collection\'s media_objects' do + get 'items', params: { id: collection.id, format: 'json' } + expect(response.body).to be_empty + end + end + context 'user manages this collection' do + let!(:collection) { FactoryBot.create(:collection, items: 2, managers: [manager.username]) } + it "should not return a 401 response code" do + get 'items', params: { id: collection.id, format: 'json' } + expect(response.status).not_to eq(401) + end + it "should return json for specific collection's media objects" do + get 'items', params: { id: collection.id, format: 'json' } + expect(JSON.parse(response.body)).to include(collection.media_objects[0].id,collection.media_objects[1].id) + end + end + end end describe "#create" do @@ -424,8 +462,65 @@ collection.reload expect(collection.default_visibility).to eq("public") end + + context "cdl functionality" do + context "cdl disabled for application" do + before { allow(Settings.controlled_digital_lending).to receive(:enable).and_return(false) } + it "enable cdl for collection" do + put 'update', params: { id: collection.id, save_access: "Save Access Settings", cdl: "1" } + collection.reload + expect(collection.cdl_enabled).to be true + expect(flash[:error]).not_to be_present + end + end + context "cdl enable for application" do + before { allow(Settings.controlled_digital_lending).to receive(:enable).and_return(true) } + it "disable cdl for collection" do + put 'update', params: { id: collection.id, save_access: "Save Access Settings" } + collection.reload + expect(collection.cdl_enabled).to be false + end + end + end end + context "changing lending period" do + it "sets a custom lending period" do + expect { put 'update', params: { id: collection.id, save_access: "Save Access Settings", cdl: 1, add_lending_period_days: 7, add_lending_period_hours: 8 } }.to change { collection.reload.default_lending_period }.to(633600) + end + + it "returns error if invalid" do + expect { put 'update', params: { id: collection.id, save_access: "Save Access Settings", cdl: 1, add_lending_period_days: -1, add_lending_period_hours: -1 } }.not_to change { collection.reload.default_lending_period } + expect(response).to redirect_to(admin_collection_path(collection)) + expect(flash[:error]).to be_present + expect(flash[:error]).to eq("Lending period must be greater than 0.") + put 'update', params: { id: collection.id, save_access: "Save Access Settings", cdl: 1, add_lending_period_days: -1, add_lending_period_hours: 1 } + expect(response).to redirect_to(admin_collection_path(collection)) + expect(flash[:error]).to be_present + expect(flash[:error]).to eq("Lending period days needs to be a positive integer.") + put 'update', params: { id: collection.id, save_access: "Save Access Settings", cdl: 1, add_lending_period_days: 1, add_lending_period_hours: -1 } + expect(response).to redirect_to(admin_collection_path(collection)) + expect(flash[:error]).to be_present + expect(flash[:error]).to eq("Lending period hours needs to be a positive integer.") + expect { put 'update', params: { id: collection.id, save_access: "Save Access Settings", cdl: 1, add_lending_period_days: 0, add_lending_period_hours: 0 } }.not_to change { collection.reload.default_lending_period } + expect(response).to redirect_to(admin_collection_path(collection)) + expect(flash[:error]).to be_present + expect(flash[:error]).to eq("Lending period must be greater than 0.") + end + + it "accepts 0 as a valid day or hour value" do + expect { put 'update', params: { id: collection.id, save_access: "Save Access Settings", cdl: 1, add_lending_period_days: 0, add_lending_period_hours: 1 } }.to change { collection.reload.default_lending_period }.to(3600) + expect(flash[:error]).not_to be_present + expect { put 'update', params: { id: collection.id, save_access: "Save Access Settings", cdl: 1, add_lending_period_days: 1, add_lending_period_hours: 0 } }.to change { collection.reload.default_lending_period }.to(86400) + expect(flash[:error]).not_to be_present + end + + it "returns error if both day and hour are 0" do + expect { put 'update', params: { id: collection.id, save_access: "Save Access Settings", cdl: 1, add_lending_period_days: 0, add_lending_period_hours: 0 } }.not_to change { collection.reload.default_lending_period } + expect(response).to redirect_to(admin_collection_path(collection)) + expect(flash[:error]).to be_present + end + end end describe "#apply_access" do diff --git a/spec/controllers/derivative_controller_spec.rb b/spec/controllers/derivative_controller_spec.rb index 725cbc1db7..5db32e6ba3 100644 --- a/spec/controllers/derivative_controller_spec.rb +++ b/spec/controllers/derivative_controller_spec.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -21,12 +21,12 @@ let(:target) { derivative.master_file.id } let(:session) { { } } let(:token) { StreamToken.find_or_create_session_token(session, target) } - + it "no token" do get :authorize, format: :text expect(response).to be_forbidden end - + it "valid token, no path" do get :authorize, params: { token: token, format: :text } expect(response).to be_accepted @@ -37,7 +37,7 @@ get :authorize, params: { token: "X#{token}X", format: :text } expect(response).to be_forbidden end - + it "valid token, valid path" do post :authorize, params: { token: token, name: auth_path, format: :text } expect(response).to be_accepted @@ -48,5 +48,11 @@ post :authorize, params: { token: token, name: "WRONG_PATH", format: :text } expect(response).to be_forbidden end + + it "bad token" do + allow(StreamToken).to receive(:find_or_create_session_token).and_return(NoMethodError) + get :authorize, params: { token: token, format: :text } + expect(response).to be_forbidden + end end end diff --git a/spec/controllers/master_files_controller_spec.rb b/spec/controllers/master_files_controller_spec.rb index 781034099f..4d2f284919 100644 --- a/spec/controllers/master_files_controller_spec.rb +++ b/spec/controllers/master_files_controller_spec.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -68,13 +68,26 @@ end end - context "cannot upload a file with a non-ascii character in the filename" do - it "provides a warning about the invalid filename" do + context "can upload a file with a non-ascii character in the filename" do + it "does not provide a warning about an invalid filename" do request.env["HTTP_REFERER"] = "/" file = fixture_file_upload('/videoshort.mp4', 'video/mp4') allow(file).to receive(:original_filename).and_return("videoshort_é.mp4") + expect { post :create, params: { Filedata: [file], original: 'any', container_id: media_object.id } }.to change { MasterFile.count } + + expect(flash[:error]).to be_nil + end + end + + context "does not upload a file with improperly encoded filename" do + it "provides a warning about an invalid filename" do + request.env["HTTP_REFERER"] = "/" + + file = fixture_file_upload('/videoshort.mp4', 'video/mp4') + allow(file).to receive(:original_filename).and_return("videoshort_é.mp4".encode('iso-8859-1')) + expect { post :create, params: { Filedata: [file], original: 'any', container_id: media_object.id } }.not_to change { MasterFile.count } expect(flash[:error]).not_to be_nil @@ -228,17 +241,12 @@ class << file end describe "#embed" do - let!(:master_file) { FactoryBot.create(:master_file) } - let(:media_object) do - instance_double('MediaObject', title: 'Media Object', id: 'avalon:1234', - ordered_master_files: [master_file], master_file_ids: [master_file.id]) - end + let!(:master_file) { FactoryBot.create(:master_file, :with_media_object) } + let(:media_object) { master_file.media_object } render_views before do - allow_any_instance_of(MasterFile).to receive(:media_object).and_return(media_object) - allow_any_instance_of(MasterFile).to receive(:media_object_id).and_return(media_object.id) disableCanCan! end @@ -250,6 +258,22 @@ class << file expect(get(:embed, params: { id: master_file.id })).to render_template('modules/_google_analytics') end + context 'with cdl enabled' do + before { allow(Settings.controlled_digital_lending).to receive(:enable).and_return(true) } + before { allow(Settings.controlled_digital_lending).to receive(:collections_enabled).and_return(true) } + it "renders the cdl_embed partial" do + expect(get(:embed, params: { id: master_file.id })).to render_template('master_files/_cdl_embed') + end + end + + context 'with cdl disabled' do + before { allow(Settings.controlled_digital_lending).to receive(:enable).and_return(true) } + before { allow(Settings.controlled_digital_lending).to receive(:collections_enabled).and_return(false) } + it "renders the player" do + expect(get(:embed, params: { id: master_file.id })).to render_template('master_files/_player') + end + end + context 'with fedora 3 pid' do let!(:master_file) { FactoryBot.create(:master_file, identifier: [fedora3_pid]) } let(:fedora3_pid) { 'avalon:1234' } @@ -664,10 +688,10 @@ class << file describe "#update" do let(:master_file) { FactoryBot.create(:master_file, :with_media_object) } - subject { put('update', params: { id: master_file.id, - master_file: { title: "New label", - poster_offset: "00:00:03", - date_digitized: "2020-08-27", + subject { put('update', params: { id: master_file.id, + master_file: { title: "New label", + poster_offset: "00:00:03", + date_digitized: "2020-08-27", permalink: "https://perma.link" }})} before do diff --git a/spec/controllers/media_objects_controller_spec.rb b/spec/controllers/media_objects_controller_spec.rb index 928bd16db5..a4166e2af0 100644 --- a/spec/controllers/media_objects_controller_spec.rb +++ b/spec/controllers/media_objects_controller_spec.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -634,25 +634,59 @@ describe "#index" do let!(:media_object) { FactoryBot.create(:published_media_object, visibility: 'public') } + let!(:private_media_object) { FactoryBot.create(:published_media_object, visibility: 'private') } subject(:json) { JSON.parse(response.body) } - let(:administrator) { FactoryBot.create(:administrator) } - before(:each) do - ApiToken.create token: 'secret_token', username: administrator.username, email: administrator.email - request.headers['Avalon-Api-Key'] = 'secret_token' - end - - it "should return list of media_objects" do - get 'index', format:'json' - expect(json.count).to eq(1) - expect(json.first['id']).to eq(media_object.id) - expect(json.first['title']).to eq(media_object.title) - expect(json.first['collection']).to eq(media_object.collection.name) - expect(json.first['main_contributors']).to eq(media_object.creator) - expect(json.first['publication_date']).to eq(media_object.date_created) - expect(json.first['published_by']).to eq(media_object.avalon_publisher) - expect(json.first['published']).to eq(media_object.published?) - expect(json.first['summary']).to eq(media_object.abstract) + context 'as an administrator' do + let(:administrator) { FactoryBot.create(:administrator) } + + before(:each) do + ApiToken.create token: 'secret_token', username: administrator.username, email: administrator.email + request.headers['Avalon-Api-Key'] = 'secret_token' + end + + it "should return list of media_objects" do + get 'index', format:'json' + expect(json.count).to eq(2) + expect(json.first['id']).to eq(media_object.id) + expect(json.first['title']).to eq(media_object.title) + expect(json.first['collection']).to eq(media_object.collection.name) + expect(json.first['main_contributors']).to eq(media_object.creator) + expect(json.first['publication_date']).to eq(media_object.date_created) + expect(json.first['published_by']).to eq(media_object.avalon_publisher) + expect(json.first['published']).to eq(media_object.published?) + expect(json.first['summary']).to eq(media_object.abstract) + expect(json.second['id']).to eq(private_media_object.id) + expect(json.second['title']).to eq(private_media_object.title) + expect(json.second['collection']).to eq(private_media_object.collection.name) + expect(json.second['main_contributors']).to eq(private_media_object.creator) + expect(json.second['publication_date']).to eq(private_media_object.date_created) + expect(json.second['published_by']).to eq(private_media_object.avalon_publisher) + expect(json.second['published']).to eq(private_media_object.published?) + expect(json.second['summary']).to eq(private_media_object.abstract) + end + end + + context 'user is not an administrator' do + let(:user) { FactoryBot.create(:user) } + + before(:each) do + ApiToken.create token: 'user_token', username: user.username, email: user.email + request.headers['Avalon-Api-Key'] = 'user_token' + end + + it "should return list of media_objects that the user is authorized to view" do + get 'index', format: 'json' + expect(json.count).to eq(1) + expect(json.first['id']).to eq(media_object.id) + expect(json.first['title']).to eq(media_object.title) + expect(json.first['collection']).to eq(media_object.collection.name) + expect(json.first['main_contributors']).to eq(media_object.creator) + expect(json.first['publication_date']).to eq(media_object.date_created) + expect(json.first['published_by']).to eq(media_object.avalon_publisher) + expect(json.first['published']).to eq(media_object.published?) + expect(json.first['summary']).to eq(media_object.abstract) + end end end @@ -687,6 +721,7 @@ end it "should be accesible by its PID" do + FactoryBot.create(:master_file, media_object: media_object) get :show, params: { id: media_object.id } expect(response.response_code).to eq(200) end @@ -699,6 +734,7 @@ it "should be available to a manager when unpublished" do login_user media_object.collection.managers.first + FactoryBot.create(:master_file, media_object: media_object) get 'show', params: { id: media_object.id } expect(response).not_to redirect_to new_user_session_path end @@ -728,8 +764,8 @@ expect(media_object.ordered_master_files.to_a.first).to eq(mf2) expect(controller.send('set_active_file')).to eq(mf2) end - end + context "Test lease access control" do let!(:media_object) { FactoryBot.create(:published_media_object, :with_master_file, visibility: 'private') } let!(:user) { FactoryBot.create(:user) } @@ -751,83 +787,270 @@ end context "Conditional Share partials should be rendered" do - context "Normal login" do - it "administrators: should include lti, embed, and share" do - login_as(:administrator) - get :show, params: { id: media_object.id } - expect(response).to render_template(:_share_resource) - expect(response).to render_template(:_embed_resource) - expect(response).to render_template(:_lti_url) - end - it "managers: should include lti, embed, and share" do - login_user media_object.collection.managers.first - get :show, params: { id: media_object.id } - expect(response).to render_template(:_share_resource) - expect(response).to render_template(:_embed_resource) - expect(response).to render_template(:_lti_url) - end - it "editors: should include lti, embed, and share" do - login_user media_object.collection.editors.first - get :show, params: { id: media_object.id } - expect(response).to render_template(:_share_resource) - expect(response).to render_template(:_embed_resource) - expect(response).to render_template(:_lti_url) - end - it "others: should include embed and share and NOT lti" do - login_as(:user) - get :show, params: { id: media_object.id } - expect(response).to render_template(:_share_resource) - expect(response).to render_template(:_embed_resource) - expect(response).to_not render_template(:_lti_url) - end - end - context "LTI login" do - it "administrators/managers/editors: should include lti, embed, and share" do - login_lti 'administrator' - lti_group = @controller.user_session[:virtual_groups].first - FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [lti_group]) - get :show, params: { id: media_object.id } - expect(response).to render_template(:_share_resource) - expect(response).to render_template(:_embed_resource) - expect(response).to render_template(:_lti_url) - end - it "others: should include only lti" do - login_lti 'student' - lti_group = @controller.user_session[:virtual_groups].first - FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [lti_group]) - get :show, params: { id: media_object.id } - expect(response).to_not render_template(:_share_resource) - expect(response).to_not render_template(:_embed_resource) - expect(response).to render_template(:_lti_url) - end - end - context "No share tabs rendered" do - before do - @original_conditional_partials = controller.class.conditional_partials.deep_dup - controller.class.conditional_partials[:share].each {|partial_name, conditions| conditions[:if] = false } - end - after do - controller.class.conditional_partials = @original_conditional_partials - end - it "should not render Share button" do - # allow(@controller).to receive(:evaluate_if_unless_configuration).and_return false - # allow(@controller).to receive(:is_editor_or_not_lti).and_return false - expect(response).to_not render_template(:_share) - end + let!(:media_object) { FactoryBot.create(:published_media_object, :with_master_file, visibility: 'public') } + let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) } + let(:cache) { Rails.cache } + + before do + allow(Rails).to receive(:cache).and_return(memory_store) + Rails.cache.clear end - context "No LTI configuration" do - around do |example| - providers = Avalon::Authentication::Providers - Avalon::Authentication::Providers = Avalon::Authentication::Providers.reject{|p| p[:provider] == :lti} - example.run - Avalon::Authentication::Providers = providers - end - it "should not include lti" do - login_as(:administrator) - get :show, params: { id: media_object.id } - expect(response).to render_template(:_share_resource) - expect(response).to render_template(:_embed_resource) - expect(response).to_not render_template(:_lti_url) + + it 'should cache .is_editor' do + # Method will not cache if CDL is enabled and item is not checked out. Ensure CDL is disabled for testing. + allow(Settings.controlled_digital_lending).to receive(:enable).and_return(false) + + login_user media_object.collection.editors.first + get :show, params: { id: media_object.id } + expect(Rails.cache.instance_variable_get(:@data).keys.any?(/\-?\d+\/is_editor/)).to be_truthy + end + + context 'With cdl enabled' do + before { allow(Settings.controlled_digital_lending).to receive(:enable).and_return(true) } + before { allow(Settings.controlled_digital_lending).to receive(:collections_enabled).and_return(true) } + context "With check out" do + context "Normal login" do + it "administrators: should include lti, embed, and share" do + login_as(:administrator) + FactoryBot.create(:checkout, media_object_id: media_object.id, user_id: controller.current_user.id) + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to render_template(:_lti_url) + end + it "managers: should include lti, embed, and share" do + login_user media_object.collection.managers.first + FactoryBot.create(:checkout, media_object_id: media_object.id, user_id: controller.current_user.id) + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to render_template(:_lti_url) + end + it "editors: should include lti, embed, and share" do + login_user media_object.collection.editors.first + FactoryBot.create(:checkout, media_object_id: media_object.id, user_id: controller.current_user.id) + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to render_template(:_lti_url) + end + it "others: should include share, embed, and NOT lti" do + login_as(:user) + FactoryBot.create(:checkout, media_object_id: media_object.id, user_id: controller.current_user.id) + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to_not render_template(:_lti_url) + end + end + context "LTI login" do + it "administrators/managers/editors: should include lti, embed, and share" do + login_lti 'administrator' + lti_group = @controller.user_session[:virtual_groups].first + FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [lti_group]) + FactoryBot.create(:checkout, media_object_id: media_object.id, user_id: controller.current_user.id) + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to render_template(:_lti_url) + end + it "others: should include only lti" do + login_lti 'student' + lti_group = @controller.user_session[:virtual_groups].first + FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [lti_group]) + FactoryBot.create(:checkout, media_object_id: media_object.id, user_id: controller.current_user.id) + get :show, params: { id: media_object.id } + expect(response).to_not render_template(:_share_resource) + expect(response).to_not render_template(:_embed_resource) + expect(response).to render_template(:_lti_url) + end + end + context "No share tabs rendered" do + before do + @original_conditional_partials = controller.class.conditional_partials.deep_dup + controller.class.conditional_partials[:share].each {|partial_name, conditions| conditions[:if] = false } + end + after do + controller.class.conditional_partials = @original_conditional_partials + end + it "should not render Share button" do + # allow(@controller).to receive(:evaluate_if_unless_configuration).and_return false + # allow(@controller).to receive(:is_editor_or_not_lti).and_return false + expect(response).to_not render_template(:_share) + end + end + context "No LTI configuration" do + around do |example| + providers = Avalon::Authentication::Providers + Avalon::Authentication::Providers = Avalon::Authentication::Providers.reject{|p| p[:provider] == :lti} + example.run + Avalon::Authentication::Providers = providers + end + it "should not include lti" do + login_as(:administrator) + FactoryBot.create(:checkout, media_object_id: media_object.id, user_id: controller.current_user.id) + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to_not render_template(:_lti_url) + end + end + end + context "Without check out" do + context "Normal login" do + it "administrators: should render checkout button in player, NOT share" do + login_as(:administrator) + get :show, params: { id: media_object.id } + expect(response).not_to render_template(:_share_resource) + expect(response).to render_template(:_embed_checkout) + end + it "managers: should render checkout button in player, NOT share" do + login_user media_object.collection.managers.first + get :show, params: { id: media_object.id } + expect(response).not_to render_template(:_share_resource) + expect(response).to render_template(:_embed_checkout) + end + it "editors: should render checkout button in player, NOT share" do + login_user media_object.collection.editors.first + get :show, params: { id: media_object.id } + expect(response).not_to render_template(:_share_resource) + expect(response).to render_template(:_embed_checkout) + end + it "others: should render checkout button in player, NOT share" do + login_as(:user) + get :show, params: { id: media_object.id } + expect(response).not_to render_template(:_share_resource) + expect(response).to render_template(:_embed_checkout) + end + end + context "LTI login" do + it "administrators/managers/editors: should render checkout button in player, NOT share" do + login_lti 'administrator' + lti_group = @controller.user_session[:virtual_groups].first + FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [lti_group]) + get :show, params: { id: media_object.id } + expect(response).not_to render_template(:_share_resource) + expect(response).to render_template(:_embed_checkout) + end + it "others: should render checkout button in player, NOT share" do + login_lti 'student' + lti_group = @controller.user_session[:virtual_groups].first + FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [lti_group]) + get :show, params: { id: media_object.id } + expect(response).not_to render_template(:_share_resource) + expect(response).to render_template(:_embed_checkout) + end + end + context "No share tabs rendered" do + before do + @original_conditional_partials = controller.class.conditional_partials.deep_dup + controller.class.conditional_partials[:share].each {|partial_name, conditions| conditions[:if] = false } + end + after do + controller.class.conditional_partials = @original_conditional_partials + end + it "should not render Share button" do + # allow(@controller).to receive(:evaluate_if_unless_configuration).and_return false + # allow(@controller).to receive(:is_editor_or_not_lti).and_return false + expect(response).to_not render_template(:_share) + end + end + context "No LTI configuration" do + around do |example| + providers = Avalon::Authentication::Providers + Avalon::Authentication::Providers = Avalon::Authentication::Providers.reject{|p| p[:provider] == :lti} + example.run + Avalon::Authentication::Providers = providers + end + it "should render checkout button in player, NOT share" do + login_as(:administrator) + get :show, params: { id: media_object.id } + expect(response).not_to render_template(:_share_resource) + expect(response).to render_template(:_embed_checkout) + end + end + end + end + context "With cdl disabled" do + before { allow(Settings.controlled_digital_lending).to receive(:enable).and_return(false) } + context "Normal login" do + it "administrators: should include lti, embed, and share" do + login_as(:administrator) + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to render_template(:_lti_url) + end + it "managers: should include lti, embed, and share" do + login_user media_object.collection.managers.first + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to render_template(:_lti_url) + end + it "editors: should include lti, embed, and share" do + login_user media_object.collection.editors.first + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to render_template(:_lti_url) + end + it "others: should include embed and share and NOT lti" do + login_as(:user) + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to_not render_template(:_lti_url) + end + end + context "LTI login" do + it "administrators/managers/editors: should include lti, embed, and share" do + login_lti 'administrator' + lti_group = @controller.user_session[:virtual_groups].first + FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [lti_group]) + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to render_template(:_lti_url) + end + it "others: should include only lti" do + login_lti 'student' + lti_group = @controller.user_session[:virtual_groups].first + FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [lti_group]) + get :show, params: { id: media_object.id } + expect(response).to_not render_template(:_share_resource) + expect(response).to_not render_template(:_embed_resource) + expect(response).to render_template(:_lti_url) + end + end + context "No share tabs rendered" do + before do + @original_conditional_partials = controller.class.conditional_partials.deep_dup + controller.class.conditional_partials[:share].each {|partial_name, conditions| conditions[:if] = false } + end + after do + controller.class.conditional_partials = @original_conditional_partials + end + it "should not render Share button" do + # allow(@controller).to receive(:evaluate_if_unless_configuration).and_return false + # allow(@controller).to receive(:is_editor_or_not_lti).and_return false + expect(response).to_not render_template(:_share) + end + end + context "No LTI configuration" do + around do |example| + providers = Avalon::Authentication::Providers + Avalon::Authentication::Providers = Avalon::Authentication::Providers.reject{|p| p[:provider] == :lti} + example.run + Avalon::Authentication::Providers = providers + end + it "should not include lti" do + login_as(:administrator) + get :show, params: { id: media_object.id } + expect(response).to render_template(:_share_resource) + expect(response).to render_template(:_embed_resource) + expect(response).to_not render_template(:_lti_url) + end end end end @@ -846,13 +1069,24 @@ end end + context "correctly handle missing controlled vocabulary sections" do + before do + stub_const("ModsDocument::RIGHTS_STATEMENTS", nil) + end + it "should redirect to homepage if controlled_vocabulary.yml is incomplete" do + get :show, params: { id: media_object.id } + expect(response).to redirect_to(root_path) + expect(flash[:error]).to be_present + end + end + describe 'Redirect back to media object after sign in' do let(:media_object){ FactoryBot.create(:media_object, visibility: 'private') } context 'Before sign in' do it 'persists the current url on the session' do get 'show', params: { id: media_object.id } - expect(session[:previous_url]).to eql media_object_path(media_object) + expect(session[:user_return_to]).to eql media_object_path(media_object) end end @@ -1246,6 +1480,29 @@ }.not_to change{media_object.leases.count} end end + + context "lending period" do + before { allow(Settings.controlled_digital_lending).to receive(:enable).and_return(true) } + before { allow(Settings.controlled_digital_lending).to receive(:collections_enabled).and_return(true) } + it "sets a custom lending period" do + expect { put :update, params: { id: media_object.id, step: 'access-control', donot_advance: 'true', add_lending_period_days: 7, add_lending_period_hours: 8 } }.to change { media_object.reload.lending_period }.to(633600) + end + + it "returns error if invalid" do + expect { put :update, params: { id: media_object.id, step: 'access-control', donot_advance: 'true', add_lending_period_days: -1, add_lending_period_hours: -1 } }.not_to change { media_object.reload.lending_period } + expect(flash[:error]).to be_present + expect(flash[:error]).to eq("Lending period must be greater than 0.") + put :update, params: { id: media_object.id, step: 'access-control', donot_advance: 'true', add_lending_period_days: 1, add_lending_period_hours: -1 } + expect(flash[:error]).to be_present + expect(flash[:error]).to eq("Lending period hours needs to be a positive integer.") + put :update, params: { id: media_object.id, step: 'access-control', donot_advance: 'true', add_lending_period_days: -1, add_lending_period_hours: 1 } + expect(flash[:error]).to be_present + expect(flash[:error]).to eq("Lending period days needs to be a positive integer.") + expect { put :update, params: { id: media_object.id, step: 'access-control', donot_advance: 'true', add_lending_period_days: 0, add_lending_period_hours: 0 } }.not_to change { media_object.reload.lending_period } + expect(flash[:error]).to be_present + expect(flash[:error]).to eq("Lending period must be greater than 0.") + end + end end context 'resource description' do diff --git a/spec/controllers/omniauth_callbacks_controller_spec.rb b/spec/controllers/omniauth_callbacks_controller_spec.rb index fe214dd405..a9796bae58 100644 --- a/spec/controllers/omniauth_callbacks_controller_spec.rb +++ b/spec/controllers/omniauth_callbacks_controller_spec.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -100,6 +100,15 @@ end end + context 'when user_return_to is in the session' do + let(:previous_url) { "http://test.host/a/sub/page?test_param=true" } + + it 'redirects to url' do + post :identity, session: { user_return_to: previous_url } + expect(response).to redirect_to(previous_url) + end + end + context 'when lti login with course group' do let(:course_group) { 'M101-Fall2019' } let(:lti_auth_double) { double() } @@ -135,5 +144,23 @@ expect(response).to redirect_to(root_path) end end + + context 'when lti has a broken signature' do + let(:course_group) { 'M101-Fall2019' } + let(:lti_auth_double) { double() } + let(:lti_extra_info) { double() } + + before do + allow(User).to receive(:find_for_lti).and_return(user) + @request.env["omniauth.auth"] = lti_auth_double + allow(lti_auth_double).to receive(:extra).and_raise (OAuth::Signature::UnknownSignatureMethod) + end + + it 'should rescue the error' do + expect { get :lti, session: { lti_group: course_group } }.not_to raise_error + expect(response).to redirect_to(root_path) + expect(flash[:error]).to be_present + end + end end end diff --git a/spec/controllers/playlists_controller_spec.rb b/spec/controllers/playlists_controller_spec.rb index b95caadd46..4994f7d4d4 100644 --- a/spec/controllers/playlists_controller_spec.rb +++ b/spec/controllers/playlists_controller_spec.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -458,4 +458,87 @@ end end end + + describe "POST #paged_index" do + before do + login_as :user + end + before :each do + FactoryBot.reload + FactoryBot.create(:playlist, title: "aardvark", user: user) + FactoryBot.create_list(:playlist, 9, user: user) + FactoryBot.create(:playlist, title: "zzzebra", user: user) + end + + context 'paging' do + let(:common_params) { { order: { '0': { column: 0, dir: 'asc' } }, search: { value: '' }, columns: { '5': { search: { value: '' } } } } } + it 'returns all results' do + post :paged_index, format: 'json', params: common_params.merge(start: 0, length: 20), session: valid_session + parsed_response = JSON.parse(response.body) + expect(parsed_response['recordsTotal']).to eq(11) + expect(parsed_response['data'].count).to eq(11) + end + it 'returns first page' do + post :paged_index, format: 'json', params: common_params.merge(start: 0, length: 10), session: valid_session + parsed_response = JSON.parse(response.body) + expect(parsed_response['data'].count).to eq(10) + end + it 'returns second page' do + post :paged_index, format: 'json', params: common_params.merge(start: 10, length: 10), session: valid_session + parsed_response = JSON.parse(response.body) + expect(parsed_response['data'].count).to eq(1) + end + end + + context 'searching' do + let(:common_params) { { start: 0, length: 20, order: { '0': { column: 0, dir: 'asc' } } } } + it "returns results filtered by title" do + post :paged_index, format: 'json', params: common_params.merge(search: { value: "aardvark" }, columns: { '5': { search: { value: '' } } }), session: valid_session + parsed_response = JSON.parse(response.body) + expect(parsed_response['recordsFiltered']).to eq(1) + expect(parsed_response['data'].count).to eq(1) + expect(parsed_response['data'][0][0]).to eq("aardvark") + end + end + + context 'sorting' do + let(:common_params) { { start: 0, length: 20, search: { value: '' }, columns: { '5': { search: { value: '' } } } } } + it "returns results sorted by title ascending" do + post :paged_index, format: 'json', params: common_params.merge(order: { '0': { column: 0, dir: 'asc' } }), session: valid_session + parsed_response = JSON.parse(response.body) + expect(parsed_response['data'][0][0]).to eq("aardvark") + expect(parsed_response['data'][10][0]).to eq("zzzebra") + end + it "returns results sorted by title descending" do + post :paged_index, format: 'json', params: common_params.merge(order: { '0': { column: 0, dir: 'desc' } }), session: valid_session + parsed_response = JSON.parse(response.body) + expect(parsed_response['data'][0][0]).to eq("zzzebra") + expect(parsed_response['data'][10][0]).to eq("aardvark") + end + it "returns results sorted by Created ascending" do + post :paged_index, format: 'json', params: common_params.merge(order: { '0': { column: 3, dir: 'asc' } }), session: valid_session + parsed_response = JSON.parse(response.body) + expect(parsed_response['data'][0][0]).to eq("aardvark") + expect(parsed_response['data'][10][0]).to eq("zzzebra") + end + it "returns results sorted by Created descending" do + post :paged_index, format: 'json', params: common_params.merge(order: { '0': { column: 3, dir: 'desc' } }), session: valid_session + parsed_response = JSON.parse(response.body) + expect(parsed_response['data'][0][0]).to eq("zzzebra") + expect(parsed_response['data'][10][0]).to eq("aardvark") + end + it "returns results sorted by Updated ascending" do + post :paged_index, format: 'json', params: common_params.merge(order: { '0': { column: 4, dir: 'asc' } }), session: valid_session + parsed_response = JSON.parse(response.body) + expect(parsed_response['data'][0][0]).to eq("aardvark") + expect(parsed_response['data'][10][0]).to eq("zzzebra") + end + it "returns results sorted by Updated descending" do + post :paged_index, format: 'json', params: common_params.merge(order: { '0': { column: 4, dir: 'desc' } }), session: valid_session + parsed_response = JSON.parse(response.body) + expect(parsed_response['data'][0][0]).to eq("zzzebra") + expect(parsed_response['data'][10][0]).to eq("aardvark") + end + end + end end diff --git a/spec/controllers/samvera/persona/user_controller_spec.rb b/spec/controllers/samvera/persona/user_controller_spec.rb index c338976886..0307d47ace 100644 --- a/spec/controllers/samvera/persona/user_controller_spec.rb +++ b/spec/controllers/samvera/persona/user_controller_spec.rb @@ -1,11 +1,11 @@ # Copyright 2011-2022, The Trustees of Indiana University and Northwestern # University. Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# +# # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. See the License for the @@ -33,7 +33,7 @@ before do sign_in(user) FactoryBot.create(:user, username: 'zzzebra', email: 'zzzebra@example.edu', last_sign_in_at: Time.new(2022,05,26), invitation_token: 'invited') - FactoryBot.create_list(:user, 10, last_sign_in_at: Time.new(2022,06,01)) + FactoryBot.create_list(:user, 10, last_sign_in_at: Time.new(2022,05,24)) end context 'paging' do @@ -57,49 +57,26 @@ end context 'filtering' do - let(:common_params) { { start: 0, length: 20, order: { '0': { column: 0, dir: 'asc' } } } } - it "returns results filtered by username" do - post :paged_index, format: 'json', params: common_params.merge(search: { value: user.username }) - parsed_response = JSON.parse(response.body) - expect(parsed_response['recordsFiltered']).to eq(1) - expect(parsed_response['data'].count).to eq(1) - expect(parsed_response['data'][0][0]).to eq("#{user.username}") - end - - let(:common_params) { { start: 0, length: 20, order: { '0': { column: 'entry', dir: 'asc' } } } } - it "returns results filtered by email" do - post :paged_index, format: 'json', params: common_params.merge(search: { value: 'zzzebra@example.edu' }) - parsed_response = JSON.parse(response.body) - expect(parsed_response['recordsFiltered']).to eq(1) - expect(parsed_response['data'].count).to eq(1) - expect(parsed_response['data'][0][1]).to eq("zzzebra@example.edu") - end - - let(:common_params) { { start: 0, length: 20, order: { '0': { column: 0, dir: 'asc' } } } } - it "returns results filtered by role" do - post :paged_index, format: 'json', params: common_params.merge( { search: { value: 'administrator' } } ) - parsed_response = JSON.parse(response.body) - expect(parsed_response['recordsFiltered']).to eq(1) - expect(parsed_response['data'].count).to eq(1) - expect(parsed_response['data'][0][0]).to eq("aardvark") - end - - let(:common_params) { { start: 0, length: 20, order: { '0': { column: 0, dir: 'asc' } } } } - it "returns results filtered by date" do - post :paged_index, format: 'json', params: common_params.merge( { search: { value: 'May' } } ) - parsed_response = JSON.parse(response.body) - expect(parsed_response['recordsFiltered']).to eq(2) - expect(parsed_response['data'].count).to eq(2) - expect(parsed_response['data'][0][3]).to eq("