fae-rails 2.1.0 → 3.0.0

data/app/assets/stylesheets/fae/modules/forms/_simple-mde.scss

@@ -23,7 +23,78 @@
   &.mde-focus {
     .CodeMirror-wrap,
     .editor-toolbar {
-      border-color: $c-notice-content;
+      border-color: $c-focus-border;
     }
   }
 }
+
+.editor-preview,
+.editor-preview-side {
+  h1 {
+    font-size: 26px;
+  }
+
+  h2 {
+    font-size: 24px;
+  }
+
+  h3 {
+    font-size: 22px;
+  }
+
+  h4 {
+    font-size: 20px;
+  }
+
+  h5 {
+    font-size: 18px;
+  }
+
+  h6 {
+    font-size: 16px;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    font-weight: bold;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  p,
+  ul,
+  ol {
+    background: none;
+    border: 0;
+    color: black;
+    letter-spacing: 0;
+    margin: inherit;
+    padding: inherit;
+    text-transform: inherit;
+  }
+
+  ul {
+    list-style: disc;
+  }
+
+  ol {
+    list-style: decimal;
+  }
+
+  ul,
+  ol {
+    padding-left: 30px;
+  }
+
+  em {
+    font-style: italic;
+  }
+}

data/app/assets/stylesheets/fae/modules/forms/_textarea.scss

@@ -11,6 +11,6 @@ textarea {
   border-radius: 2px;
 
   &:focus {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
   }
 }

data/app/assets/stylesheets/fae/modules/tables/_base.scss

@@ -22,7 +22,7 @@ tbody {
     &:hover {
       td {
         &:first-child {
-          border-left-color: $c-custom-highlight;
+          border-left-color: var(--highlight-color);
         }
       }
     }

data/app/assets/stylesheets/fae/modules/tables/_filters.scss

@@ -58,4 +58,8 @@
 .table-filter-group {
   display: inline-block;
   margin: 0 30px 20px 0;
+
+  &.no-right-margin {
+    margin-right: 0;
+  }
 }

data/app/assets/stylesheets/fae/modules/tables/_pagination.scss

@@ -19,7 +19,7 @@
 
     &:hover {
       color: $c-white;
-      background: $c-custom-highlight;
+      background: var(--highlight-color);
     }
   }
 
@@ -29,6 +29,6 @@
 
   .current {
     color: $c-white;
-    background: $c-custom-highlight;
+    background: var(--highlight-color);
   }
 }

data/app/assets/stylesheets/fae/pages/_error.scss

@@ -8,7 +8,7 @@
     min-width: 235px;
     height: 330px;
     padding: 35px;
-    border-top: 8px solid $c-custom-highlight;
+    border-top: 8px solid var(--highlight-color);
     border-radius: 4px;
     background: white;
     color: $c-mid-dark-grey;

data/app/assets/stylesheets/fae/pages/_login.scss

