spree_admin 5.2.6 → 5.3.0.rc1

data/app/controllers/spree/admin/page_sections_controller.rb

@@ -1,82 +0,0 @@
-module Spree
-  module Admin
-    class PageSectionsController < ResourceController
-      include Spree::Admin::PageBuilderConcern
-
-      before_action :load_pageable, only: %i[new create index]
-
-      def create
-        page_section_type = params.dig(:page_section, :type)
-        allowed_types = available_page_section_types.map(&:to_s)
-
-        if allowed_types.include?(page_section_type)
-          # Find the actual class from our allowed types rather than using constantize
-          section_class = available_page_section_types.find { |type| type.to_s == page_section_type }
-
-          if section_class
-            @page_section = section_class.new(permitted_resource_params)
-            @page_section.pageable = @pageable
-            @page_section.save!
-          end
-        end
-      end
-
-      def destroy
-        @page_section.destroy if @page_section.can_be_deleted?
-      end
-
-      def move_higher
-        if @page_section.first?
-          head :ok
-        else
-          @page_section.move_higher
-        end
-      end
-
-      def move_lower
-        if @page_section.last?
-          head :ok
-        else
-          @page_section.move_lower
-        end
-      end
-
-      def restore_design_settings_to_defaults
-        @page_section.restore_design_settings_to_defaults
-      end
-
-      private
-
-      def load_pageable
-        @pageable = if @page_section.present? && @page_section.pageable.present?
-                      @page_section.pageable
-                    elsif params[:page_id].present?
-                      current_store.theme_page_previews.friendly.find_by(id: params[:page_id]) ||
-                        current_store.page_previews.friendly.find(params[:page_id])
-                    elsif params[:theme_id].present?
-                      current_store.theme_previews.find(params[:theme_id])
-                    end
-      end
-
-      def available_page_section_types
-        return [] unless @pageable.present?
-
-        if @pageable.is_a?(Spree::Theme)
-          @pageable.available_page_sections
-        elsif @pageable.respond_to?(:theme)
-          @pageable.theme.available_page_sections
-        else
-          []
-        end
-      end
-
-      def permitted_resource_params
-        params.require(:page_section).permit(
-          permitted_page_section_attributes +
-          [link_attributes: permitted_page_link_attributes + [:id]] +
-          @object.preferences.keys.map { |key| "preferred_#{key}" }
-        )
-      end
-    end
-  end
-end

data/app/controllers/spree/admin/pages_controller.rb

@@ -1,39 +0,0 @@
-module Spree
-  module Admin
-    class PagesController < Spree::Admin::ResourceController
-      create.before :set_page
-      update.after :remove_preview_from_session
-      destroy.after :remove_preview_from_session
-      create.after :remove_preview_from_session
-
-      include StorefrontBreadcrumbConcern
-      add_breadcrumb Spree.t(:pages), :admin_pages_path
-
-      private
-
-      def remove_preview_from_session
-        session.delete(:page_preview_id)
-      end
-
-      def flash_message_for(object, event_sym)
-        Spree.t(event_sym, resource: "#{Spree.t(:page)} \"#{object.name}\"")
-      end
-
-      def set_page
-        @object = current_store.pages.custom.new
-      end
-
-      def edit_object_url(object, options = {})
-        spree.edit_admin_theme_path(current_store.default_theme, page_id: object.id, **options)
-      end
-
-      def scope
-        super.custom.without_previews
-      end
-
-      def permitted_resource_params
-        params.require(:page).permit(permitted_page_attributes)
-      end
-    end
-  end
-end

data/app/controllers/spree/admin/storefront_controller.rb

@@ -1,41 +0,0 @@
-module Spree
-  module Admin
-    class StorefrontController < BaseController
-      include StorefrontBreadcrumbConcern
-      add_breadcrumb Spree.t(:settings), :edit_admin_storefront_path
-
-      def edit
-        @store = current_store
-      end
-
-      def update
-        @store = current_store
-        if @store.update(store_params)
-          remove_assets(%w[favicon_image social_image], object: @store)
-          flash[:success] = flash_message_for(@store, :successfully_updated)
-        else
-          flash[:error] = @store.errors.full_messages.to_sentence
-        end
-
-        redirect_to spree.edit_admin_storefront_path
-      end
-
-      private
-
-      def store_params
-        params.require(:store).permit(
-          :preferred_index_in_search_engines,
-          :preferred_password_protected, :social_image, :favicon_image, :name,
-          :meta_description, :meta_keywords, :seo_robots, :seo_title,
-          :facebook, :twitter, :instagram, :linkedin, :youtube, :tiktok, :pinterest,
-          :storefront_custom_code_head, :storefront_custom_code_body_start,
-          :storefront_custom_code_body_end, :storefront_password, :spotify, :discord
-        )
-      end
-
-      def model_class
-        Spree::Store
-      end
-    end
-  end
-end

