spree_backend 4.3.0 → 4.4.0

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

@@ -23,7 +23,7 @@ module Spree
 
       def field_container(model, method, options = {}, &block)
         css_classes = options[:class].to_a
-        css_classes << 'field'
+        css_classes << 'form-group'
         css_classes << 'withError' if error_message_on(model, method).present?
         content_tag(
           :div, capture(&block),
@@ -237,18 +237,28 @@ module Spree
       end
 
       def product_preview_link(product)
-        button_link_to(
-          Spree.t(:preview_product),
-          spree_storefront_resource_url(product),
-          class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_product', target: :blank
-        )
+       ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+         Admin::BaseHelper#product_preview_link is deprecated and will be removed in Spree 5.0. - Use Admin::BaseHelper#external_page_preview_link
+       DEPRECATION
+
+        external_page_preview_link(product)
       end
 
       def taxon_preview_link(taxon)
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Admin::BaseHelper#taxon_preview_link is deprecated and will be removed in Spree 5.0. - Use Admin::BaseHelper#external_page_preview_link
+        DEPRECATION
+
+        external_page_preview_link(taxon)
+      end
+
+      def external_page_preview_link(resource, options = {})
+        resource_name = options[:name] || resource.class.name.demodulize
+
         button_link_to(
-          Spree.t(:preview_taxon),
-          spree_storefront_resource_url(taxon),
-          class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_taxon', target: :blank
+          Spree.t('admin.utilities.preview', name: resource_name ),
+          spree_storefront_resource_url(resource),
+          class: 'btn-outline-secondary', icon: 'view.svg', id: "adminPreview#{resource_name}", target: :blank, data: { turbo: false }
         )
       end
 
@@ -285,6 +295,14 @@ module Spree
           'default'
         end
       end
+
+      def product_wysiwyg_editor_enabled?
+        Spree::Backend::Config[:product_wysiwyg_editor_enabled]
+      end
+
+      def taxon_wysiwyg_editor_enabled?
+        Spree::Backend::Config[:taxon_wysiwyg_editor_enabled]
+      end
     end
   end
 end

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

@@ -0,0 +1,28 @@
+module Spree
+  module Admin
+    module DigitalHelper
+      def asset_icon(asset)
+        file_name = case asset.attachment.content_type
+                    when /pdf\z/
+                      'file-earmark-pdf.svg'
+                    when /\Aimage/
+                      'file-earmark-image.svg'
+                    when /zip\z/
+                      'file-earmark-zip.svg'
+                    when 'text/csv', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                      'file-earmark-spreadsheet.svg'
+                    when /\Avideo/
+                      'file-earmark-play.svg'
+                    when /\Aaudio/
+                      'file-earmark-music.svg'
+                    when /\Afont/
+                      'file-earmark-font.svg'
+                    else
+                      'file-earmark.svg'
+                    end
+
+        svg_icon name: file_name, width: 50, height: 50
+      end
+    end
+  end
+end

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

@@ -1,27 +1,6 @@
 module Spree
   module Admin
     module MenuHelper
-      def menu_item_bar(menu, item)
-        render 'spree/admin/menus/nested_menu_items/item_bar', menu: menu, item: item
-      end
-
-      def build_menu_item(menu, item)
-        decendents = []
-
-        unless item.leaf?
-          item.children.each do |child_item|
-            decendents << build_menu_item(menu, child_item) unless item.leaf?
-          end
-        end
-
-        info_row = menu_item_bar(menu, item)
-        menu_container = content_tag(:div, raw(decendents.join), class: 'menu-container', data: { parent_id: item.id })
-
-        content_tag(:div, info_row + menu_container,
-                    class: 'menu-item menu-container-item dragable removable-dom-element',
-                    data: { item_id: item.id })
-      end
-
       def default_menu_for_store?(menu)
         menu.store.default_locale == menu.locale
       end

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

@@ -3,7 +3,7 @@ module Spree
     module NavigationHelper
       # Makes an admin navigation tab (<li> tag) that links to a routing resource under /admin.
       # The arguments should be a list of symbolized controller names that will cause this tab to
-      # be highlighted, with the first being the name of the resouce to link (uses URL helpers).
+      # be highlighted, with the first being the name of the resource to link (uses URL helpers).
       #
       # Option hash may follow. Valid options are
       #   * :label to override link text, otherwise based on the first resource name (translated)
@@ -22,13 +22,18 @@ module Spree
         options = { label: args.first.to_s }
 
         # Return if resource is found and user is not allowed to :admin
-        return '' if (klass = klass_for(options[:label])) && cannot?(:admin, klass)
+        return '' if (klass = klass_for(args.first.to_s)) && cannot?(:admin, klass)
 
         options = options.merge(args.pop) if args.last.is_a?(Hash)
         options[:route] ||= "admin_#{args.first}"
 
         destination_url = options[:url] || spree.send("#{options[:route]}_path")
-        titleized_label = Spree.t(options[:label], default: options[:label], scope: [:admin, :tab]).titleize
+
+        if options[:do_not_titleize] == true
+          titleized_label = options[:label]
+        else
+          titleized_label = Spree.t(options[:label], default: options[:label], scope: [:admin, :tab]).titleize
+        end
 
         css_classes = ['sidebar-menu-item d-block w-100 position-relative']
 
@@ -88,13 +93,13 @@ module Spree
       # this method generates the select_tag
       def per_page_dropdown
         # there is a config setting for admin_products_per_page, only for the orders page
-        if @products && per_page_default = Spree::Config.admin_products_per_page
+        if @products && per_page_default = Spree::Backend::Config.admin_products_per_page
           per_page_options = []
           5.times do |amount|
-            per_page_options << (amount + 1) * Spree::Config.admin_products_per_page
+            per_page_options << (amount + 1) * Spree::Backend::Config.admin_products_per_page
           end
         else
-          per_page_default = Spree::Config.admin_orders_per_page
+          per_page_default = Spree::Backend::Config.admin_orders_per_page
           per_page_options = %w{25 50 75}
         end
 
@@ -199,11 +204,13 @@ module Spree
                  end
           text = "#{icon} #{text}"
         end
+
+        css_classes = options[:class] || 'btn-primary'
         button_tag(
           text.html_safe,
           options.merge(
             type: button_type,
-            class: "btn btn-primary #{options[:class]}",
+            class: "btn #{css_classes}",
             'data-disable-with' => "#{Spree.t(:saving)}..."
           )
         )
@@ -262,6 +269,9 @@ module Spree
       end
 
       def main_part_classes
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Admin::NavigationHelper#main_part_classes is deprecated and will be removed in Spree 5.0.
+        DEPRECATION
         if cookies['sidebar-minimized'] == 'true'
           'col-12 sidebar-collapsed'
         else
@@ -271,7 +281,7 @@ module Spree
 
       def main_sidebar_classes
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          Admin::NavigationsHelper#main_sidebar_classes is deprecated and will be removed in Spree 5.0.
+          Admin::NavigationHelper#main_sidebar_classes is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         if cookies['sidebar-minimized'] == 'true'
           'col-3 col-md-2 sidebar'
@@ -282,7 +292,7 @@ module Spree
 
       def wrapper_classes
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          Admin::NavigationsHelper#wrapper_classes is deprecated and will be removed in Spree 5.0.
+          Admin::NavigationHelper#wrapper_classes is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         'sidebar-minimized' if cookies['sidebar-minimized'] == 'true'
       end

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

@@ -0,0 +1,31 @@
+module Spree
+  module Admin
+    module SortableTreeHelper
+      def sortable_tree_bar(parent_resource, child_resource)
+        partial_name = parent_resource.class.name.demodulize.underscore
+        render "spree/admin/shared/sortable_tree/#{partial_name}", parent_resource: parent_resource, child_resource: child_resource
+      end
+
+      def build_sortable_tree(parent_resource, child_resource)
+        child_resource_name = child_resource.class.name.demodulize.underscore
+        descendants = []
+
+        unless child_resource.leaf?
+          child_resource.children.each do |child_item|
+            descendants << build_sortable_tree(parent_resource, child_item) unless child_resource.leaf?
+          end
+        end
+
+        row = sortable_tree_bar(parent_resource, child_resource)
+        container = content_tag(:div, raw(descendants.join), data: { sortable_tree_parent_id_value: child_resource.id })
+
+        content_tag(:div, row + container,
+                    class: 'sortable-tree-item draggable removable-dom-element',
+                    data: {
+                      sortable_tree_resource_name_value: child_resource_name.singularize,
+                      sortable_tree_update_url_value: "/api/v2/platform/#{child_resource_name.pluralize}/#{child_resource.id}/reposition"
+                    })
+      end
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module Spree
         end
 
         link_to icon + store.unique_name, url_for(host: store.formatted_url),
-                class: "#{classes} text-dark p-3 dropdown-item", id: store.code
+                class: "#{classes} text-dark p-3 dropdown-item", id: store.code, data: { turbo: false }
       end
     end
   end

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

@@ -0,0 +1,31 @@
+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("admin.webhooks_subscribers.#{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/dashboard/controllers/clipboard_controller.js

@@ -0,0 +1,12 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = [ "source" ]
+
+  copy(event) {
+    console.log(event)
+    event.preventDefault()
+    this.sourceTarget.select()
+    document.execCommand("copy")
+  }
+}

data/app/javascript/spree/dashboard/controllers/password_toggle_controller.js

@@ -0,0 +1,14 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["unhide"]
+
+  password(e) {
+    if (this.unhideTarget.type === "password") {
+      this.unhideTarget.type = "text"
+    } else {
+      this.unhideTarget.type = "password"
+    }
+  }
+}
+

