fae-rails 1.7.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2efad2fc9feedd56fc9ec582e9ac519e6f7c0a8b
-  data.tar.gz: 1f3079cb3d1143a955289d8add21a72a7b6772a4
+  metadata.gz: 627ef0b4fdd41a840e63ef13d5816702d67109e3
+  data.tar.gz: 2ee2bdb673debee82c40eb3064d44fdaf0143515
 SHA512:
-  metadata.gz: ccf4b94fe96cdc89fe3119ba65ee96584dea2cacbc6dc15a7b8518a90a8053f1481c82201d7165883b3ad57bfb993abe0d5368242ae2e18750a8ec3d5a29bf8b
-  data.tar.gz: 5f3702e59f1583fac3bcddada5aff0c324c2a9464c4071584256995ccbed06e4ae8329f14b1bcb8e5667d500a50b1bb199d449d8a5555a07c53ae6c2df941a3d
+  metadata.gz: 3b31bb1dce450aecd010f337e851fb895ef86c4ccbcc8983d77e7d594e72a28e457a9966d79f238963d8e45fcb32a539167cd2e29666d2c6fb8a7b908cf8e41b
+  data.tar.gz: 0d9775d7d639bc6fbe66ffbfb40ca5aaf1dccf99344c6160fbbdc6e2f7116e57f42bcc0da4b81345d7f504c2fa89fb206bc9235393f9913f14f3955fe6745e16

data/README.md

@@ -7,7 +7,7 @@
 
 Like many Rails CMS engines, Fae delivers all the basics to get you up and running quickly: authentication, authorization, a sleek UI, form helpers, image processing and workflows. But unlike other engines, Fae's generated models, controllers, and views are built to customize and scale.
 
-Fae supports Rails 4.1 to 5.0. We are currently working on Rails 5.1 support.
+Fae 2.0 supports Rails 5.0 to 5.2, support for Rails 4.x is deprecated as of Fae 2.0.
 
 ## Installation
 
@@ -27,7 +27,7 @@ $ rails g fae:install
 
 ## Documentation
 
-For full documentation visit:  
+For full documentation visit:
 https://www.faecms.com/documentation
 
 ### Topics
@@ -57,10 +57,13 @@ https://www.faecms.com/documentation
 * [Change Tracker](docs/features/change_tracker.md)
 * [Slugger](docs/features/slugger.md)
 * [Disabling Environments](docs/features/disable_envs.md)
+* [Form Field Label & Helper Text Manager](docs/features/form_manager.md)
+* [Netlify Deploy Monitor](docs/features/netlify.md)
 
 
 ### Tutorials
 
+* [Setting Up GraphQL with Fae](docs/tutorials/graphql_support.md)
 * [Setting Up Images and Files](docs/tutorials/image_and_files.md)
 * [Adding Dynamic Relationships to Pages](docs/tutorials/dynamic_relationships_to_pages.md)
 * [Adding Conditional Validations](docs/tutorials/conditional_validations.md)
@@ -84,6 +87,7 @@ https://www.faecms.com/documentation
 
 * [Running Fae Locally](docs/contributing/local_setup.md)
 * [Fae Standards](docs/contributing/standards.md)
+* [Share Your Creation](docs/contributing/share_your_creation.md)
 
 ## [Upgrading](docs/upgrading/index.md)
 

data/Rakefile

@@ -25,9 +25,6 @@ require 'rspec/core/rake_task'
 desc "Run all specs in spec directory (excluding plugin specs)"
 RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-# @deprecation - remove require when we drop Rails 4 support
-require 'sub_test_task_patch'
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'

data/app/assets/javascripts/fae/_deploy.js

