hyrax 3.6.0 → 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/analytics.yml +2 -4
- 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/.github/workflows/main.yml +17 -0
- data/.github/workflows/release.yml +17 -0
- data/.regen +1 -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/collections_membership_actor.rb +1 -1
- data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +5 -11
- data/app/actors/hyrax/actors/embargo_actor.rb +4 -11
- data/app/actors/hyrax/actors/file_actor.rb +9 -37
- data/app/actors/hyrax/actors/file_set_actor.rb +13 -62
- data/app/actors/hyrax/actors/lease_actor.rb +4 -11
- data/app/assets/javascripts/hyrax/analytics_events.js +38 -88
- data/app/assets/javascripts/hyrax/app.js.erb +2 -2
- 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/control.es6 +1 -8
- 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/embargoes_controller_behavior.rb +2 -11
- data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +2 -11
- data/app/controllers/concerns/hyrax/manages_embargoes.rb +1 -13
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +4 -9
- data/app/controllers/hyrax/admin/analytics/collection_reports_controller.rb +2 -2
- data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb +1 -1
- data/app/controllers/hyrax/admin/strategies_controller.rb +1 -1
- data/app/controllers/hyrax/admin/workflows_controller.rb +3 -48
- data/app/controllers/hyrax/batch_edits_controller.rb +1 -1
- data/app/controllers/hyrax/dashboard/collections_controller.rb +2 -1
- data/app/controllers/hyrax/dashboard/nest_collections_controller.rb +0 -32
- data/app/controllers/hyrax/downloads_controller.rb +1 -16
- data/app/controllers/hyrax/file_sets_controller.rb +4 -10
- data/app/controllers/hyrax/homepage_controller.rb +0 -1
- data/app/controllers/hyrax/my_controller.rb +0 -6
- data/app/controllers/hyrax/permissions_controller.rb +1 -1
- data/app/controllers/hyrax/single_use_links_controller.rb +1 -2
- data/app/controllers/hyrax/transfers_controller.rb +2 -0
- data/app/controllers/hyrax/workflow_actions_controller.rb +2 -3
- data/app/forms/hyrax/forms/collection_form.rb +1 -1
- data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +0 -2
- data/app/forms/hyrax/forms/file_set_edit_form.rb +1 -1
- data/app/forms/hyrax/forms/file_set_form.rb +35 -8
- data/app/forms/hyrax/forms/resource_form.rb +32 -36
- data/app/helpers/hyrax/embargo_helper.rb +0 -11
- data/app/helpers/hyrax/facets_helper.rb +150 -0
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +5 -5
- data/app/helpers/hyrax/lease_helper.rb +0 -11
- data/app/indexers/hyrax/basic_metadata_indexer.rb +3 -9
- data/app/indexers/hyrax/pcdm_collection_indexer.rb +0 -1
- data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +8 -2
- data/app/jobs/characterize_job.rb +4 -7
- data/app/jobs/content_event_job.rb +1 -1
- 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 +2 -3
- data/app/models/concerns/hyrax/collection_nesting.rb +1 -10
- data/app/models/concerns/hyrax/file_set_behavior.rb +1 -2
- 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 +1 -3
- data/app/models/content_block.rb +0 -6
- data/app/models/hyrax/embargo.rb +1 -1
- data/app/models/hyrax/file_metadata.rb +1 -1
- data/app/models/hyrax/file_set.rb +3 -3
- data/app/models/hyrax/lease.rb +1 -1
- data/app/models/hyrax/permission_template.rb +0 -35
- data/app/models/proxy_deposit_request.rb +1 -1
- 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 +8 -9
- data/app/presenters/hyrax/version_list_presenter.rb +1 -6
- 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/dashboard/nested_collections_search_builder.rb +5 -13
- 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/analytics/google.rb +15 -23
- data/app/services/hyrax/analytics/matomo.rb +3 -4
- data/app/services/hyrax/collection_member_service.rb +1 -2
- data/app/services/hyrax/collections/nested_collection_query_service.rb +1 -1
- data/app/services/hyrax/collections/search_service.rb +0 -1
- data/app/services/hyrax/custom_queries.rb +25 -0
- data/app/services/hyrax/edit_permissions_service.rb +3 -21
- data/app/services/hyrax/embargo_manager.rb +0 -9
- 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/lease_manager.rb +0 -9
- data/app/services/hyrax/listeners/file_metadata_listener.rb +0 -11
- data/app/services/hyrax/search_service.rb +1 -81
- data/app/services/hyrax/solr_query_service.rb +4 -4
- data/app/services/hyrax/statistics/depositors/summary.rb +1 -3
- data/app/services/hyrax/user_stat_importer.rb +0 -2
- data/app/services/hyrax/valkyrie_upload.rb +13 -1
- data/app/services/hyrax/versioning_service.rb +9 -77
- data/app/services/hyrax/visibility_propagator.rb +5 -5
- data/app/services/hyrax/work_query_service.rb +1 -1
- data/app/services/hyrax/workflow/actionable_objects.rb +3 -28
- data/app/services/hyrax/workflow/permission_query.rb +2 -23
- 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 +7 -7
- 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 +8 -8
- 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 +80 -55
- 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 +7 -7
- 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 +16 -20
- 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 +10 -10
- data/app/views/hyrax/base/_work_button_row.html.erb +17 -16
- 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 +11 -11
- 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 +14 -14
- 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.html.erb +1 -1
- data/app/views/hyrax/file_sets/_permission_form.html.erb +39 -30
- data/app/views/hyrax/file_sets/_show_actions.html.erb +3 -3
- 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 +19 -13
- 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 +14 -14
- 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/transfers/new.html.erb +1 -1
- 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/_head_tag_content.html.erb +2 -5
- 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 +5 -6
- data/config/locales/hyrax.en.yml +4 -15
- data/config/locales/hyrax.es.yml +6 -7
- data/config/locales/hyrax.fr.yml +8 -9
- data/config/locales/hyrax.it.yml +6 -7
- data/config/locales/hyrax.pt-BR.yml +6 -7
- data/config/locales/hyrax.zh.yml +6 -7
- data/docker-compose.yml +2 -1
- data/documentation/developing-your-hyrax-based-app.md +2 -2
- data/documentation/legacyREADME.md +3 -3
- data/hyrax.gemspec +13 -24
- 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/analytics.yml +0 -3
- data/lib/generators/hyrax/templates/config/initializers/riiif.rb +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
- data/lib/generators/hyrax/templates/hyrax.scss +1 -2
- data/lib/generators/hyrax/templates/package.json +7 -8
- data/lib/hyrax/active_fedora_dummy_model.rb +0 -13
- data/lib/hyrax/configuration.rb +2 -49
- data/lib/hyrax/engine.rb +1 -2
- data/lib/hyrax/errors.rb +0 -2
- data/lib/hyrax/publisher.rb +0 -4
- data/lib/hyrax/specs/capybara.rb +5 -3
- data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb +0 -6
- data/lib/hyrax/specs/shared_specs/indexers.rb +0 -5
- 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/lib/wings/valkyrie/storage.rb +2 -6
- 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 +95 -218
- data/app/actors/hyrax/actors/initialize_workflow_actor.rb +0 -35
- data/app/forms/hyrax/forms/embargo.rb +0 -13
- data/app/forms/hyrax/forms/lease.rb +0 -13
- data/app/forms/hyrax/forms/pcdm_object_form.rb +0 -46
- data/app/forms/hyrax/forms/work_embargo_form.rb +0 -35
- data/app/forms/hyrax/forms/work_lease_form.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/app/services/hyrax/analytics/ga4.rb +0 -204
- data/app/services/hyrax/file_set_file_service.rb +0 -55
- data/app/services/hyrax/work_resource_query_service.rb +0 -45
- data/app/views/hyrax/admin/workflows/_tabs.html.erb +0 -9
- data/app/views/shared/_ga4.html.erb +0 -10
- data/config/metadata/file_set_metadata.yaml +0 -130
- 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,35 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
module Hyrax
|
3
|
-
module Actors
|
4
|
-
##
|
5
|
-
# @deprecated
|
6
|
-
#
|
7
|
-
# Responsible for generating the workflow for the given curation_concern.
|
8
|
-
# Done through direct collaboration with the configured Hyrax::Actors::InitializeWorkflowActor.workflow_factory
|
9
|
-
#
|
10
|
-
# @see Hyrax::Actors::InitializeWorkflowActor.workflow_factory
|
11
|
-
# @see Hyrax::Workflow::WorkflowFactory for default workflow factory
|
12
|
-
class InitializeWorkflowActor < AbstractActor
|
13
|
-
class_attribute :workflow_factory
|
14
|
-
self.workflow_factory = ::Hyrax::Workflow::WorkflowFactory
|
15
|
-
|
16
|
-
# @param [Hyrax::Actors::Environment] env
|
17
|
-
# @return [Boolean] true if create was successful
|
18
|
-
def create(env)
|
19
|
-
Deprecation.warn('Use Hyrax::Listeners::WorkflowListener instead.')
|
20
|
-
next_actor.create(env) && create_workflow(env)
|
21
|
-
end
|
22
|
-
|
23
|
-
private
|
24
|
-
|
25
|
-
# @return [TrueClass]
|
26
|
-
def create_workflow(env)
|
27
|
-
# if the entity exists, this is already initialized
|
28
|
-
Sipity::Entity(env.curation_concern)
|
29
|
-
true
|
30
|
-
rescue Sipity::ConversionError
|
31
|
-
workflow_factory.create(env.curation_concern, env.attributes, env.user)
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
@@ -1,13 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
module Hyrax
|
3
|
-
module Forms
|
4
|
-
##
|
5
|
-
# Nested form for embargos.
|
6
|
-
class Embargo < Hyrax::ChangeSet
|
7
|
-
property :visibility_after_embargo
|
8
|
-
property :visibility_during_embargo
|
9
|
-
property :embargo_release_date
|
10
|
-
property :embargo_history, default: []
|
11
|
-
end
|
12
|
-
end
|
13
|
-
end
|
@@ -1,13 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
module Hyrax
|
3
|
-
module Forms
|
4
|
-
##
|
5
|
-
# Nested form for leases.
|
6
|
-
class Lease < Hyrax::ChangeSet
|
7
|
-
property :visibility_after_lease
|
8
|
-
property :visibility_during_lease
|
9
|
-
property :lease_expiration_date
|
10
|
-
property :lease_history, default: []
|
11
|
-
end
|
12
|
-
end
|
13
|
-
end
|
@@ -1,46 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Hyrax
|
4
|
-
module Forms
|
5
|
-
##
|
6
|
-
# A form for PCDM objects: resources which have collection relationships and
|
7
|
-
# generally resemble +Hyrax::Work+.
|
8
|
-
class PcdmObjectForm < Hyrax::Forms::ResourceForm
|
9
|
-
include Hyrax::FormFields(:core_metadata)
|
10
|
-
|
11
|
-
property :on_behalf_of
|
12
|
-
property :proxy_depositor
|
13
|
-
|
14
|
-
# pcdm relationships
|
15
|
-
property :admin_set_id, prepopulator: ->(_opts) { self.admin_set_id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s }
|
16
|
-
property :member_ids, default: [], type: Valkyrie::Types::Array
|
17
|
-
property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
|
18
|
-
property :member_of_collections_attributes, virtual: true, populator: :in_collections_populator
|
19
|
-
validates_with CollectionMembershipValidator
|
20
|
-
|
21
|
-
property :representative_id, type: Valkyrie::Types::String
|
22
|
-
property :thumbnail_id, type: Valkyrie::Types::String
|
23
|
-
property :rendering_ids, default: [], type: Valkyrie::Types::Array
|
24
|
-
|
25
|
-
# backs the child work search element;
|
26
|
-
# @todo: look for a way for the view template not to depend on this
|
27
|
-
property :find_child_work, default: nil, virtual: true
|
28
|
-
|
29
|
-
private
|
30
|
-
|
31
|
-
def in_collections_populator(fragment:, **_options)
|
32
|
-
adds = []
|
33
|
-
deletes = []
|
34
|
-
fragment.each do |_, h|
|
35
|
-
if h["_destroy"] == "true"
|
36
|
-
deletes << Valkyrie::ID.new(h["id"])
|
37
|
-
else
|
38
|
-
adds << Valkyrie::ID.new(h["id"])
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
self.member_of_collection_ids = ((member_of_collection_ids + adds) - deletes).uniq
|
43
|
-
end
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
@@ -1,35 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Hyrax
|
4
|
-
module Forms
|
5
|
-
##
|
6
|
-
# Represents an embargo for edit through a work. That is, this form can
|
7
|
-
# be used to wrap a Work in order to capture state changes related only to
|
8
|
-
# its embargo, ignoring the work's other fields.
|
9
|
-
#
|
10
|
-
# @note this supports the edit functionality of
|
11
|
-
# +EmbargoesControllerBehavior+.
|
12
|
-
class WorkEmbargoForm < Hyrax::ChangeSet
|
13
|
-
property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator, prepopulator: :embargo_populator
|
14
|
-
property :embargo_release_date, virtual: true, prepopulator: ->(_opts) { self.embargo_release_date = model.embargo&.embargo_release_date }
|
15
|
-
property :visibility_after_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
|
16
|
-
property :visibility_during_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
|
17
|
-
|
18
|
-
def embargo_populator(**)
|
19
|
-
self.embargo = Hyrax::EmbargoManager.embargo_for(resource: model)
|
20
|
-
end
|
21
|
-
|
22
|
-
##
|
23
|
-
# @return [String]
|
24
|
-
def human_readable_type
|
25
|
-
model.to_model.human_readable_type
|
26
|
-
end
|
27
|
-
|
28
|
-
##
|
29
|
-
# @return [ActiveModel::Name]
|
30
|
-
def model_name
|
31
|
-
model.to_model.model_name
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
@@ -1,35 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Hyrax
|
4
|
-
module Forms
|
5
|
-
##
|
6
|
-
# Represents a lease for edit through a work. That is, this form can
|
7
|
-
# be used to wrap a Work in order to capture state changes related only to
|
8
|
-
# its lease, ignoring the work's other fields.
|
9
|
-
#
|
10
|
-
# @note this supports the edit functionality of
|
11
|
-
# +LeasesControllerBehavior+.
|
12
|
-
class WorkLeaseForm < Hyrax::ChangeSet
|
13
|
-
property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator, prepopulator: :lease_populator
|
14
|
-
property :lease_expiration_date, virtual: true, prepopulator: ->(_opts) { self.lease_expiration_date = model.lease&.lease_expiration_date }
|
15
|
-
property :visibility_after_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_after_lease = model.lease&.visibility_after_lease }
|
16
|
-
property :visibility_during_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_during_lease = model.lease&.visibility_during_lease }
|
17
|
-
|
18
|
-
def lease_populator(**)
|
19
|
-
self.lease = Hyrax::LeaseManager.lease_for(resource: model)
|
20
|
-
end
|
21
|
-
|
22
|
-
##
|
23
|
-
# @return [String]
|
24
|
-
def human_readable_type
|
25
|
-
model.to_model.human_readable_type
|
26
|
-
end
|
27
|
-
|
28
|
-
##
|
29
|
-
# @return [ActiveModel::Name]
|
30
|
-
def model_name
|
31
|
-
model.to_model.model_name
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
@@ -1,13 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
module Hyrax
|
3
|
-
module UrlHelper
|
4
|
-
# generated models get registered as curation concerns and need a
|
5
|
-
# track_model_path to render Blacklight-related views
|
6
|
-
(['FileSet', 'Collection', 'Hyrax::AdministrativeSet'] + Hyrax.config.registered_curation_concern_types).each do |concern|
|
7
|
-
model = concern.safe_constantize
|
8
|
-
model_name = model.respond_to?(:model_name) && model.model_name
|
9
|
-
next unless model_name
|
10
|
-
define_method("track_#{model_name.singular_route_key}_path") { |*args| main_app.track_solr_document_path(*args) }
|
11
|
-
end
|
12
|
-
end
|
13
|
-
end
|
@@ -1,48 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
# Log work depositor change to activity streams
|
3
|
-
#
|
4
|
-
# @attr [Boolean] reset (false) should the access controls be reset. This means revoking edit access from the depositor
|
5
|
-
class ContentDepositorChangeEventJob < ContentEventJob
|
6
|
-
include Rails.application.routes.url_helpers
|
7
|
-
include ActionDispatch::Routing::PolymorphicRoutes
|
8
|
-
|
9
|
-
attr_accessor :reset
|
10
|
-
|
11
|
-
# @param [ActiveFedora::Base, Hyrax::Work] work the work to be transferred
|
12
|
-
# @param [User] user the user the work is being transfered to.
|
13
|
-
# @param [TrueClass,FalseClass] reset (false) if true, reset the access controls. This revokes edit access from the depositor
|
14
|
-
def perform(work, user, reset = false)
|
15
|
-
Deprecation.warn("This class will be removed in the next major release. Use Hyrax::ChangeDepositorService.call instead.")
|
16
|
-
@reset = reset
|
17
|
-
super(work, user)
|
18
|
-
end
|
19
|
-
|
20
|
-
def action
|
21
|
-
"User #{link_to_profile work.proxy_depositor} has transferred #{link_to_work work.title.first} to user #{link_to_profile depositor}"
|
22
|
-
end
|
23
|
-
|
24
|
-
def link_to_work(text)
|
25
|
-
link_to text, polymorphic_path(work)
|
26
|
-
end
|
27
|
-
|
28
|
-
# Log the event to the work's stream
|
29
|
-
def log_work_event(work)
|
30
|
-
work.log_event(event)
|
31
|
-
end
|
32
|
-
alias log_file_set_event log_work_event
|
33
|
-
|
34
|
-
def work
|
35
|
-
@work ||= Hyrax::ChangeContentDepositorService.call(repo_object, depositor, reset)
|
36
|
-
end
|
37
|
-
|
38
|
-
# overriding default to log the event to the depositor instead of their profile
|
39
|
-
def log_user_event(depositor)
|
40
|
-
# log the event to the proxy depositor's profile
|
41
|
-
proxy_depositor.log_profile_event(event)
|
42
|
-
depositor.log_event(event)
|
43
|
-
end
|
44
|
-
|
45
|
-
def proxy_depositor
|
46
|
-
@proxy_depositor ||= ::User.find_by_user_key(work.proxy_depositor)
|
47
|
-
end
|
48
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
module Hyrax
|
3
|
-
module WithFileSets
|
4
|
-
extend ActiveSupport::Concern
|
5
|
-
|
6
|
-
##
|
7
|
-
# @deprecated Use 'Hyrax::VisibilityPropagator' instead.
|
8
|
-
def copy_visibility_to_files
|
9
|
-
Deprecation.warn "Use 'Hyrax::VisibilityPropagator' instead."
|
10
|
-
|
11
|
-
file_sets.each do |fs|
|
12
|
-
fs.visibility = visibility
|
13
|
-
fs.save!
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
@@ -1,204 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
require 'oauth2'
|
3
|
-
require 'signet/oauth_2/client'
|
4
|
-
|
5
|
-
# rubocop:disable Metrics/ModuleLength
|
6
|
-
module Hyrax
|
7
|
-
module Analytics
|
8
|
-
module Ga4
|
9
|
-
extend ActiveSupport::Concern
|
10
|
-
# rubocop:disable Metrics/BlockLength
|
11
|
-
class_methods do
|
12
|
-
# Loads configuration options from config/analytics.yml. Expected structure:
|
13
|
-
# `analytics:`
|
14
|
-
# ` ga4:`
|
15
|
-
# ` app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME']`
|
16
|
-
# ` app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION']`
|
17
|
-
# ` privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH']`
|
18
|
-
# ` privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET']`
|
19
|
-
# ` client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL']`
|
20
|
-
# @return [Config]
|
21
|
-
def config
|
22
|
-
@config ||= Config.load_from_yaml
|
23
|
-
end
|
24
|
-
|
25
|
-
class Config
|
26
|
-
def self.load_from_yaml
|
27
|
-
filename = Rails.root.join('config', 'analytics.yml')
|
28
|
-
yaml = YAML.safe_load(ERB.new(File.read(filename)).result)
|
29
|
-
unless yaml
|
30
|
-
Hyrax.logger.error("Unable to fetch any keys from #{filename}.")
|
31
|
-
return new({})
|
32
|
-
end
|
33
|
-
config = yaml.fetch('analytics')&.fetch('ga4', nil)
|
34
|
-
unless config
|
35
|
-
Deprecation.warn("Deprecated analytics configuration format found. Please update config/analytics.yml.")
|
36
|
-
config = yaml.fetch('analytics')
|
37
|
-
# this has to exist here with a placeholder so it can be set in the Hyrax initializer
|
38
|
-
# it is only for backward compatibility
|
39
|
-
config['analytics_id'] = '-'
|
40
|
-
end
|
41
|
-
new config
|
42
|
-
end
|
43
|
-
|
44
|
-
REQUIRED_KEYS = %w[analytics_id app_name app_version privkey_path privkey_secret client_email].freeze
|
45
|
-
|
46
|
-
def initialize(config)
|
47
|
-
@config = config
|
48
|
-
end
|
49
|
-
|
50
|
-
# @return [Boolean] are all the required values present?
|
51
|
-
def valid?
|
52
|
-
config_keys = @config.keys
|
53
|
-
REQUIRED_KEYS.all? { |required| config_keys.include?(required) }
|
54
|
-
end
|
55
|
-
|
56
|
-
REQUIRED_KEYS.each do |key|
|
57
|
-
class_eval %{ def #{key}; @config.fetch('#{key}'); end }
|
58
|
-
end
|
59
|
-
|
60
|
-
# This method allows setting the analytics id in the initializer
|
61
|
-
# @deprecated set the analytics id in either ENV['GOOGLE_ANALYTICS_ID'] or config/analytics.yaml
|
62
|
-
def analytics_id=(value)
|
63
|
-
@config['analytics_id'] = value
|
64
|
-
end
|
65
|
-
end
|
66
|
-
|
67
|
-
# Generate an OAuth2 token for Google Analytics
|
68
|
-
# @return [OAuth2::AccessToken] An OAuth2 access token for GA
|
69
|
-
def token(scope = 'https://www.googleapis.com/auth/analytics.readonly')
|
70
|
-
access_token = auth_client(scope).fetch_access_token!
|
71
|
-
OAuth2::AccessToken.new(oauth_client, access_token['access_token'], expires_in: access_token['expires_in'])
|
72
|
-
end
|
73
|
-
|
74
|
-
def oauth_client
|
75
|
-
OAuth2::Client.new('', '', authorize_url: 'https://accounts.google.com/o/oauth2/auth',
|
76
|
-
token_url: 'https://accounts.google.com/o/oauth2/token')
|
77
|
-
end
|
78
|
-
|
79
|
-
def auth_client(scope)
|
80
|
-
raise "Private key file for Google analytics was expected at '#{config.privkey_path}', but no file was found." unless File.exist?(config.privkey_path)
|
81
|
-
private_key = File.read(config.privkey_path)
|
82
|
-
Signet::OAuth2::Client.new token_credential_uri: 'https://accounts.google.com/o/oauth2/token',
|
83
|
-
audience: 'https://accounts.google.com/o/oauth2/token',
|
84
|
-
scope: scope,
|
85
|
-
issuer: config.client_email,
|
86
|
-
signing_key: OpenSSL::PKCS12.new(private_key, config.privkey_secret).key,
|
87
|
-
sub: config.client_email
|
88
|
-
end
|
89
|
-
|
90
|
-
# Return a user object linked to a Google Analytics account
|
91
|
-
# @return [Legato::User] A user account with GA access
|
92
|
-
def user
|
93
|
-
Legato::User.new(token)
|
94
|
-
end
|
95
|
-
|
96
|
-
# Return a Google Analytics profile matching specified ID
|
97
|
-
# @ return [Legato::Management::Profile] A user profile associated with GA
|
98
|
-
def profile
|
99
|
-
return unless config.valid?
|
100
|
-
@profile = user.profiles.detect do |profile|
|
101
|
-
profile.web_property_id == config.analytics_id
|
102
|
-
end
|
103
|
-
raise 'User does not have access to this property' unless @profile
|
104
|
-
@profile
|
105
|
-
end
|
106
|
-
|
107
|
-
# rubocop:disable Metrics/MethodLength
|
108
|
-
def to_date_range(period)
|
109
|
-
case period
|
110
|
-
when "day"
|
111
|
-
start_date = Time.zone.today
|
112
|
-
end_date = Time.zone.today
|
113
|
-
when "week"
|
114
|
-
start_date = Time.zone.today - 7.days
|
115
|
-
end_date = Time.zone.today
|
116
|
-
when "month"
|
117
|
-
start_date = Time.zone.today - 1.month
|
118
|
-
end_date = Time.zone.today
|
119
|
-
when "year"
|
120
|
-
start_date = Time.zone.today - 1.year
|
121
|
-
end_date = Time.zone.today
|
122
|
-
end
|
123
|
-
|
124
|
-
[start_date, end_date]
|
125
|
-
end
|
126
|
-
# rubocop:enabl e Metrics/MethodLength
|
127
|
-
|
128
|
-
def keyword_conversion(date)
|
129
|
-
case date
|
130
|
-
when "last12"
|
131
|
-
start_date = Time.zone.today - 11.months
|
132
|
-
end_date = Time.zone.today
|
133
|
-
|
134
|
-
[start_date, end_date]
|
135
|
-
else
|
136
|
-
date.split(",")
|
137
|
-
end
|
138
|
-
end
|
139
|
-
|
140
|
-
def date_period(period, date)
|
141
|
-
if period == "range"
|
142
|
-
date.split(",")
|
143
|
-
else
|
144
|
-
to_date_range(period)
|
145
|
-
end
|
146
|
-
end
|
147
|
-
|
148
|
-
# Configure analytics_start_date in ENV file
|
149
|
-
def default_date_range
|
150
|
-
"#{Hyrax.config.analytics_start_date},#{Time.zone.today + 1.day}"
|
151
|
-
end
|
152
|
-
|
153
|
-
# The number of events by day for an action
|
154
|
-
def daily_events(action, date = default_date_range)
|
155
|
-
date = date.split(",")
|
156
|
-
EventsDaily.summary(profile, date[0], date[1], action)
|
157
|
-
end
|
158
|
-
|
159
|
-
# The number of events by day for an action and ID
|
160
|
-
def daily_events_for_id(id, action, date = default_date_range)
|
161
|
-
date = date.split(",")
|
162
|
-
EventsDaily.by_id(profile, date[0], date[1], id, action)
|
163
|
-
end
|
164
|
-
|
165
|
-
# A list of events sorted by highest event count
|
166
|
-
def top_events(action, date = default_date_range)
|
167
|
-
date = date.split(",")
|
168
|
-
Events.send('list', profile, date[0], date[1], action)
|
169
|
-
end
|
170
|
-
|
171
|
-
def unique_visitors(date = default_date_range); end
|
172
|
-
|
173
|
-
def unique_visitors_for_id(id, date = default_date_range); end
|
174
|
-
|
175
|
-
def new_visitors(period = 'month', date = default_date_range)
|
176
|
-
date = date_period(period, date)
|
177
|
-
Visits.new_visits(profile, date[0], date[1])
|
178
|
-
end
|
179
|
-
|
180
|
-
def new_visits_by_day(date = default_date_range, _period = 'day')
|
181
|
-
date = date.split(",")
|
182
|
-
VisitsDaily.new_visits(profile, date[0], date[1])
|
183
|
-
end
|
184
|
-
|
185
|
-
def returning_visitors(period = 'month', date = default_date_range)
|
186
|
-
date = date_period(period, date)
|
187
|
-
Visits.return_visits(profile, date[0], date[1])
|
188
|
-
end
|
189
|
-
|
190
|
-
def returning_visits_by_day(date = default_date_range, _period = 'day')
|
191
|
-
date = date.split(",")
|
192
|
-
VisitsDaily.return_visits(profile, date[0], date[1])
|
193
|
-
end
|
194
|
-
|
195
|
-
def total_visitors(period = 'month', date = default_date_range)
|
196
|
-
date = date_period(period, date)
|
197
|
-
Visits.total_visits(profile, date[0], date[1])
|
198
|
-
end
|
199
|
-
end
|
200
|
-
# rubocop:enable Metrics/BlockLength
|
201
|
-
end
|
202
|
-
end
|
203
|
-
end
|
204
|
-
# rubocop:enable Metrics/ModuleLength
|
@@ -1,55 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Hyrax
|
4
|
-
##
|
5
|
-
# A service for accessing specific Hyrax::FileMetadata objects referenced by a
|
6
|
-
# Hyrax::FileSet.
|
7
|
-
class FileSetFileService
|
8
|
-
##
|
9
|
-
# @!attribute [r] file_set
|
10
|
-
# @return [Hyrax::FileSet]
|
11
|
-
attr_reader :file_set
|
12
|
-
|
13
|
-
##
|
14
|
-
# @!attribute [r] query_service
|
15
|
-
# @return [#find_by]
|
16
|
-
attr_reader :query_service
|
17
|
-
|
18
|
-
##
|
19
|
-
# @param resource [Hyrax::FileSet]
|
20
|
-
def initialize(file_set:, query_service: Hyrax.query_service)
|
21
|
-
@query_service = query_service
|
22
|
-
@file_set = file_set
|
23
|
-
end
|
24
|
-
|
25
|
-
##
|
26
|
-
# Return the Hyrax::FileMetadata which should be considered “original” for
|
27
|
-
# indexing and version‐tracking.
|
28
|
-
#
|
29
|
-
# If +file_set.original_file_id+ is defined, it will be used; otherwise,
|
30
|
-
# this requires a custom query. The ultimate fallback, if no
|
31
|
-
# pcdm:OriginalFile is associated with the :file_set, is to just use the
|
32
|
-
# first file in its :file_ids.
|
33
|
-
#
|
34
|
-
# @return [Hyrax::FileMetadata]
|
35
|
-
def original_file
|
36
|
-
if file_set.original_file_id
|
37
|
-
# Always just use original_file_id if it is defined.
|
38
|
-
#
|
39
|
-
# NOTE: This needs to use :find_file_metadata_by, not :find_by, because
|
40
|
-
# at time of writing the latter does not work in Wings.
|
41
|
-
query_service.custom_queries.find_file_metadata_by(id: file_set.original_file_id)
|
42
|
-
else
|
43
|
-
# Cache the fallback to avoid needing to do this query twice.
|
44
|
-
#
|
45
|
-
# See NOTE above regarding use of :find_file_metadata_by.
|
46
|
-
@original_file ||= begin
|
47
|
-
query_service.custom_queries.find_original_file(file_set: file_set)
|
48
|
-
rescue Valkyrie::Persistence::ObjectNotFoundError
|
49
|
-
fallback_id = file_set.file_ids.first
|
50
|
-
query_service.custom_queries.find_file_metadata_by(id: fallback_id) if fallback_id
|
51
|
-
end
|
52
|
-
end
|
53
|
-
end
|
54
|
-
end
|
55
|
-
end
|
@@ -1,45 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
module Hyrax
|
3
|
-
# Responsible for retrieving information based on the given work.
|
4
|
-
#
|
5
|
-
# @see ProxyDepositRequest
|
6
|
-
# @see SolrDocument
|
7
|
-
# @see Hyrax::SolrService
|
8
|
-
# @note This was extracted from the ProxyDepositRequest, which was coordinating lots of effort. It was also an ActiveRecord object that required lots of Fedora/Solr interactions.
|
9
|
-
class WorkResourceQueryService
|
10
|
-
# @param [String] id - The id of the work
|
11
|
-
def initialize(id:)
|
12
|
-
@id = id
|
13
|
-
end
|
14
|
-
attr_reader :id
|
15
|
-
|
16
|
-
# @return [Boolean] if the work has been deleted
|
17
|
-
def deleted_work?
|
18
|
-
Hyrax.query_service.find_by(id: id)
|
19
|
-
false
|
20
|
-
rescue Valkyrie::Persistence::ObjectNotFoundError
|
21
|
-
true
|
22
|
-
end
|
23
|
-
|
24
|
-
def work
|
25
|
-
# Need to ensure it is a work?
|
26
|
-
resource = Hyrax.query_service.find_by(id: id)
|
27
|
-
raise ModelMismatchError, "Expected work but got #{resource.class}" unless resource.work?
|
28
|
-
resource
|
29
|
-
end
|
30
|
-
|
31
|
-
def to_s
|
32
|
-
if deleted_work?
|
33
|
-
'work not found'
|
34
|
-
else
|
35
|
-
solr_doc.to_s
|
36
|
-
end
|
37
|
-
end
|
38
|
-
|
39
|
-
private
|
40
|
-
|
41
|
-
def solr_doc
|
42
|
-
@solr_doc ||= ::SolrDocument.new(Hyrax::SolrService.search_by_id(id))
|
43
|
-
end
|
44
|
-
end
|
45
|
-
end
|
@@ -1,9 +0,0 @@
|
|
1
|
-
<ul class="nav nav-tabs" id="my_nav" role="list">
|
2
|
-
<li<%= ' class="active"'.html_safe if @response.viewing_under_review? %>>
|
3
|
-
<%= link_to t('hyrax.admin.workflows.index.tabs.under_review'),
|
4
|
-
hyrax.admin_workflows_path(state: 'under-review'), class: "nav-link#{' active' if @response.viewing_under_review?}" %>
|
5
|
-
</li>
|
6
|
-
<li<%= ' class="active"'.html_safe if !@response.viewing_under_review? %>>
|
7
|
-
<%= link_to t('hyrax.admin.workflows.index.tabs.published'), hyrax.admin_workflows_path(state: 'published'), class: "nav-link#{' active' if !@response.viewing_under_review?}" %>
|
8
|
-
</li>
|
9
|
-
</ul>
|
@@ -1,10 +0,0 @@
|
|
1
|
-
<!-- Google tag (gtag.js) -->
|
2
|
-
<script async src="https://www.googletagmanager.com/gtag/js?id=<%= Hyrax::Analytics.config.analytics_id %>"></script>
|
3
|
-
<script>
|
4
|
-
window.dataLayer = window.dataLayer || [];
|
5
|
-
function gtag(){dataLayer.push(arguments);}
|
6
|
-
gtag('js', new Date());
|
7
|
-
|
8
|
-
gtag('config', '<%= Hyrax::Analytics.config.analytics_id %>');
|
9
|
-
</script>
|
10
|
-
<meta name="analytics-provider" content="ga4">
|