data/app/javascript/spree/dashboard/controllers/sortable_tree_controller.js

@@ -0,0 +1,55 @@
+import { Controller } from "@hotwired/stimulus"
+import { Sortable } from "sortablejs"
+import { patch } from "../utilities/request_utility"
+
+export default class extends Controller {
+  static values = { handle: String }
+
+  connect() {
+    const itemSortable = {
+      ...this.options
+    }
+
+    let containers = null
+    containers = this.element.querySelectorAll("[data-sortable-tree-parent-id-value]")
+
+    for (let i = 0; i < containers.length; i++) {
+      new Sortable(containers[i], itemSortable)
+    }
+  }
+
+  async end({ item, newIndex, to }) {
+    if (!item.dataset.sortableTreeUpdateUrlValue) return
+
+    const data = {
+      [item.dataset.sortableTreeResourceNameValue]: {
+        new_parent_id: to.dataset.sortableTreeParentIdValue,
+        new_position_idx: newIndex
+      }
+    }
+
+    const response = await patch(item.dataset.sortableTreeUpdateUrlValue, { body: data })
+
+    if (!response.ok) {
+      show_flash("error", "This move could not be saved.")
+    }
+  }
+
+  get options() {
+    return {
+      group: {
+        name: "sortable-tree",
+        pull: true,
+        put: true
+      },
+      handle: this.handleValue || undefined,
+      swapThreshold: 0.5,
+      emptyInsertThreshold: 8,
+      dragClass: "item-dragged",
+      draggable: ".draggable",
+      animation: 350,
+      forceFallback: false,
+      onEnd: this.end
+    }
+  }
+}