@@ -0,0 +1,198 @@
+
+/* global Fae, modal, FCH */
+
+/**
+ * Fae deploy
+ * @namespace
+ */
+
+Fae.deploy = {
+
+  ready: function() {
+    if (!$('body').hasClass('deploy')) return false;
+    this.$deployButtons  = $('.js-run-deploy');
+    this.deployFinished  = true;
+    this.buttonsEnabled  = true;
+    this.pollTimeout     = null;
+    this.pollInterval    = 5000;
+    this.idleStates      = ['ready', 'error']
+
+    this.pollDeployStatus();
+    this.deployButtonListener();
+    this.documentFocusListener();
+    this.notifyIdle();
+    this.refreshDeploysListAndStatuses();
+  },
+
+  deployButtonListener: function() {
+    var _this = this;
+    _this.$deployButtons.click(function(e) {
+      e.preventDefault();
+      _this.disableButtons();
+      var deploy_hook_type = $(this).data('build-hook-type');
+      $.post( '/admin/deploy/deploy_site', { deploy_hook_type: deploy_hook_type }, function(data) {
+        // Netlify returns nothing for deploy hook posts
+      });
+    });
+  },
+
+  documentFocusListener: function() {
+    var _this = this;
+    document.addEventListener('visibilitychange', function(ev) {
+      if (document.visibilityState === 'visible') {
+        _this.pollDeployStatus();
+      } else if (document.visibilityState === 'hidden') {
+        _this.destroyPoll();
+      }
+    });
+  },
+
+  refreshDeploysListAndStatuses: function() {
+    var _this = this;
+    $.get('/admin/deploy/deploys_list', function (data) {
+      if (data) {
+        _this.drawTables(data);
+        _this.stateChecks(data);
+      }
+    });
+  },
+
+  pollDeployStatus: function() {
+    var _this = this;
+    function poll() {
+      _this.refreshDeploysListAndStatuses();
+      _this.pollTimeout = setTimeout(poll, _this.pollInterval);
+    }
+    poll();
+  },
+
+  destroyPoll: function() {
+    clearTimeout(this.pollTimeout);
+  },
+
+  notifyRunning: function() {
+    $('.deploying-heading').addClass('running');
+    $('#js-deploying-section').removeClass('hidden');
+  },
+
+  notifyIdle: function() {
+    $('.deploying-heading').removeClass('running');
+    $('#js-deploying-section').addClass('hidden');
+  },
+
+  enableButtons: function() {
+    var _this = this;
+    if (!_this.buttonsEnabled) {
+      _this.buttonsEnabled = true;
+      _this.$deployButtons.prop('disabled', false);
+    }
+  },
+
+  disableButtons: function() {
+    var _this = this;
+    if (_this.buttonsEnabled) {
+      _this.buttonsEnabled = false;
+      _this.$deployButtons.prop('disabled', true);
+    }
+  },
+
+  afterDeploy: function() {
+    var _this = this;
+    if (!_this.deployFinished) {
+      _this.notifyIdle();
+      _this.enableButtons();
+      _this.deployFinished = true;
+    }
+  },
+
+  drawTables: function(data) {
+    var _this = this;
+    var runningDeploys = _this.getRunningDeploys(data);
+    var pastDeploys = _this.getPastDeploys(data);
+    $('.js-deploys-list').find('tbody').find('tr').remove();
+    _this.injectTableDeployData(runningDeploys, $('.js-deploys-list.running').find('tbody'));
+    _this.injectTableDeployData(pastDeploys, $('.js-deploys-list.past').find('tbody'));
+    Fae.navigation.lockFooter();
+  },
+
+  getRunningDeploys: function(data) {
+    var _this = this;
+    return data.filter(function(deploy) {
+      return $.inArray(deploy.state, _this.idleStates) === -1;
+    });
+  },
+
+  getPastDeploys: function(data) {
+    var _this = this;
+    return data.filter(function(deploy) {
+      return $.inArray(deploy.state, _this.idleStates) !== -1;
+    });
+  },
+
+  injectTableDeployData: function(deploys, $tbody) {
+    var _this = this;
+    $.each(deploys, function(i, deploy) {
+      $tbody.append(
+        $('<tr>').append([
+          $('<td>').text(deploy.commit_ref !== null ? 'FINE dev update' : deploy.title),
+          $('<td>').text(moment(deploy.updated_at).format('MM/DD/YYYY h:mm a')),
+          $('<td>').text(_this.deployDuration(deploy)),
+          $('<td>').text(_this.deployEnvironment(deploy)),
+          $('<td>').html(_this.errorMsg(deploy)),
+        ])
+      );
+    });
+  },
+
+  stateChecks: function(data) {
+    var _this = this;
+    if (_this.deployIsRunning(data)) {
+      _this.notifyRunning();
+      _this.disableButtons();
+      _this.deployFinished = false;
+    } else {
+      _this.afterDeploy();
+    }
+  },
+
+  valCheck: function(val) {
+    if (val !== null) return val;
+  },
+
+  deployIsRunning: function(data) {
+    var _this = this;
+    var running = false;
+    $.each(data, function(i, deploy) {
+      if(_this.idleStates.indexOf(deploy.state) === -1) {
+        running = true;
+        return false;
+      }
+    });
+    return running;
+  },
+
+  deployDuration: function(deploy) {
+    if (deploy.deploy_time === null) {
+      return '–';
+    } else {
+      return moment.utc(parseInt(deploy.deploy_time)*1000).format('HH:mm:ss');
+    }
+  },
+
+  deployEnvironment: function(deploy) {
+    if (deploy.branch === 'master' || deploy.branch === 'main') {
+      return 'Production';
+    }
+    return deploy.branch.charAt(0).toUpperCase() + deploy.branch.slice(1);
+  },
+
+  errorMsg: function(deploy) {
+    if (deploy.error_message) {
+      var out = 'An error occurred. Please contact your ';
+      out += '<a href="/admin/help">FINE team</a>.'
+      return out;
+    }
+  }
+
+};
+

