pages_core 3.7.0 → 3.8.0

data/app/javascript/components/drag/useDraggable.js

@@ -0,0 +1,17 @@
+import { useEffect, useRef } from "react";
+
+export default function useDraggable(draggable, startDrag) {
+  const ref = useRef();
+
+  const handleDrag = (evt) => {
+    evt.preventDefault();
+    evt.stopPropagation();
+    startDrag(evt, draggable);
+  };
+
+  useEffect(() => {
+    draggable.ref.current = ref.current;
+  }, []);
+
+  return { ref: ref, onDragStart: handleDrag, draggable: true };
+}

data/app/javascript/components/drag.js

@@ -0,0 +1,6 @@
+export { default as useDragCollection,
+         createDraggable } from "./drag/useDragCollection";
+export { default as useDragUploader } from "./drag/useDragUploader";
+export { default as useDraggable } from "./drag/useDraggable";
+export { default as draggedOrder,
+         collectionOrder } from "./drag/draggedOrder";

data/app/javascript/components.js

@@ -0,0 +1,14 @@
+export { default as Attachments } from "./components/Attachments";
+export { default as DateRangeSelect } from "./components/DateRangeSelect";
+export { default as EditableImage } from "./components/EditableImage";
+export { default as ImageCropper } from "./components/ImageCropper";
+export { default as ImageGrid } from "./components/ImageGrid";
+export { default as ImageUploader } from "./components/ImageUploader";
+export { default as Modal } from "./components/Modal";
+export { default as PageDates } from "./components/PageDates";
+export { default as PageFiles } from "./components/PageFiles";
+export { default as PageImages } from "./components/PageImages";
+export { default as PageTree } from "./components/PageTree";
+export { default as RichTextArea } from "./components/RichTextArea";
+export { default as TagEditor } from "./components/TagEditor";
+export { default as Toast } from "./components/Toast";

data/app/javascript/controllers/EditPageController.js

@@ -0,0 +1,20 @@
+import { Controller } from "stimulus";
+
+export default class EditPageController extends Controller {
+  static get targets() {
+    return ["form"];
+  }
+
+  preview() {
+    const form = this.formTarget;
+    const prevAction = form.action;
+    const prevTarget = form.target;
+
+    form.target = "_blank";
+    form.action = form.dataset.previewUrl;
+    form.submit();
+
+    form.action = prevAction;
+    form.target = prevTarget;
+  }
+}

data/app/javascript/controllers/LoginController.js

@@ -0,0 +1,29 @@
+import { Controller } from "stimulus";
+
+export default class LoginController extends Controller {
+  static get targets() {
+    return ["tab"];
+  }
+
+  connect() {
+    if (this.tabTargets.length > 0) {
+      this.showTab(this.tabTargets[0].dataset.tab);
+    }
+  }
+
+
+  changeTab(evt) {
+    evt.preventDefault();
+    this.showTab(evt.target.dataset.tab);
+  }
+
+  showTab(tab) {
+    this.tabTargets.forEach((t) => {
+      if (t.dataset.tab == tab) {
+        t.classList.remove("hidden");
+      } else {
+        t.classList.add("hidden");
+      }
+    });
+  }
+}

data/app/javascript/controllers/MainController.js

@@ -0,0 +1,65 @@
+import { Controller } from "stimulus";
+
+export default class MainController extends Controller {
+  static get targets() {
+    return ["tab", "link"];
+  }
+
+  connect() {
+    let tabs = this.tabNames();
+    if (tabs.length > 0) {
+      let initTab = null;
+      const tabExpression = /#(.*)$/;
+
+      if (document.location.toString().match(tabExpression)) {
+        let id = document.location.toString().match(tabExpression)[1];
+        if (tabs.indexOf(id) !== -1) {
+          initTab = id;
+        }
+      }
+
+      this.showTab(initTab || tabs[0]);
+    }
+
+    window.addEventListener("popstate", this.stateHandler.bind(this));
+  }
+
+  disconnect() {
+    window.removeEventListener("popstate", this.stateHandler.bind(this));
+  }
+
+  stateHandler(evt) {
+    if (evt.state && evt.state.tabId) {
+      this.showTab(evt.state.tabId);
+    }
+  }
+
+  changeTab(evt) {
+    evt.preventDefault();
+    const tab = evt.target.dataset.tab;
+    this.showTab(tab);
+    history.pushState({ tabId: tab }, "", `${window.location.pathname}#${tab}`);
+  }
+
+  showTab(tab) {
+    this.linkTargets.forEach((l) => {
+      if (l.dataset.tab == tab) {
+        l.classList.add("current");
+      } else {
+        l.classList.remove("current");
+      }
+    });
+
+    this.tabTargets.forEach((t) => {
+      if (t.dataset.tab == tab) {
+        t.classList.remove("hidden");
+      } else {
+        t.classList.add("hidden");
+      }
+    });
+  }
+
+  tabNames () {
+    return this.linkTargets.map((l) => l.dataset.tab);
+  }
+}