@@ -15,7 +15,7 @@
 }
 
 .login-area {
-  border-top: 10px solid $c-custom-highlight;
+  border-top: 10px solid var(--highlight-color);
   margin: auto;
   border-radius: 5px;
   box-shadow: 0 0 5px 0 $c-grey;
@@ -33,6 +33,10 @@
   width: 50%;
   margin: auto;
 
+  h2 {
+    margin: 0 0 28px;
+  }
+
   @include bp(login_container) {
     display: inline-block;
     vertical-align: middle;

data/app/assets/stylesheets/fae/simplemde_override.scss

@@ -0,0 +1,32 @@
+.editor-preview,
+.editor-preview-side {
+  h1 { font-size: 26px; }
+  h2 { font-size: 24px; }
+  h3 { font-size: 22px; }
+  h4 { font-size: 20px; }
+  h5 { font-size: 18px; }
+  h6 { font-size: 16px; }
+
+  h1, h2, h3, h4, h5, h6 {
+    font-weight: bold;
+  }
+
+  h1, h2, h3, h4, h5, h6, p, ul, ol {
+    background: none;
+    border: 0;
+    color: black;
+    letter-spacing: 0;
+    margin: inherit;
+    padding: inherit;
+    text-transform: inherit;
+  }
+
+  ul { list-style: disc; }
+  ol { list-style: decimal; }
+
+  ul, ol {
+    padding-left: 30px;
+  }
+
+  em { font-style: italic; }
+}

data/app/controllers/fae/application_controller.rb

@@ -17,9 +17,16 @@ module Fae
     before_action :detect_cancellation
     before_action :set_change_user
     before_action :set_locale
+    before_action :setup_form_manager
 
     private
 
+    def setup_form_manager
+      if Fae.use_form_manager
+        @form_manager = FormManager.for_model(params, @item)
+      end
+    end
+
     # defines the locale used to translate the Fae interface
     def set_locale
       if I18n.available_locales.include?(language_from_browser)
@@ -53,7 +60,7 @@ module Fae
     end
 
     def show_404
-      render template: 'fae/pages/error404.html.slim', layout: 'fae/error.html.slim', status: :not_found
+      render 'fae/pages/error404', layout: 'fae/error', status: :not_found
     end
 
     def set_option
@@ -118,7 +125,7 @@ module Fae
 
     def load_and_filter_models
       # load of all models since Rails caches activerecord queries.
-      Rails.application.eager_load!
+      Zeitwerk::Loader.eager_load_all
       ActiveRecord::Base.descendants.map.reject { |m| m.name['Fae::'] || !m.instance_methods.include?(:fae_display_field) || Fae.dashboard_exclusions.include?(m.name) || !authorize_model(m) }
     end
 

data/app/controllers/fae/base_controller.rb

@@ -16,7 +16,7 @@ module Fae
       end
       respond_to do |format|
         format.html
-        format.csv { send_data @items.to_csv, filename: @items.name.parameterize + "." + Time.now.to_s(:filename) + '.csv'  }
+        format.csv { send_data @items.to_csv, filename: @items.name.parameterize + "." + Time.now.to_fs(:filename) + '.csv'  }
       end
     end
 
@@ -35,7 +35,11 @@ module Fae
       @item = @klass.new(item_params)
 
       if @item.save
-        redirect_to @index_path, notice: t('fae.save_notice')
+        if @item.try(:fae_redirect_to_form_on_create)
+          redirect_to send("edit_admin_#{@klass_singular}_path", @item.id), notice: t('fae.save_notice')
+        else
+          redirect_to @index_path, notice: t('fae.save_notice')
+        end
       else
         build_assets
         flash[:alert] = t('fae.save_error')

data/app/controllers/fae/deploy_controller.rb

@@ -0,0 +1,24 @@
+module Fae
+  class DeployController < ApplicationController
+    before_action :admin_only
+
+    include Fae::ApplicationHelper
+
+    def index
+      raise 'Fae.netlify configs are missing.' unless netlify_enabled?
+      @deploy_hooks = DeployHook.all
+    end
+
+    def deploys_list
+      render json: Fae::NetlifyApi.new().get_deploys
+    end
+
+    def deploy_site
+      if Fae::NetlifyApi.new().run_deploy(params['deploy_hook_type'], current_user)
+        return render json: { success: true }
+      end
+      render json: {success: false}
+    end
+
+  end
+end

data/app/controllers/fae/deploy_hooks_controller.rb

@@ -0,0 +1,71 @@
+module Fae
+  class DeployHooksController < ApplicationController
+
+    before_action :super_admin_only
+    before_action :set_deploy_hook, only: [:show, :edit, :update, :destroy]
+    layout false
+
+    def index
+      @deploy_hooks = DeployHook.all
+    end
+
+    def new
+      @deploy_hook = DeployHook.new
+    end
+
+    def edit
+    end
+
+    def create
+      @deploy_hook = DeployHook.new(deploy_hook_params)
+
+      if @deploy_hook.save
+        flash[:notice] = t('fae.save_notice')
+        @deploy_hooks = DeployHook.all
+        render partial: table_template_path
+      else
+        render action: 'new'
+      end
+    end
+
+    def update
+      if @deploy_hook.update(deploy_hook_params)
+        flash[:notice] = t('fae.save_notice')
+        @deploy_hooks = DeployHook.all
+        render partial: table_template_path
+      else
+        render action: 'edit'
+      end
+    end
+
+    def destroy
+      if @deploy_hook.destroy
+        flash[:notice] = t('fae.delete_notice')
+      else
+        flash[:alert] = t('fae.delete_error')
+      end
+      @deploy_hooks = DeployHook.all
+      render partial: table_template_path
+    end
+
+    private
+
+      def set_deploy_hook
+        @deploy_hook = DeployHook.find(params[:id])
+      end
+
+      def deploy_hook_params
+        params.require(:deploy_hook).permit!
+      end
+
+      def set_index_path
+        # @index_path determines form's cancel btn path
+        @index_path = deploy_hooks_path
+      end
+
+      def table_template_path
+        "fae/deploy_hooks/table"
+      end
+
+  end
+end

data/app/controllers/fae/form_managers_controller.rb

@@ -0,0 +1,19 @@
+module Fae
+  class FormManagersController < ApplicationController
+
+    def update
+      if params[:form_manager].present?
+        fields_serialized = params[:form_manager][:fields].to_json
+        conditions = {
+          form_manager_model_name: params[:form_manager][:form_manager_model_name],
+        }
+        if params[:form_manager][:form_manager_model_name] == 'Fae::StaticPage'
+          conditions[:form_manager_model_id] = params[:form_manager][:form_manager_model_id]
+        end
+        FormManager.where(conditions).first_or_initialize.update_attribute(:fields, fields_serialized)
+      end
+      render body: nil
+    end
+
+  end
+end

data/app/controllers/fae/options_controller.rb

@@ -7,6 +7,7 @@ module Fae
       @option = Option.first || Option.instance
       @option.build_logo if @option.logo.blank?
       @option.build_favicon if @option.favicon.blank?
+      @deploy_hooks = DeployHook.all
     end
 
     # PATCH/PUT /options/1

data/app/controllers/fae/setup_controller.rb

@@ -34,11 +34,11 @@ module Fae
     private
 
     def show_404
-      render template: 'fae/pages/error404.html.slim', layout: 'fae/error.html.slim', status: :not_found
+      render 'fae/pages/error404', layout: 'fae/error', status: :not_found
     end
 
     def show_401
-      render template: 'fae/pages/error404.html.slim', layout: 'fae/error.html.slim', status: :unauthorized
+      render 'fae/pages/error404', layout: 'fae/error', status: :unauthorized
     end
 
     def user_params

data/app/controllers/fae/static_pages_controller.rb

@@ -20,7 +20,8 @@ module Fae
         redirect_to @index_path, notice: t('fae.save_notice')
       else
         build_assocs
-        render template: "#{fae.root_path.gsub('/', '')}/content_blocks/#{params[:slug]}", error: t('fae.save_error')
+        flash[:alert] = t('fae.save_error')
+        render template: "#{fae.root_path.gsub('/', '')}/content_blocks/#{params[:slug]}"
       end
     end
 
@@ -29,6 +30,9 @@ module Fae
     # Use callbacks to share common setup or constraints between actions.
     def set_item
       @item = "#{params[:slug]}_page".classify.constantize.instance
+      if Fae.use_form_manager
+        @form_manager = FormManager.for_model(params, @item)
+      end
     end
 
     # set up variables so that fae partial forms work
@@ -50,5 +54,6 @@ module Fae
         @item.send(:"create_#{assoc.name}", attached_as: assoc.name.to_s) if assoc.macro == :has_one && @item.send(:"#{assoc.name}").blank?
       end
     end
+
   end
 end

data/app/controllers/fae/users_controller.rb

@@ -23,6 +23,8 @@ module Fae
     end
 
     def create
+      authorize_role
+
       @user = Fae::User.new(user_params)
 
       if @user.save
@@ -33,11 +35,13 @@ module Fae
     end
 
     def update
+      authorize_role
+
       params[:user].delete(:password) if params[:user][:password].blank?
       params[:user].delete(:password_confirmation) if params[:user][:password].blank? and params[:user][:password_confirmation].blank?
 
       if @user.update(user_params)
-        path = current_user.super_admin? ? users_path : fae.root_path
+        path = current_user.super_admin_or_admin? ? users_path : fae.root_path
         redirect_to path, notice: t('fae.save_notice')
       else
         render action: 'edit', error: t('fae.save_error')
@@ -75,5 +79,11 @@ module Fae
         # @index_path determines form's cancel btn path
         @index_path = users_path
       end
+
+      def authorize_role
+        return if params[:user][:role_id].blank?
+        return if @role_collection.map(&:id).include?(params[:user][:role_id].to_i)
+        params[:user].delete(:role_id)
+      end
   end
 end

data/app/controllers/fae/utilities_controller.rb

@@ -2,8 +2,9 @@ module Fae
   class UtilitiesController < ApplicationController
 
     def toggle
-      klass = params[:object].gsub('__', '/').classify.constantize
-      if can_toggle(klass)
+      klass = params[:object].gsub('__', '/').classify
+      if can_toggle(klass, params[:attr])
+        klass = klass.constantize
         klass.find(params[:id]).toggle(params[:attr]).save(validate: false)
         render body: nil
       else
@@ -42,10 +43,21 @@ module Fae
 
     private
 
-    def can_toggle(klass)
-      # restrict models that non-admins aren't allowed to update
-      restricted_classes = %w(Fae::User Fae::Role Fae::Option)
-      return false if restricted_classes.include?(klass.name.to_s) && !current_user.super_admin_or_admin?
+    def can_toggle(klass, attribute)
+      # check if class exists and convert
+      return false unless Object.const_defined?(klass)
+      klass = klass.constantize
+
+      # allow admins to toggle Fae::User#active
+      return true if klass == Fae::User && attribute == 'active' && current_user.super_admin_or_admin?
+
+      # restrict models that only super admins can toggle
+      restricted_classes = %w(Fae::User Fae::Role Fae::Option Fae::Change)
+      return false if restricted_classes.include?(klass.name.to_s) && !current_user.super_admin?
+
+      # restrict to only other boolean fields
+      return false unless klass.columns_hash[attribute].type == :boolean
+
       true
     end
 

data/app/helpers/fae/application_helper.rb

@@ -22,12 +22,16 @@ module Fae
       new_klass
     end
 
+    def deployments_active_class
+      '-parent-current -open' if params[:controller].split('/').last == 'deploy'
+    end
+
     def col_name_or_image(item, attribute)
       value = item.send(attribute)
       return if value.blank?
       # if item is an image
       if value.class.name == 'Fae::Image'
-        image_tag(value.asset.thumb.url) if value.asset.thumb.url.present?
+        image_tag(nested_table_thumb_url(value), class: 'addedit-form-thumb') if nested_table_thumb_url(value).present?
       # if item's attribute is an association
       elsif item.class.reflections.include?(attribute)
         value.try(:fae_display_field)
@@ -72,7 +76,9 @@ module Fae
         begin
           return link_to text, fae.edit_content_block_path(change.changeable.slug) if change.changeable_type == 'Fae::StaticPage'
           parent = change.changeable.respond_to?(:fae_parent) ? change.changeable.fae_parent : nil
-          edit_path = edit_polymorphic_path([main_app, fae_scope, parent, change.changeable])
+          edit_path = edit_polymorphic_path(
+            [main_app, fae_scope.to_sym, parent, change.changeable]
+          )
           return link_to text, edit_path
         rescue
           return text
@@ -80,6 +86,15 @@ module Fae
       end
     end
 
+    def netlify_enabled?
+      Fae.netlify.present? &&
+      Fae.netlify[:api_user].present? &&
+      Fae.netlify[:api_token].present? &&
+      Fae.netlify[:site].present? &&
+      Fae.netlify[:site_id].present? &&
+      Fae.netlify[:api_base].present?
+    end
+
     private
 
     def nav_path_current?(path)
@@ -110,5 +125,24 @@ module Fae
       "#{item.class.name.underscore.gsub('/', '_').pluralize}_#{item.id}"
     end
 
+    def multi_column_nav_ul_class(item_count)
+      num = item_count.length
+      if num > 30
+        'multicol-nav four'
+      elsif num > 20
+        'multicol-nav three'
+      elsif num > 10
+        'multicol-nav'
+      end
+    end
+
+    def nested_table_thumb_url(image)
+      return unless image.asset.file
+      if image.asset.file.extension.downcase == 'svg'
+        image.asset.url
+      else
+        image.asset.thumb.url
+      end
+    end
   end
 end

data/app/helpers/fae/form_helper.rb

@@ -11,6 +11,8 @@ module Fae
       add_input_class(options, 'js-markdown-editor') if options[:markdown].present?
       add_input_class(options, 'js-html-editor') if options[:html].present?
 
+      set_form_manager_container_attr(f, options, attribute) unless options[:show_form_manager] == false
+
       set_maxlength(f, attribute, options)
 
       f.input attribute, options
@@ -22,6 +24,8 @@ module Fae
       list_order f, attribute, options
       set_prompt f, attribute, options if !options[:include_blank].is_a?(String)
 
+      set_form_manager_container_attr(f, options, attribute) unless options[:show_form_manager] == false
+
       f.association attribute, options
     end
 
@@ -46,7 +50,8 @@ module Fae
 
     def fae_checkbox(f, attribute, options={})
       options[:type] ||= 'stacked'
-      options.update(as: :check_boxes, wrapper_class: "checkbox-wrapper js-checkbox-wrapper #{options[:wrapper_class]} -#{options[:type]}", no_label_div: true)
+      options[:input_type] ||= :check_boxes
+      options.update(as: options[:input_type], wrapper_class: "input checkbox-wrapper js-checkbox-wrapper #{options[:wrapper_class]} -#{options[:type]}", no_label_div: true)
       association_or_input f, attribute, options
     end
 
@@ -125,7 +130,7 @@ module Fae
       label = options[:label] || label_translation(attribute) || attribute_name
       if options[:markdown_supported].present? || options[:helper_text].present?
         label += content_tag :h6, class: 'helper_text' do
-          concat(options[:helper_text]) if options[:helper_text].present?
+          concat(content_tag(:span, options[:helper_text], class: 'helper_text_text')) if options[:helper_text].present?
           concat(content_tag(:span, 'Markdown Supported', class: 'markdown-support')) if options[:markdown_supported].present?
         end
       end
@@ -188,6 +193,25 @@ module Fae
       end
     end
 
+    def add_wrapper_class(options, class_name)
+      if options.key?(:wrapper_html)
+        options[:wrapper_html].merge!({class: "#{options[:wrapper_html][:class]} #{class_name}"})
+      else
+        options[:wrapper_html] = { class: class_name }
+      end
+    end
+
+    def set_form_manager_container_attr(f, options, attribute)
+      form_manager_id = f.object.class.name
+      form_manager_id = f.object.attached_as if f.object.try(:attached_as)
+      form_manager_id += "_#{attribute}"
+      if options.key?(:wrapper_html)
+        options[:wrapper_html]['data-form-manager-id'] = form_manager_id
+      else
+        options[:wrapper_html] = { 'data-form-manager-id' => form_manager_id }
+      end
+    end
+
     # sets collection to class.for_fae_index if not defined
     def list_order(f, attribute, options)
       if is_association?(f, attribute) && !options[:collection]