data/app/assets/javascripts/fae/_modals.js

@@ -6,8 +6,19 @@
  */
 Fae.modals = {
   ready: function() {
+    this.$body = $('body');
+    this.openClass = 'modal-open';
+    this.modalClass = 'MODAL_ID-modal-open';
+    this.showEvent = 'modal:show';
+    this.shownEvent = 'modal:shown';
+    this.closeEvent = 'modal:close';
+    this.closedEvent = 'modal:closed';
+    this.modalOpen = false;
+
     this.imageModals();
     this.markdownModalListener();
+
+    this.ajaxModalListener();
   },
 
   /**
@@ -56,5 +67,88 @@ Fae.modals = {
    */
   markdownModalListener: function() {
     FCH.$document.on('click', '.markdown-support', this.markdownModal);
+  },
+
+  /**
+   * load remote data, open modal view
+   * @see {@link modals.formModalListener}
+   * @has_test {features/form_helpers/fae_input_spec.rb}
+   */
+  openAjaxModal: function (remoteUrl, relatedTarget) {
+    var _this = this;
+
+    $.get(remoteUrl, function (data) {
+      //Open remote url content in modal window
+      $(data).modal({
+        minHeight: "75%",
+        minWidth: "75%",
+        overlayClose: true,
+        zIndex: 1100,
+        containerId: "fae-modal",
+        persist: true,
+        opacity: 70,
+        overlayCss: { backgroundColor: "#000" },
+        onOpen: function (dialog) {
+          // Fade in modal + show data
+          dialog.overlay.fadeIn();
+          dialog.container.fadeIn(function() {
+            var shownEvent = $.Event(_this.shownEvent, { dialog: dialog, relatedTarget: relatedTarget });
+            _this.$body.trigger(shownEvent);
+          });
+          dialog.data.show();
+
+          var modalClasses = [_this.createClassFromModalId(relatedTarget.attr('id')), _this.openClass].join(' ');
+
+          _this.modalOpen = true;
+          _this.$body.addClass(modalClasses);
+        },
+        onShow: function (dialog) {
+          var showEvent = $.Event(_this.showEvent, { dialog: dialog, relatedTarget: relatedTarget });
+          _this.$body.trigger(showEvent);
+
+          $(dialog.container).css('height', 'auto')
+        },
+        onClose: function (dialog) {
+          var closeEvent = $.Event(_this.closeEvent, { dialog: dialog, relatedTarget: relatedTarget });
+          _this.$body.trigger(closeEvent);
+
+          // Fade out modal and close
+          dialog.container.fadeOut();
+          dialog.overlay.fadeOut(function () {
+            $.modal.close(); // must call this!
+
+            var closedEvent = $.Event(_this.closedEvent, { dialog: dialog, relatedTarget: relatedTarget });
+            var modalClasses = [_this.createClassFromModalId(relatedTarget.attr('id')), _this.openClass].join(' ');
+
+            _this.modalOpen = false;
+            _this.$body.removeClass(modalClasses);
+            _this.$body.trigger(closedEvent);
+          });
+        }
+      });
+
+    });
+  },
+
+  /**
+   * Click event listener for ajax modal links triggering specific view within modal popup
+   * @fires {@link modals.ajaxModal}
+   * @has_test {features/form_helpers/fae_input_spec.rb}
+   */
+  ajaxModalListener: function () {
+    var _this = this;
+
+    FCH.$document.on('click', '.js-fae-modal', function (e) {
+      e.preventDefault();
+      var $this = $(this);
+      var url = $this.attr('href');
+      var id = $this.attr('id');
+
+      _this.openAjaxModal(url, $this)
+    });
+  },
+
+  createClassFromModalId: function(modalId) {
+    return this.modalClass.replace('MODAL_ID', modalId);
   }
 };

