blacklight-spotlight 3.6.0.beta4 → 3.6.0.beta5

data/app/assets/stylesheets/spotlight/_exhibits_index.scss

@@ -1,4 +1,4 @@
-$exhibit-card-overlay-padding: $card-img-overlay-padding / 2 !default;
+$exhibit-card-overlay-padding: $card-img-overlay-padding * 0.5 !default;
 $exhibit-card-overlay-opacity: 0.85 !default;
 $exhibit-card-bg: $card-bg !default;
 

data/app/assets/stylesheets/spotlight/_featured_browse_categories_block.scss

@@ -73,7 +73,7 @@ $xl-sidebar-five-tile-width: ($container-xl-sidebar * 0.2) - $tile-margin;
     font-size: $h4-font-size;
     line-height: 1.2;
     margin: 0;
-    padding: $spacer / 4;
+    padding: $spacer * 0.25;
 
     @media (min-width: breakpoint-min("sm")) {
       font-size: 1.125rem;

data/app/javascript/spotlight/admin/{add_image_selector.es6 → add_image_selector.js}

@@ -1,4 +1,4 @@
-import Iiif from 'iiif'
+import Iiif from 'spotlight/admin/iiif'
 
 export function addImageSelector(input, panel, manifestUrl, initialize) {
   if (!manifestUrl) {

data/app/javascript/spotlight/admin/block_mixins/autocompleteable.js

@@ -10,10 +10,6 @@
         this.autocomplete_url = function() { return $('form[data-autocomplete-url]').data('autocomplete-url').replace("%25QUERY", "%QUERY"); };
       }
 
-      if (this['autocomplete_template'] === undefined) {
-        this.autocomplete_url = function() { return '<div class="autocomplete-item{{#if private}} blacklight-private{{/if}}">{{#if thumbnail}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' };
-      }
-
       if (this['transform_autocomplete_results'] === undefined) {
         this.transform_autocomplete_results = (val) => val
       }
@@ -35,7 +31,7 @@
     },
 
     addAutocompletetoSirTrevorForm: function() {
-      $('[data-twitter-typeahead]', this.inner).spotlightSearchTypeAhead({bloodhound: this.bloodhound(), template: this.autocomplete_template()}).on('typeahead:selected typeahead:autocompleted', this.autocompletedHandler()).on( 'focus', function() {
+      $('[data-twitter-typeahead]', this.inner).spotlightSearchTypeAhead({bloodhound: this.bloodhound(), template: this.autocomplete_template}).on('typeahead:selected typeahead:autocompleted', this.autocompletedHandler()).on( 'focus', function() {
         if($(this).val() === '') {
           $(this).data().ttTypeahead.input.trigger('queryChanged', '');
         }

data/app/javascript/spotlight/admin/blocks/block.js

@@ -1,6 +1,6 @@
-import Spotlight from 'spotlight'
+import Core from 'spotlight/core'
 (function ($){
-  Spotlight.Block = SirTrevor.Block.extend({
+  Core.Block = SirTrevor.Block.extend({
     scribeOptions: {
       allowBlockElements: true,
       tags: { p: true }

data/app/javascript/spotlight/admin/blocks/browse_block.js

@@ -1,8 +1,8 @@
-import Spotlight from 'spotlight'
+import Core from 'spotlight/core'
 
 SirTrevor.Blocks.Browse = (function(){
 
-  return Spotlight.Block.Resources.extend({
+  return Core.Block.Resources.extend({
     type: "browse",
 
     icon_name: "browse",
@@ -10,7 +10,12 @@ SirTrevor.Blocks.Browse = (function(){
     autocomplete_url: function() {
       return $(this.inner).closest('form[data-autocomplete-exhibit-searches-path]').data('autocomplete-exhibit-searches-path').replace("%25QUERY", "%QUERY");
     },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{full_title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
+
+    autocomplete_template: function(obj) {
+      const thumbnail = obj.thumbnail_image_url ? `<div class="document-thumbnail"><img class="img-thumbnail" src="${obj.thumbnail_image_url}" /></div>` : ''
+      return `<div class="autocomplete-item${!obj.published ? ' blacklight-private' : ''}">${thumbnail}
+      <span class="autocomplete-title">${obj.full_title}</span><br/><small>&nbsp;&nbsp;${obj.description}</small></div>`
+    },
 
     bloodhoundOptions: function() {
       return {

data/app/javascript/spotlight/admin/blocks/browse_group_categories_block.js

@@ -1,11 +1,11 @@
 /*
   Sir Trevor BrowseGroupCategories
 */
-import Spotlight from 'spotlight'
+import Core from 'spotlight/core'
 
 SirTrevor.Blocks.BrowseGroupCategories = (function(){
 
-  return Spotlight.Block.Resources.extend({
+  return Core.Block.Resources.extend({
     type: "browse_group_categories",
     icon_name: "browse",
     bloodhoundOptions: function() {
@@ -26,7 +26,11 @@ SirTrevor.Blocks.BrowseGroupCategories = (function(){
     autocomplete_control: function() {
       return `<input type="text" class="st-input-string form-control item-input-field" data-twitter-typeahead="true" placeholder="${i18n.t("blocks:browse_group_categories:autocomplete")}"/>`
     },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}"><span class="autocomplete-title">{{title}}</span><br/></div>' },
+    autocomplete_template: function(obj) {
+      return `<div class="autocomplete-item${!obj.published ? ' blacklight-private' : ''}">
+      <span class="autocomplete-title">${obj.title}</span><br/></div>`
+    },
+
     autocomplete_url: function() { return $(this.inner).closest('form[data-autocomplete-exhibit-browse-groups-path]').data('autocomplete-exhibit-browse-groups-path').replace("%25QUERY", "%QUERY"); },
     _itemPanel: function(data) {
       var index = "item_" + this.globalIndex++;

data/app/javascript/spotlight/admin/blocks/oembed_block.js

@@ -6,11 +6,11 @@
   and any provided text
   and displays them.
 */
-import Spotlight from 'spotlight'
+import Core from 'spotlight/core'
 
 SirTrevor.Blocks.Oembed =  (function(){
 
-  return Spotlight.Block.extend({
+  return Core.Block.extend({
     plustextable: true,
 
     id_key:"url",

data/app/javascript/spotlight/admin/blocks/pages_block.js

@@ -1,14 +1,18 @@
-import Spotlight from 'spotlight'
+import Core from 'spotlight/core'
 
 SirTrevor.Blocks.FeaturedPages = (function(){
 
-  return Spotlight.Block.Resources.extend({
+  return Core.Block.Resources.extend({
     type: "featured_pages",
 
     icon_name: "pages",
 
     autocomplete_url: function() { return $(this.inner).closest('form[data-autocomplete-exhibit-pages-path]').data('autocomplete-exhibit-pages-path').replace("%25QUERY", "%QUERY"); },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
+    autocomplete_template: function(obj) {
+      const thumbnail = obj.thumbnail_image_url ? `<div class="document-thumbnail"><img class="img-thumbnail" src="${obj.thumbnail_image_url}" /></div>` : ''
+      return `<div class="autocomplete-item${!obj.published ? ' blacklight-private' : ''}">${thumbnail}
+      <span class="autocomplete-title">${obj.title}</span><br/><small>&nbsp;&nbsp;${obj.description}</small></div>`
+    },
     bloodhoundOptions: function() {
       return {
         prefetch: {

data/app/javascript/spotlight/admin/blocks/resources_block.js

@@ -1,9 +1,9 @@
-import Spotlight from 'spotlight'
-import SpotlightNestable from 'spotlight_nestable'
+import Core from 'spotlight/core'
+import SpotlightNestable from 'spotlight/admin/spotlight_nestable'
 
-Spotlight.Block.Resources = (function(){
+Core.Block.Resources = (function(){
 
-  return Spotlight.Block.extend({
+  return Core.Block.extend({
     type: "resources",
     formable: true,
     autocompleteable: true,

data/app/javascript/spotlight/admin/blocks/solr_documents_base_block.js

@@ -1,13 +1,16 @@
-import Iiif from '../iiif'
-import Spotlight from 'spotlight'
+import Iiif from 'spotlight/admin/iiif'
+import Core from 'spotlight/core'
 
 SirTrevor.Blocks.SolrDocumentsBase = (function(){
 
-  return Spotlight.Block.Resources.extend({
+  return Core.Block.Resources.extend({
     plustextable: true,
     autocomplete_url: function() { return this.$instance().closest('form[data-autocomplete-exhibit-catalog-path]').data('autocomplete-exhibit-catalog-path').replace("%25QUERY", "%QUERY"); },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#if private}} blacklight-private{{/if}}">{{#if thumbnail}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
-
+    autocomplete_template: function(obj) {
+      const thumbnail = obj.thumbnail ? `<div class="document-thumbnail"><img class="img-thumbnail" src="${obj.thumbnail}" /></div>` : ''
+      return `<div class="autocomplete-item${obj.private ? ' blacklight-private' : ''}">${thumbnail}
+      <span class="autocomplete-title">${obj.title}</span><br/><small>&nbsp;&nbsp;${obj.description}</small></div>`
+    },
     transform_autocomplete_results: function(response) {
       return $.map(response['docs'], function(doc) {
         return doc;

data/app/javascript/spotlight/admin/blocks/uploaded_items_block.js

@@ -1,8 +1,8 @@
-import SpotlightNestable from 'spotlight_nestable'
-import Spotlight from 'spotlight'
+import SpotlightNestable from 'spotlight/admin/spotlight_nestable'
+import Core from 'spotlight/core'
 
 SirTrevor.Blocks.UploadedItems = (function(){
-  return Spotlight.Block.Resources.extend({
+  return Core.Block.Resources.extend({
     plustextable: true,
     uploadable: true,
     autocompleteable: false,

data/app/javascript/spotlight/admin/crop.js

@@ -1,5 +1,5 @@
-import { addImageSelector } from 'add_image_selector'
-import Spotlight from 'spotlight'
+import { addImageSelector } from 'spotlight/admin/add_image_selector'
+import Core from 'spotlight/core'
 
 export default class Crop {
   constructor(cropArea) {
@@ -265,7 +265,7 @@ export default class Crop {
       // Form data
       data: this.getData(),
       headers: {
-        'X-CSRF-Token': Spotlight.csrfToken() || ''
+        'X-CSRF-Token': Core.csrfToken() || ''
       },
       //Options to tell jQuery not to process data or worry about content-type.
       cache: false,

data/app/javascript/spotlight/admin/{croppable.es6 → croppable.js}

@@ -1,4 +1,4 @@
-import Crop from 'crop';
+import Crop from 'spotlight/admin/crop';
 
 export default class {
   connect() {

data/app/javascript/spotlight/admin/index.js

@@ -1,62 +1,60 @@
-// import '../../../../vendor/assets/javascripts/sir-trevor'
-import '../../../../vendor/assets/javascripts/nestable'
-import '../../../../vendor/assets/javascripts/parameterize'
-import '../../../../vendor/assets/javascripts/bootstrap-tagsinput'
-import '../../../../vendor/assets/javascripts/jquery.serializejson'
-// import '../../../../vendor/assets/javascripts/clipboard'
-// import '../../../../vendor/assets/javascripts/leaflet'
-import '../../../../vendor/assets/javascripts/leaflet-iiif'
-import '../../../../vendor/assets/javascripts/Leaflet.Editable'
-import '../../../../vendor/assets/javascripts/Path.Drag'
+// These scripts are in the vendor directory
+import 'nestable'
+import 'parameterize'
+import 'bootstrap-tagsinput'
+import 'jquery.serializejson'
+import 'leaflet-iiif'
+import 'Leaflet.Editable'
+import 'Path.Drag'
 
-import AddAnother from 'add_another'
-import AddNewButton from 'add_new_button'
-import Appearance from 'appearance'
-import BlacklightConfiguration from 'blacklight_configuration'
-import CopyEmailAddress from 'copy_email_addresses'
-import Croppable from 'croppable'
-import EditInPlace from 'edit_in_place'
-import ExhibitTagAutocomplete from 'exhibit_tag_autocomplete'
-import Exhibits from 'exhibits'
-import FormObserver from 'form_observer'
-import Locks from 'locks'
-import 'multi_image_selector'
-import Pages from 'pages'
-import ProgressMonitor from 'progress_monitor'
-import ReadonlyCheckbox from 'readonly_checkbox'
-import { addAutocompletetoFeaturedImage } from 'search_typeahead'
-import SelectRelatedInput from 'select_related_input'
-import SpotlightNestable from 'spotlight_nestable'
-import Tabs from 'tabs'
-import TranslationProgress from 'translation_progress'
-import 'visibility_toggle'
-import Users from 'users'
+import AddAnother from 'spotlight/admin/add_another'
+import AddNewButton from 'spotlight/admin/add_new_button'
+import Appearance from 'spotlight/admin/appearance'
+import BlacklightConfiguration from 'spotlight/admin/blacklight_configuration'
+import CopyEmailAddress from 'spotlight/admin/copy_email_addresses'
+import Croppable from 'spotlight/admin/croppable'
+import EditInPlace from 'spotlight/admin/edit_in_place'
+import ExhibitTagAutocomplete from 'spotlight/admin/exhibit_tag_autocomplete'
+import Exhibits from 'spotlight/admin/exhibits'
+import FormObserver from 'spotlight/admin/form_observer'
+import Locks from 'spotlight/admin/locks'
+import 'spotlight/admin/multi_image_selector'
+import Pages from 'spotlight/admin/pages'
+import ProgressMonitor from 'spotlight/admin/progress_monitor'
+import ReadonlyCheckbox from 'spotlight/admin/readonly_checkbox'
+import { addAutocompletetoFeaturedImage } from 'spotlight/admin/search_typeahead'
+import SelectRelatedInput from 'spotlight/admin/select_related_input'
+import SpotlightNestable from 'spotlight/admin/spotlight_nestable'
+import Tabs from 'spotlight/admin/tabs'
+import TranslationProgress from 'spotlight/admin/translation_progress'
+import 'spotlight/admin/visibility_toggle'
+import Users from 'spotlight/admin/users'
 
-import 'block_mixins/autocompleteable'
-import 'block_mixins/formable'
-import 'block_mixins/plustextable'
+import 'spotlight/admin/block_mixins/autocompleteable'
+import 'spotlight/admin/block_mixins/formable'
+import 'spotlight/admin/block_mixins/plustextable'
 
-import 'blocks/block'
-import 'blocks/resources_block' // This is a base class of several other blocks, so must come first
-import 'blocks/browse_block'
-import 'blocks/browse_group_categories_block'
-import 'blocks/iframe_block'
-import 'blocks/link_to_search_block'
-import 'blocks/oembed_block'
-import 'blocks/pages_block'
-import 'blocks/rule_block'
-import 'blocks/search_result_block'
-import 'blocks/solr_documents_base_block'
-import 'blocks/solr_documents_block'
-import 'blocks/solr_documents_carousel_block'
-import 'blocks/solr_documents_embed_block'
-import 'blocks/solr_documents_features_block'
-import 'blocks/solr_documents_grid_block'
-import 'blocks/uploaded_items_block'
+import 'spotlight/admin/blocks/block'
+import 'spotlight/admin/blocks/resources_block' // This is a base class of several other blocks, so must come first
+import 'spotlight/admin/blocks/browse_block'
+import 'spotlight/admin/blocks/browse_group_categories_block'
+import 'spotlight/admin/blocks/iframe_block'
+import 'spotlight/admin/blocks/link_to_search_block'
+import 'spotlight/admin/blocks/oembed_block'
+import 'spotlight/admin/blocks/pages_block'
+import 'spotlight/admin/blocks/rule_block'
+import 'spotlight/admin/blocks/search_result_block'
+import 'spotlight/admin/blocks/solr_documents_base_block'
+import 'spotlight/admin/blocks/solr_documents_block'
+import 'spotlight/admin/blocks/solr_documents_carousel_block'
+import 'spotlight/admin/blocks/solr_documents_embed_block'
+import 'spotlight/admin/blocks/solr_documents_features_block'
+import 'spotlight/admin/blocks/solr_documents_grid_block'
+import 'spotlight/admin/blocks/uploaded_items_block'
 
-import 'sir-trevor/block_controls'
-import 'sir-trevor/block_limits'
-import 'sir-trevor/locales'
+import 'spotlight/admin/sir-trevor/block_controls'
+import 'spotlight/admin/sir-trevor/block_limits'
+import 'spotlight/admin/sir-trevor/locales'
 
 
 export default class {

data/app/javascript/spotlight/admin/{pages.es6 → pages.js}

@@ -1,6 +1,6 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
-import Spotlight from 'spotlight'
+import Core from 'spotlight/core'
 
 export default class {
   connect(){
@@ -9,7 +9,7 @@ export default class {
       uploadUrl: $('[data-attachment-endpoint]').data('attachment-endpoint'),
       ajaxOptions: {
         headers: {
-          'X-CSRF-Token': Spotlight.csrfToken() || ''
+          'X-CSRF-Token': Core.csrfToken() || ''
         },
         credentials: 'same-origin'
       }
@@ -34,9 +34,9 @@ export default class {
         }
       });
 
-      editor.blockControls = Spotlight.BlockControls.create(editor);
+      editor.blockControls = Core.BlockControls.create(editor);
 
-      new Spotlight.BlockLimits(editor).enforceLimits(editor);
+      new Core.BlockLimits(editor).enforceLimits(editor);
     }
   }
 }

data/app/javascript/spotlight/admin/search_typeahead.js

@@ -1,4 +1,4 @@
-import { addImageSelector } from 'add_image_selector'
+import { addImageSelector } from 'spotlight/admin/add_image_selector'
 
 (function($){
   $.fn.spotlightSearchTypeAhead = function( options ) {
@@ -14,12 +14,11 @@ import { addImageSelector } from 'add_image_selector'
         hint: (typeAheadInput.data('autocomplete-hint') || false),
         autoselect: (typeAheadInput.data('autocomplete-autoselect') || true)
       }, options);
-
       typeAheadInput.typeahead(settings, {
         displayKey: settings.displayKey,
         source: settings.bloodhound.ttAdapter(),
         templates: {
-          suggestion: Handlebars.compile(settings.template)
+          suggestion: settings.template
         }
       })
     }
@@ -47,13 +46,15 @@ function itemsBloodhound() {
   return results;
 };
 
-function itemsTemplate() {
-  return '<div class="autocomplete-item{{#if private}} blacklight-private{{/if}}">{{#if thumbnail}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>';
+function templateFunc(obj) {
+  const thumbnail = obj.thumbnail ? `<div class="document-thumbnail"><img class="img-thumbnail" src="${obj.thumbnail}" /></div>` : ''
+  return $(`<div class="autocomplete-item${obj.private ? ' blacklight-private' : ''}">${thumbnail}
+  <span class="autocomplete-title">${obj.title}</span><br/><small>&nbsp;&nbsp;${obj.description}</small></div>`)
 }
 
 export function addAutocompletetoFeaturedImage(){
   if($('[data-featured-image-typeahead]').length > 0) {
-    $('[data-featured-image-typeahead]').spotlightSearchTypeAhead({bloodhound: itemsBloodhound(), template: itemsTemplate()}).on('click', function() {
+    $('[data-featured-image-typeahead]').spotlightSearchTypeAhead({bloodhound: itemsBloodhound(), template: templateFunc}).on('click', function() {
       $(this).select();
     }).on('typeahead:selected typeahead:autocompleted', function(e, data) {
       var panel = $($(this).data('target-panel'));

data/app/javascript/spotlight/admin/sir-trevor/block_controls.js

@@ -1,4 +1,4 @@
-import Spotlight from 'spotlight'
+import Core from 'spotlight/core'
 
 (function() {
   var BLOCK_REPLACER_CONTROL_TEMPLATE = function(block) {
@@ -77,8 +77,8 @@ import Spotlight from 'spotlight'
     return elButtons;
   }
 
-  Spotlight.BlockControls = function() { };
-  Spotlight.BlockControls.create = function(editor) {
+  Core.BlockControls = function() { };
+  Core.BlockControls.create = function(editor) {
     // REFACTOR - should probably not know about blockManager
     var el = render(SirTrevor.Blocks, editor.blockManager.blockTypes);
 

data/app/javascript/spotlight/admin/sir-trevor/block_limits.js

@@ -1,20 +1,20 @@
-import Spotlight from 'spotlight'
+import Core from 'spotlight/core'
 
-Spotlight.BlockLimits = function(editor) {
+Core.BlockLimits = function(editor) {
   this.editor = editor;
 };
 
-Spotlight.BlockLimits.prototype.enforceLimits = function(editor) {
+Core.BlockLimits.prototype.enforceLimits = function(editor) {
   this.addEditorCallbacks(editor);
   this.checkGlobalBlockTypeLimit()();
 };
 
-Spotlight.BlockLimits.prototype.addEditorCallbacks = function(editor) {
+Core.BlockLimits.prototype.addEditorCallbacks = function(editor) {
   SirTrevor.EventBus.on('block:create:new', this.checkBlockTypeLimitOnAdd());
   SirTrevor.EventBus.on('block:remove', this.checkGlobalBlockTypeLimit());
 };
 
-Spotlight.BlockLimits.prototype.checkBlockTypeLimitOnAdd = function() {
+Core.BlockLimits.prototype.checkBlockTypeLimitOnAdd = function() {
   var editor = this.editor;
 
   return function(block) {
@@ -24,7 +24,7 @@ Spotlight.BlockLimits.prototype.checkBlockTypeLimitOnAdd = function() {
   };
 };
 
-Spotlight.BlockLimits.prototype.checkGlobalBlockTypeLimit = function() {
+Core.BlockLimits.prototype.checkGlobalBlockTypeLimit = function() {
   // we don't know what type of block was created or removed.. So, try them all.
   var editor = this.editor;
 

data/app/javascript/spotlight/admin/{visibility_toggle.es6 → visibility_toggle.js}

@@ -1,7 +1,7 @@
 // Visibility toggle for items in an exhibit, based on Blacklight's bookmark toggle
 // See: https://github.com/projectblacklight/blacklight/blob/main/app/javascript/blacklight/bookmark_toggle.js
 
-import CheckboxSubmit from 'checkbox_submit'
+import CheckboxSubmit from 'spotlight/admin/checkbox_submit'
 
 const VisibilityToggle = (e) => {
   if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {

data/app/javascript/spotlight/index.js

@@ -1,10 +1,10 @@
-import UserIndex from 'user/index'
-import AdminIndex from 'admin/index'
-import Spotlight from 'spotlight'
+import UserIndex from 'spotlight/user'
+import AdminIndex from 'spotlight/admin'
+import Core from 'spotlight/core'
 
-Spotlight.onLoad(() => {
+Core.onLoad(() => {
   new UserIndex().connect()
   new AdminIndex().connect()
 })
 
-export default Spotlight
+export default Core

data/app/javascript/spotlight/user/index.js

@@ -1,8 +1,8 @@
-import BrowseGroupCateogries from 'browse_group_categories'
-import Carousel from 'carousel'
-import ClearFormButton from 'clear_form_button'
-import ReportProblem from 'report_a_problem'
-import ZprLinks from 'zpr_links'
+import BrowseGroupCateogries from 'spotlight/user/browse_group_categories'
+import Carousel from 'spotlight/user/carousel'
+import ClearFormButton from 'spotlight/user/clear_form_button'
+import ReportProblem from 'spotlight/user/report_a_problem'
+import ZprLinks from 'spotlight/user/zpr_links'
 
 export default class {
   connect() {

data/app/views/layouts/spotlight/base.html.erb

@@ -26,9 +26,9 @@
     <%= render partial: 'shared/body_preamble' %>
     <div id="skip-link">
       <% if should_render_spotlight_search_bar? %>
-        <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+        <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3' %>
       <% end %>
-      <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'element-invisible element-focusable rounded-bottom py-2 px-3' %>
       <%= content_for(:skip_links) %>
     </div>
 

data/app/views/spotlight/dashboards/_page.html.erb

@@ -4,10 +4,10 @@
     <div class="page-links pt-0">
       <% if page.is_a?(Spotlight::HomePage) %>
           <%= link_to action_default_value(page, :view), current_exhibit %> &middot;
-          <%= exhibit_edit_link page, edit_exhibit_home_page_path(page.exhibit), data: { turbolinks: false } %>
+          <%= exhibit_edit_link page, edit_exhibit_home_page_path(page.exhibit), data: { turbolinks: false, turbo: false } %>
       <% else %>
         <%= exhibit_view_link page %> &middot;
-        <%= exhibit_edit_link page, data: { turbolinks: false } %>
+        <%= exhibit_edit_link page, data: { turbolinks: false, turbo: false } %>
       <% end %>
     </div>
   </td>

data/app/views/spotlight/home_pages/_edit_page_link.html.erb

@@ -1 +1,2 @@
-<%= exhibit_edit_link @page, spotlight.edit_exhibit_home_page_path(@page.exhibit), class: 'edit-button float-right btn btn-primary', data: { turbolinks: false } %>
+<%= exhibit_edit_link @page, spotlight.edit_exhibit_home_page_path(@page.exhibit), class: 'edit-button float-right btn btn-primary',
+                      data: { turbolinks: false, turbo: false } %>

data/app/views/spotlight/pages/_edit_page_link.html.erb

@@ -1 +1,2 @@
-<%= exhibit_edit_link @page, class: 'edit-button float-right btn btn-primary', data: { turbolinks: false } %>
+<%= exhibit_edit_link @page, class: 'edit-button float-right btn btn-primary',
+                      data: { turbolinks: false, turbo: false } %>

data/app/views/spotlight/pages/_page.html.erb

@@ -3,7 +3,7 @@
   <% case section when :additional_options %>
     <div class="page-links">
       <%= exhibit_view_link page %> &middot;
-      <%= exhibit_edit_link page, data: { turbolinks: false } %> &middot;
+      <%= exhibit_edit_link page, data: { turbolinks: false, turbo: false } %> &middot;
       <%= exhibit_delete_link page %>
     </div>
     <%- if page.feature_page? -%>

data/app/views/spotlight/shared/_locale_picker.html.erb

@@ -6,7 +6,8 @@
     <ul class="dropdown-menu">
       <% locale_selecter_dropown_options.each do |language| %>
         <li>
-          <%= link_to language.to_native, current_page_for_locale(language.locale), class: 'dropdown-item', data: { turbolinks: false } %>
+          <%= link_to language.to_native, current_page_for_locale(language.locale), class: 'dropdown-item',
+                      data: { turbolinks: false, turbo: false } %>
         </li>
       <% end %>
     </ul>

data/config/importmap.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+pin_all_from File.expand_path('../app/javascript/spotlight', __dir__), under: 'spotlight'
+pin_all_from File.expand_path('../vendor/assets/javascripts', __dir__)

data/lib/generators/spotlight/install_generator.rb

@@ -21,6 +21,9 @@ module Spotlight
     def add_manifest
       append_to_file 'app/assets/javascripts/application.js', "\n//= require_tree .\n"
       append_to_file 'app/assets/config/manifest.js', "\n//= link spotlight/manifest.js"
+
+      # Rails installed importmap by default, but we don't have importmap + Blacklight 7 working yet.
+      remove_file 'app/javascript/application.js'
     end
 
     def inject_spotlight_routes

data/lib/spotlight/engine.rb

@@ -41,7 +41,6 @@ module Spotlight
     require 'redcarpet' # required for markdown support in github/markup https://github.com/github/markup#markups
     require 'github/markup'
     require 'openseadragon'
-    require 'handlebars_assets'
 
     config.assets.precompile += %w[spotlight/fallback/*.png]
 
@@ -64,8 +63,23 @@ module Spotlight
       FactoryBot.definition_file_paths << File.expand_path('../../spec/factories', __dir__) if defined?(FactoryBot)
     end
 
+    PRECOMPILE_ASSETS = %w[
+      spotlight/blocks/sir-trevor-icons.svg
+      spotlight/default_thumbnail.jpg
+      spotlight/default_browse_thumbnail.jpg
+      spotlight/spotlight.js
+      spotlight/spotlight.js.map
+      spotlight/spotlight.esm.js
+      spotlight/spotlight.esm.js.map
+    ].freeze
+
     initializer 'spotlight.assets.precompile' do |app|
-      app.config.assets.precompile += %w[spotlight/default_thumbnail.jpg spotlight/default_browse_thumbnail.jpg]
+      app.config.assets.paths << Engine.root.join('app/javascript')
+      app.config.assets.precompile += PRECOMPILE_ASSETS
+    end
+
+    initializer 'spotlight.importmap', before: 'importmap' do |app|
+      app.config.importmap.paths << Engine.root.join('config/importmap.rb') if app.config.respond_to?(:importmap)
     end
 
     def self.user_class

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.6.0.beta4'
+  VERSION = '3.6.0.beta5'
 end