data/app/controllers/spree/admin/themes_controller.rb

@@ -1,86 +0,0 @@
-module Spree
-  module Admin
-    class ThemesController < ResourceController
-      layout :choose_layout
-
-      include StorefrontBreadcrumbConcern
-      add_breadcrumb Spree.t(:themes), :admin_themes_path
-
-      def edit
-        @theme_preview = params[:theme_preview_id].present? ? @theme.previews.find(params[:theme_preview_id]) : @theme.create_preview
-        @page = if params[:page_id].present?
-                  @theme.pages.find_by(id: params[:page_id]) || current_store.pages.find(params[:page_id])
-                else
-                  @theme.pages.find_by(type: 'Spree::Pages::Homepage')
-                end
-        @page_preview = params[:page_preview_id].present? ? @page.previews.find(params[:page_preview_id]) : @page.create_preview
-
-        session[:theme_preview_id] = @theme_preview.id
-        session[:page_preview_id] = @page_preview.id
-      end
-
-      def update_with_page
-        @theme_preview = @theme.previews.find(params[:theme_preview_id])
-        @page_preview = @theme.page_previews.find_by(id: params[:page_preview_id]) || current_store.page_previews.find(params[:page_preview_id])
-
-        ApplicationRecord.transaction do
-          @page_preview.promote && @theme_preview.promote
-        end
-        flash[:success] = Spree.t('changes_published')
-
-        redirect_to spree.edit_admin_theme_path(@theme_preview, page_id: @page_preview.id), status: :see_other
-      rescue ActiveRecord::RecordInvalid
-        redirect_to spree.edit_admin_theme_path(@theme_preview, page_id: @page_preview.id), alert: Spree.t('something_went_wrong')
-      end
-
-      def publish
-        @theme = current_store.themes.find(params[:id])
-
-        if @theme.update(default: true)
-          flash[:success] = Spree.t('theme_is_now_live')
-        else
-          flash[:error] = "#{Spree.t('something_went_wrong')}: #{@theme.errors.full_messages.to_sentence}"
-        end
-        redirect_to spree.admin_themes_path
-      end
-
-      def clone
-        @new = @theme.duplicate
-
-        if @new.persisted?
-          flash[:success] = Spree.t('theme_copied')
-        else
-          flash[:error] = Spree.t('theme_not_copied', error: @new.errors.full_messages.to_sentence)
-        end
-
-        redirect_to spree.admin_themes_path
-      end
-
-      private
-
-      def choose_layout
-        if action_name == 'index'
-          'spree/admin'
-        else
-          'spree/page_builder'
-        end
-      end
-
-      def update_turbo_stream_enabled?
-        true
-      end
-
-      def scope
-        super.without_previews.order(default: :desc)
-      end
-
-      def collection_includes
-        { screenshot_attachment: :blob }
-      end
-
-      def permitted_resource_params
-        params.require(:theme).permit(permitted_theme_attributes + @object.preferences.keys.map { |key| "preferred_#{key}" })
-      end
-    end
-  end
-end

data/app/controllers/spree/admin/webhooks_subscribers_controller.rb