data/app/javascript/controllers/PageOptionsController.js

@@ -0,0 +1,62 @@
+import { Controller } from "stimulus";
+
+export default class PageOptionsController extends Controller {
+  static get targets() {
+    return ["advancedOptions", "autoPublishNotice", "published", "publishedDate"];
+  }
+
+  connect() {
+    this.checkAutoPublish();
+    this.checkPublishedDate();
+  }
+
+  checkAutoPublish() {
+    if (this.publishedDate() > new Date()) {
+      this.show(this.autoPublishNoticeTarget);
+    } else {
+      this.hide(this.autoPublishNoticeTarget);
+    }
+  }
+
+  checkPublishedDate() {
+    if (this.publishedTarget.value == 2) {
+      this.show(this.publishedDateTarget);
+    } else {
+      this.hide(this.publishedDateTarget);
+    }
+  }
+
+  publishedDate() {
+    const lookup = (name) => {
+      return this.publishedDateTarget.getElementsByClassName(name)[0].value;
+    };
+    return new Date(
+      lookup("year"),
+      (lookup("month") - 1),
+      lookup("day"),
+      lookup("hour"),
+      lookup("minute")
+    );
+  }
+
+  show(elem) {
+    elem.classList.add("show");
+  }
+
+  hide(elem) {
+    elem.classList.remove("show");
+  }
+
+  toggle(elem) {
+    if (elem.classList.contains("show")) {
+      this.hide(elem);
+    } else {
+      this.show(elem);
+    }
+  }
+
+  toggleAdvancedOptions(evt) {
+    evt.preventDefault();
+    this.toggle(this.advancedOptionsTarget);
+  }
+}

data/app/javascript/features/RichText.jsx

@@ -0,0 +1,34 @@
+import React from "react";
+import ReactDOM from "react-dom";
+import RichTextArea from "../components/RichTextArea";
+import readyHandler from "../lib/readyHandler";
+
+class RichText {
+  apply () {
+    const elems = document.querySelectorAll("textarea.rich");
+    elems.forEach((elem) => {
+      this.enhance(elem);
+    });
+  }
+
+  enhance (elem) {
+    const container = document.createElement("div");
+    elem.parentNode.appendChild(container);
+    ReactDOM.render(
+      <RichTextArea value={elem.value}
+                    name={elem.name}
+                    rows={elem.rows}
+                    id={elem.id} />,
+      container
+    );
+    elem.parentNode.removeChild(elem);
+  }
+
+  start () {
+    readyHandler.ready(() => {
+      this.apply();
+    });
+  }
+}
+
+export default new RichText();

data/app/javascript/hooks.js

@@ -0,0 +1,2 @@
+export { useCrop, cropParams } from "./components/ImageCropper";
+export * from "./components/drag";

data/app/javascript/index.js

@@ -0,0 +1,33 @@
+import Rails from "@rails/ujs";
+import { Application } from "stimulus";
+require("react_ujs");
+
+import * as Components from "./components";
+
+import EditPageController from "./controllers/EditPageController";
+import MainController from "./controllers/MainController";
+import LoginController from "./controllers/LoginController";
+import PageOptionsController from "./controllers/PageOptionsController";
+
+import RichText from "./features/RichText";
+
+export function registerComponent(name, component) {
+  window[name] = component;
+}
+
+export default function startPages () {
+  Rails.start();
+  for (var name in Components) {
+    registerComponent(name, Components[name]);
+  }
+  RichText.start();
+
+  const application = Application.start();
+  application.register("edit-page", EditPageController);
+  application.register("main", MainController);
+  application.register("login", LoginController);
+  application.register("page-options", PageOptionsController);
+}
+
+export * from "./components";
+export * from "./hooks";