data/app/javascript/spree/dashboard/controllers/spree_controller.js

@@ -0,0 +1,25 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  connect() {
+
+    // This is a hack to allow legacy JavaScript to run in a Turbo enabled environment.
+    // Once all JavaScript is reduced to Stimulus controllers, this can be removed.
+    const event = new Event("spree:load")
+    document.dispatchEvent(event)
+
+    // The Issue
+    // If you initiate common JavaScript with an event listener of "turbo:load"
+    // This will work, but if someone submits an update to a field that is required,
+    // a 442 Unprocessable entity is returned, and a render event is used render the errors in place.
+
+    // Because this in not a successful "turbo:load" event, all common JavaScript will fail.
+    // You could set up a separate listener for "turbo:render", but this can cause duplicate loading.
+    // Using a Stimulus connect() is the correct way to go, but should be phased out as JavaScript is replaced
+    // With Hotwire Frames and dedicated Stimulus controllers for the JavaScript you have remaining.
+
+    // References:
+    // https://github.com/hotwired/turbo-rails/issues/12#issuecomment-915893233
+    // https://github.com/hotwired/turbo/issues/85#issuecomment-756259687
+  }
+}

data/app/javascript/spree/dashboard/controllers/upload_button_controller.js

@@ -0,0 +1,13 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = [ "uploadButton"]
+
+  initialize() {
+    this.uploadButtonTarget.disabled = true
+  }
+
+  buttonState() {
+    this.uploadButtonTarget.disabled = false
+  }
+}

