Run the OpenSeadragon rails installer

projectblacklight · Dec 19, 2024 · 14597a3 · 14597a3
1 parent 105986e
commit 14597a3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -46,6 +46,12 @@ jobs:
         run: bundle install
       - name: Run tests
         run: bundle exec rake
+      - name: Store artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: asset-config
+          path: .internal_test_app/config/initializers/assets.rb
 
   build:
     runs-on: ubuntu-latest

diff --git a/app/views/layouts/spotlight/base.html.erb b/app/views/layouts/spotlight/base.html.erb
@@ -24,14 +24,11 @@
     <%= javascript_include_tag 'leaflet-iiif', "data-turbo-track": "reload", defer: true %>
     <%= javascript_include_tag 'Leaflet.Editable', "data-turbo-track": "reload", defer: true %>
     <%= javascript_include_tag 'Path.Drag', "data-turbo-track": "reload", defer: true %>
-    <%= javascript_include_tag 'openseadragon/openseadragon', "data-turbo-track": "reload", defer: true %>
-    <%= javascript_include_tag 'openseadragon/jquery', "data-turbo-track": "reload", defer: true %>
     <% if defined? Importmap %>
       <%= javascript_importmap_tags %>
     <% else %>
       <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
     <% end %>
-    <%= javascript_include_tag 'openseadragon/rails', "data-turbo-track": "reload", defer: true %>
     <%= csrf_meta_tags %>
     <%= content_for(:head) %>
     <% if @document %>

diff --git a/lib/generators/spotlight/assets/propshaft_generator.rb b/lib/generators/spotlight/assets/propshaft_generator.rb
@@ -78,6 +78,11 @@ def add_javascript
         end
       end
 
+      def add_osd_rails
+        # blacklight-gallery's install generator calls openseadragon:install generator'
+        run 'yarn add openseadragon-rails'
+      end
+
       def add_stylesheets
         copy_file 'assets/spotlight.scss', 'app/assets/stylesheets/spotlight.scss'
         append_to_file 'app/assets/stylesheets/application.bootstrap.scss', "\n@import \"spotlight\";\n"

diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "jquery-serializejson": "^3.2.1",
     "leaflet": "^1.9.4",
     "leaflet-iiif": "^3.0.0",
+    "openseadragon-rails": "^1.0.1",
     "sir-trevor": "^0.8.2",
     "sortablejs": "^1.15.3"
   }