pages_core 3.6.2 → 3.7.0

data/app/assets/javascripts/pages/admin/features/rich_text.jsx

@@ -1,5 +1,5 @@
 $(function() {
-  $('textarea.rich').each(function () {
+  $("textarea.rich").each(function () {
     let container = document.createElement("div");
     this.parentNode.appendChild(container);
     ReactDOM.render(

data/app/assets/javascripts/pages/admin/features/tag_editor.jsx

@@ -7,67 +7,67 @@ $.extend(TagEditor.prototype, {
     var tagEditor = this;
     tagEditor.container = container;
     tagEditor.tags = Array();
-    tagEditor.serializeField = $(tagEditor.container).find('.serialized_tags').get(0);
+    tagEditor.serializeField = $(tagEditor.container).find(".serialized_tags").get(0);
     tagEditor.findTags(true);
 
-    tagEditor.inputField = $(tagEditor.container).find('.add-tag').get(0);
-    $(tagEditor.container).find('.add-tag-button').click(function() {
+    tagEditor.inputField = $(tagEditor.container).find(".add-tag").get(0);
+    $(tagEditor.container).find(".add-tag-button").click(function() {
       tagEditor.addTag();
-      $(tagEditor.container).find('.add-tag').blur();
+      $(tagEditor.container).find(".add-tag").blur();
       return false;
     });
-    $(tagEditor.container).find('.add-tag').keydown(function(event) {
+    $(tagEditor.container).find(".add-tag").keydown(function(event) {
       if (event.which === 13) {
         tagEditor.addTag();
         return false;
       }
     });
 
-    $(tagEditor.container).find('.add-tag').each(function(){
+    $(tagEditor.container).find(".add-tag").each(function(){
       var field = this;
       field.exampleText = $(field).val();
-      $(field).addClass('example');
+      $(field).addClass("example");
       $(field).focus(function(event){
-        $(tagEditor.container).find('.add-tag-button').fadeIn('fast');
-        $(field).removeClass('example');
+        $(tagEditor.container).find(".add-tag-button").fadeIn("fast");
+        $(field).removeClass("example");
         if ($(field).val() === field.exampleText) {
-          $(field).val('');
+          $(field).val("");
         }
       });
       $(field).blur(function(event) {
-        $(tagEditor.container).find('.add-tag-button').fadeOut('fast');
+        $(tagEditor.container).find(".add-tag-button").fadeOut("fast");
         if (!$(field).val() || $(field).val() === field.exampleText) {
-          $(field).addClass('example').val(field.exampleText);
+          $(field).addClass("example").val(field.exampleText);
         }
       });
     });
-    $(tagEditor.container).find('.add-tag-button').hide();
+    $(tagEditor.container).find(".add-tag-button").hide();
   },
 
   addTag: function() {
     var tagEditor = this;
-    var tagName = $(tagEditor.inputField).val().replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+    var tagName = $(tagEditor.inputField).val().replace(/^\s\s*/, "").replace(/\s\s*$/, "");
     if (tagName) {
       if (this.hasTag(tagName)) {
         this.enable(this.getTagByName(tagName));
       } else {
-        $(tagEditor.container).find('.tags').append('<span class="tag"><input type="checkbox" name="tag-'+tagName+'" value="1" checked="checked"><span class="name">'+tagName+'</span></span>');
+        $(tagEditor.container).find(".tags").append("<span class=\"tag\"><input type=\"checkbox\" name=\"tag-"+tagName+"\" value=\"1\" checked=\"checked\"><span class=\"name\">"+tagName+"</span></span>");
         tagEditor.findTags();
       }
     }
-    $(tagEditor.inputField).val('');
+    $(tagEditor.inputField).val("");
   },
 
   findTags: function(permanentize) {
     var tagEditor = this;
-    $(this.container).find('.tag').each(function () {
+    $(this.container).find(".tag").each(function () {
       var tag = this;
       if (!tag.tagEditorApplied) {
-        tag.checkBox = $(tag).find('input[type=checkbox]').get(0);
-        tag.name = $(tag).find('.name').text();
+        tag.checkBox = $(tag).find("input[type=checkbox]").get(0);
+        tag.name = $(tag).find(".name").text();
         if(tagEditor.isChecked(tag)){
           tag.enabled = true;
-          $(tag).addClass('enabled');
+          $(tag).addClass("enabled");
         } else {
           tag.enabled = false;
         }
@@ -94,11 +94,11 @@ $.extend(TagEditor.prototype, {
   setEnabled: function(tag, enabled) {
     tag.enabled = enabled;
     if (tag.enabled) {
-      $(tag).addClass('enabled');
+      $(tag).addClass("enabled");
     } else {
-      $(tag).removeClass('enabled');
+      $(tag).removeClass("enabled");
     }
-    $(tag.checkBox).attr('checked', tag.enabled);
+    $(tag.checkBox).attr("checked", tag.enabled);
     this.serializeTags();
   },
 
@@ -129,7 +129,7 @@ $.extend(TagEditor.prototype, {
   },
 
   isChecked: function(tag) {
-    return $(tag.checkBox).attr('checked');
+    return $(tag.checkBox).attr("checked");
   },
 
   enabledTags: function() {
@@ -145,16 +145,16 @@ $.extend(TagEditor.prototype, {
   serializeTags: function() {
     var tagNames = Array();
     $(this.enabledTags()).each(function() {
-      tagNames[tagNames.length] = '"' + this.name.replace('"', '\\"') + '"';
+      tagNames[tagNames.length] = "\"" + this.name.replace("\"", "\\\"") + "\"";
     });
-    $(this.serializeField).val('['+tagNames.join(', ')+']');
-    $(this.container).find('.add-tag').attr('disabled', false);
+    $(this.serializeField).val("["+tagNames.join(", ")+"]");
+    $(this.container).find(".add-tag").attr("disabled", false);
   }
 });
 
 // Apply the tag editor to each instance
 $(function() {
-  $('.tag-editor').each(function() {
+  $(".tag-editor").each(function() {
     this.tagEditor = new TagEditor(this);
   });
 });

data/app/assets/javascripts/pages/admin/lib/tree.jsx

@@ -63,7 +63,7 @@ class Tree {
     var self = this;
 
     var index = { id: startId, node: obj };
-    indexes[this.cnt + ''] = index;
+    indexes[this.cnt + ""] = index;
     this.cnt++;
 
     if (obj.children && obj.children.length) {
@@ -81,7 +81,7 @@ class Tree {
           index.parent = parent.id;
         }
 
-        indexes[self.cnt + ''] = index;
+        indexes[self.cnt + ""] = index;
         children.push(self.cnt);
         self.cnt++;
 
@@ -92,7 +92,7 @@ class Tree {
       parent.children = children;
 
       children.forEach(function(id, i) {
-        var index = indexes[id + ''];
+        var index = indexes[id + ""];
         if (i > 0) {
           index.prev = children[i - 1];
         }
@@ -106,7 +106,7 @@ class Tree {
   }
 
   getIndex(id) {
-    var index = this.indexes[id + ''];
+    var index = this.indexes[id + ""];
     if (index) {
       return index;
     }
@@ -117,7 +117,7 @@ class Tree {
     del(index);
 
     function del(index) {
-      delete self.indexes[index.id + ''];
+      delete self.indexes[index.id + ""];
       if (index.children && index.children.length) {
         index.children.forEach(function(child) {
           del(self.getIndex(child));
@@ -259,13 +259,13 @@ class Tree {
     var obj = this.remove(fromId);
     var index = null;
 
-    if (placement === 'before') {
+    if (placement === "before") {
       index = this.insertBefore(obj, toId);
-    } else if (placement === 'after') {
+    } else if (placement === "after") {
       index = this.insertAfter(obj, toId);
-    } else if(placement === 'prepend') {
+    } else if(placement === "prepend") {
       index = this.prepend(obj, toId);
-    } else if(placement === 'append') {
+    } else if(placement === "append") {
       index = this.append(obj, toId);
     }
 

data/app/assets/javascripts/pages/login_form.jsx

@@ -1,21 +1,21 @@
 $(function () {
-  $('.login-form').each(function () {
+  $(".login-form").each(function () {
     let container = this;
 
     function showTab(tabName) {
-      $(container).find('.login-tab').hide();
+      $(container).find(".login-tab").hide();
       $(container).find(`.login-tab.${tabName}`).show();
-      return false
+      return false;
     }
 
-    $(container).find('.show-password').click(function () {
-      return showTab('password');
+    $(container).find(".show-password").click(function () {
+      return showTab("password");
     });
 
-    $(container).find('.show-password-reset').click(function () {
-      return showTab('password-reset');
+    $(container).find(".show-password-reset").click(function () {
+      return showTab("password-reset");
     });
 
-    showTab('password');
+    showTab("password");
   });
 });

data/app/assets/stylesheets/pages/admin/components/forms.scss

@@ -62,6 +62,26 @@ form {
     }
   }
 
+  .row {
+    display: flex;
+    flex-wrap: wrap;
+    margin-right: -16px;
+
+    .field {
+      margin-right: 16px;
+      &.text-field {
+        flex-grow: 1;
+        min-width: 300px;
+      }
+    }
+
+    input[type=text],
+    input[type=password] {
+      width: 100%;
+      max-width: none;
+    }
+  }
+
   .date-range-select {
     .date {
       line-height: 34px;

data/app/assets/stylesheets/pages/errors.css

@@ -1,5 +1,7 @@
 body {
   background:          #fff;
+  background:          linear-gradient(180deg, rgba(236,236,236,1) 0%, rgba(255,255,255,1) 50%);
+  background-repeat:   no-repeat;
   margin:              0;
   padding:             0;
   border:              0;

data/app/controller_dummies/admin/admin_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class AdminController < PagesCore::AdminController #:nodoc:
   end

data/app/controller_dummies/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < PagesCore::BaseController #:nodoc:
   helper :all
   protect_from_forgery with: :exception

data/app/controller_dummies/attachments_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class AttachmentsController < PagesCore::AttachmentsController #:nodoc:
 end

data/app/controller_dummies/frontend_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class FrontendController < PagesCore::FrontendController #:nodoc:
 end

data/app/controller_dummies/images_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class ImagesController < PagesCore::ImagesController #:nodoc:
 end

data/app/controller_dummies/page_files_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class PageFilesController < PagesCore::Frontend::PageFilesController #:nodoc:
 end

data/app/controller_dummies/pages_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class PagesController < PagesCore::Frontend::PagesController #:nodoc:
 end

data/app/controller_dummies/sitemaps_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class SitemapsController < PagesCore::SitemapsController #:nodoc:
 end

data/app/controllers/admin/attachments_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class AttachmentsController < Admin::AdminController
     before_action :find_attachment, only: %i[update]
@@ -27,8 +29,8 @@ module Admin
     def attachment_params
       params.require(:attachment).permit(
         :file,
-        localized_attributes.each_with_object({}) do |a, h|
-          h[a] = I18n.available_locales
+        localized_attributes.index_with do |_a|
+          I18n.available_locales
         end
       )
     end

data/app/controllers/admin/categories_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class CategoriesController < Admin::AdminController
     before_action :find_category, only: %i[show edit update destroy]

data/app/controllers/admin/images_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class ImagesController < Admin::AdminController
     before_action :find_image, only: %i[show edit update destroy]
@@ -12,10 +14,13 @@ module Admin
 
     def create
       @image = Image.create(image_params)
-      if @image.valid?
-        respond_to do |format|
-          format.json do
+
+      respond_to do |format|
+        format.json do
+          if @image.valid?
             render json: @image, serializer: Admin::ImageSerializer
+          else
+            render json: { status: "error", error: @image.errors.first }
           end
         end
       end
@@ -41,8 +46,8 @@ module Admin
         :name, :description, :file,
         :crop_start_x, :crop_start_y, :crop_height, :crop_width, :locale,
         :crop_gravity_x, :crop_gravity_y,
-        localized_attributes.each_with_object({}) do |a, h|
-          h[a] = I18n.available_locales
+        localized_attributes.index_with do |_a|
+          I18n.available_locales
         end
       )
     end

data/app/controllers/admin/invites_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class InvitesController < Admin::AdminController
     before_action :require_authentication, except: %i[accept show]
@@ -45,7 +47,7 @@ module Admin
 
     def destroy
       flash[:notice] = "The invite to #{@invite.email} has been deleted"
-      @invite.destroy
+      PagesCore::DestroyInviteService.call(invite: @invite)
       redirect_to admin_invites_url
     end
 
@@ -58,6 +60,7 @@ module Admin
     def find_and_validate_invite
       @invite = Invite.find_by(id: params[:id])
       return if @invite && secure_compare(@invite.token, params[:token])
+
       flash[:notice] = "This invite is no longer valid."
       redirect_to(login_admin_users_url) && return
     end

data/app/controllers/admin/pages_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Admin
   class PagesController < Admin::AdminController
+    include PagesCore::Admin::PageJsonHelper
     include PagesCore::Admin::NewsPageController
 
     before_action :find_categories
-    before_action :find_page, only: %i[show edit update destroy
-                                       move]
+    before_action :find_page, only: %i[show edit update destroy move]
 
     require_authorization
 
@@ -99,23 +101,9 @@ module Admin
       )
     end
 
-    def page_json(page)
-      { id: page.id,
-        param: page.to_param,
-        parent_page_id: page.parent_page_id,
-        locale: page.locale,
-        status: page.status,
-        news_page: page.news_page,
-        name: page.name,
-        published_at: page.published_at,
-        pinned: page.pinned?,
-        starts_at: page.starts_at,
-        permissions: [(:edit if policy(page).edit?),
-                      (:create if policy(page).edit?)].compact }
-    end
-
     def param_categories
       return [] unless params[:category]
+
       params.permit(category: {})[:category]
             .to_hash
             .map { |id, _| Category.find(id) }
@@ -129,9 +117,9 @@ module Admin
       @categories = Category.order("name")
     end
 
-    def respond_with_page(page)
+    def respond_with_page(page, &block)
       respond_to do |format|
-        format.html { yield }
+        format.html { block.call }
         format.json { render json: page_json(page) }
       end
     end