hyrax 3.4.2 → 4.0.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.circleci/config.yml +41 -61
- data/.dassie/Gemfile +4 -4
- data/.dassie/app/assets/javascripts/application.js +8 -4
- data/.dassie/app/assets/stylesheets/application.css +1 -1
- data/.dassie/app/assets/stylesheets/hyrax.scss +1 -2
- data/.dassie/app/controllers/application_controller.rb +1 -3
- data/.dassie/app/controllers/catalog_controller.rb +23 -19
- data/.dassie/app/models/user.rb +0 -3
- data/.dassie/config/application.rb +1 -1
- data/.dassie/config/initializers/riiif.rb +1 -1
- data/.dassie/db/schema.rb +5 -5
- data/.dassie/package.json +7 -7
- data/.engine_cart.yml +2 -39
- data/.env +1 -0
- data/.regen +2 -1
- data/.rubocop.yml +1 -1
- data/CONTRIBUTING.md +22 -24
- data/Dockerfile +1 -1
- data/Rakefile +0 -4
- data/app/actors/hyrax/actors/base_actor.rb +1 -1
- data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +5 -11
- data/app/actors/hyrax/actors/file_actor.rb +9 -37
- data/app/actors/hyrax/actors/file_set_actor.rb +13 -62
- data/app/assets/javascripts/hyrax/app.js.erb +1 -1
- data/app/assets/javascripts/hyrax/batch.js +2 -2
- data/app/assets/javascripts/hyrax/batch_edit.js +4 -4
- data/app/assets/javascripts/hyrax/batch_select_all.js +13 -13
- data/app/assets/javascripts/hyrax/browse_everything.js +4 -2
- data/app/assets/javascripts/hyrax/collection_types.es6 +1 -1
- data/app/assets/javascripts/hyrax/collections/editor.es6 +5 -1
- data/app/assets/javascripts/hyrax/dashboard_actions.js +5 -5
- data/app/assets/javascripts/hyrax/editor/controlled_vocabulary.es6 +3 -3
- data/app/assets/javascripts/hyrax/editor.es6 +3 -3
- data/app/assets/javascripts/hyrax/facets.js +6 -4
- data/app/assets/javascripts/hyrax/file_manager/member.es6 +1 -1
- data/app/assets/javascripts/hyrax/file_manager/save_manager.es6 +2 -2
- data/app/assets/javascripts/hyrax/file_manager/sorting.es6 +2 -2
- data/app/assets/javascripts/hyrax/file_manager.es6 +2 -17
- data/app/assets/javascripts/hyrax/notification.es6 +1 -1
- data/app/assets/javascripts/hyrax/permissions/registry.es6 +4 -4
- data/app/assets/javascripts/hyrax/permissions/user_controls.es6 +3 -1
- data/app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6 +1 -1
- data/app/assets/javascripts/hyrax/relationships/control.es6 +2 -2
- data/app/assets/javascripts/hyrax/relationships/registry_entry.es6 +1 -1
- data/app/assets/javascripts/hyrax/reports-buttons.js +9 -9
- data/app/assets/javascripts/hyrax/save_work/required_fields.es6 +1 -1
- data/app/assets/javascripts/hyrax/save_work/save_work_control.es6 +6 -6
- data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +2 -2
- data/app/assets/javascripts/hyrax/single_use_links_manager.js +1 -1
- data/app/assets/javascripts/hyrax/skip_to_content.js +1 -1
- data/app/assets/javascripts/hyrax/sorting.js +1 -1
- data/app/assets/javascripts/hyrax/trophy.js +1 -1
- data/app/assets/javascripts/hyrax/uploader.js +3 -3
- data/app/assets/javascripts/hyrax.js +1 -19
- data/app/assets/stylesheets/_bootstrap-default-overrides.scss +4 -4
- data/app/assets/stylesheets/hyrax/_accessibility.scss +1 -1
- data/app/assets/stylesheets/hyrax/_badge.scss +7 -0
- data/app/assets/stylesheets/hyrax/_batch-edit.scss +8 -8
- data/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss +1 -1
- data/app/assets/stylesheets/hyrax/_buttons.scss +31 -1
- data/app/assets/stylesheets/hyrax/_card.scss +10 -0
- data/app/assets/stylesheets/hyrax/_catalog.scss +22 -48
- data/app/assets/stylesheets/hyrax/_collection_types.scss +1 -1
- data/app/assets/stylesheets/hyrax/_collections.scss +13 -13
- data/app/assets/stylesheets/hyrax/_facets.scss +46 -0
- data/app/assets/stylesheets/hyrax/_featured.scss +1 -1
- data/app/assets/stylesheets/hyrax/_file-listing.scss +3 -3
- data/app/assets/stylesheets/hyrax/_file_manager.scss +17 -17
- data/app/assets/stylesheets/hyrax/_file_sets.scss +1 -1
- data/app/assets/stylesheets/hyrax/_file_upload.scss +4 -4
- data/app/assets/stylesheets/hyrax/_fixedsticky.scss +1 -1
- data/app/assets/stylesheets/hyrax/_footer.scss +3 -3
- data/app/assets/stylesheets/hyrax/_form-progress.scss +9 -9
- data/app/assets/stylesheets/hyrax/_form.scss +3 -4
- data/app/assets/stylesheets/hyrax/_forms.scss +62 -29
- data/app/assets/stylesheets/hyrax/_header.scss +0 -17
- data/app/assets/stylesheets/hyrax/_home-page.scss +13 -51
- data/app/assets/stylesheets/hyrax/_html.scss +11 -0
- data/app/assets/stylesheets/hyrax/_hyrax.scss +16 -14
- data/app/assets/stylesheets/hyrax/_nestable.scss +1 -1
- data/app/assets/stylesheets/hyrax/_select_work_type.scss +2 -2
- data/app/assets/stylesheets/hyrax/_styles.scss +9 -14
- data/app/assets/stylesheets/hyrax/_users.scss +2 -2
- data/app/assets/stylesheets/hyrax/_variables.scss +20 -1
- data/app/assets/stylesheets/hyrax/_work-show.scss +21 -13
- data/app/assets/stylesheets/hyrax/blacklight_gallery.scss +75 -2
- data/app/assets/stylesheets/hyrax/dashboard.scss +70 -95
- data/app/assets/stylesheets/hyrax/sidebar.scss +39 -19
- data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +9 -0
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +4 -9
- data/app/controllers/hyrax/batch_edits_controller.rb +1 -1
- data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +0 -32
- data/app/controllers/hyrax/file_sets_controller.rb +3 -0
- data/app/controllers/hyrax/homepage_controller.rb +0 -1
- data/app/controllers/hyrax/my_controller.rb +0 -6
- data/app/controllers/hyrax/single_use_links_controller.rb +1 -2
- data/app/forms/hyrax/forms/collection_form.rb +1 -1
- data/app/helpers/hyrax/facets_helper.rb +150 -0
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +5 -5
- data/app/indexers/hyrax/basic_metadata_indexer.rb +3 -9
- data/app/jobs/characterize_job.rb +4 -7
- data/app/jobs/create_derivatives_job.rb +4 -2
- data/app/jobs/ingest_local_file_job.rb +5 -13
- data/app/jobs/inherit_permissions_job.rb +1 -5
- data/app/models/admin_set.rb +0 -8
- data/app/models/concerns/hyrax/collection_behavior.rb +1 -1
- data/app/models/concerns/hyrax/file_set_behavior.rb +1 -1
- data/app/models/concerns/hyrax/in_admin_set.rb +0 -7
- data/app/models/concerns/hyrax/user.rb +3 -3
- data/app/models/concerns/hyrax/work_behavior.rb +0 -1
- data/app/models/content_block.rb +0 -6
- data/app/models/hyrax/file_metadata.rb +1 -1
- data/app/models/hyrax/permission_template.rb +0 -35
- data/app/presenters/hyrax/admin/repository_object_presenter.rb +0 -2
- data/app/presenters/hyrax/collapsable_section_presenter.rb +2 -2
- data/app/presenters/hyrax/collection_presenter.rb +1 -1
- data/app/presenters/hyrax/fixity_status_presenter.rb +2 -2
- data/app/presenters/hyrax/menu_presenter.rb +1 -1
- data/app/presenters/hyrax/permission_badge.rb +7 -7
- data/app/presenters/hyrax/workflow_presenter.rb +1 -1
- data/app/renderers/hyrax/renderers/external_link_attribute_renderer.rb +1 -1
- data/app/search_builders/hyrax/deposit_search_builder.rb +1 -1
- data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +10 -1
- data/app/search_builders/hyrax/single_result.rb +1 -1
- data/app/search_builders/hyrax/stats/work_status_search_builder.rb +1 -1
- data/app/services/hyrax/adapters/nesting_index_adapter.rb +1 -1
- data/app/services/hyrax/collection_member_service.rb +1 -2
- data/app/services/hyrax/collections/search_service.rb +0 -1
- data/app/services/hyrax/custom_queries.rb +25 -0
- data/app/services/hyrax/file_set_csv_service.rb +1 -1
- data/app/services/hyrax/graph_exporter.rb +3 -8
- data/app/services/hyrax/iiif_authorization_service.rb +1 -1
- data/app/services/hyrax/listeners/file_metadata_listener.rb +0 -11
- data/app/services/hyrax/search_service.rb +1 -81
- data/app/services/hyrax/statistics/depositors/summary.rb +1 -3
- data/app/services/hyrax/valkyrie_upload.rb +13 -1
- data/app/services/hyrax/work_query_service.rb +1 -1
- data/app/services/hyrax/working_directory.rb +2 -0
- data/app/views/_controls.html.erb +14 -18
- data/app/views/_logo.html.erb +0 -1
- data/app/views/_masthead.html.erb +8 -18
- data/app/views/_user_util_links.html.erb +16 -18
- data/app/views/catalog/_document.html.erb +2 -2
- data/app/views/catalog/_document_list.html.erb +1 -1
- data/app/views/catalog/_facet_limit.html.erb +1 -1
- data/app/views/catalog/_index_gallery_collection_wrapper.html.erb +1 -1
- data/app/views/catalog/_index_header_list_collection.html.erb +2 -2
- data/app/views/catalog/_index_header_list_default.html.erb +1 -1
- data/app/views/catalog/_index_list_default.html.erb +7 -5
- data/app/views/catalog/_search_form.html.erb +13 -15
- data/app/views/catalog/_thumbnail_list_collection.html.erb +2 -2
- data/app/views/catalog/_thumbnail_list_default.html.erb +3 -3
- data/app/views/catalog/facet.html.erb +21 -0
- data/app/views/catalog/index.html.erb +6 -4
- data/app/views/hyrax/admin/admin_sets/_form.html.erb +16 -16
- data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +35 -33
- data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +9 -8
- data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb +24 -24
- data/app/views/hyrax/admin/admin_sets/_form_workflow.erb +5 -5
- data/app/views/hyrax/admin/admin_sets/_show_actions.html.erb +3 -3
- data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +9 -9
- data/app/views/hyrax/admin/admin_sets/index.html.erb +3 -3
- data/app/views/hyrax/admin/admin_sets/show.html.erb +4 -4
- data/app/views/hyrax/admin/analytics/_date_range_form.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_custom_range.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_monthly_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb +7 -7
- data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb +6 -6
- data/app/views/hyrax/admin/analytics/collection_reports/show.html.erb +10 -10
- data/app/views/hyrax/admin/analytics/work_reports/_custom_range.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/work_reports/_monthly_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/work_reports/_summary.html.erb +3 -3
- data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb +5 -5
- data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb +7 -7
- data/app/views/hyrax/admin/analytics/work_reports/_work_counts.html.erb +4 -4
- data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb +5 -5
- data/app/views/hyrax/admin/analytics/work_reports/index.html.erb +7 -7
- data/app/views/hyrax/admin/analytics/work_reports/show.html.erb +10 -10
- data/app/views/hyrax/admin/appearances/show.html.erb +2 -2
- data/app/views/hyrax/admin/collection_types/_form.html.erb +24 -23
- data/app/views/hyrax/admin/collection_types/_form_appearance.html.erb +2 -2
- data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +4 -4
- data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +9 -9
- data/app/views/hyrax/admin/collection_types/index.html.erb +6 -6
- data/app/views/hyrax/admin/features/index.html.erb +3 -3
- data/app/views/hyrax/admin/stats/_new_users.html.erb +1 -1
- data/app/views/hyrax/admin/stats/show.html.erb +4 -6
- data/app/views/hyrax/admin/users/index.html.erb +3 -3
- data/app/views/hyrax/admin/workflow_roles/index.html.erb +8 -8
- data/app/views/hyrax/admin/workflows/index.html.erb +13 -13
- data/app/views/hyrax/base/_citations.html.erb +6 -6
- data/app/views/hyrax/base/_currently_shared.html.erb +3 -3
- data/app/views/hyrax/base/_file_manager_actions.html.erb +5 -3
- data/app/views/hyrax/base/_file_manager_member.html.erb +5 -5
- data/app/views/hyrax/base/_file_manager_member_resource_options.html.erb +6 -6
- data/app/views/hyrax/base/_file_manager_members.html.erb +1 -1
- data/app/views/hyrax/base/_file_manager_thumbnail.html.erb +1 -1
- data/app/views/hyrax/base/_form_child_work_relationships.html.erb +3 -3
- data/app/views/hyrax/base/_form_files.html.erb +9 -9
- data/app/views/hyrax/base/_form_member_of_collections.html.erb +3 -3
- data/app/views/hyrax/base/_form_metadata.html.erb +1 -1
- data/app/views/hyrax/base/_form_permission.html.erb +30 -20
- data/app/views/hyrax/base/_form_permission_under_embargo.html.erb +1 -1
- data/app/views/hyrax/base/_form_permission_under_lease.html.erb +1 -1
- data/app/views/hyrax/base/_form_progress.html.erb +6 -6
- data/app/views/hyrax/base/_form_relationships.html.erb +1 -1
- data/app/views/hyrax/base/_form_rendering.html.erb +1 -1
- data/app/views/hyrax/base/_form_representative.html.erb +1 -1
- data/app/views/hyrax/base/_form_share.html.erb +6 -6
- data/app/views/hyrax/base/_form_thumbnail.html.erb +1 -1
- data/app/views/hyrax/base/_form_visibility_component.html.erb +15 -15
- data/app/views/hyrax/base/_guts4form.html.erb +12 -20
- data/app/views/hyrax/base/_member.html.erb +1 -1
- data/app/views/hyrax/base/_metadata.html.erb +1 -1
- data/app/views/hyrax/base/_show_actions.html.erb +9 -9
- data/app/views/hyrax/base/_work_button_row.html.erb +16 -15
- data/app/views/hyrax/base/_workflow_actions.html.erb +10 -10
- data/app/views/hyrax/base/_workflow_actions_widget.erb +1 -1
- data/app/views/hyrax/base/file_manager.html.erb +4 -5
- data/app/views/hyrax/base/inspect_work.html.erb +1 -1
- data/app/views/hyrax/base/show.html.erb +12 -12
- data/app/views/hyrax/base/unavailable.html.erb +2 -2
- data/app/views/hyrax/batch_edits/_check_all.html.erb +0 -1
- data/app/views/hyrax/batch_edits/_delete_selected.html.erb +1 -1
- data/app/views/hyrax/batch_edits/edit.html.erb +26 -18
- data/app/views/hyrax/collections/_bookmark_control.html.erb +2 -2
- data/app/views/hyrax/collections/_list_collections.html.erb +6 -6
- data/app/views/hyrax/collections/_list_works.html.erb +3 -1
- data/app/views/hyrax/collections/_search_form.html.erb +4 -4
- data/app/views/hyrax/collections/_show_document_list_row.html.erb +5 -2
- data/app/views/hyrax/collections/_sort_and_per_page.html.erb +3 -3
- data/app/views/hyrax/collections/_view_type_group.html.erb +2 -2
- data/app/views/hyrax/contact_form/new.html.erb +12 -13
- data/app/views/hyrax/content_blocks/_form.html.erb +29 -23
- data/app/views/hyrax/content_blocks/templates/agreement.html.erb +3 -3
- data/app/views/hyrax/dashboard/_admin_sets.html.erb +22 -28
- data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb +2 -2
- data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb +4 -4
- data/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb +2 -2
- data/app/views/hyrax/dashboard/_repository_growth.html.erb +28 -28
- data/app/views/hyrax/dashboard/_resource_type_graph.html.erb +4 -4
- data/app/views/hyrax/dashboard/_sidebar.html.erb +3 -3
- data/app/views/hyrax/dashboard/_tabs.html.erb +6 -2
- data/app/views/hyrax/dashboard/_user_activity.html.erb +22 -19
- data/app/views/hyrax/dashboard/_visibility_graph.html.erb +4 -4
- data/app/views/hyrax/dashboard/_work_type_graph.html.erb +4 -4
- data/app/views/hyrax/dashboard/collections/_batch_edits_actions.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_bookmark_control.html.erb +2 -2
- data/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_form.html.erb +30 -22
- data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +19 -19
- data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +8 -4
- data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +7 -7
- data/app/views/hyrax/dashboard/collections/_form_share.html.erb +11 -9
- data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +34 -31
- data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_list_works.html.erb +3 -1
- data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_show_descriptions.html.erb +5 -3
- data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb +4 -4
- data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +12 -10
- data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +2 -2
- data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +4 -4
- data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_work_action_menu.html.erb +10 -10
- data/app/views/hyrax/dashboard/collections/show.html.erb +4 -4
- data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb +21 -21
- data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb +5 -5
- data/app/views/hyrax/dashboard/profiles/_zotero.html.erb +2 -2
- data/app/views/hyrax/dashboard/profiles/edit.html.erb +2 -2
- data/app/views/hyrax/dashboard/profiles/show.html.erb +3 -3
- data/app/views/hyrax/dashboard/show_admin.html.erb +36 -34
- data/app/views/hyrax/dashboard/show_user.html.erb +16 -16
- data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +10 -10
- data/app/views/hyrax/dashboard/sidebar/_configuration.html.erb +8 -8
- data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +3 -1
- data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb +5 -1
- data/app/views/hyrax/dashboard/works/_list_works.html.erb +4 -1
- data/app/views/hyrax/depositors/index.html.erb +2 -2
- data/app/views/hyrax/embargoes/edit.html.erb +11 -11
- data/app/views/hyrax/embargoes/index.html.erb +18 -6
- data/app/views/hyrax/file_sets/_actions.html.erb +5 -6
- data/app/views/hyrax/file_sets/_descriptions.html.erb +1 -1
- data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +1 -1
- data/app/views/hyrax/file_sets/_form.html.erb +1 -1
- data/app/views/hyrax/file_sets/_permission_form.html.erb +33 -29
- data/app/views/hyrax/file_sets/_show_actions.html.erb +2 -2
- data/app/views/hyrax/file_sets/_show_details.html.erb +27 -17
- data/app/views/hyrax/file_sets/_single_use_link_rows.html.erb +2 -2
- data/app/views/hyrax/file_sets/_single_use_links.html.erb +2 -2
- data/app/views/hyrax/file_sets/_versioning.html.erb +9 -9
- data/app/views/hyrax/file_sets/edit.html.erb +17 -11
- data/app/views/hyrax/file_sets/media_display/_image.html.erb +4 -4
- data/app/views/hyrax/file_sets/show.html.erb +2 -2
- data/app/views/hyrax/homepage/_announcement.html.erb +2 -2
- data/app/views/hyrax/homepage/_explore_collections.html.erb +6 -4
- data/app/views/hyrax/homepage/_featured_fields.html.erb +1 -1
- data/app/views/hyrax/homepage/_featured_works.html.erb +1 -1
- data/app/views/hyrax/homepage/_home_content.html.erb +24 -10
- data/app/views/hyrax/homepage/_marketing.html.erb +1 -1
- data/app/views/hyrax/homepage/_recent_document.html.erb +4 -1
- data/app/views/hyrax/homepage/_sortable_featured.html.erb +3 -3
- data/app/views/hyrax/homepage/index.html.erb +4 -4
- data/app/views/hyrax/leases/edit.html.erb +11 -11
- data/app/views/hyrax/leases/index.html.erb +18 -6
- data/app/views/hyrax/my/_admin_set_action_menu.html.erb +5 -5
- data/app/views/hyrax/my/_collection_action_menu.html.erb +6 -6
- data/app/views/hyrax/my/_constraints.html.erb +2 -2
- data/app/views/hyrax/my/_document_list.html.erb +1 -1
- data/app/views/hyrax/my/_facet_layout.html.erb +1 -2
- data/app/views/hyrax/my/_facet_limit.html.erb +4 -4
- data/app/views/hyrax/my/_facet_pagination.html.erb +1 -25
- data/app/views/hyrax/my/_facet_pivot.html.erb +1 -1
- data/app/views/hyrax/my/_facet_selected.html.erb +1 -1
- data/app/views/hyrax/my/_search_form.html.erb +7 -8
- data/app/views/hyrax/my/_sort_and_per_page.html.erb +10 -12
- data/app/views/hyrax/my/_work_action_menu.html.erb +4 -5
- data/app/views/hyrax/my/collections/_facets.html.erb +2 -2
- data/app/views/hyrax/my/collections/_list_collections.html.erb +1 -1
- data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +2 -2
- data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +2 -2
- data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +5 -5
- data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +1 -1
- data/app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb +1 -1
- data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +1 -1
- data/app/views/hyrax/my/collections/_tabs.html.erb +11 -4
- data/app/views/hyrax/my/collections/index.html.erb +3 -3
- data/app/views/hyrax/my/facet.html.erb +17 -16
- data/app/views/hyrax/my/index.html.erb +2 -2
- data/app/views/hyrax/my/works/_batch_actions.html.erb +1 -1
- data/app/views/hyrax/my/works/_facets.html.erb +2 -2
- data/app/views/hyrax/my/works/_list_works.html.erb +6 -7
- data/app/views/hyrax/my/works/_tabs.html.erb +6 -6
- data/app/views/hyrax/my/works/index.html.erb +20 -18
- data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
- data/app/views/hyrax/notifications/index.html.erb +4 -4
- data/app/views/hyrax/operations/index.html.erb +1 -1
- data/app/views/hyrax/operations/show.html.erb +2 -2
- data/app/views/hyrax/pages/_form.html.erb +76 -64
- data/app/views/hyrax/permissions/confirm.html.erb +4 -4
- data/app/views/hyrax/permissions/confirm_access.html.erb +4 -4
- data/app/views/hyrax/stats/file.html.erb +1 -1
- data/app/views/hyrax/stats/work.html.erb +1 -1
- data/app/views/hyrax/transfers/_received.html.erb +4 -4
- data/app/views/hyrax/transfers/index.html.erb +8 -8
- data/app/views/hyrax/uploads/_js_templates.html.erb +14 -14
- data/app/views/hyrax/uploads/_js_templates_branding.html.erb +5 -5
- data/app/views/hyrax/uploads/_js_templates_versioning.html.erb +15 -15
- data/app/views/hyrax/users/_activity.html.erb +3 -3
- data/app/views/hyrax/users/_contributions.html.erb +3 -3
- data/app/views/hyrax/users/_left_sidebar.html.erb +1 -1
- data/app/views/hyrax/users/_profile_tabs.html.erb +16 -8
- data/app/views/hyrax/users/_search_form.html.erb +2 -2
- data/app/views/hyrax/users/_user.html.erb +5 -5
- data/app/views/hyrax/users/_user_info.html.erb +4 -4
- data/app/views/hyrax/users/_vitals.html.erb +3 -3
- data/app/views/hyrax/users/show.html.erb +2 -2
- data/app/views/layouts/hyrax/dashboard.html.erb +4 -4
- data/app/views/layouts/hyrax.html.erb +4 -3
- data/app/views/shared/_appearance_styles.html.erb +8 -8
- data/app/views/shared/_footer.html.erb +1 -1
- data/app/views/shared/_locale_picker.html.erb +5 -8
- data/app/views/shared/_nav_safety_modal.html.erb +2 -2
- data/app/views/shared/_select_work_type_modal.html.erb +2 -2
- data/config/locales/hyrax.de.yml +4 -4
- data/config/locales/hyrax.en.yml +4 -4
- data/config/locales/hyrax.es.yml +6 -6
- data/config/locales/hyrax.fr.yml +7 -7
- data/config/locales/hyrax.it.yml +6 -6
- data/config/locales/hyrax.pt-BR.yml +6 -6
- data/config/locales/hyrax.zh.yml +6 -6
- data/docker-compose.yml +2 -1
- data/documentation/developing-your-hyrax-based-app.md +1 -1
- data/documentation/legacyREADME.md +1 -1
- data/hyrax.gemspec +12 -21
- data/karma.conf.js +104 -0
- data/lib/generators/hyrax/assets_generator.rb +2 -5
- data/lib/generators/hyrax/install_generator.rb +9 -33
- data/lib/generators/hyrax/templates/catalog_controller.rb +20 -13
- data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml +1 -1
- data/lib/generators/hyrax/templates/hyrax.scss +1 -2
- data/lib/generators/hyrax/templates/package.json +7 -8
- data/lib/hyrax/configuration.rb +0 -40
- data/lib/hyrax/engine.rb +1 -2
- data/lib/hyrax/publisher.rb +0 -4
- data/lib/hyrax/specs/capybara.rb +5 -3
- data/lib/hyrax/transactions/container.rb +0 -54
- data/lib/hyrax/version.rb +1 -1
- data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
- data/lib/wings/valkyrie/persister.rb +2 -1
- data/package.json +11 -0
- data/tasks/hyrax_dev.rake +32 -0
- data/template.rb +1 -1
- data/vendor/assets/javascripts/dataTables.bootstrap4.js +184 -0
- data/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js +1 -1
- data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +2 -2
- data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +1 -1
- data/vendor/assets/javascripts/handlebars.js +5214 -0
- data/vendor/assets/javascripts/jquery-ui.js +19057 -0
- data/vendor/assets/javascripts/jquery.dataTables.js +15336 -0
- data/vendor/assets/javascripts/morris/morris.min.js +9 -1
- data/vendor/assets/javascripts/morris/raphael-min.js +4 -6
- data/vendor/assets/javascripts/nestable.js +1 -1
- data/vendor/assets/stylesheets/dataTables.bootstrap4.css +307 -0
- data/vendor/assets/stylesheets/jquery-ui.css +1315 -0
- data/vendor/assets/stylesheets/morris.css +3 -0
- metadata +92 -172
- data/app/actors/hyrax/actors/initialize_workflow_actor.rb +0 -35
- data/app/helpers/hyrax/url_helper.rb +0 -13
- data/app/jobs/content_depositor_change_event_job.rb +0 -48
- data/app/models/concerns/hyrax/with_file_sets.rb +0 -17
- data/lib/hyrax/transactions/create_work.rb +0 -65
- data/lib/hyrax/transactions/destroy_work.rb +0 -28
- data/lib/hyrax/transactions/steps/apply_collection_permission_template.rb +0 -34
- data/lib/hyrax/transactions/steps/apply_permission_template.rb +0 -32
- data/lib/hyrax/transactions/steps/apply_visibility.rb +0 -41
- data/lib/hyrax/transactions/steps/destroy_work.rb +0 -27
- data/lib/hyrax/transactions/steps/ensure_permission_template.rb +0 -29
- data/lib/hyrax/transactions/steps/save_work.rb +0 -38
- data/lib/hyrax/transactions/update_work.rb +0 -19
- data/lib/wings/services/file_converter_service.rb +0 -19
- data/lib/wings/services/file_metadata_builder.rb +0 -94
- data/vendor/assets/javascripts/handlebars-v4.0.5.js +0 -4612
- data/vendor/assets/stylesheets/morris.js/0.5.1/morris.css +0 -2
@@ -1,7 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
module Hyrax
|
3
3
|
class SingleUseLinksController < ApplicationController
|
4
|
-
include Blacklight::SearchHelper
|
5
4
|
class_attribute :show_presenter
|
6
5
|
self.show_presenter = Hyrax::SingleUseLinkPresenter
|
7
6
|
before_action :authenticate_user!
|
@@ -45,7 +44,7 @@ module Hyrax
|
|
45
44
|
end
|
46
45
|
|
47
46
|
def asset_show_path
|
48
|
-
polymorphic_path([main_app, fetch(params[:id]).last])
|
47
|
+
polymorphic_path([main_app, search_service.fetch(params[:id]).last])
|
49
48
|
end
|
50
49
|
end
|
51
50
|
end
|
@@ -0,0 +1,150 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Hyrax
|
4
|
+
module FacetsHelper
|
5
|
+
# Methods in this module are from Blacklight::FacetsHelperBehavior, blacklight v6.24.0
|
6
|
+
# This module is used to ensure Hyrax facet views that rely on deprecated Blacklight helper methods are still functional
|
7
|
+
|
8
|
+
include Blacklight::Facet
|
9
|
+
|
10
|
+
##
|
11
|
+
# Renders the list of values
|
12
|
+
# removes any elements where render_facet_item returns a nil value. This enables an application
|
13
|
+
# to filter undesireable facet items so they don't appear in the UI
|
14
|
+
def render_facet_limit_list(paginator, facet_field, wrapping_element = :li)
|
15
|
+
safe_join(paginator.items.map { |item| render_facet_item(facet_field, item) }.compact.map { |item| content_tag(wrapping_element, item) })
|
16
|
+
end
|
17
|
+
|
18
|
+
##
|
19
|
+
# Renders a single facet item
|
20
|
+
def render_facet_item(facet_field, item)
|
21
|
+
if facet_in_params?(facet_field, item.value)
|
22
|
+
render_selected_facet_value(facet_field, item)
|
23
|
+
else
|
24
|
+
render_facet_value(facet_field, item)
|
25
|
+
end
|
26
|
+
end
|
27
|
+
|
28
|
+
##
|
29
|
+
# Standard display of a facet value in a list. Used in both _facets sidebar
|
30
|
+
# partial and catalog/facet expanded list. Will output facet value name as
|
31
|
+
# a link to add that to your restrictions, with count in parens.
|
32
|
+
#
|
33
|
+
# @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
|
34
|
+
# @param [Blacklight::Solr::Response::Facets::FacetItem] item
|
35
|
+
# @param [Hash] options
|
36
|
+
# @option options [Boolean] :suppress_link display the facet, but don't link to it
|
37
|
+
# @return [String]
|
38
|
+
def render_facet_value(facet_field, item, options = {})
|
39
|
+
path = path_for_facet(facet_field, item)
|
40
|
+
content_tag(:span, class: "facet-label") do
|
41
|
+
link_to_unless(options[:suppress_link], facet_display_value(facet_field, item), path, class: "facet_select")
|
42
|
+
end + render_facet_count(item.hits)
|
43
|
+
end
|
44
|
+
|
45
|
+
##
|
46
|
+
# Where should this facet link to?
|
47
|
+
# @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
|
48
|
+
# @param [String] item
|
49
|
+
# @return [String]
|
50
|
+
def path_for_facet(facet_field, item)
|
51
|
+
facet_config = facet_configuration_for_field(facet_field)
|
52
|
+
if facet_config.url_method
|
53
|
+
send(facet_config.url_method, facet_field, item)
|
54
|
+
else
|
55
|
+
search_action_path(search_state.add_facet_params_and_redirect(facet_field, item))
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
##
|
60
|
+
# Standard display of a SELECTED facet value (e.g. without a link and with a remove button)
|
61
|
+
# @see #render_facet_value
|
62
|
+
# @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
|
63
|
+
# @param [String] item
|
64
|
+
def render_selected_facet_value(facet_field, item)
|
65
|
+
remove_href = search_action_path(search_state.remove_facet_params(facet_field, item))
|
66
|
+
content_tag(:span, class: "facet-label") do
|
67
|
+
content_tag(:span, facet_display_value(facet_field, item), class: "selected") +
|
68
|
+
# remove link
|
69
|
+
link_to(remove_href, class: "remove") do
|
70
|
+
content_tag(:i, '', class: "fa fa-times") +
|
71
|
+
content_tag(:span, '[remove]', class: 'sr-only')
|
72
|
+
end
|
73
|
+
end + render_facet_count(item.hits, classes: ["selected"])
|
74
|
+
end
|
75
|
+
|
76
|
+
##
|
77
|
+
# Renders a count value for facet limits. Can be over-ridden locally
|
78
|
+
# to change style. And can be called by plugins to get consistent display.
|
79
|
+
#
|
80
|
+
# @param [Integer] num number of facet results
|
81
|
+
# @param [Hash] options
|
82
|
+
# @option options [Array<String>] an array of classes to add to count span.
|
83
|
+
# @return [String]
|
84
|
+
def render_facet_count(num, options = {})
|
85
|
+
classes = (options[:classes] || []) << "facet-count"
|
86
|
+
content_tag("span", t('blacklight.search.facets.count', number: number_with_delimiter(num)), class: classes)
|
87
|
+
end
|
88
|
+
|
89
|
+
##
|
90
|
+
# Check if the query parameters have the given facet field with the
|
91
|
+
# given value.
|
92
|
+
#
|
93
|
+
# @param [Object] field
|
94
|
+
# @param [Object] item facet value
|
95
|
+
# @return [Boolean]
|
96
|
+
def facet_in_params?(field, item)
|
97
|
+
value = facet_value_for_facet_item(item)
|
98
|
+
|
99
|
+
(facet_params(field) || []).include? value
|
100
|
+
end
|
101
|
+
|
102
|
+
##
|
103
|
+
# Get the values of the facet set in the blacklight query string
|
104
|
+
def facet_params(field)
|
105
|
+
config = facet_configuration_for_field(field)
|
106
|
+
|
107
|
+
params[:f][config.key] if params[:f]
|
108
|
+
end
|
109
|
+
|
110
|
+
##
|
111
|
+
# Get the displayable version of a facet's value
|
112
|
+
#
|
113
|
+
# @param [Object] field
|
114
|
+
# @param [String] item value
|
115
|
+
# @return [String]
|
116
|
+
# rubocop:disable Metrics/MethodLength
|
117
|
+
def facet_display_value(field, item)
|
118
|
+
facet_config = facet_configuration_for_field(field)
|
119
|
+
|
120
|
+
value = if item.respond_to? :label
|
121
|
+
item.label
|
122
|
+
else
|
123
|
+
facet_value_for_facet_item(item)
|
124
|
+
end
|
125
|
+
|
126
|
+
if facet_config.helper_method
|
127
|
+
send facet_config.helper_method, value
|
128
|
+
elsif facet_config.query && facet_config.query[value]
|
129
|
+
facet_config.query[value][:label]
|
130
|
+
elsif facet_config.date
|
131
|
+
localization_options = facet_config.date == true ? {} : facet_config.date
|
132
|
+
|
133
|
+
l(value.to_datetime, localization_options)
|
134
|
+
else
|
135
|
+
value
|
136
|
+
end
|
137
|
+
end
|
138
|
+
# rubocop:enable Metrics/MethodLength
|
139
|
+
|
140
|
+
private
|
141
|
+
|
142
|
+
def facet_value_for_facet_item(item)
|
143
|
+
if item.respond_to? :value
|
144
|
+
item.value
|
145
|
+
else
|
146
|
+
item
|
147
|
+
end
|
148
|
+
end
|
149
|
+
end
|
150
|
+
end
|
@@ -8,7 +8,6 @@ module Hyrax
|
|
8
8
|
include Hyrax::TitleHelper
|
9
9
|
include Hyrax::FileSetHelper
|
10
10
|
include Hyrax::AbilityHelper
|
11
|
-
include Hyrax::UrlHelper
|
12
11
|
include Hyrax::EmbargoHelper
|
13
12
|
include Hyrax::LeaseHelper
|
14
13
|
include Hyrax::CollectionsHelper
|
@@ -19,6 +18,7 @@ module Hyrax
|
|
19
18
|
include Hyrax::PermissionLevelsHelper
|
20
19
|
include Hyrax::WorkFormHelper
|
21
20
|
include Hyrax::WorkflowsHelper
|
21
|
+
include Hyrax::FacetsHelper
|
22
22
|
|
23
23
|
##
|
24
24
|
# @return [Array<String>] the list of all user groups
|
@@ -69,7 +69,7 @@ module Hyrax
|
|
69
69
|
unread_notifications = mailbox.unread_count
|
70
70
|
link_to(hyrax.notifications_path,
|
71
71
|
'aria-label' => mailbox.label(params[:locale]),
|
72
|
-
class: 'notify-number') do
|
72
|
+
class: 'notify-number nav-link') do
|
73
73
|
capture do
|
74
74
|
concat tag.span('', class: 'fa fa-bell')
|
75
75
|
concat "\n"
|
@@ -195,7 +195,7 @@ module Hyrax
|
|
195
195
|
# this block is only executed when a link is inserted;
|
196
196
|
# if we pass text containing no links, it just returns text.
|
197
197
|
auto_link(html_escape(text)) do |value|
|
198
|
-
"<span class='
|
198
|
+
"<span class='fa fa-external-link'></span>#{(' ' + value) if show_link}"
|
199
199
|
end
|
200
200
|
end
|
201
201
|
|
@@ -312,9 +312,9 @@ module Hyrax
|
|
312
312
|
end
|
313
313
|
|
314
314
|
def count_classes_for(unread_count)
|
315
|
-
classes = unread_count.zero? ? 'invisible
|
315
|
+
classes = unread_count.zero? ? 'invisible badge-secondary' : 'badge-danger'
|
316
316
|
|
317
|
-
"count
|
317
|
+
"count badge #{classes}"
|
318
318
|
end
|
319
319
|
|
320
320
|
def search_action_for_dashboard
|
@@ -32,21 +32,15 @@ module Hyrax
|
|
32
32
|
end
|
33
33
|
|
34
34
|
def stored_and_facetable_index_config
|
35
|
-
stored_and_facetable_fields.
|
36
|
-
hash[name] = index_object_for(name, as: [:stored_searchable, :facetable])
|
37
|
-
end
|
35
|
+
stored_and_facetable_fields.index_with { |name| index_object_for(name, as: [:stored_searchable, :facetable]) }
|
38
36
|
end
|
39
37
|
|
40
38
|
def stored_searchable_index_config
|
41
|
-
stored_fields.
|
42
|
-
hash[name] = index_object_for(name, as: [:stored_searchable])
|
43
|
-
end
|
39
|
+
stored_fields.index_with { |name| index_object_for(name, as: [:stored_searchable]) }
|
44
40
|
end
|
45
41
|
|
46
42
|
def symbol_index_config
|
47
|
-
symbol_fields.
|
48
|
-
hash[name] = index_object_for(name, as: [:symbol])
|
49
|
-
end
|
43
|
+
symbol_fields.index_with { |name| index_object_for(name, as: [:symbol]) }
|
50
44
|
end
|
51
45
|
|
52
46
|
def index_object_for(attribute_name, as: [])
|
@@ -29,13 +29,10 @@ class CharacterizeJob < Hyrax::ApplicationJob
|
|
29
29
|
# @param [String, NilClass] filepath the cached file within the Hyrax.config.working_path
|
30
30
|
def perform(file_set, file_id, filepath = nil)
|
31
31
|
raise "#{file_set.class.characterization_proxy} was not found for FileSet #{file_set.id}" unless file_set.characterization_proxy?
|
32
|
-
|
32
|
+
# Ensure a fresh copy of the repo file's latest version is being worked on, if no filepath is directly provided
|
33
|
+
filepath = Hyrax::WorkingDirectory.copy_repository_resource_to_working_directory(Hydra::PCDM::File.find(file_id), file_set.id) unless filepath && File.exist?(filepath)
|
33
34
|
characterize(file_set, file_id, filepath)
|
34
|
-
|
35
|
-
Hyrax.publisher.publish('file.characterized',
|
36
|
-
file_set: file_set,
|
37
|
-
file_id: file_id,
|
38
|
-
path_hint: filepath)
|
35
|
+
CreateDerivativesJob.perform_later(file_set, file_id, filepath)
|
39
36
|
end
|
40
37
|
|
41
38
|
private
|
@@ -65,7 +62,7 @@ class CharacterizeJob < Hyrax::ApplicationJob
|
|
65
62
|
file_set.date_modified = Hyrax::TimeService.time_in_utc if file_set.characterization_proxy.original_checksum.first != previous_checksum
|
66
63
|
|
67
64
|
# set title to label if that's how it was before this characterization
|
68
|
-
file_set.title = [file_set.characterization_proxy.original_name] if reset_title
|
65
|
+
file_set.title = [file_set.characterization_proxy.original_name.force_encoding("UTF-8")] if reset_title
|
69
66
|
# always set the label to the original_name
|
70
67
|
file_set.label = file_set.characterization_proxy.original_name
|
71
68
|
|
@@ -7,9 +7,11 @@ class CreateDerivativesJob < Hyrax::ApplicationJob
|
|
7
7
|
# @param [String, NilClass] filepath the cached file within the Hyrax.config.working_path
|
8
8
|
def perform(file_set, file_id, filepath = nil)
|
9
9
|
return if file_set.video? && !Hyrax.config.enable_ffmpeg
|
10
|
-
filename = Hyrax::WorkingDirectory.find_or_retrieve(file_id, file_set.id, filepath)
|
11
10
|
|
12
|
-
|
11
|
+
# Ensure a fresh copy of the repo file's latest version is being worked on, if no filepath is directly provided
|
12
|
+
filepath = Hyrax::WorkingDirectory.copy_repository_resource_to_working_directory(Hydra::PCDM::File.find(file_id), file_set.id) unless filepath && File.exist?(filepath)
|
13
|
+
|
14
|
+
file_set.create_derivatives(filepath)
|
13
15
|
|
14
16
|
# Reload from Fedora and reindex for thumbnail and extracted text
|
15
17
|
file_set.reload
|
@@ -1,4 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
##
|
3
|
+
# Ingest a local file using ActiveFedora & FileSetActor.
|
2
4
|
class IngestLocalFileJob < Hyrax::ApplicationJob
|
3
5
|
queue_as Hyrax.config.ingest_queue_name
|
4
6
|
|
@@ -6,25 +8,15 @@ class IngestLocalFileJob < Hyrax::ApplicationJob
|
|
6
8
|
# @param [String] path
|
7
9
|
# @param [User] user
|
8
10
|
def perform(file_set, path, user)
|
9
|
-
|
10
|
-
when ActiveFedora::Base
|
11
|
-
__perform(file_set, path, user, use_valkyrie: false)
|
12
|
-
else
|
13
|
-
__perform(file_set, path, user, use_valkyrie: true)
|
14
|
-
end
|
11
|
+
__perform(file_set, path, user)
|
15
12
|
end
|
16
13
|
|
17
14
|
private
|
18
15
|
|
19
|
-
|
20
|
-
# the Hyrax::Actors::FileSetActor, we wouldn't need to pass the
|
21
|
-
# `use_valkyrie` parameter. However, I want to include this logic
|
22
|
-
# to demonstrate that "Yes, the IngestLocalFileJob has been tested
|
23
|
-
# for Valkyrie usage"
|
24
|
-
def __perform(file_set, path, user, use_valkyrie:)
|
16
|
+
def __perform(file_set, path, user)
|
25
17
|
file_set.label ||= File.basename(path)
|
26
18
|
|
27
|
-
actor = Hyrax::Actors::FileSetActor.new(file_set, user
|
19
|
+
actor = Hyrax::Actors::FileSetActor.new(file_set, user)
|
28
20
|
|
29
21
|
if actor.create_content(File.open(path))
|
30
22
|
Hyrax.config.callback.run(:after_import_local_file_success, file_set, user, path, warn: false)
|
@@ -5,11 +5,7 @@ class InheritPermissionsJob < Hyrax::ApplicationJob
|
|
5
5
|
# Perform the copy from the work to the contained filesets
|
6
6
|
#
|
7
7
|
# @param work containing access level and filesets
|
8
|
-
|
9
|
-
def perform(work, use_valkyrie: :DEFAULT)
|
10
|
-
Deprecation.warn("use_valkyrie argument is deprecated, behavior depends on deserialized resource") unless
|
11
|
-
use_valkyrie == :DEFAULT
|
12
|
-
|
8
|
+
def perform(work)
|
13
9
|
case work
|
14
10
|
when ActiveFedora::Base
|
15
11
|
af_perform(work)
|
data/app/models/admin_set.rb
CHANGED
@@ -97,14 +97,6 @@ class AdminSet < ActiveFedora::Base
|
|
97
97
|
permission_template.reset_access_controls_for(collection: self)
|
98
98
|
end
|
99
99
|
|
100
|
-
# @api public
|
101
|
-
#
|
102
|
-
# return an id for the AdminSet.
|
103
|
-
# defaults to calling Hyrax::Noid, but needs a fall back if noid is off
|
104
|
-
def assign_id
|
105
|
-
super || SecureRandom.uuid
|
106
|
-
end
|
107
|
-
|
108
100
|
private
|
109
101
|
|
110
102
|
def destroy_permission_template
|
@@ -18,7 +18,7 @@ module Hyrax
|
|
18
18
|
|
19
19
|
self.indexer = Hyrax::CollectionIndexer
|
20
20
|
|
21
|
-
class_attribute :index_collection_type_gid_as,
|
21
|
+
class_attribute :index_collection_type_gid_as, instance_writer: false
|
22
22
|
self.index_collection_type_gid_as = [:symbol]
|
23
23
|
|
24
24
|
property :collection_type_gid, predicate: ::RDF::Vocab::SCHEMA.additionalType, multiple: false do |index|
|
@@ -6,12 +6,5 @@ module Hyrax
|
|
6
6
|
included do
|
7
7
|
belongs_to :admin_set, predicate: Hyrax.config.admin_set_predicate
|
8
8
|
end
|
9
|
-
|
10
|
-
##
|
11
|
-
# @deprecated Use `Sipity::Workflow.find_active_workflow_for` instead.
|
12
|
-
def active_workflow
|
13
|
-
Deprecation.warn 'Use `Sipity::Workflow.find_active_workflow_for` instead.'
|
14
|
-
Sipity::Workflow.find_active_workflow_for(admin_set_id: admin_set_id)
|
15
|
-
end
|
16
9
|
end
|
17
10
|
end
|
@@ -34,12 +34,12 @@ module Hyrax::User
|
|
34
34
|
scope :without_system_accounts, -> { where("#{::User.user_key_field} not in (?)", [::User.batch_user_key, ::User.audit_user_key, ::User.system_user_key]) }
|
35
35
|
|
36
36
|
# Validate and normalize ORCIDs
|
37
|
-
validates_with OrcidValidator
|
37
|
+
validates_with Hyrax::OrcidValidator
|
38
38
|
after_validation :normalize_orcid
|
39
39
|
|
40
40
|
# Set up user profile avatars
|
41
|
-
mount_uploader :avatar, AvatarUploader, mount_on: :avatar_file_name
|
42
|
-
validates_with AvatarValidator
|
41
|
+
mount_uploader :avatar, Hyrax::AvatarUploader, mount_on: :avatar_file_name
|
42
|
+
validates_with Hyrax::AvatarValidator
|
43
43
|
|
44
44
|
# Add token to authenticate Arkivo API calls
|
45
45
|
after_initialize :set_arkivo_token, unless: :persisted? if Hyrax.config.arkivo_api?
|
data/app/models/content_block.rb
CHANGED
@@ -24,12 +24,6 @@ class ContentBlock < ActiveRecord::Base
|
|
24
24
|
end
|
25
25
|
|
26
26
|
class << self
|
27
|
-
# @deprecated
|
28
|
-
def whitelisted?(key)
|
29
|
-
Deprecation.warn(self, "Samvera is deprecating '#{self}.whitelisted?' in Hyrax 3.0. Use #{self}.registered? instead.")
|
30
|
-
registered?(key)
|
31
|
-
end
|
32
|
-
|
33
27
|
def registered?(key)
|
34
28
|
NAME_REGISTRY.include?(key)
|
35
29
|
end
|
@@ -65,7 +65,7 @@ module Hyrax
|
|
65
65
|
attribute :label, ::Valkyrie::Types::Set
|
66
66
|
attribute :original_filename, ::Valkyrie::Types::String
|
67
67
|
attribute :mime_type, ::Valkyrie::Types::String.default(GENERIC_MIME_TYPE)
|
68
|
-
attribute :type, ::Valkyrie::Types::Set.default([Use::ORIGINAL_FILE])
|
68
|
+
attribute :type, ::Valkyrie::Types::Set.default([Use::ORIGINAL_FILE].freeze)
|
69
69
|
|
70
70
|
# attributes set by fits
|
71
71
|
attribute :format_label, ::Valkyrie::Types::Set
|
@@ -91,30 +91,6 @@ module Hyrax
|
|
91
91
|
raise Hyrax::ObjectNotFoundError
|
92
92
|
end
|
93
93
|
|
94
|
-
# A bit of an analogue for a `belongs_to :admin_set` as it crosses from Fedora to the DB
|
95
|
-
# @deprecated Use #source instead
|
96
|
-
# @return [AdminSet]
|
97
|
-
# @raise [Hyrax::ObjectNotFoundError] when the we cannot find the AdminSet
|
98
|
-
def admin_set
|
99
|
-
Deprecation.warn("#admin_set is deprecated; use #source instead.")
|
100
|
-
return AdminSet.find(source_id) if AdminSet.exists?(source_id)
|
101
|
-
raise Hyrax::ObjectNotFoundError
|
102
|
-
rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
|
103
|
-
raise Hyrax::ObjectNotFoundError
|
104
|
-
end
|
105
|
-
|
106
|
-
# A bit of an analogue for a `belongs_to :collection` as it crosses from Fedora to the DB
|
107
|
-
# @deprecated Use #source instead
|
108
|
-
# @return [Collection]
|
109
|
-
# @raise [Hyrax::ObjectNotFoundError] when the we cannot find the Collection
|
110
|
-
def collection
|
111
|
-
Deprecation.warn("#collection is deprecated; use #source instead.")
|
112
|
-
return ::Collection.find(source_id) if ::Collection.exists?(source_id)
|
113
|
-
raise Hyrax::ObjectNotFoundError
|
114
|
-
rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
|
115
|
-
raise Hyrax::ObjectNotFoundError
|
116
|
-
end
|
117
|
-
|
118
94
|
# Valid Release Period values
|
119
95
|
RELEASE_TEXT_VALUE_FIXED = 'fixed'
|
120
96
|
RELEASE_TEXT_VALUE_NO_DELAY = 'now'
|
@@ -219,17 +195,6 @@ module Hyrax
|
|
219
195
|
[::Ability.registered_group_name, ::Ability.public_group_name]
|
220
196
|
end
|
221
197
|
|
222
|
-
##
|
223
|
-
# @deprecated Use #reset_access_controls_for instead
|
224
|
-
# @param interpret_visibility [Boolean] whether to retain the existing
|
225
|
-
# visibility when applying permission template ACLs
|
226
|
-
# @return [Boolean]
|
227
|
-
def reset_access_controls(interpret_visibility: false)
|
228
|
-
Deprecation.warn("#reset_access_controls is deprecated; use #reset_access_controls_for instead.")
|
229
|
-
reset_access_controls_for(collection: source_model,
|
230
|
-
interpret_visibility: interpret_visibility)
|
231
|
-
end
|
232
|
-
|
233
198
|
##
|
234
199
|
# @param collection [::Collection, Hyrax::Resource]
|
235
200
|
# @param interpret_visibility [Boolean] whether to retain the existing
|
@@ -21,7 +21,7 @@ module Hyrax
|
|
21
21
|
|
22
22
|
def button_tag
|
23
23
|
tag.a(role: 'button',
|
24
|
-
class: "#{button_class}collapse-toggle",
|
24
|
+
class: "#{button_class}collapse-toggle nav-link",
|
25
25
|
data: { toggle: 'collapse' },
|
26
26
|
href: "##{id}",
|
27
27
|
onclick: "toggleCollapse(this)",
|
@@ -44,7 +44,7 @@ module Hyrax
|
|
44
44
|
end
|
45
45
|
|
46
46
|
def workflows_class
|
47
|
-
'
|
47
|
+
'show ' if open
|
48
48
|
end
|
49
49
|
end
|
50
50
|
end
|
@@ -111,7 +111,7 @@ module Hyrax
|
|
111
111
|
end
|
112
112
|
|
113
113
|
def collection_type_badge
|
114
|
-
tag.span(collection_type.title, class: "
|
114
|
+
tag.span(collection_type.title, class: "badge", style: "background-color: " + collection_type.badge_color + ";")
|
115
115
|
end
|
116
116
|
|
117
117
|
# The total number of parents that this collection belongs to, visible or not.
|
@@ -25,9 +25,9 @@ module Hyrax
|
|
25
25
|
if relevant_log_records.empty?
|
26
26
|
"Fixity checks have not yet been run on this object"
|
27
27
|
elsif failing_checks.empty?
|
28
|
-
tag.span("passed", class: "
|
28
|
+
tag.span("passed", class: "badge badge-success") + ' ' + render_existing_check_summary
|
29
29
|
else
|
30
|
-
tag.span("FAIL", class: "
|
30
|
+
tag.span("FAIL", class: "badge badge-danger") + ' ' + render_existing_check_summary + render_failed_compact
|
31
31
|
end
|
32
32
|
end
|
33
33
|
|
@@ -22,7 +22,7 @@ module Hyrax
|
|
22
22
|
# @param also_active_for [Hash, String] a hash or string with alternative paths that should be 'active'
|
23
23
|
def nav_link(options, also_active_for: nil, **link_html_options)
|
24
24
|
active_urls = [options, also_active_for].compact
|
25
|
-
list_options = active_urls.any? { |url| current_page?(url) } ? { class: 'active' } : {}
|
25
|
+
list_options = active_urls.any? { |url| current_page?(url) } ? { class: 'active nav-item' } : { class: 'nav-item' }
|
26
26
|
tag.li(list_options) do
|
27
27
|
link_to(options, link_html_options) do
|
28
28
|
yield
|
@@ -4,11 +4,11 @@ module Hyrax
|
|
4
4
|
include ActionView::Helpers::TagHelper
|
5
5
|
|
6
6
|
VISIBILITY_LABEL_CLASS = {
|
7
|
-
authenticated: "
|
8
|
-
embargo: "
|
9
|
-
lease: "
|
10
|
-
open: "
|
11
|
-
restricted: "
|
7
|
+
authenticated: "badge-info",
|
8
|
+
embargo: "badge-warning",
|
9
|
+
lease: "badge-warning",
|
10
|
+
open: "badge-success",
|
11
|
+
restricted: "badge-danger"
|
12
12
|
}.freeze
|
13
13
|
|
14
14
|
# @param visibility [String] the current visibility
|
@@ -18,13 +18,13 @@ module Hyrax
|
|
18
18
|
|
19
19
|
# Draws a span tag with styles for a bootstrap label
|
20
20
|
def render
|
21
|
-
tag.span(text, class: "
|
21
|
+
tag.span(text, class: "badge #{dom_label_class}")
|
22
22
|
end
|
23
23
|
|
24
24
|
private
|
25
25
|
|
26
26
|
def dom_label_class
|
27
|
-
VISIBILITY_LABEL_CLASS.fetch(@visibility.to_sym, '
|
27
|
+
VISIBILITY_LABEL_CLASS.fetch(@visibility.to_sym, 'badge-info')
|
28
28
|
end
|
29
29
|
|
30
30
|
def text
|
@@ -6,7 +6,7 @@ module Hyrax
|
|
6
6
|
# zero to just get the facet information
|
7
7
|
# @param solr_parameters the current solr parameters
|
8
8
|
def include_depositor_facet(solr_parameters)
|
9
|
-
solr_parameters
|
9
|
+
solr_parameters.append_facet_fields(DepositSearchBuilder.depositor_field)
|
10
10
|
|
11
11
|
# default facet limit is 10, which will only show the top 10 users.
|
12
12
|
# As we want to show all user deposits, so set the facet.limit to the
|
@@ -22,7 +22,7 @@ module Hyrax
|
|
22
22
|
# @return [void]
|
23
23
|
def parent_collections_only(solr_parameters)
|
24
24
|
solr_parameters[:fq] ||= []
|
25
|
-
solr_parameters[:fq] += [
|
25
|
+
solr_parameters[:fq] += [process_fq]
|
26
26
|
end
|
27
27
|
self.default_processor_chain += [:parent_collections_only]
|
28
28
|
|
@@ -34,5 +34,14 @@ module Hyrax
|
|
34
34
|
solr_parameters[:page] = page
|
35
35
|
end
|
36
36
|
self.default_processor_chain += [:with_pagination]
|
37
|
+
|
38
|
+
private
|
39
|
+
|
40
|
+
def process_fq
|
41
|
+
ids = child.member_of_collection_ids.reject(&:blank?)
|
42
|
+
|
43
|
+
return "id:NEVER_USE_THIS_ID" if ids.empty?
|
44
|
+
Hyrax::SolrQueryService.new.with_ids(ids: child.member_of_collection_ids).build
|
45
|
+
end
|
37
46
|
end
|
38
47
|
end
|
@@ -9,7 +9,7 @@ module Hyrax
|
|
9
9
|
# zero to just get the facet information
|
10
10
|
# @param solr_parameters the current solr parameters
|
11
11
|
def include_suppressed_facet(solr_parameters)
|
12
|
-
solr_parameters
|
12
|
+
solr_parameters.append_facet_fields(IndexesWorkflow.suppressed_field)
|
13
13
|
solr_parameters[:'facet.missing'] = true
|
14
14
|
|
15
15
|
# we only want the facet counts not the actual data
|