blacklight 7.35.0 → 8.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/.env +2 -3
- data/.github/workflows/ruby.yml +32 -127
- data/.rubocop.yml +241 -2
- data/.rubocop_todo.yml +214 -270
- data/Gemfile +7 -10
- data/README.md +11 -3
- data/VERSION +1 -1
- data/app/assets/javascripts/blacklight/blacklight.esm.js +384 -0
- data/app/assets/javascripts/blacklight/blacklight.esm.js.map +1 -0
- data/app/assets/javascripts/blacklight/blacklight.js +374 -489
- data/app/assets/javascripts/blacklight/blacklight.js.map +1 -0
- data/app/assets/stylesheets/blacklight/_autocomplete.scss +25 -0
- data/app/assets/stylesheets/blacklight/_blacklight_base.scss +1 -1
- data/app/assets/stylesheets/blacklight/_bookmark.scss +16 -0
- data/app/assets/stylesheets/blacklight/_bootstrap_overrides.scss +8 -0
- data/app/assets/stylesheets/blacklight/_facets.scss +72 -44
- data/app/assets/stylesheets/blacklight/_header.scss +0 -15
- data/app/assets/stylesheets/blacklight/_icons.scss +0 -14
- data/app/assets/stylesheets/blacklight/_mixins.scss +20 -0
- data/app/assets/stylesheets/blacklight/_modal.scss +8 -2
- data/app/assets/stylesheets/blacklight/_search_form.scss +30 -3
- data/app/assets/stylesheets/blacklight/_search_history.scss +10 -1
- data/app/assets/stylesheets/blacklight/_search_results.scss +6 -2
- data/app/assets/stylesheets/blacklight/blacklight_defaults.scss +4 -1
- data/app/builders/blacklight/action_builder.rb +18 -9
- data/app/components/blacklight/advanced_search_form_component.html.erb +2 -2
- data/app/components/blacklight/advanced_search_form_component.rb +8 -10
- data/app/components/blacklight/constraints_component.rb +27 -37
- data/app/components/blacklight/document/action_component.rb +9 -9
- data/app/components/blacklight/document/actions_component.rb +2 -2
- data/app/components/blacklight/document/bookmark_component.html.erb +9 -0
- data/app/components/blacklight/document/bookmark_component.rb +4 -2
- data/app/components/blacklight/document/citation_component.rb +5 -3
- data/app/components/blacklight/document/group_component.rb +7 -3
- data/app/components/blacklight/document/sidebar_component.html.erb +2 -0
- data/app/components/blacklight/document/sidebar_component.rb +16 -0
- data/app/components/blacklight/document/thumbnail_component.html.erb +2 -7
- data/app/components/blacklight/document/thumbnail_component.rb +1 -9
- data/app/components/blacklight/document_component.html.erb +4 -0
- data/app/components/blacklight/document_component.rb +14 -53
- data/app/components/blacklight/document_metadata_component.html.erb +2 -4
- data/app/components/blacklight/document_metadata_component.rb +5 -10
- data/app/components/blacklight/document_title_component.rb +4 -1
- data/app/components/blacklight/facet_component.rb +1 -1
- data/app/components/blacklight/facet_field_checkboxes_component.html.erb +3 -3
- data/app/components/blacklight/facet_field_checkboxes_component.rb +1 -1
- data/app/components/blacklight/facet_field_component.html.erb +5 -5
- data/app/components/blacklight/facet_field_component.rb +9 -2
- data/app/components/blacklight/facet_field_list_component.html.erb +3 -3
- data/app/components/blacklight/facet_field_list_component.rb +37 -5
- data/app/components/blacklight/facet_field_no_layout_component.rb +0 -2
- data/app/components/blacklight/facet_item_component.rb +1 -43
- data/app/components/blacklight/facet_item_pivot_component.rb +21 -23
- data/app/components/blacklight/header_component.rb +1 -1
- data/app/components/blacklight/hidden_search_state_component.rb +1 -2
- data/app/components/blacklight/icons/legacy_icon_component.rb +30 -0
- data/app/components/blacklight/icons/list_component.rb +16 -0
- data/app/components/blacklight/icons/search_component.rb +16 -0
- data/app/components/blacklight/metadata_field_component.html.erb +2 -2
- data/app/components/blacklight/metadata_field_component.rb +24 -8
- data/app/components/blacklight/metadata_field_layout_component.rb +4 -25
- data/app/components/blacklight/response/facet_group_component.html.erb +3 -5
- data/app/components/blacklight/response/facet_group_component.rb +29 -8
- data/app/components/blacklight/response/pagination_component.html.erb +1 -1
- data/app/components/blacklight/response/pagination_component.rb +1 -5
- data/app/components/blacklight/response/sort_component.rb +1 -1
- data/app/components/blacklight/response/spellcheck_component.rb +17 -6
- data/app/components/blacklight/response/view_type_button_component.rb +2 -6
- data/app/components/blacklight/response/view_type_component.rb +3 -5
- data/app/components/blacklight/search/sidebar_component.html.erb +8 -0
- data/app/components/blacklight/search/sidebar_component.rb +17 -0
- data/app/components/blacklight/search_bar_component.html.erb +20 -15
- data/app/components/blacklight/search_bar_component.rb +2 -16
- data/app/components/blacklight/search_button_component.rb +3 -3
- data/app/components/blacklight/search_context_component.rb +43 -9
- data/app/components/blacklight/search_header_component.html.erb +2 -0
- data/app/components/blacklight/search_header_component.rb +6 -0
- data/app/components/blacklight/start_over_button_component.rb +5 -3
- data/app/components/blacklight/system/dropdown_component.rb +2 -2
- data/app/components/blacklight/system/flash_message_component.html.erb +3 -1
- data/app/components/blacklight/system/flash_message_component.rb +11 -2
- data/app/components/blacklight/system/modal_component.html.erb +1 -1
- data/app/components/blacklight/system/modal_component.rb +0 -2
- data/app/components/blacklight/top_navbar_component.html.erb +1 -1
- data/app/components/blacklight/top_navbar_component.rb +0 -4
- data/app/controllers/bookmarks_controller.rb +1 -0
- data/app/controllers/catalog_controller.rb +1 -0
- data/app/controllers/concerns/blacklight/bookmarks.rb +10 -9
- data/app/controllers/concerns/blacklight/catalog.rb +21 -83
- data/app/controllers/concerns/blacklight/controller.rb +3 -41
- data/app/controllers/concerns/blacklight/search_context.rb +25 -7
- data/app/controllers/concerns/blacklight/search_history.rb +2 -0
- data/app/controllers/concerns/blacklight/searchable.rb +12 -1
- data/app/controllers/concerns/blacklight/token_based_user.rb +1 -0
- data/app/controllers/search_history_controller.rb +1 -0
- data/app/helpers/blacklight/blacklight_helper_behavior.rb +12 -310
- data/app/helpers/blacklight/catalog_helper_behavior.rb +22 -137
- data/app/helpers/blacklight/component_helper_behavior.rb +2 -53
- data/app/helpers/blacklight/configuration_helper_behavior.rb +2 -117
- data/app/helpers/blacklight/facets_helper_behavior.rb +4 -321
- data/app/helpers/blacklight/icon_helper_behavior.rb +5 -4
- data/app/helpers/blacklight/layout_helper_behavior.rb +1 -0
- data/app/helpers/blacklight/render_partials_helper_behavior.rb +11 -31
- data/app/helpers/blacklight/url_helper_behavior.rb +13 -97
- data/app/helpers/blacklight_helper.rb +1 -0
- data/app/helpers/catalog_helper.rb +1 -0
- data/app/javascript/blacklight/bookmark_toggle.js +13 -19
- data/app/javascript/blacklight/button_focus.js +12 -10
- data/app/javascript/blacklight/checkbox_submit.js +68 -122
- data/app/javascript/blacklight/core.js +6 -5
- data/app/javascript/blacklight/index.js +13 -0
- data/app/javascript/blacklight/modal.js +99 -164
- data/app/javascript/blacklight/modalForm.js +60 -0
- data/app/javascript/blacklight/search_context.js +45 -55
- data/app/models/blacklight/facet_paginator.rb +3 -2
- data/app/models/blacklight/icon.rb +4 -2
- data/app/models/bookmark.rb +0 -2
- data/app/models/concerns/blacklight/configurable.rb +5 -4
- data/app/models/concerns/blacklight/document/active_model_shim.rb +1 -10
- data/app/models/concerns/blacklight/document/cache_key.rb +1 -0
- data/app/models/concerns/blacklight/document/dublin_core.rb +2 -1
- data/app/models/concerns/blacklight/document/email.rb +1 -0
- data/app/models/concerns/blacklight/document/export.rb +2 -1
- data/app/models/concerns/blacklight/document/extensions.rb +1 -0
- data/app/models/concerns/blacklight/document/schema_org.rb +1 -0
- data/app/models/concerns/blacklight/document/semantic_fields.rb +1 -0
- data/app/models/concerns/blacklight/document/sms.rb +1 -0
- data/app/models/concerns/blacklight/suggest/response.rb +1 -0
- data/app/models/concerns/blacklight/user.rb +17 -8
- data/app/models/record_mailer.rb +13 -12
- data/app/models/search.rb +1 -7
- data/app/models/solr_document.rb +1 -0
- data/app/presenters/blacklight/clause_presenter.rb +1 -1
- data/app/presenters/blacklight/document_presenter.rb +13 -21
- data/app/presenters/blacklight/facet_field_presenter.rb +39 -14
- data/app/presenters/blacklight/facet_grouped_item_presenter.rb +1 -5
- data/app/presenters/blacklight/facet_item_pivot_presenter.rb +60 -0
- data/app/presenters/blacklight/facet_item_presenter.rb +3 -9
- data/app/presenters/blacklight/field_presenter.rb +1 -0
- data/app/presenters/blacklight/index_presenter.rb +2 -40
- data/app/presenters/blacklight/json_presenter.rb +7 -5
- data/app/presenters/blacklight/rendering/link_to_facet.rb +2 -5
- data/app/presenters/blacklight/show_presenter.rb +1 -9
- data/app/presenters/blacklight/thumbnail_presenter.rb +1 -1
- data/app/services/blacklight/bookmarks_search_builder.rb +22 -0
- data/app/services/blacklight/field_retriever.rb +12 -21
- data/app/services/blacklight/search_service.rb +8 -7
- data/app/values/blacklight/types.rb +0 -4
- data/app/views/bookmarks/_clear_bookmarks_widget.html.erb +8 -1
- data/app/views/bookmarks/_tools.html.erb +7 -12
- data/app/views/catalog/_advanced_search_form.html.erb +0 -1
- data/app/views/catalog/_bookmark_control.html.erb +1 -1
- data/app/views/catalog/_constraints.html.erb +1 -14
- data/app/views/catalog/_document.atom.builder +12 -14
- data/app/views/catalog/_document.html.erb +5 -3
- data/app/views/catalog/_document.rss.builder +2 -4
- data/app/views/catalog/_facet_layout.html.erb +2 -2
- data/app/views/catalog/_facets.html.erb +5 -4
- data/app/views/catalog/_home_text.html.erb +2 -14
- data/app/views/catalog/_search_form.html.erb +2 -2
- data/app/views/catalog/_search_header.html.erb +1 -2
- data/app/views/catalog/_search_results.html.erb +2 -2
- data/app/views/catalog/_search_sidebar.html.erb +5 -1
- data/app/views/catalog/_show_main_content.html.erb +11 -16
- data/app/views/catalog/_show_sidebar.html.erb +2 -2
- data/app/views/catalog/_show_tools.html.erb +8 -14
- data/app/views/catalog/_view_type_group.html.erb +1 -1
- data/app/views/catalog/email_success.html.erb +5 -6
- data/app/views/catalog/facet.html.erb +7 -5
- data/app/views/catalog/index.atom.builder +12 -14
- data/app/views/catalog/index.html.erb +4 -1
- data/app/views/catalog/index.json.jbuilder +19 -19
- data/app/views/catalog/index.rss.builder +1 -1
- data/app/views/catalog/opensearch.xml.builder +1 -1
- data/app/views/catalog/sms_success.html.erb +5 -6
- data/app/views/catalog/suggest.html.erb +3 -0
- data/app/views/layouts/blacklight/base.html.erb +13 -2
- data/app/views/search_history/index.html.erb +6 -2
- data/app/views/shared/_modal.html.erb +3 -3
- data/blacklight.gemspec +8 -9
- data/config/importmap.rb +3 -0
- data/config/locales/blacklight.ar.yml +0 -1
- data/config/locales/blacklight.ca.yml +0 -1
- data/config/locales/blacklight.de.yml +0 -1
- data/config/locales/blacklight.en.yml +0 -2
- data/config/locales/blacklight.es.yml +0 -1
- data/config/locales/blacklight.fr.yml +0 -1
- data/config/locales/blacklight.hu.yml +0 -1
- data/config/locales/blacklight.it.yml +0 -1
- data/config/locales/blacklight.nl.yml +0 -1
- data/config/locales/blacklight.pt-BR.yml +0 -1
- data/config/locales/blacklight.sq.yml +0 -1
- data/config/locales/blacklight.zh.yml +0 -1
- data/config/routes.rb +3 -2
- data/db/migrate/20140202020201_create_searches.rb +1 -0
- data/db/migrate/20140202020202_create_bookmarks.rb +1 -0
- data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb +1 -0
- data/docker-compose.yml +0 -1
- data/lib/blacklight/abstract_repository.rb +1 -0
- data/lib/blacklight/configuration/context.rb +4 -4
- data/lib/blacklight/configuration/display_field.rb +7 -9
- data/lib/blacklight/configuration/facet_field.rb +17 -11
- data/lib/blacklight/configuration/field.rb +1 -0
- data/lib/blacklight/configuration/fields.rb +12 -15
- data/lib/blacklight/configuration/index_field.rb +1 -0
- data/lib/blacklight/configuration/null_display_field.rb +17 -0
- data/lib/blacklight/configuration/search_field.rb +1 -0
- data/lib/blacklight/configuration/show_field.rb +1 -0
- data/lib/blacklight/configuration/sort_field.rb +1 -0
- data/lib/blacklight/configuration/tool_config.rb +1 -0
- data/lib/blacklight/configuration/view_config.rb +16 -6
- data/lib/blacklight/configuration.rb +294 -358
- data/lib/blacklight/engine.rb +8 -24
- data/lib/blacklight/exceptions.rb +2 -2
- data/lib/blacklight/nested_open_struct_with_hash_access.rb +6 -12
- data/lib/blacklight/open_struct_with_hash_access.rb +19 -17
- data/lib/blacklight/parameters.rb +7 -21
- data/lib/blacklight/routes/exportable.rb +1 -0
- data/lib/blacklight/routes/searchable.rb +2 -1
- data/lib/blacklight/routes.rb +1 -0
- data/lib/blacklight/search_builder.rb +10 -10
- data/lib/blacklight/search_state/filter_field.rb +8 -25
- data/lib/blacklight/search_state/pivot_filter_field.rb +144 -0
- data/lib/blacklight/search_state.rb +23 -79
- data/lib/blacklight/solr/document.rb +1 -0
- data/lib/blacklight/solr/facet_paginator.rb +1 -0
- data/lib/blacklight/solr/repository.rb +3 -14
- data/lib/blacklight/solr/request.rb +1 -0
- data/lib/blacklight/solr/response/facets.rb +21 -5
- data/lib/blacklight/solr/response/group.rb +1 -0
- data/lib/blacklight/solr/response/group_response.rb +1 -0
- data/lib/blacklight/solr/response/more_like_this.rb +1 -0
- data/lib/blacklight/solr/response/pagination_methods.rb +4 -3
- data/lib/blacklight/solr/response/params.rb +5 -4
- data/lib/blacklight/solr/response/response.rb +1 -0
- data/lib/blacklight/solr/response/spelling.rb +1 -0
- data/lib/blacklight/solr/response.rb +4 -3
- data/lib/blacklight/solr/search_builder_behavior.rb +17 -34
- data/lib/blacklight/solr.rb +1 -0
- data/lib/blacklight/version.rb +1 -0
- data/lib/blacklight.rb +7 -10
- data/lib/generators/blacklight/assets/importmap_generator.rb +55 -0
- data/lib/generators/blacklight/assets/propshaft_generator.rb +25 -0
- data/lib/generators/blacklight/assets/sprockets_generator.rb +66 -0
- data/lib/generators/blacklight/assets_generator.rb +13 -89
- data/lib/generators/blacklight/controller_generator.rb +3 -2
- data/lib/generators/blacklight/document_generator.rb +1 -0
- data/lib/generators/blacklight/install_generator.rb +4 -3
- data/lib/generators/blacklight/models_generator.rb +1 -0
- data/lib/generators/blacklight/search_builder_generator.rb +1 -0
- data/lib/generators/blacklight/solr_generator.rb +1 -1
- data/lib/generators/blacklight/templates/catalog_controller.rb +34 -8
- data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml +0 -69
- data/lib/generators/blacklight/test_support_generator.rb +4 -2
- data/lib/generators/blacklight/user_generator.rb +7 -9
- data/lib/railties/blacklight.rake +6 -7
- data/package.json +10 -13
- data/rollup.config.js +27 -0
- data/spec/components/blacklight/constraints_component_spec.rb +17 -13
- data/spec/components/blacklight/document_component_spec.rb +23 -82
- data/spec/components/blacklight/facet_component_spec.rb +3 -18
- data/spec/components/blacklight/facet_field_checkboxes_component_spec.rb +1 -2
- data/spec/components/blacklight/facet_field_list_component_spec.rb +7 -6
- data/spec/components/blacklight/facet_item_pivot_component_spec.rb +10 -9
- data/spec/components/blacklight/response/view_type_component_spec.rb +66 -0
- data/spec/components/blacklight/search_bar_component_spec.rb +1 -1
- data/spec/components/blacklight/search_context_component_spec.rb +40 -0
- data/spec/controllers/blacklight/catalog/component_configuration_spec.rb +1 -6
- data/spec/controllers/blacklight/{base_spec.rb → catalog_spec.rb} +2 -2
- data/spec/controllers/bookmarks_controller_spec.rb +2 -3
- data/spec/controllers/catalog_controller_spec.rb +13 -135
- data/spec/features/advanced_search_spec.rb +0 -56
- data/spec/features/autocomplete_spec.rb +1 -1
- data/spec/features/axe_spec.rb +1 -6
- data/spec/features/bookmarks_spec.rb +1 -1
- data/spec/features/facets_spec.rb +1 -1
- data/spec/features/search_context_spec.rb +4 -10
- data/spec/features/search_results_spec.rb +0 -33
- data/spec/features/sitelinks_search_box.rb +13 -0
- data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb +2 -138
- data/spec/helpers/blacklight/facets_helper_behavior_spec.rb +0 -387
- data/spec/helpers/blacklight/icon_helper_behavior_spec.rb +8 -0
- data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb +5 -7
- data/spec/helpers/blacklight/url_helper_behavior_spec.rb +9 -131
- data/spec/helpers/blacklight_helper_spec.rb +8 -252
- data/spec/helpers/catalog_helper_spec.rb +7 -118
- data/spec/i18n_spec.rb +1 -0
- data/spec/integration/generators/blacklight/solr_generator_spec.rb +1 -1
- data/spec/lib/blacklight/configuration/facet_field_spec.rb +27 -16
- data/spec/lib/blacklight/configuration/field_spec.rb +1 -1
- data/spec/lib/blacklight/configuration/view_config_spec.rb +1 -1
- data/spec/lib/blacklight/open_struct_with_hash_access_spec.rb +2 -2
- data/spec/lib/blacklight/parameters_spec.rb +1 -4
- data/spec/lib/blacklight/search_state/filter_field_spec.rb +4 -4
- data/spec/lib/blacklight/search_state/pivot_filter_field_spec.rb +117 -0
- data/spec/lib/blacklight/search_state_spec.rb +80 -198
- data/spec/lib/tasks/blacklight_task_spec.rb +1 -0
- data/spec/models/blacklight/configuration_spec.rb +17 -51
- data/spec/models/blacklight/document/active_model_shim_spec.rb +2 -2
- data/spec/models/blacklight/icon_spec.rb +31 -15
- data/spec/models/blacklight/search_builder_spec.rb +9 -9
- data/spec/models/blacklight/solr/document_spec.rb +3 -3
- data/spec/models/blacklight/solr/repository_spec.rb +0 -27
- data/spec/models/blacklight/solr/response/facets_spec.rb +27 -27
- data/spec/models/blacklight/solr/response/group_response_spec.rb +1 -0
- data/spec/models/blacklight/solr/response/group_spec.rb +1 -0
- data/spec/models/blacklight/solr/response_spec.rb +9 -2
- data/spec/models/blacklight/solr/search_builder_spec.rb +24 -31
- data/spec/models/blacklight/user_spec.rb +22 -0
- data/spec/presenters/blacklight/clause_presenter_spec.rb +1 -0
- data/spec/presenters/blacklight/document_presenter_spec.rb +2 -2
- data/spec/presenters/blacklight/facet_field_presenter_spec.rb +85 -12
- data/spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb +1 -0
- data/spec/presenters/blacklight/facet_item_presenter_spec.rb +14 -13
- data/spec/presenters/blacklight/field_presenter_spec.rb +0 -14
- data/spec/presenters/blacklight/index_presenter_spec.rb +2 -4
- data/spec/presenters/blacklight/json_presenter_spec.rb +1 -0
- data/spec/presenters/blacklight/link_alternate_presenter_spec.rb +3 -2
- data/spec/presenters/blacklight/show_presenter_spec.rb +20 -29
- data/spec/presenters/thumbnail_presenter_spec.rb +1 -1
- data/spec/requests/load_suggestions_spec.rb +16 -0
- data/spec/routing/catalog_routing_spec.rb +2 -1
- data/spec/services/blacklight/search_service_spec.rb +31 -68
- data/spec/spec_helper.rb +6 -32
- data/spec/support/controller_level_helpers.rb +1 -2
- data/spec/support/features/search_helpers.rb +39 -0
- data/spec/support/features/session_helpers.rb +1 -0
- data/spec/support/features.rb +3 -0
- data/spec/support/view_component_capybara_test_helpers.rb +8 -0
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +9 -2
- data/spec/views/catalog/_document.html.erb_spec.rb +3 -34
- data/spec/views/catalog/_facet_index_navigation.html.erb_spec.rb +1 -1
- data/spec/views/catalog/_search_header.erb_spec.rb +1 -0
- data/spec/views/catalog/_show_sidebar.erb_spec.rb +1 -0
- data/spec/views/catalog/_show_tools.html.erb_spec.rb +5 -66
- data/spec/views/catalog/_view_type_group.html.erb_spec.rb +17 -9
- data/spec/views/catalog/email_success.html.erb_spec.rb +2 -2
- data/spec/views/catalog/facet.html.erb_spec.rb +6 -3
- data/spec/views/catalog/index.atom.builder_spec.rb +18 -11
- data/spec/views/catalog/index.html.erb_spec.rb +5 -6
- data/spec/views/catalog/index.json.jbuilder_spec.rb +2 -2
- data/spec/views/catalog/show.html.erb_spec.rb +3 -25
- data/spec/views/catalog/sms_success.html.erb_spec.rb +2 -2
- data/tasks/blacklight.rake +6 -4
- metadata +81 -130
- data/.babelrc +0 -11
- data/app/assets/images/blacklight/list.svg +0 -1
- data/app/assets/images/blacklight/search.svg +0 -1
- data/app/assets/stylesheets/blacklight/_twitter_typeahead.scss +0 -37
- data/app/components/blacklight/content_areas_shim.rb +0 -13
- data/app/controllers/concerns/blacklight/base.rb +0 -12
- data/app/controllers/concerns/blacklight/default_component_configuration.rb +0 -64
- data/app/controllers/concerns/blacklight/facet.rb +0 -69
- data/app/controllers/concerns/blacklight/search_fields.rb +0 -46
- data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +0 -27
- data/app/helpers/blacklight/render_constraints_helper_behavior.rb +0 -188
- data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +0 -97
- data/app/helpers/blacklight/suggest_helper_behavior.rb +0 -13
- data/app/javascript/blacklight/autocomplete.js +0 -36
- data/app/javascript/blacklight/facet_load.js +0 -22
- data/app/presenters/blacklight/search_bar_presenter.rb +0 -47
- data/app/views/catalog/_constraints_element.html.erb +0 -14
- data/app/views/catalog/_document_action.html.erb +0 -5
- data/app/views/catalog/_facet_group.html.erb +0 -5
- data/app/views/catalog/_facet_limit.html.erb +0 -3
- data/app/views/catalog/_index.html.erb +0 -1
- data/app/views/catalog/_index_header.html.erb +0 -22
- data/app/views/catalog/_previous_next_doc.html.erb +0 -2
- data/app/views/catalog/_show.html.erb +0 -6
- data/app/views/catalog/_show_header.html.erb +0 -2
- data/app/views/catalog/_thumbnail.html.erb +0 -1
- data/lib/blacklight/deprecations/engine_configuration.rb +0 -66
- data/lib/blacklight/deprecations/search_state_normalization.rb +0 -52
- data/spec/components/blacklight/header_component_spec.rb +0 -20
- data/spec/controllers/blacklight/facet_spec.rb +0 -33
- data/spec/controllers/blacklight/search_fields_spec.rb +0 -62
- data/spec/features/sitelinks_search_box_spec.rb +0 -13
- data/spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb +0 -26
- data/spec/helpers/blacklight/render_constraints_helper_behavior_spec.rb +0 -92
- data/spec/helpers/blacklight/search_history_constraints_helper_behavior_spec.rb +0 -101
- data/spec/helpers/blacklight/suggest_helper_behavior_spec.rb +0 -48
- data/spec/lib/blacklight/engine_spec.rb +0 -41
- data/spec/presenters/blacklight/search_bar_presenter_spec.rb +0 -94
- data/spec/services/blacklight/field_retriever_spec.rb +0 -17
- data/spec/support/view_component_test_helpers.rb +0 -35
- data/spec/views/catalog/_constraints.html.erb_spec.rb +0 -33
- data/spec/views/catalog/_facet_group.html.erb_spec.rb +0 -84
- data/spec/views/catalog/_facets.html.erb_spec.rb +0 -15
- data/spec/views/catalog/_index.html.erb_spec.rb +0 -62
- data/spec/views/catalog/_index_header.html.erb_spec.rb +0 -35
- data/spec/views/catalog/_previous_next_doc.html.erb_spec.rb +0 -22
- data/spec/views/catalog/_show.html.erb_spec.rb +0 -62
- data/spec/views/catalog/_thumbnail.html.erb_spec.rb +0 -38
@@ -1,6 +1,5 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
<% end %>
|
1
|
+
<turbo-stream action="append" target="main-flashes">
|
2
|
+
<template>
|
3
|
+
<%= render '/shared/flash_msg' %>
|
4
|
+
</template>
|
5
|
+
</turbo-stream>
|
@@ -1,20 +1,22 @@
|
|
1
1
|
<%= render Blacklight::System::ModalComponent.new do |component| %>
|
2
|
-
<% component.
|
2
|
+
<% component.prefix do %>
|
3
3
|
<div class="facet-pagination top row justify-content-between">
|
4
4
|
<%= render :partial=>'facet_pagination' %>
|
5
5
|
</div>
|
6
6
|
<% end %>
|
7
7
|
|
8
|
-
<% component.
|
8
|
+
<% component.title { facet_field_label(@facet.key) } %>
|
9
9
|
|
10
10
|
<%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
|
11
11
|
|
12
12
|
<div class="facet-extended-list">
|
13
|
-
<%=
|
13
|
+
<%= render Blacklight::FacetComponent.new(display_facet: @display_facet,
|
14
|
+
blacklight_config: blacklight_config,
|
15
|
+
layout: false) %>
|
14
16
|
</div>
|
15
17
|
|
16
|
-
<% component.
|
17
|
-
<div class="facet-pagination bottom row justify-content-between">
|
18
|
+
<% component.footer do %>
|
19
|
+
<div class="facet-pagination bottom flex-row justify-content-between">
|
18
20
|
<%= render :partial=>'facet_pagination' %>
|
19
21
|
</div>
|
20
22
|
<% end %>
|
@@ -6,7 +6,7 @@ xml.instruct!(:xml, encoding: "UTF-8")
|
|
6
6
|
|
7
7
|
xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
|
8
8
|
"xmlns:opensearch" => "http://a9.com/-/spec/opensearch/1.1/") do
|
9
|
-
xml.title
|
9
|
+
xml.title t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name)
|
10
10
|
# an author is required, so we'll just use the app name
|
11
11
|
xml.author { xml.name application_name }
|
12
12
|
|
@@ -16,25 +16,23 @@ xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
|
|
16
16
|
|
17
17
|
# Navigational and context links
|
18
18
|
|
19
|
-
xml.link(
|
20
|
-
|
21
|
-
) if @response.next_page
|
19
|
+
xml.link("rel" => "next",
|
20
|
+
"href" => url_for(search_state.to_h.merge(only_path: false, page: @response.next_page.to_s))) if @response.next_page
|
22
21
|
|
23
|
-
xml.link(
|
24
|
-
|
25
|
-
) if @response.prev_page
|
22
|
+
xml.link("rel" => "previous",
|
23
|
+
"href" => url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s))) if @response.prev_page
|
26
24
|
|
27
|
-
xml.link(
|
28
|
-
|
25
|
+
xml.link("rel" => "first",
|
26
|
+
"href" => url_for(search_state.to_h.merge(only_path: false, page: "1")))
|
29
27
|
|
30
|
-
xml.link(
|
31
|
-
|
28
|
+
xml.link("rel" => "last",
|
29
|
+
"href" => url_for(search_state.to_h.merge(only_path: false, page: @response.total_pages.to_s)))
|
32
30
|
|
33
31
|
# "search" doesn't seem to actually be legal, but is very common, and
|
34
32
|
# used as an example in opensearch docs
|
35
|
-
xml.link(
|
36
|
-
|
37
|
-
|
33
|
+
xml.link("rel" => "search",
|
34
|
+
"type" => "application/opensearchdescription+xml",
|
35
|
+
"href" => url_for(controller: 'catalog', action: 'opensearch', format: 'xml', only_path: false))
|
38
36
|
|
39
37
|
# opensearch response elements
|
40
38
|
xml.opensearch :totalResults, @response.total.to_s
|
@@ -1,5 +1,8 @@
|
|
1
1
|
<% content_for(:sidebar) do %>
|
2
|
-
|
2
|
+
<% conf = blacklight_config.view_config(document_index_view_type) %>
|
3
|
+
<%= render conf.sidebar_component.new(blacklight_config: blacklight_config,
|
4
|
+
response: @response,
|
5
|
+
view_config: conf) %>
|
3
6
|
<% end %>
|
4
7
|
|
5
8
|
<% unless has_search_parameters? %>
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
json.links do
|
3
4
|
json.self url_for(search_state.to_h.merge(only_path: false))
|
4
5
|
json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page
|
@@ -13,7 +14,7 @@ end
|
|
13
14
|
json.data do
|
14
15
|
json.array! @presenter.documents do |document|
|
15
16
|
doc_presenter = document_presenter(document)
|
16
|
-
document_url =
|
17
|
+
document_url = polymorphic_url(search_state.url_for_document(document))
|
17
18
|
json.id document.id
|
18
19
|
json.type doc_presenter.display_type.first
|
19
20
|
json.attributes do
|
@@ -51,14 +52,10 @@ json.included do
|
|
51
52
|
json.hits item.hits
|
52
53
|
end
|
53
54
|
json.links do
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
end
|
59
|
-
else
|
60
|
-
json.self path_for_facet(facet.name, item.value, only_path: false)
|
61
|
-
end
|
55
|
+
if search_state.filter(facet_config).include?(facet_value_for_facet_item(item.value))
|
56
|
+
json.remove search_action_path(search_state.filter(facet.name).remove(item.value))
|
57
|
+
else
|
58
|
+
json.self facet_item_presenter(facet_config, item.value, facet.name).href(only_path: false)
|
62
59
|
end
|
63
60
|
end
|
64
61
|
end
|
@@ -69,16 +66,19 @@ json.included do
|
|
69
66
|
end
|
70
67
|
end
|
71
68
|
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
69
|
+
search_fields = blacklight_config.search_fields
|
70
|
+
.values
|
71
|
+
.select { |field_def| should_render_field?(field_def) }
|
72
|
+
.collect { |field_def| [label_for_search_field(field_def.key), field_def.key] }
|
73
|
+
|
74
|
+
json.array! search_fields do |(label, key)|
|
75
|
+
json.type 'search_field'
|
76
|
+
json.id key
|
77
|
+
json.attributes do
|
78
|
+
json.label label
|
79
|
+
end
|
80
|
+
json.links do
|
81
|
+
json.self url_for(search_state.to_h.merge(search_field: key, only_path: false))
|
82
82
|
end
|
83
83
|
end
|
84
84
|
|
@@ -4,7 +4,7 @@ xml.instruct! :xml, version: "1.0"
|
|
4
4
|
xml.rss(version: "2.0") {
|
5
5
|
xml.channel {
|
6
6
|
xml.title(t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name))
|
7
|
-
xml.link(search_action_url(
|
7
|
+
xml.link(search_action_url(search_state.to_h.merge(only_path: false)))
|
8
8
|
xml.description(t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name))
|
9
9
|
xml.language('en-us')
|
10
10
|
@response.documents.each_with_index do |document, document_counter|
|
@@ -8,5 +8,5 @@ xml.OpenSearchDescription(xmlns: 'http://a9.com/-/spec/opensearch/1.1/') {
|
|
8
8
|
xml.Contact
|
9
9
|
xml.Url type: 'text/html', method: 'get', template: "#{url_for controller: 'catalog', only_path: false}?q={searchTerms}&page={startPage?}"
|
10
10
|
xml.Url type: 'application/rss+xml', method: 'get', template: "#{url_for controller: 'catalog', only_path: false}.rss?q={searchTerms}&page={startPage?}"
|
11
|
-
xml.Url type: 'application/x-suggestions+json', method: 'get', template: "#{url_for controller: 'catalog',action: 'opensearch', format: 'json', only_path: false}?q={searchTerms}"
|
11
|
+
xml.Url type: 'application/x-suggestions+json', method: 'get', template: "#{url_for controller: 'catalog', action: 'opensearch', format: 'json', only_path: false}?q={searchTerms}"
|
12
12
|
}
|
@@ -1,6 +1,5 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
<% end %>
|
1
|
+
<turbo-stream action="append" target="main-flashes">
|
2
|
+
<template>
|
3
|
+
<%= render '/shared/flash_msg' %>
|
4
|
+
</template>
|
5
|
+
</turbo-stream>
|
@@ -14,11 +14,22 @@
|
|
14
14
|
</script>
|
15
15
|
<%= opensearch_description_tag application_name, opensearch_catalog_url(format: 'xml') %>
|
16
16
|
<%= favicon_link_tag %>
|
17
|
-
<%= stylesheet_link_tag "application", media: "all", "data-turbo-track": "reload"
|
18
|
-
<%=
|
17
|
+
<%= stylesheet_link_tag "application", media: "all", "data-turbo-track": "reload" %>
|
18
|
+
<%= stylesheet_link_tag "https://ga.jspm.io/npm:dialog-polyfill@0.5.6/dist/dialog-polyfill.css" %>
|
19
|
+
<% if defined? Importmap %>
|
20
|
+
<%= javascript_importmap_tags %>
|
21
|
+
<% elsif defined? Propshaft %>
|
22
|
+
<%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
|
23
|
+
<% else %>
|
24
|
+
<%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
|
25
|
+
<%= javascript_include_tag "blacklight/blacklight", type: 'module' %>
|
26
|
+
<% end %>
|
19
27
|
|
20
28
|
<%= csrf_meta_tags %>
|
21
29
|
<%= content_for(:head) %>
|
30
|
+
<script type="module">
|
31
|
+
import githubAutoCompleteElement from 'https://cdn.skypack.dev/@github/auto-complete-element';
|
32
|
+
</script>
|
22
33
|
</head>
|
23
34
|
<body class="<%= render_body_class %>">
|
24
35
|
<nav id="skip-link" role="navigation" aria-label="<%= t('blacklight.skip_links.label') %>">
|
@@ -7,8 +7,12 @@
|
|
7
7
|
<% else %>
|
8
8
|
<%= link_to t('blacklight.search_history.clear.action_title'),
|
9
9
|
blacklight.clear_search_history_path,
|
10
|
-
method: :delete,
|
11
|
-
data: {
|
10
|
+
method: :delete, # for rails-ujs
|
11
|
+
data: {
|
12
|
+
confirm: t('blacklight.search_history.clear.action_confirm'), # for rails-ujs
|
13
|
+
turbo_confirm: t('blacklight.search_history.clear.action_confirm'),
|
14
|
+
turbo_method: :delete
|
15
|
+
},
|
12
16
|
class: 'btn btn-danger float-md-right float-md-end' %>
|
13
17
|
<h2 class='section-heading'><%= t('blacklight.search_history.recent') %></h2>
|
14
18
|
<table class="table table-striped search-history">
|
@@ -1,6 +1,6 @@
|
|
1
|
-
<
|
2
|
-
<div class="modal-dialog modal-lg"
|
1
|
+
<dialog id="blacklight-modal" class="modal" data-turbo="false">
|
2
|
+
<div class="modal-dialog modal-lg">
|
3
3
|
<div class="modal-content">
|
4
4
|
</div>
|
5
5
|
</div>
|
6
|
-
</
|
6
|
+
</dialog>
|
data/blacklight.gemspec
CHANGED
@@ -23,30 +23,29 @@ Gem::Specification.new do |s|
|
|
23
23
|
s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
24
24
|
s.require_paths = ["lib"]
|
25
25
|
|
26
|
-
s.required_ruby_version = '>= 2.
|
26
|
+
s.required_ruby_version = '>= 2.7'
|
27
27
|
|
28
|
-
s.add_dependency "rails", '>=
|
28
|
+
s.add_dependency "rails", '>= 6.1', '< 8'
|
29
29
|
s.add_dependency "globalid"
|
30
30
|
s.add_dependency "jbuilder", '~> 2.7'
|
31
31
|
s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
|
32
|
-
s.add_dependency "deprecation"
|
33
32
|
s.add_dependency "i18n", '>= 1.7.0' # added named parameters
|
34
33
|
s.add_dependency "ostruct", '>= 0.3.2'
|
35
|
-
s.add_dependency "view_component", '
|
36
|
-
s.add_dependency 'hashdiff'
|
34
|
+
s.add_dependency "view_component", '~> 2.66'
|
37
35
|
|
38
36
|
s.add_development_dependency "rsolr", ">= 1.0.6", "< 3" # Library for interacting with rSolr.
|
39
|
-
s.add_development_dependency "rspec-rails", "
|
37
|
+
s.add_development_dependency "rspec-rails", "~> 6.0"
|
40
38
|
s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
|
41
39
|
s.add_development_dependency 'axe-core-rspec'
|
42
40
|
s.add_development_dependency "capybara", '~> 3'
|
41
|
+
s.add_development_dependency 'webdrivers'
|
43
42
|
s.add_development_dependency 'selenium-webdriver'
|
44
43
|
s.add_development_dependency 'engine_cart', '~> 2.1'
|
45
44
|
s.add_development_dependency "equivalent-xml"
|
46
45
|
s.add_development_dependency "simplecov"
|
47
|
-
s.add_development_dependency "rubocop", '~> 0
|
48
|
-
s.add_development_dependency "rubocop-rails"
|
49
|
-
s.add_development_dependency "rubocop-rspec"
|
46
|
+
s.add_development_dependency "rubocop", '~> 1.0'
|
47
|
+
s.add_development_dependency "rubocop-rails"
|
48
|
+
s.add_development_dependency "rubocop-rspec"
|
50
49
|
s.add_development_dependency "i18n-tasks"
|
51
50
|
s.add_development_dependency "solr_wrapper"
|
52
51
|
end
|
data/config/importmap.rb
ADDED
@@ -154,7 +154,6 @@ ar:
|
|
154
154
|
search_constraints_header: 'قيود البحث'
|
155
155
|
search_results: 'نتائج البحث'
|
156
156
|
errors:
|
157
|
-
request_error: "معذرة، لم أفهم ما تبحث عنه."
|
158
157
|
invalid_solr_id: "معذرة! لقد طلبت سجلًا غير موجود."
|
159
158
|
per_page:
|
160
159
|
label: '%{count}<span class="sr-only visually-hidden"> لكل صفحة</span>'
|
@@ -144,7 +144,6 @@ ca:
|
|
144
144
|
search_constraints_header: 'Filtres de la cerca'
|
145
145
|
search_results: 'Resultats de la cerca'
|
146
146
|
errors:
|
147
|
-
request_error: "No ha estat possible entendre la cerca"
|
148
147
|
invalid_solr_id: "El registre que heu sol·licitat no existeix."
|
149
148
|
per_page:
|
150
149
|
label: '%{count}<span class="sr-only visually-hidden"> per pàgina</span>'
|
@@ -144,7 +144,6 @@ de:
|
|
144
144
|
search_constraints_header: 'Suchen'
|
145
145
|
search_results: 'Suchergebnisse'
|
146
146
|
errors:
|
147
|
-
request_error: "Entschuldigung, ich habe Ihre Suche nicht verstanden."
|
148
147
|
invalid_solr_id: "Entschuldigung, Sie haben einen nicht vorhandenen Datensatz angefordert."
|
149
148
|
per_page:
|
150
149
|
label: '%{count}<span class="sr-only visually-hidden"> pro Seite</span>'
|
@@ -144,7 +144,6 @@ en:
|
|
144
144
|
search_constraints_header: 'Search Constraints'
|
145
145
|
search_results: 'Search Results'
|
146
146
|
errors:
|
147
|
-
request_error: "Sorry, I don't understand your search."
|
148
147
|
invalid_solr_id: "Sorry, you have requested a record that doesn't exist."
|
149
148
|
per_page:
|
150
149
|
label: '%{count}<span class="sr-only visually-hidden"> per page</span>'
|
@@ -249,7 +248,6 @@ en:
|
|
249
248
|
more_options: More options
|
250
249
|
any_of: 'Any of:'
|
251
250
|
op:
|
252
|
-
label: search operator
|
253
251
|
must: all
|
254
252
|
should: any
|
255
253
|
page_title: Advanced search - %{application_name}
|
@@ -144,7 +144,6 @@ es:
|
|
144
144
|
search_constraints_header: 'Buscar'
|
145
145
|
search_results: 'Resultados de la búsqueda'
|
146
146
|
errors:
|
147
|
-
request_error: "Lo siento, no entiendo esta búsqueda"
|
148
147
|
invalid_solr_id: "Lo sentimos, usted ha solicitado un registro que no existe."
|
149
148
|
per_page:
|
150
149
|
label: '%{count}<span class="sr-only visually-hidden"> por página</span>'
|
@@ -147,7 +147,6 @@ fr:
|
|
147
147
|
search_constraints_header: 'Recherche'
|
148
148
|
search_results: 'Résultats de recherche'
|
149
149
|
errors:
|
150
|
-
request_error: "Pardon, nous n'avons pas compris votre recherche."
|
151
150
|
invalid_solr_id: "Vous avez demandé une notice qui n'existe pas."
|
152
151
|
per_page:
|
153
152
|
label: '%{count}<span class="sr-only visually-hidden"> par page</span>'
|
@@ -144,7 +144,6 @@ hu:
|
|
144
144
|
search_constraints_header: 'Keresés feltételei'
|
145
145
|
search_results: 'Keresés eredményei'
|
146
146
|
errors:
|
147
|
-
request_error: "Elnézést, nem tudom értelmezni a keresést."
|
148
147
|
invalid_solr_id: "Elnézést, de az Ön által kért rekord nem létezik."
|
149
148
|
per_page:
|
150
149
|
label: '%{count}<span class="sr-only visually-hidden"> oldalanként</span>'
|
@@ -144,7 +144,6 @@ it:
|
|
144
144
|
search_constraints_header: 'Ricerca'
|
145
145
|
search_results: 'Risultati della ricerca'
|
146
146
|
errors:
|
147
|
-
request_error: "La richiesta non è comprensibile."
|
148
147
|
invalid_solr_id: "Il numero di scheda richiesto non esiste."
|
149
148
|
per_page:
|
150
149
|
label: '%{count}<span class="sr-only visually-hidden"> per pagina</span>'
|
@@ -144,7 +144,6 @@ nl:
|
|
144
144
|
search_constraints_header: 'Zoek filters'
|
145
145
|
search_results: 'Zoek resultaten'
|
146
146
|
errors:
|
147
|
-
request_error: "Sorry, ik kon uw zoekopdracht niet begrijpen."
|
148
147
|
invalid_solr_id: "Sorry, u vroeg een onbestaande record op."
|
149
148
|
per_page:
|
150
149
|
label: '%{count}<span class="sr-only visually-hidden"> per pagina</span>'
|
@@ -145,7 +145,6 @@ pt-BR:
|
|
145
145
|
search_constraints_header: 'Busca'
|
146
146
|
search_results: 'Resultados da Busca'
|
147
147
|
errors:
|
148
|
-
request_error: "Desculpe, Eu não compreendi sua busca."
|
149
148
|
invalid_solr_id: "Desculpe, você solicitou um cadastro que não existe."
|
150
149
|
per_page:
|
151
150
|
label: '%{count}<span class="hide-text"> por página</span>'
|
@@ -144,7 +144,6 @@ sq:
|
|
144
144
|
search_constraints_header: 'Kufizimet e kërkimit'
|
145
145
|
search_results: 'Rezultatet e kërkimit'
|
146
146
|
errors:
|
147
|
-
request_error: "Na vjen keq, unë nuk e kuptoj kërkimin tuaj."
|
148
147
|
invalid_solr_id: "Na vjen keq, ju keni kërkuar një të dhënë që nuk ekziston."
|
149
148
|
per_page:
|
150
149
|
label: '%{count}<span class="sr-only visually-hidden"> për faqe</span>'
|
data/config/routes.rb
CHANGED
@@ -1,5 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
Blacklight::Engine.routes.draw do
|
3
|
-
get "search_history",
|
4
|
-
delete "search_history/clear",
|
4
|
+
get "search_history", to: "search_history#index", as: "search_history"
|
5
|
+
delete "search_history/clear", to: "search_history#clear", as: "clear_search_history"
|
5
6
|
end
|
data/docker-compose.yml
CHANGED
@@ -17,7 +17,6 @@ services:
|
|
17
17
|
environment:
|
18
18
|
- SOLR_URL # Set via environment variable or use default defined in .env file
|
19
19
|
- RAILS_VERSION # Set via environment variable or use default defined in .env file
|
20
|
-
- VIEW_COMPONENT_VERSION # Set via environment variable or use default defined in .env file
|
21
20
|
- SOLR_ENV=docker-compose
|
22
21
|
- ENGINE_CART_RAILS_OPTIONS=--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test --skip-solr
|
23
22
|
|
@@ -28,12 +28,12 @@ module Blacklight
|
|
28
28
|
return config if config == true || config == false
|
29
29
|
|
30
30
|
if_value = !config.respond_to?(:if) ||
|
31
|
-
|
32
|
-
|
31
|
+
config.if.nil? ||
|
32
|
+
evaluate_configuration_conditional(config.if, config, *args)
|
33
33
|
|
34
34
|
unless_value = !config.respond_to?(:unless) ||
|
35
|
-
|
36
|
-
|
35
|
+
config.unless.nil? ||
|
36
|
+
!evaluate_configuration_conditional(config.unless, config, *args)
|
37
37
|
|
38
38
|
if_value && unless_value
|
39
39
|
end
|
@@ -1,6 +1,13 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Blacklight
|
3
4
|
class Configuration::DisplayField < Blacklight::Configuration::Field
|
5
|
+
def initialize(*args, **kwargs, &block)
|
6
|
+
super
|
7
|
+
|
8
|
+
self.presenter ||= Blacklight::FieldPresenter
|
9
|
+
self.component ||= Blacklight::MetadataFieldComponent
|
10
|
+
end
|
4
11
|
##
|
5
12
|
# The following is a non-exhaustive list of display field config parameters that are used
|
6
13
|
# by Blacklight directly. Application-specific code or plugins may add or replace
|
@@ -33,18 +40,9 @@ module Blacklight
|
|
33
40
|
# Default rendering pipeline:
|
34
41
|
# @!attribute link_to_facet
|
35
42
|
# @return [Boolean]
|
36
|
-
# @!attribute link_to_search
|
37
|
-
# @deprecated use link_to_facet instead.
|
38
|
-
# @return [Boolean]
|
39
43
|
# @!attribute itemprop
|
40
44
|
# @return [String]
|
41
45
|
# @!attribute separator_options
|
42
46
|
# @return [Hash]
|
43
|
-
|
44
|
-
# @param [Blacklight::Configuration] _blacklight_config
|
45
|
-
def normalize! _blacklight_config = nil
|
46
|
-
super
|
47
|
-
self.presenter ||= Blacklight::FieldPresenter
|
48
|
-
end
|
49
47
|
end
|
50
48
|
end
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Blacklight
|
3
4
|
class Configuration::FacetField < Blacklight::Configuration::Field
|
4
5
|
##
|
@@ -19,9 +20,6 @@ module Blacklight
|
|
19
20
|
# @return [Symbol|Hash] the i18n localization option for a date or time value; used as the second parameter for the I18n.l method
|
20
21
|
# @!attribute link_to_facet
|
21
22
|
# @return [Boolean]
|
22
|
-
# @!attribute link_to_search
|
23
|
-
# @deprecated use link_to_facet instead.
|
24
|
-
# @return [Boolean]
|
25
23
|
# @!attribute helper_method
|
26
24
|
# @return [Symbol] the name of a helper method used to display the facet's value to the user; it receives the facet value.
|
27
25
|
# @!attribute url_method
|
@@ -67,22 +65,20 @@ module Blacklight
|
|
67
65
|
# @!attribute partial
|
68
66
|
# @return [String] Rails view partial used to render the facet field
|
69
67
|
|
70
|
-
|
71
|
-
|
68
|
+
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
72
69
|
def normalize! blacklight_config = nil
|
73
70
|
query.stringify_keys! if query
|
74
71
|
|
72
|
+
normalize_pivot_config! if pivot
|
75
73
|
self.collapse = true if collapse.nil?
|
76
74
|
self.show = true if show.nil?
|
77
75
|
self.if = show if self.if.nil?
|
78
76
|
self.index_range = 'A'..'Z' if index_range == true
|
79
77
|
self.presenter ||= Blacklight::FacetFieldPresenter
|
80
|
-
|
81
|
-
if
|
82
|
-
|
83
|
-
|
84
|
-
end
|
85
|
-
|
78
|
+
self.item_presenter ||= Blacklight::FacetItemPresenter
|
79
|
+
self.component = Blacklight::FacetFieldListComponent if component.nil? || component == true
|
80
|
+
self.advanced_search_component ||= Blacklight::FacetFieldCheckboxesComponent
|
81
|
+
self.item_component ||= Blacklight::FacetItemComponent
|
86
82
|
super
|
87
83
|
|
88
84
|
if single && tag.blank? && ex.blank?
|
@@ -92,5 +88,15 @@ module Blacklight
|
|
92
88
|
|
93
89
|
self
|
94
90
|
end
|
91
|
+
# rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
92
|
+
|
93
|
+
private
|
94
|
+
|
95
|
+
def normalize_pivot_config!
|
96
|
+
self.item_presenter ||= Blacklight::FacetItemPivotPresenter
|
97
|
+
self.item_component ||= Blacklight::FacetItemPivotComponent
|
98
|
+
self.filter_class ||= Blacklight::SearchState::PivotFilterField
|
99
|
+
self.filter_query_builder ||= Blacklight::SearchState::PivotFilterField::QueryBuilder
|
100
|
+
end
|
95
101
|
end
|
96
102
|
end
|