Consolidate image display (#606)

* Decorate

* Change redirect_to_external to use noopener noreferrer

* Don't support external urls for Resources anymore

* Allow stories to open show page if no_redirect param is passed

* Fix leader_spotlights to be found correctly

* Remove the old main_image_url and instead use display_image and default_display_image methods

* Support pdf's for main_image and gallery_image

* Remove main_image_url method

* Add back in resource kinds for now

* Separate directly-associated resources from resources through: workshop_resources

* Delete bookmarks flex, since it's unused

* Remove unused index.js.erb

* Consolidate media/image partials so there's a shared interface

* No need to conditionally check responds to title, since all decorators have title implemented

* Delete bookmarks/index.js.erb

* Replace quotes

* Show bookmarks personal_row on bookmarks show

* Don't update led_count via turbo stream anymore since it's a static value

* Move all dashboard content 'cards' to their respective views folder

* Add new media partials for a consolidated interface for image display

* Update event_registration displays

* Update resources form -- url field needs to be re-attached. and, attachments need to be reattached as 'images'

* Don't show cursor-pointer for the whole resource card

* Remove external_link reference from resource bc the 'url' field is being used for pdf's rn, not external links

* Move the Resource kind_display logic to the decorator

* Allow sizes and variants to be sent to the resource_icon svg partial

* Show resource windows_type, if present

* Fix indentation

* Don't show Attachments on Resource show anymore

* Only iterate over present attachments

* Change form_image_field partials and related calls to them

* Add organizations and facilitators to nav

* Pre-select story details from params

* Make stories index view button pass param to open show page rather than external link

* Show image on story_ideas index

* Correct color call on workshop_ideas index

* Fix indentation

* Add /n

* Fix LeaderSpotlight display on Workshop show show_associations

* Change capitalization and indentation of workshop sections, and add spanish translation for Age range

* Tweak image storage settings to support pdf previews in dev, prod, staging (will prob need to install some libraries on DO)

* WIP rake task to convert resource pdf's stored in 'url' field into real image uploads

* Futz w names of resource assns on workshop

* Fix tests that refer to alt titles

* Don't validate external url for resources anymore

* Test on classes not alt text

* Properly assign decorated index collection in tests

* Replace tabs w spaces

* Fix tabs and spacing

* Adjust decorator so we don't need to call html_safe anymore to appease rubocop

Author: maebeale

app/controllers/bookmarks_controller.rb

@@ -3,11 +3,12 @@ class BookmarksController < ApplicationController
 
   def index
     per_page = params[:number_of_items_per_page] || 25
-    bookmarks = Bookmark.search(params)
-    bookmarks = bookmarks.sorted(params[:sort])
+    unfiltered = Bookmark.all
+    filtered = unfiltered.search(params)
+    filtered = filtered.sorted(params[:sort])
 
-    @bookmarks = bookmarks.paginate(page: params[:page], per_page: per_page)
-    @bookmarks_count = bookmarks.length
+    @bookmarks = filtered.paginate(page: params[:page], per_page: per_page).decorate
+    @bookmarks_count = unfiltered.length
     @windows_types_array = WindowsType::TYPES
     set_index_variables
     respond_to do |format|

app/controllers/concerns/externally_redirectable.rb

@@ -2,6 +2,6 @@ module ExternallyRedirectable
   extend ActiveSupport::Concern
 
   def redirect_to_external(url)
-    redirect_to url, allow_other_host: true
+    redirect_to url, allow_other_host: true, rel: "noopener noreferrer"
   end
 end

app/controllers/resources_controller.rb

@@ -41,11 +41,6 @@ def show
     @resource = Resource.find(resource_id_param).decorate
     @resource.increment_view_count!(session: session, request: request)
     load_forms
-
-    if @resource.external_url.present?
-      redirect_to_external @resource.link_target
-      nil
-    end
   end
 
   def rhino_text

app/controllers/stories_controller.rb

@@ -21,7 +21,7 @@ def show
     @story = @story.decorate
     @story.increment_view_count!(session: session, request: request)
 
-    if @story.external_url.present?
+    if @story.external_url.present? && !params[:no_redirect].present?
       redirect_to_external @story.link_target
       nil
     end

app/controllers/story_ideas_controller.rb

@@ -7,7 +7,7 @@ def index
 
     story_ideas = StoryIdea.includes(:windows_type, :project, :workshop, :created_by, :updated_by)
     @story_ideas = story_ideas.order(created_at: :desc)
-                              .paginate(page: params[:page], per_page: per_page)
+                              .paginate(page: params[:page], per_page: per_page).decorate
 
     @story_ideas_count = story_ideas.size
   end

app/controllers/workshop_ideas_controller.rb

@@ -5,7 +5,7 @@ def index
     per_page = params[:number_of_items_per_page].presence || 25
     workshop_ideas = WorkshopIdea.search(params.slice(:title, :author_name))
     @workshop_ideas_count = workshop_ideas.size
-    @workshop_ideas = workshop_ideas.paginate(page: params[:page], per_page: per_page)
+    @workshop_ideas = workshop_ideas.paginate(page: params[:page], per_page: per_page).decorate
   end
 
   def show

app/controllers/workshops_controller.rb

@@ -151,7 +151,7 @@ def search
   def set_show
     @workshop = Workshop.find(params[:id]).decorate
     @quotes = Quote.where(workshop_id: @workshop.id).active
-    @leader_spotlights = @workshop.resources.published.leader_spotlights
+    @leader_spotlights = @workshop.associated_resources.leader_spotlights.where(inactive: false)
     @workshop_variations = @workshop.workshop_variations.active
     @sectors = @workshop.sectorable_items.published.map { |item| item.sector if item.sector.published }.compact if @workshop.sectorable_items.any?
   end

app/decorators/application_decorator.rb

@@ -1,6 +1,18 @@
 class ApplicationDecorator < Draper::Decorator
   delegate_all
 
+  def display_image
+    return main_image.file if object.respond_to?(:main_image) && main_image&.file&.attached?
+    return gallery_images.first.file if object.respond_to?(:gallery_images) && gallery_images.first&.file&.attached?
+    return images.first.file if object.respond_to?(:images) && images.first&.file&.attached?
+    return attachments.first.file if object.respond_to?(:attachments) && attachments.first&.file&.attached?
+    default_display_image
+  end
+
+  def default_display_image
+    "theme_default.png"
+  end
+
   def link_target
     h.polymorphic_path(object)
   end

app/decorators/bookmark_decorator.rb

@@ -10,6 +10,10 @@ def detail
     "Bookmarkable: #{bookmarkable_class_name} ##{bookmarkable.id} (#{bookmarkable.title})"
   end
 
+  def display_image
+    bookmarkable.decorate.display_image
+  end
+
   def breadcrumbs
     "#{bookmarks_link} >> #{bookmarkable_link}".html_safe
   end
@@ -36,14 +40,4 @@ def bookmarkable_link
       bookmarkable.breadcrumb_link
     end
   end
-
-  def bookmarkable_image_url(fallback: "missing.png")
-    if bookmarkable.respond_to?(:images) && bookmarkable.images.first&.file&.attached?
-      Rails.application.routes.url_helpers.rails_blob_path(bookmarkable.images.first.file, only_path: true)
-    elsif bookmarkable_type == "Workshop"
-      ActionController::Base.helpers.asset_path("workshop_default.jpg")
-    else
-      ActionController::Base.helpers.asset_path(fallback)
-    end
-  end
 end

app/decorators/community_news_decorator.rb

@@ -12,14 +12,4 @@ def external_url
   def inactive?
     !published?
   end
-
-  def main_image_url
-    if main_image&.file&.attached?
-      Rails.application.routes.url_helpers.url_for(main_image.file)
-    elsif gallery_images.first&.file&.attached?
-      Rails.application.routes.url_helpers.url_for(gallery_images.first.file)
-    else
-      ActionController::Base.helpers.asset_path("theme_default.png")
-    end
-  end
 end