data/app/javascript/spree/dashboard/controllers/webhooks_subscriber_events_controller.js

@@ -0,0 +1,19 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = [ "eventsCheckboxesContainer", "subscribeToAll" ]
+
+  hideCheckboxes() {
+    this.eventsCheckboxesContainerTarget.hidden = true
+  }
+
+  showCheckboxes() {
+    this.eventsCheckboxesContainerTarget.hidden = false
+  }
+
+  initialize() {
+    if (this.subscribeToAllTarget.checked) {
+      this.hideCheckboxes()
+    }
+  }
+}

data/app/javascript/spree/dashboard/index.js

@@ -0,0 +1,49 @@
+//
+// Initialize Dashboard
+class Dashboard {
+  constructor() {
+    console.log("Spree Dashboard Initialized")
+  }
+}
+
+//
+// Import JavaScript packages that are required globally.
+import { Application } from "@hotwired/stimulus"
+import flatpickr from "flatpickr"
+import * as Turbo from "@hotwired/turbo"
+
+// To disable Turbo, un-comment the line below.
+// Turbo.session.drive = false
+
+//
+// Import Utility JavaScript required globally.
+import "./utilities/bootstrap"
+
+//
+// Stimulus - Setup
+const application = Application.start()
+application.debug = false
+window.Stimulus = application
+
+// Stimulus - Spree Controllers
+import UploadButtonController from "./controllers/upload_button_controller"
+application.register("upload-button", UploadButtonController)
+
+import SpreeController from "./controllers/spree_controller"
+application.register("spree", SpreeController)
+
+import SortableTreeController from "./controllers/sortable_tree_controller"
+application.register("sortable-tree", SortableTreeController)
+
+import WebhooksSubscriberEventsController from "./controllers/webhooks_subscriber_events_controller"
+application.register("webhooks_subscriber_events", WebhooksSubscriberEventsController)
+
+import PasswordToggleController from "./controllers/password_toggle_controller"
+application.register("password-toggle", PasswordToggleController)
+
+import ClipboardController from "./controllers/clipboard_controller"
+application.register("clipboard", ClipboardController)
+
+//
+// Export
+export { Dashboard, application, flatpickr, Turbo }

data/app/{assets/javascripts/spree/backend/global/bootstrap.es6 → javascript/spree/dashboard/utilities/bootstrap.js}

@@ -1,6 +1,10 @@
-// Use this file for Boostrap customization applied across the Spree Backend
+import jquery from 'jquery'
+import 'bootstrap'
+import 'popper.js'
 