data/app/{assets/javascripts/pages/admin/lib/tree.jsx → javascript/lib/Tree.js}

@@ -1,55 +1,56 @@
 /*
-   Based on
-
-   js-tree by Wang Zuo
-   https://github.com/wangzuo/js-tree
-
-   react-ui-tree
-   https://github.com/pqx/react-ui-tree
-
-   The MIT License (MIT)
-
-   Copyright (c) 2015 Wang Zuo
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-
-   Copyright (c) 2015 pqx Limited
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
- */
-class Tree {
+  Based on
+
+  js-tree by Wang Zuo
+  https://github.com/wangzuo/js-tree
+
+  react-ui-tree
+  https://github.com/pqx/react-ui-tree
+
+  The MIT License (MIT)
+
+  Copyright (c) 2015 Wang Zuo
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+
+  Copyright (c) 2015 pqx Limited
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+export default class Tree {
   constructor(obj) {
     this.cnt = 1;
     this.obj = obj || { children: [] };
@@ -72,7 +73,7 @@ class Tree {
 
     function walk(objs, parent) {
       var children = [];
-      objs.forEach(function(obj, i) {
+      objs.forEach(function(obj) {
         var index = {};
         index.id = self.cnt;
         index.node = obj;
@@ -276,7 +277,7 @@ class Tree {
 
   getParent(id) {
     var indexes = this.indexes;
-    if (indexes.hasOwnProperty(id)) {
+    if (Object.prototype.hasOwnProperty.call(indexes, id)) {
       return this.getIndex(indexes[id].parent);
     }
   }
@@ -284,7 +285,7 @@ class Tree {
   getNodeByTop(top) {
     var indexes = this.indexes;
     for(var id in indexes) {
-      if (indexes.hasOwnProperty(id)) {
+      if (Object.prototype.hasOwnProperty.call(indexes, id)) {
         if(indexes[id].top === top) {
           return indexes[id];
         }

data/app/javascript/lib/copyToClipboard.js

@@ -0,0 +1,13 @@
+export function copySupported () {
+  return document.queryCommandSupported &&
+    document.queryCommandSupported("copy");
+}
+
+export default function copyToClipboard (str) {
+  const el = document.createElement("textarea");
+  el.value = str;
+  document.body.appendChild(el);
+  el.select();
+  document.execCommand("copy");
+  document.body.removeChild(el);
+}

data/app/javascript/lib/readyHandler.js

@@ -0,0 +1,22 @@
+let readyHandlers = [];
+
+const handleState = () => {
+  if (["interactive", "complete"].indexOf(document.readyState) > -1) {
+    while(readyHandlers.length > 0) {
+      (readyHandlers.shift())();
+    }
+  }
+};
+
+class ReadyHandler {
+  constructor () {
+    document.onreadystatechange = handleState;
+  }
+
+  ready (handler) {
+    readyHandlers.push(handler);
+    handleState();
+  }
+}
+
+export default new ReadyHandler();

data/app/javascript/lib/request.js

@@ -0,0 +1,36 @@
+export function csrfToken() {
+  return document.querySelector("[name=csrf-token]").content;
+}
+
+function jsonFetchOptions() {
+  return({ method: "POST",
+           headers: { "Content-Type": "application/json; charset=utf-8",
+                      "X-CSRF-Token": csrfToken() } });
+}
+
+export async function postJson(url, data) {
+  const options = { ...jsonFetchOptions(), method: "POST" };
+  if (data) {
+    options.body = JSON.stringify(data);
+  }
+  const response = await fetch(url, options);
+  return response.json();
+}
+
+export async function putJson(url, data) {
+  const options = { ...jsonFetchOptions(), method: "PUT" };
+  if (data) {
+    options.body = JSON.stringify(data);
+  }
+  const response = await fetch(url, options);
+  return response.json();
+}
+
+export async function post(url, data) {
+  const response = await fetch(url, {
+    method: "POST",
+    body: data,
+    headers: { "X-CSRF-Token": csrfToken() }
+  });
+  return response.json();
+}

data/app/models/concerns/pages_core/page_model/images.rb

@@ -8,7 +8,9 @@ module PagesCore
       included do
         belongs_to_image :image, optional: true
         belongs_to_image :meta_image, class_name: "Image", optional: true
-        has_many :page_images, -> { order("position") }, inverse_of: :page
+        has_many :page_images, -> { order("position") },
+                 inverse_of: :page,
+                 dependent: :destroy
         has_many(
           :images,
           -> { where(page_images: { primary: false }).order("position") },

data/app/models/concerns/pages_core/page_model/searchable.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module PageModel
+    module Searchable
+      extend ActiveSupport::Concern
+
+      def search_document_attributes
+        super.merge(
+          published: published?,
+          name: name,
+          description: try(&:meta_description?) ? meta_description : excerpt,
+          # content: "",
+          tags: tag_names.join(" ")
+        )
+      end
+    end
+  end
+end

data/app/models/concerns/pages_core/searchable_document.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module SearchableDocument
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :search_documents, as: :searchable, dependent: :destroy
+      after_save :update_search_documents!
+    end
+
+    class Indexer
+      attr_reader :record
+
+      def initialize(record)
+        @record = record
+      end
+
+      class << self
+        def index_all!(scope)
+          scope.all.find_each { |r| new(r).index! }
+        end
+      end
+
+      def index!
+        SearchDocument.transaction do
+          record.search_documents.where.not(locale: locales).destroy_all
+          locales.each do |locale|
+            update_index(
+              locale,
+              localized_record(locale).search_document_attributes
+            )
+          end
+        end
+      end
+
+      private
+
+      def locales
+        if record.respond_to?(:locales)
+          record.locales
+        elsif PagesCore.config.locales
+          PagesCore.config.locales.keys
+        else
+          [I18n.default_locale]
+        end
+      end
+
+      def localized_record(locale)
+        return record unless record.respond_to?(:localize)
+
+        record.localize(locale)
+      end
+
+      def update_index(locale, attrs)
+        record.search_documents.create_or_find_by!(locale: locale).update(attrs)
+      end
+    end
+
+    def search_document_attributes
+      return {} unless respond_to?(:localized_attributes)
+
+      content = localized_attributes.keys.map { |a| localizer.get(a) }.join(" ")
+      { content: content }
+    end
+
+    def update_search_documents!
+      PagesCore::SearchableDocument::Indexer.new(self).index!
+    end
+  end
+end

data/app/models/concerns/pages_core/taggable.rb

@@ -4,25 +4,27 @@ module PagesCore
   module Taggable
     extend ActiveSupport::Concern
 
+    attr_accessor :new_tags
+
     included do
       has_many :taggings,
                as: :taggable,
                dependent: :destroy,
                inverse_of: :taggable
       has_many :tags, through: :taggings
+      after_save :update_taggings
     end
 
     module ClassMethods
       def tagged_with(*tags)
-        all
-          .includes(:tags)
-          .where(tags: { name: Tag.parse(tags) })
-          .references(:tags)
+        all.includes(:tags)
+           .where(tags: { name: Tag.parse(tags) })
+           .references(:tags)
       end
     end
 
     def serialized_tags
-      tags.order("name ASC").map(&:name).to_json
+      tag_names.to_json
     end
 
     def serialized_tags=(json)
@@ -30,12 +32,11 @@ module PagesCore
     end
 
     def tag_with(*list)
-      Tag.transaction do
-        taggings.destroy_all
-        Tag.parse(list).each do |name|
-          Tag.find_or_create_by(name: name).on(self)
-        end
-      end
+      @new_tags = Tag.parse(list)
+    end
+
+    def tag_with!(*list)
+      update(tag_list: list)
     end
 
     def tag_list=(tag_list)
@@ -47,7 +48,21 @@ module PagesCore
     end
 
     def tag_names
-      tags.map(&:name).sort
+      @new_tags || tags.by_name.map(&:name)
+    end
+
+    private
+
+    def update_taggings
+      return unless new_tags
+
+      Tag.transaction do
+        taggings.includes(:tag).where.not(tag: { name: new_tags }).destroy_all
+        new_tags.map { |n| Tag.find_or_create_by(name: n) }
+                .each { |t| taggings.create(tag: t) }
+      end
+
+      @new_tags = nil
     end
   end
 end