@@ -1,59 +0,0 @@
-module Spree
-  module Admin
-    class WebhooksSubscribersController < ResourceController
-      include Spree::Admin::SettingsConcern
-
-      before_action :set_supported_events, except: [:index, :show]
-
-      create.before :process_subscriptions
-      update.before :process_subscriptions
-
-      def show
-        @webhooks_subscriber = Webhooks::Subscriber.find(params[:id])
-        @events = @webhooks_subscriber.events.order(created_at: :desc).page(params[:page]).per(params[:per_page])
-      end
-
-      private
-
-      def resource
-        @resource ||= Spree::Admin::Resource.new 'spree/admin/webhooks/subscribers', 'subscribers', nil
-      end
-
-      def process_subscriptions
-        return if params[:webhooks_subscriber].blank?
-
-        params[:webhooks_subscriber][:subscriptions] = if params[:subscribe_to_all_events] == 'true'
-                                                         ['*']
-                                                       else
-                                                         selected_events
-                                                       end
-
-        params[:webhooks_subscriber] = params[:webhooks_subscriber].except(*supported_events.keys)
-      end
-
-      def selected_events
-        @supported_events.select { |resource, _events| params[:webhooks_subscriber][resource] == 'true' }.values.flatten
-      end
-
-      def set_supported_events
-        @supported_events ||= Spree::Webhooks::Subscriber.supported_events
-      end
-
-      def supported_events
-        @supported_events
-      end
-
-      def permitted_resource_params
-        params.require(:webhooks_subscriber).permit(:url, :active, subscriptions: [])
-      end
-
-      def location_after_create
-        location_after_save
-      end
-
-      def location_after_save
-        spree.admin_webhooks_subscriber_path(@object)
-      end
-    end
-  end
-end

data/app/helpers/spree/admin/page_builder_helper.rb

@@ -1,125 +0,0 @@
-module Spree
-  module Admin
-    module PageBuilderHelper
-      def system_fonts_list
-        ['Sans-serif', 'Serif', 'Mono']
-      end
-
-      def google_fonts_list
-        ['Abel', 'Abril Fatface', 'Alegreya', 'Alegreya Sans', 'Alice', 'Amiri', 'Anonymous Pro', 'Arapey', 'Archivo', 'Archivo Narrow',
-         'Arimo', 'Armata', 'Arvo', 'Asap', 'Assistant', 'Asul', 'Bitter', 'Cabin', 'Cardo', 'Catamaran', 'Chivo', 'Cormorant',
-         'Crimson Text', 'DM Sans', 'Domine', 'Dosis', 'Eczar', 'Figtree', 'Fira Sans', 'Fjalla One', 'Glegoo', 'IBM Plex Sans', 'Inconsolata',
-         'Inknut Antiqua', 'Inter', 'Josefin Sans', 'Josefin Slab', 'Kalam', 'Karla', 'Kreon', 'Lato', 'Libre Baskerville',
-         'Libre Franklin', 'Lobster', 'Lobster Two', 'Lora', 'Maven Pro', 'Megrim', 'Merriweather Sans', 'Montserrat',
-         'Mouse Memoirs', 'Muli', 'Neuton', 'News Cycle', 'Nobile', 'Noticia Text', 'Noto Serif', 'Nunito', 'Nunito Sans',
-         'Old Standard TT', 'Open Sans', 'Oswald', 'Ovo', 'Oxygen', 'PT Mono', 'PT Sans', 'PT Sans Narrow', 'PT Serif',
-         'Pacifico', 'Playball', 'Playfair Display', 'Poppins', 'Prata', 'Prompt', 'Quattrocento', 'Quattrocento Sans',
-         'Questrial', 'Quicksand', 'Rajdhani', 'Raleway', 'Righteous', 'Roboto', 'Roboto Condensed', 'Roboto Mono', 'Roboto Slab',
-         'Rubik', 'Shadows Into Light', 'Slabo 13px', 'Slabo 27px', 'Smooch', 'Source Code Pro', 'Source Sans Pro', 'Space Mono',
-         'Syne', 'Tenor Sans', 'Tinos', 'Titillium Web', 'Ubuntu', 'Unica One', 'Unna', 'Varela', 'Varela Round', 'Vidaloka',
-         'Volkhov', 'Vollkorn', 'Work Sans']
-      end
-
-      def color_palettes
-        [
-          {
-            primary_color: '#1e4bd1',
-            text_color: '#000000',
-            border_color: '#d1d5db',
-            button_text_color: '#ffffff',
-            background_color: '#F9FAFB'
-          },
-          {
-            primary_color: '#e63946',
-            text_color: '#1d3557',
-            border_color: '#a8dadc',
-            button_text_color: '#ffffff',
-            background_color: '#f1faee'
-          },
-          {
-            primary_color: '#264653',
-            text_color: '#060C0E',
-            border_color: '#2a9d8f',
-            button_text_color: '#ffffff',
-            background_color: '#e9c46a'
-          },
-          {
-            primary_color: '#606c38',
-            text_color: '#283618',
-            border_color: '#dda15e',
-            button_text_color: '#ffffff',
-            background_color: '#fefae0'
-          },
-          {
-            primary_color: '#FF961F',
-            text_color: '#023047',
-            border_color: '#219EBC',
-            button_text_color: '#FFEEDA',
-            background_color: '#DEF0F7'
-          },
-          {
-            primary_color: '#181CF1',
-            text_color: '#011627',
-            border_color: '#7678ED',
-            button_text_color: '#FFFFFF',
-            background_color: '#FFF5D6'
-          }
-        ]
-      end
-
-      def color_palette_active?(color_palette)
-        @theme_preview&.primary_color&.downcase == color_palette[:primary_color].downcase &&
-          @theme_preview&.text_color&.downcase == color_palette[:text_color].downcase &&
-          @theme_preview&.border_color&.downcase == color_palette[:border_color].downcase &&
-          @theme_preview&.button_text_color&.downcase == color_palette[:button_text_color].downcase &&
-          @theme_preview&.background_color&.downcase == color_palette[:background_color].downcase
-      end
-
-      def all_fonts_options
-        @all_fonts_options ||= system_fonts_list + google_fonts_list
-      end
-
-      def all_linkable_pages
-        @all_linkable_pages ||= Spree::Page.
-                                without_previews.
-                                where(pageable: [@theme, current_store]).
-                                select(&:linkable?).
-                                map { |page| [page.display_name, page.id] }.sort_by(&:first)
-      end
-
-      def all_linkable_policies
-        @all_linkable_policies ||= current_store.policies.pluck(:name, :id)
-      end
-
-      def refresh_theme_preview(section = nil, block = nil)
-        reload_params = section.present? ? "{ frame: 'section-#{section.id}' }" : "{ action: 'replace' }"
-
-        editor_id = if block.present?
-                      "block-#{block.id}"
-                    elsif section.present?
-                      "section-#{section.id}"
-                    end
-
-        turbo_stream.replace :iframe_preview_scripts do
-          turbo_frame_tag :iframe_preview_scripts do
-            javascript_tag do
-              raw <<~JS
-                document.getElementById('page-builder-preview').contentWindow.window.Turbo.visit(
-                  document.getElementById('page-builder').dataset.pageBuilderPreviewUrlValue + '&editor_id=#{editor_id}',
-                  #{reload_params}
-                )
-              JS
-            end
-          end
-        end
-      end
-
-      def page_preview_url
-        preview_url = @page.preview_url(@theme_preview, @page_preview)
-        return if preview_url.blank?
-
-        "#{preview_url}&page_builder=true"
-      end
-    end
-  end
-end