-document.addEventListener('DOMContentLoaded', function() {
+const $ = jquery
+
+document.addEventListener("spree:load", function() {
   $('.with-tip').each(function() {
     $(this).tooltip({
       container: $(this)

data/app/javascript/spree/dashboard/utilities/request_utility.js

@@ -0,0 +1,54 @@
+import { RequestInterceptor } from "@rails/request.js"
+import { FetchRequest } from "@rails/request.js"
+import { navigator } from "@hotwired/turbo"
+
+//
+// Inject Authorization & Content-Type into @rails/request.js requests.
+RequestInterceptor.register(async (request) => {
+  request.addHeader("Authorization", `Bearer ${OAUTH_TOKEN}`)
+})
+
+//
+// Setup Turbo Progress bar on @rails/request.js requests.
+export function showProgressBar() {
+  navigator.delegate.adapter.progressBar.setValue(0)
+  navigator.delegate.adapter.progressBar.show()
+}
+
+export function hideProgressBar() {
+  navigator.delegate.adapter.progressBar.setValue(1)
+  navigator.delegate.adapter.progressBar.hide()
+}
+
+export function withProgress(request) {
+  new Promise(resolve => {
+    showProgressBar()
+    resolve(request.then(hideProgressBar))
+  })
+  return request
+}
+
+export function get (url, options) {
+  const request = new FetchRequest("get", url, options)
+  return withProgress(request.perform())
+}
+
+export function post (url, options) {
+  const request = new FetchRequest("post", url, options)
+  return withProgress(request.perform())
+}
+
+export function put (url, options) {
+  const request = new FetchRequest("put", url, options)
+  return withProgress(request.perform())
+}
+
+export function patch (url, options) {
+  const request = new FetchRequest("patch", url, options)
+  return withProgress(request.perform())
+}
+
+export function destroy (url, options) {
+  const request = new FetchRequest("delete", url, options)
+  return withProgress(request.perform())
+}

data/app/models/spree/backend_configuration.rb

@@ -1,8 +1,19 @@
 module Spree
   class BackendConfiguration < Preferences::Configuration
+    preference :admin_path, :string, default: '/admin'
+    preference :admin_products_per_page, :integer, default: Kaminari.config.default_per_page
+    preference :admin_orders_per_page, :integer, default: Kaminari.config.default_per_page
+    preference :admin_properties_per_page, :integer, default: Kaminari.config.default_per_page
+    preference :admin_promotions_per_page, :integer, default: Kaminari.config.default_per_page
+    preference :admin_customer_returns_per_page, :integer, default: Kaminari.config.default_per_page
+    preference :admin_users_per_page, :integer, default: Kaminari.config.default_per_page
+    preference :admin_show_version, :boolean, default: true
     preference :locale, :string, default: Rails.application.config.i18n.default_locale
     preference :variants_per_page, :integer, default: Kaminari.config.default_per_page
     preference :menus_per_page, :integer, default: Kaminari.config.default_per_page
+    preference :product_wysiwyg_editor_enabled, :boolean, default: true
+    preference :taxon_wysiwyg_editor_enabled, :boolean, default: true
+    preference :show_only_complete_orders_by_default, :boolean, default: true
 
     ORDER_TABS         ||= [:orders, :payments, :creditcard_payments,
                             :shipments, :credit_cards, :return_authorizations,

data/app/views/spree/admin/adjustments/_form.html.erb

@@ -1,10 +1,10 @@
 <div data-hook="admin_adjustment_form_fields">
-  <%= f.field_container :amount, class: ['form-group'] do %>
+  <%= f.field_container :amount do %>
     <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>
     <%= text_field :adjustment, :amount, class: 'form-control' %>
     <%= f.error_message_on :amount %>
   <% end %>
-  <%= f.field_container :label, class: ['form-group'] do %>
+  <%= f.field_container :label do %>
     <%= f.label :label, raw(Spree.t(:description) + required_span_tag) %>
     <%= text_field :adjustment, :label, class: 'form-control' %>
     <%= f.error_message_on :label %>

data/app/views/spree/admin/adjustments/index.html.erb

@@ -31,6 +31,7 @@
 
 <script>
   var order_number = '<%= @order.number %>';
+  var order_id = '<%= @order.id %>';
 </script>
 
 <%= render partial: 'spree/admin/shared/order_summary' %>

data/app/views/spree/admin/cms_pages/_form.html.erb

@@ -6,7 +6,7 @@
         <div class="card-header col-12">
           <div class="row no-gutters pb-0">
             <div class="col d-flex justify-content-start align-items-center">
-              <%= f.field_container :visible, class: ['form-group pb-0 mb-0'] do %>
+              <%= f.field_container :visible, class: ['pb-0 mb-0'] do %>
                 <div class="custom-control custom-switch custom-switch-md">
                   <%= f.check_box :visible, class: 'custom-control-input', data: {cms_page_id: @cms_page.id} %>
                   <label class="custom-control-label" for="cms_page_visible"></label>
@@ -36,13 +36,13 @@
         <div class="card-body pb-2">
           <div class="row pb-0">
 
-            <%= f.field_container :title, class: ['form-group col-12 col-md-6'] do %>
+            <%= f.field_container :title, class: ['col-12 col-md-6'] do %>
               <%= f.label :title, raw(Spree.t('admin.cms.title') + required_span_tag) %>
               <%= f.text_field :title, class: 'form-control', required: true %>
               <%= f.error_message_on :title %>
             <% end %>
 
-            <%= f.field_container :type, class: ['form-group col-12 col-md-6'] do %>
+            <%= f.field_container :type, class: ['col-12 col-md-6'] do %>
               <%= f.label :type, Spree.t('admin.cms.page_type') %>
               <%= f.select(:type, spree_humanize_dropdown_values('Spree::CmsPage', {const: 'TYPES'}), {include_blank: false}, class: 'select2') %>
               <%= f.error_message_on :type %>
@@ -61,19 +61,19 @@
           <div class="<% unless %w[new create].include? controller.action_name %>collapse<% end %>" id="cmsPageSettings">
             <div class="row pb-0">
               <div class="col-12"><hr></div>
-              <%= f.field_container :locale, class: ['form-group col-12 col-md-4'] do %>
+              <%= f.field_container :locale, class: ['col-12 col-md-4'] do %>
                 <%= f.label :language %>
                 <%= f.select :locale, options_from_collection_for_select(supported_locales_options, :last, :first, @cms_page.locale || I18n.locale), {}, { class: 'select2' } %>
                 <%= f.error_message_on :default_locale %>
               <% end %>
 
-              <%= f.field_container :meta_title, class: ['form-group col-12 col-md-4'] do %>
+              <%= f.field_container :meta_title, class: ['col-12 col-md-4'] do %>
                 <%= f.label :meta_title, Spree.t('admin.cms.meta_title') %>
                 <%= f.text_field :meta_title, class: 'form-control' %>
                 <%= f.error_message_on :meta_title %>
               <% end %>
 
-              <%= f.field_container :slug, class: ['form-group col-12 col-md-4'] do %>
+              <%= f.field_container :slug, class: ['col-12 col-md-4'] do %>
                 <div id="noHomePage">
                   <%= f.label :slug, Spree.t('slug') %>
                   <%= f.text_field :slug, class: 'form-control', disabled: @cms_page.homepage? %>
@@ -81,7 +81,7 @@
                 </div>
               <% end %>
 
-              <%= f.field_container :meta_description, class: ['form-group col-12'] do %>
+              <%= f.field_container :meta_description, class: ['col-12'] do %>
                 <%= f.label :meta_description, Spree.t('admin.cms.meta_description') %>
                 <%= f.text_area :meta_description, { rows: 3, class: 'form-control' } %>
                 <%= f.error_message_on :meta_description %>
@@ -123,7 +123,7 @@
 <% if @cms_page.type == 'Spree::Cms::Pages::StandardPage' %>
   <div class="row">
     <div class="col-12">
-      <%= f.field_container :content, class: ['form-group']  do %>
+      <%= f.field_container :content  do %>
         <%= f.text_area :content, { rows: 22, class: 'spree-rte'} %>
         <%= f.error_message_on :content %>
       <% end %>