data/app/assets/javascripts/fae/_tables.js

@@ -17,16 +17,14 @@ Fae.tables = {
   sort_cookie_name: 'Fae_table_sort_preferences',
 
   ready: function() {
-    // @depreciation - remove `|| FCH.exists('.main_table-sort_columns')` and only use FCH.exists('.js-sort-column') in v2.0
-    if (FCH.exists('.js-sort-column') || FCH.exists('.main_table-sort_columns')) {
+    if (FCH.exists('.js-sort-column')) {
       this.dateColumnSorting();
       this.columnSorting();
       this.defaultSortCookie();
       this.sortColumnsFromCookies();
     }
 
-    // @depreciation - remove || FCH.exists('.main_content-sortable-handle') and only use FCH.exists('.sortable-handle') in v2.0
-    if (FCH.exists('.sortable-handle') || FCH.exists('.main_content-sortable-handle')) {
+    if (FCH.exists('.sortable-handle')) {
       this.rowSorting();
     }
 
@@ -36,10 +34,7 @@ Fae.tables = {
       this.collapsibleTable();
     }
 
-    // @depreciation - remove conditional wrapping and call endingSelectShim like `this.endingSelectShim()` in v2.0
-    if (FCH.exists('form ' + Fae.content_selector)) {
-      this.endingSelectShim(Fae.content_selector);
-    }
+    this.endingSelectShim();
 
     if (FCH.exists('.js-tooltip')) {
       this.tooltip();
@@ -54,8 +49,7 @@ Fae.tables = {
     var path = window.location.pathname;
     var cookie_value = Cookies.getJSON(_this.sort_cookie_name);
 
-    // @depreciation - remove `, .main_table-sort_columns` and only use '.js-sort-column' in v2.0
-    $('.js-sort-column, .main_table-sort_columns')
+    $('.js-sort-column')
       .tablesorter()
       .on('sortEnd', function(e) {
         var $this = $(this);
@@ -142,8 +136,7 @@ Fae.tables = {
       return;
     }
 
-    // @depreciation - remove `, .main_table-sort_columns` and only use '.js-sort-column' in v2.0
-    $('.js-sort-column, .main_table-sort_columns').each(function(idx) {
+    $('.js-sort-column').each(function(idx) {
       // If this table exists in the cookie hash
       if (cookie_value[path].hasOwnProperty(idx)) {
         // Use array value within another array because of how tablesorter accepts this argument
@@ -156,15 +149,10 @@ Fae.tables = {
    * Make table rows draggable by user
    */
   rowSorting: function() {
-    // @depreciation - remove sort_selector var in v2.0
-    var sort_selector = FCH.exists('.sortable-handle') ? '.sortable-handle' : '.main_content-sortable-handle';
-
-    // @depreciation - remove `, .main_content-sortable` and only use '.js-sort-row' in v2.0
-    $('.js-sort-row, .main_content-sortable').sortable({
+    $('.js-sort-row').sortable({
       items: 'tbody tr',
       opacity: 0.8,
-      // @depreciation - replace sort_selector with '.sortable-handle' in v2.0
-      handle: (sort_selector),
+      handle: ('.sortable-handle'),
 
       //helper function to preserve the width of the table row
       helper: function(e, $tr) {
@@ -271,11 +259,9 @@ Fae.tables = {
 
   /**
    * Add extra space if the last item in a form is a select menu so the dropdown doesn't run off the screen or section
-   * @param {String} selector - Last of type element to target
-   * @deprecation remove selector arg and replace selector variable with '.content' in v2.0
    */
-  endingSelectShim: function(selector) {
-    $('form ' + selector + ':last-of-type').each(function() {
+  endingSelectShim: function() {
+    $('form .content:last-of-type').each(function() {
       var $last_item = $(this).find('.input:last-of-type');
 
       if( $last_item.hasClass('select') ) {
@@ -342,8 +328,8 @@ Fae.tables = {
    */
   sizeFixedHeader: function() {
     var $tables = $('.content table');
-    // @depreciation - change value from ternary to $('.js-content-header').outerHeight() in v2.0
-    var header_height = FCH.exists('.js-content-header') ? $('.js-content-header').outerHeight() : $('.main_content-header').outerHeight();
+
+    var header_height = $('.js-content-header').outerHeight();
     if(FCH.large_down) {
       header_height = $('#js-main-header').outerHeight();
     }

data/app/assets/javascripts/fae/application.js

@@ -13,8 +13,8 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery.remotipart
-//= require jquery.ui.sortable
-//= require jquery.ui.datepicker
+//= require jquery-ui/widgets/sortable
+//= require jquery-ui/widgets/datepicker
 //= require underscore
 //= require json2
 //= require judge
@@ -46,6 +46,7 @@
 //= require fae/form/_cancel
 //= require fae/form/_ajax
 //= require fae/form/_filtering
+//= require fae/form/_form_manager
 //= require fae/form/fae_chosen
 //= require fae/form/fileinputer
 
@@ -57,6 +58,7 @@
 
 //= require fae/_modals
 //= require fae/_tables
+//= require fae/_deploy
 
 //= require fae
 

data/app/assets/javascripts/fae/fae_init.js

@@ -5,8 +5,4 @@
   window.FCH = new FrobCoreHelpers(Fae, {
     mobile_fps: false
   });
-
-  // Selector to support pre-1.3 changes
-  // @depreciation - replace Fae.content_selector property and all instances of it with '.content' in v2.0
-  Fae.content_selector = FCH.exists('.main_content-section') || FCH.exists('.main_content-sections') ? '.main_content-section-area' : '.content';
 })();

data/app/assets/javascripts/fae/form/_ajax.js

@@ -66,6 +66,11 @@ Fae.form.ajax = {
         $wrapper.find('.input.file').fileinputer();
       }
 
+      this.$nested_form = $('.nested-form');
+
+      // Bind validation to nested form fields added by AJAX
+      Fae.form.validator.bindValidationEvents(this.$nested_form);
+
       // Reinitialize form elements
       Fae.form.dates.initDatepicker();
       Fae.form.dates.initDateRangePicker();
@@ -73,7 +78,13 @@ Fae.form.ajax = {
       Fae.form.slugger.addListener();
       Fae.form.validator.length_counter.init();
       Fae.form.text.initMarkdown();
+      Fae.form.text.initHTML();
       Fae.form.checkbox.setCheckboxAsActive();
+      Fae.form.select.init();
+      Fae.form.formManager.setupAllFields($wrapper.find('form'));
+
+      // validate nested form fields on submit
+      Fae.form.validator.formValidate(this.$nested_form);
 
       $wrapper.find('.hint').hinter();
     });
@@ -123,13 +134,10 @@ Fae.form.ajax = {
           if($html.hasClass('js-addedit-form') || $html.hasClass( 'js-index-addedit-form' )) {
             // we're returning the table, replace everything
             _this._addEditReplaceAndReinit($this, $html.html(), $target);
-          } else if ($html.hasClass('nested-form') || $html.hasClass('form_content-wrapper')) {
-
-            // @depreciation - remove `|| $html.hasClass('form_content_wrapper')` from above conditional as well as the following ternary (value should just be '.nested-form') in v2.0
-            var form_wrapper_selector = $html.hasClass('nested-form') ? '.nested-form' : '.form_content-wrapper';
+          } else if ($html.hasClass('nested-form')) {
 
             // we're returning the form due to an error, just replace the form
-            $this.find( form_wrapper_selector ).replaceWith(data);
+            $this.find('.nested-form' ).replaceWith($html);
             $this.find('.select select').fae_chosen();
             $this.find('.input.file').fileinputer();
 
@@ -139,6 +147,7 @@ Fae.form.ajax = {
             Fae.form.validator.length_counter.init();
             Fae.form.checkbox.setCheckboxAsActive();
             Fae.form.text.initMarkdown();
+            Fae.form.text.initHTML();
 
             FCH.smoothScroll($this.find('.js-addedit-form-wrapper'), 500, 100, 120);
           }
@@ -286,11 +295,21 @@ Fae.form.ajax = {
   },
 
   /**
-   * Attaching click handlers to #main_content to allow ajax replacement
+   * Attaching click handlers to #js-main-content to allow ajax replacement
    * @todo Clean this up, moving listeners into their respective component classes (select, checkbox, etc.)
    */
   htmlListeners: function() {
-    $('#js-main-content, .login-form > form')
+    $('#js-main-content, .login-form > form, #simplemodal-data')
+
+      /**
+       * For the delete button on file input
+       */
+      .on('click', '.js-file-clear', function(e) {
+        e.preventDefault();
+        var $parent = $(this).parent();
+        $parent.next().show();
+        $parent.hide();
+      })
 
       /**
        * For the yes/no slider

data/app/assets/javascripts/fae/form/_cancel.js

@@ -35,4 +35,5 @@ Fae.form.cancel = {
 
     $('form').on('change', 'input, textarea, select', updateCancel);
   }
+
 };

data/app/assets/javascripts/fae/form/_filtering.js

@@ -25,6 +25,7 @@ Fae.form.filtering = {
       }
 
       this.setFilterDropDowns();
+      this.setTextInputs();
       this.filterFormListeners();
       this.paginationListeners();
       this.sortingSetup();
@@ -87,6 +88,7 @@ Fae.form.filtering = {
       // update search param when form submits
       .on('submit', function(ev) {
         $('.js-reset-btn').show();
+        $('.js-reset-btn').removeClass('hidden');
         _this.updateFryrAndResetPaging('search', $('#filter_search').val());
         return false;
       })
@@ -117,6 +119,17 @@ Fae.form.filtering = {
         _this.updateFryrAndResetPaging(key, value);
 
         $('.js-reset-btn').show();
+        $('.js-reset-btn').removeClass('hidden');
+      })
+
+      // update hash when date inputs changed
+      .on('change', '.datepicker input', function() {
+        var key = $(this).attr('id').split('filter_')[1];
+        var value = $(this).val();
+        timer = setTimeout(function() {
+          _this.updateFryrAndResetPaging(key, value);
+          $('.js-reset-btn').show();
+        }, 500);
       });
   },
 
@@ -147,6 +160,27 @@ Fae.form.filtering = {
     $('.js-reset-btn').show();
   },
 
+  /**
+   * Sets filter dropdowns on page load based on Fryr params
+   */
+  setTextInputs: function() {
+    // Exit early if this.fry.params is blank
+    if ($.isEmptyObject(this.fry.params)) {
+      return;
+    }
+
+    // Loop through all available this.fry.params to find the select menu and the proper option
+    $.each(this.fry.params, function(key, value) {
+      var $input = $('.js-filter-form .table-filter-group.text-input #filter_' + key);
+
+      if($input.length) {
+        $input.val(decodeURIComponent(value));
+      }
+    });
+
+    $('.js-reset-btn').show();
+  },
+
   /**
    * Updates a Fryr param while reseting paging
    * Use for most cases of pushing a single params to Fryr, as paging will always reset in those cases

data/app/assets/javascripts/fae/form/_form.js

@@ -20,6 +20,7 @@ Fae.form = {
     this.ajax.init();
     this.filtering.init();
     this.slugger.init();
+    this.formManager.init();
 
     // input type=file customization
     // This doesn't work in IE. It's not worth figuring out why by this point. IE9 gets plain file uploader.