data/app/helpers/spree/admin/themes_helper.rb

@@ -1,9 +0,0 @@
-module Spree
-  module Admin
-    module ThemesHelper
-      def available_themes
-        @available_themes ||= Spree::Theme.available_themes.sort_by(&:name).reject { |theme_class| current_store.themes.any? { |theme| theme.class.to_s == theme_class.to_s } }
-      end
-    end
-  end
-end

data/app/helpers/spree/admin/webhooks_subscribers_helper.rb

@@ -1,31 +0,0 @@
-module Spree
-  module Admin
-    module WebhooksSubscribersHelper
-      def event_checkbox_for(resource_name, form)
-        content_tag :div, class: 'col-xs-12 col-sm-6 col-md-4 col-lg-4 form-group' do
-          content_tag :div, class: 'custom-control custom-switch' do
-            (form.check_box resource_name, event_checkbox_opts(resource_name), true, nil) + ' ' +
-              form.label(resource_name, Spree.t("#{resource_name.to_s.pluralize}"), class: 'custom-control-label')
-          end
-        end
-      end
-
-      def subscribe_to_all_events?
-        @webhooks_subscriber.new_record? || @webhooks_subscriber.subscriptions == ['*']
-      end
-
-      private
-
-      def event_checkbox_opts(resource_name)
-        {
-          class: 'events-checkbox custom-control-input',
-          checked: subscribed_to_resource?(resource_name)
-        }
-      end
-
-      def subscribed_to_resource?(resource_name)
-        @webhooks_subscriber.subscriptions&.any? { |event| event.include? "#{resource_name}." }
-      end
-    end
-  end
-end

data/app/javascript/spree/admin/helpers/bootstrap.js

@@ -1,51 +0,0 @@
-import 'jquery'
-import 'bootstrap'
-import { lockScroll, unlockScroll } from 'spree/core/helpers/scroll_lock'
-
-
-const initTooltips = () => {
-  $('.with-tip, .trix-button, .uppy-Dashboard-close').each(function() {
-    $(this).tooltip()
-  })
-
-  $('.with-tip, .trix-button, .uppy-Dashboard-close').on('show.bs.tooltip', function(event) {
-    if (('ontouchstart' in window)) {
-      event.preventDefault()
-    }
-  })
-}
-
-const removeTooltips = () => {
-  $('.with-tip, .trix-button, .uppy-Dashboard-close').each(function() {
-    $(this).tooltip('dispose')
-  })
-}
-
-const resetDialogModal = () => {
-  console.warn('resetDialogModal is deprecated and will be removed in Spree 6')
-
-  const modalElement = document.getElementById('dialog_modal')
-  const modalTitle = modalElement ? modalElement.querySelector('.modal-title') : null
-  const modalBody = modalElement ? modalElement.querySelector('.modal-body') : null
-  if (modalBody) {
-    modalBody.innerHTML = '<div class="spinner-border text-light mx-auto my-5" role="status"><span class="sr-only">Loading...</span></div>'
-  }
-  if (modalTitle) {
-    modalTitle.innerHTML = 'Loading...'
-  }
-}
-
-const fixModalAutofocus = () => {
-  $('.modal').on('shown.bs.modal', function (e) {
-    $('[autofocus]', e.target).focus();
-  });
-}
-
-$('.modal').on('show.bs.modal', lockScroll)
-$('.modal').on('hide.bs.modal', unlockScroll)
-$('.modal').on('hidden.bs.modal	', resetDialogModal)
-
-document.addEventListener("turbo:click", removeTooltips)
-document.addEventListener("turbo:load", initTooltips)
-document.addEventListener('turbo:frame-render', initTooltips)
-document.addEventListener('turbo:frame-render', fixModalAutofocus)

data/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb

@@ -1,11 +0,0 @@
-<%# Link to the "First" page
-  - available local variables
-    url:           url to the first page
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote -%>
-
-<li class="first page-item <%= current_page.first? ? 'disabled' : '' %>">
-  <%= link_to icon('double-chevron-left', class: 'text-dark'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>
-</li>

data/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erb

@@ -1,12 +0,0 @@
-<%# Non-link tag that stands for skipped pages...
-  - available local variables
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote -%>
-
-<li class="page gap disabled page-item d-none d-lg-flex">
-  <a href="#" onclick="return false;" class="page-link">
-    <%= raw(t 'views.pagination.truncate') %>
-  </a>
-</li>

data/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb

@@ -1,11 +0,0 @@
-<%# Link to the "Last" page
-  - available local variables
-    url:           url to the last page
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote -%>
-
-<li class="last next page-item <%= current_page.last? ? 'disabled' : '' %>">
-  <%= link_to icon('double-chevron-right', class: 'text-dark'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>
-</li>

data/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb

@@ -1,12 +0,0 @@
-<%# Link to the "Next" page
-  - available local variables
-    url:           url to the next page
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote -%>
-
-<li class="next page-item <%= current_page.last? ? 'disabled' : '' %>">
-  <%= link_to icon('chevron-right', class: 'text-dark'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>
-</li>
-

data/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erb

@@ -1,18 +0,0 @@
-<%# Link showing page number
-  - available local variables
-    page:          a page object for "this" page
-    url:           url to this page
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote -%>
-
-<li class="page<%= ' active' if page.current? %> page-item">
-  <%= link_to page,
-    url,
-    opts = {
-      remote: remote,
-      rel: page.next? ? 'next' : page.prev? ? 'prev' : nil,
-      class: 'page-link'
-    } %>
-</li>

data/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb

@@ -1,17 +0,0 @@
-<%# The container tag
-  - available local variables
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
-    paginator:     the paginator that renders the pagination tags inside -%>
-
-<% pagination_class ||= '' %>
-
-<%= paginator.render do %>
-  <ul class="pagination d-inline-flex <%= pagination_class %> mb-0">
-
-    <%= prev_page_tag %>
-    <%= next_page_tag %>
-  </ul>
-<% end %>

data/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb

@@ -1,12 +0,0 @@
-<%# Link to the "Previous" page
-  - available local variables
-    url:           url to the previous page
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote -%>
-
-<li class="prev page-item <%= current_page.first? ? 'disabled' : '' %>">
-  <%= link_to icon('chevron-left', class: 'text-dark'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>
-</li>
-