pages_core 3.15.3 → 3.15.5

data/app/javascript/components/PageTree/Draggable.tsx

@@ -1,338 +0,0 @@
-/*
-   Based on react-ui-tree
-   https://github.com/pqx/react-ui-tree
-
-   The MIT License (MIT)
-
-   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.
- */
-
-import React, { Component } from "react";
-
-import Tree from "../../lib/Tree";
-import * as Trees from "../../types/Trees";
-import * as Pages from "../../types/Pages";
-
-import Node from "./Node";
-
-interface DragState {
-  id?: Trees.Id;
-  x: number | null;
-  y: number | null;
-  w: number | null;
-  h: number | null;
-  scrollTop: number | null;
-  scrollLeft: number | null;
-}
-
-interface Props {
-  addChild: (id: Trees.Id, attrs: Pages.TreeNode) => void;
-  dir: string;
-  locale: string;
-  movedPage: (id: Trees.Id) => void;
-  paddingLeft?: number;
-  toggleCollapsed: (id: Trees.Id) => void;
-  tree: Tree<Pages.TreeNode>;
-  updatePage: (id: Trees.Id, attributes: Partial<Pages.TreeItem>) => void;
-  updateTree: (Tree) => void;
-}
-
-interface State {
-  dragging: DragState;
-}
-
-const defaultPadding = 20;
-
-export default class Draggable extends Component<Props, State> {
-  _dragListener: (evt: MouseEvent) => void;
-  _dragEndListener: () => void;
-  _start: boolean;
-  _startX: number;
-  _startY: number;
-  _offsetX: number;
-  _offsetY: number;
-  dragging: DragState;
-
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      dragging: this.initDragging()
-    };
-  }
-
-  initDragging(): DragState {
-    return {
-      id: null,
-      x: null,
-      y: null,
-      w: null,
-      h: null,
-      scrollTop: null,
-      scrollLeft: null
-    };
-  }
-
-  getDraggingDom() {
-    const tree = this.props.tree;
-    const dragging = this.state.dragging;
-    if (dragging && dragging.id) {
-      const draggingIndex = tree.getIndex(dragging.id);
-      const draggingStyles = {
-        top: dragging.y,
-        left: dragging.x,
-        width: dragging.w
-      };
-
-      return (
-        <div className="draggable" style={draggingStyles}>
-          <Node
-            tree={tree}
-            index={draggingIndex}
-            locale={this.props.locale}
-            paddingLeft={this.props.paddingLeft || defaultPadding}
-          />
-        </div>
-      );
-    }
-
-    return null;
-  }
-
-  render() {
-    const { tree, dir, locale } = this.props;
-    const dragging = this.state.dragging;
-
-    if (!tree) {
-      return <div className="page-tree">{this.getDraggingDom()}</div>;
-    } else {
-      const root = tree.getIndex(1);
-      return (
-        <div className="page-tree">
-          {this.getDraggingDom()}
-          <Node
-            tree={tree}
-            index={root}
-            key={root.id}
-            paddingLeft={this.props.paddingLeft || defaultPadding}
-            addChild={(idx: Trees.Index<Pages.TreeNode>) => this.addChild(idx)}
-            onDragStart={this.dragStart}
-            onCollapse={(nodeId) => this.toggleCollapse(nodeId)}
-            updatePage={(idx, attrs) => this.updatePage(idx, attrs)}
-            dragging={dragging && dragging.id}
-            dir={dir}
-            locale={locale}
-          />
-        </div>
-      );
-    }
-  }
-
-  addChild(parent: Trees.Index<Pages.TreeNode>) {
-    const newNode: Pages.TreeNode = {
-      blocks: { name: { [this.props.locale]: "" } },
-      status: 0,
-      editing: true,
-      children: [],
-      published_at: new Date(),
-      pinned: false,
-      parent_page_id: parent.node.id,
-      collapsed: false
-    };
-    this.props.addChild(parent.id, newNode);
-  }
-
-  prevAddButtonCount(tree: Tree, index: Trees.Index) {
-    let count = 0;
-    const parentNodes = [];
-    let pointer = tree.getIndex(index.parent);
-    while (pointer) {
-      parentNodes.push(pointer);
-      pointer = tree.getIndex(pointer.parent);
-    }
-
-    pointer = index;
-
-    pointer = tree.getNodeByTop(index.top - 1);
-    while (pointer) {
-      if (
-        parentNodes.indexOf(pointer) == -1 &&
-        !pointer.node.collapsed &&
-        pointer.node.children.filter((p: Pages.TreeNode) => p.status != 4)
-          .length > 0
-      ) {
-        count += 1;
-      }
-      pointer = tree.getNodeByTop(pointer.top - 1);
-    }
-
-    return count;
-  }
-
-  scrollOffset() {
-    const dragging = this.state.dragging;
-    return {
-      top: document.body.scrollTop - dragging.scrollTop,
-      left: document.body.scrollLeft - dragging.scrollLeft
-    };
-  }
-
-  drag(e: MouseEvent) {
-    if (this._start) {
-      const distance =
-        Math.abs(e.clientX - this._offsetX) +
-        Math.abs(e.clientY - this._offsetY);
-      if (distance >= 15) {
-        this.setState({
-          dragging: this.dragging
-        });
-        this._start = false;
-      } else {
-        return null;
-      }
-    }
-
-    const tree = this.props.tree;
-    const dragging = this.state.dragging;
-    const paddingLeft = this.props.paddingLeft || defaultPadding;
-    let newIndex: Trees.Index<Pages.TreeNode> = null;
-    let index = tree.getIndex(dragging.id);
-    const collapsed = index.node.collapsed;
-
-    const _startX = this._startX;
-    const _startY = this._startY;
-    const _offsetX = this._offsetX;
-    const _offsetY = this._offsetY;
-
-    const pos = {
-      x: _startX + e.clientX - _offsetX + this.scrollOffset().left,
-      y: _startY + e.clientY - _offsetY + this.scrollOffset().top
-    };
-    dragging.x = pos.x;
-    dragging.y = pos.y;
-
-    const diffX = dragging.x - paddingLeft / 2 - (index.left - 2) * paddingLeft;
-    const diffY =
-      dragging.y -
-      dragging.h / 2 -
-      (index.top - 2 + this.prevAddButtonCount(tree, index)) * dragging.h;
-
-    if (diffX < 0) {
-      // left
-      if (index.parent && !index.next) {
-        newIndex = tree.move(index.id, index.parent, "after");
-      }
-    } else if (diffX > paddingLeft) {
-      // right
-      if ("prev" in index) {
-        const prev = tree.getIndex(index.prev);
-
-        if (!prev.node.collapsed) {
-          newIndex = tree.move(index.id, index.prev, "append");
-        }
-      }
-    }
-
-    if (newIndex) {
-      index = newIndex;
-      newIndex.node.collapsed = collapsed;
-      dragging.id = newIndex.id;
-    }
-
-    if (diffY < 0 - dragging.h * 0.5) {
-      // up
-      const above = tree.getNodeByTop(index.top - 1);
-      newIndex = tree.move(index.id, above.id, "before");
-    } else if (diffY > dragging.h * 1.5) {
-      // down
-      const below = index.next
-        ? tree.getIndex(index.next)
-        : tree.getNodeByTop(index.top + index.height);
-
-      if (below && below.parent !== index.id) {
-        if (below.children && below.children.length && !below.node.collapsed) {
-          newIndex = tree.move(index.id, below.id, "prepend");
-        } else {
-          newIndex = tree.move(index.id, below.id, "after");
-        }
-      }
-    }
-
-    if (newIndex) {
-      newIndex.node.collapsed = collapsed;
-      dragging.id = newIndex.id;
-    }
-
-    this.setState({ dragging: dragging });
-  }
-
-  dragStart = (id: Trees.Id, dom: HTMLDivElement, e: React.MouseEvent) => {
-    // Only drag on left click
-    if (e.button !== 0) {
-      return;
-    }
-
-    this.dragging = {
-      id: id,
-      w: dom.offsetWidth,
-      h: dom.offsetHeight,
-      x: dom.offsetLeft,
-      y: dom.offsetTop,
-      scrollTop: document.body.scrollTop,
-      scrollLeft: document.body.scrollLeft
-    };
-
-    this._startX = dom.offsetLeft;
-    this._startY = dom.offsetTop;
-    this._offsetX = e.clientX;
-    this._offsetY = e.clientY;
-    this._start = true;
-
-    this._dragListener = (e: MouseEvent) => {
-      this.drag(e);
-    };
-    this._dragEndListener = () => this.dragEnd();
-
-    window.addEventListener("mousemove", this._dragListener);
-    window.addEventListener("mouseup", this._dragEndListener);
-  };
-
-  dragEnd() {
-    if (!this._start) {
-      this.props.updateTree(this.props.tree);
-      this.props.movedPage(this.state.dragging.id);
-    }
-
-    this.setState({
-      dragging: this.initDragging()
-    });
-
-    window.removeEventListener("mousemove", this._dragListener);
-    window.removeEventListener("mouseup", this._dragEndListener);
-  }
-
-  toggleCollapse(nodeId: Trees.Id) {
-    this.props.toggleCollapsed(nodeId);
-  }
-
-  updatePage(index: Trees.Index, attributes: Partial<Pages.TreeItem>) {
-    this.props.updatePage(index.id, attributes);
-  }
-}

data/app/javascript/lib/Tree.ts

@@ -1,305 +0,0 @@
-/*
-  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.
- */
-
-import * as Trees from "../types/Trees";
-
-type MovePlacement = "before" | "after" | "prepend" | "append";
-
-function indexName(id: Trees.Id): string {
-  return `${id}`;
-}
-
-export default class Tree<N extends Trees.Node = Trees.Node> {
-  cnt: number;
-  obj: N;
-  indexes: Record<string, Trees.Index<N>>;
-
-  constructor(obj: N) {
-    this.cnt = 1;
-    this.obj = obj || ({ children: [] } as N);
-    this.indexes = {};
-    this.build(this.obj);
-  }
-
-  build(obj: N): Trees.Index<N> {
-    const indexes = this.indexes;
-    const startId = this.cnt;
-
-    const index = { id: startId, node: obj };
-    indexes[indexName(this.cnt)] = index;
-    this.cnt++;
-
-    const walk = (objs: Trees.Node[], parent: Trees.Index<N>) => {
-      const children: Trees.Id[] = [];
-      objs.forEach((obj: N) => {
-        const index: Trees.Index<N> = {
-          id: this.cnt,
-          node: obj
-        };
-
-        if (parent) {
-          index.parent = parent.id;
-        }
-
-        indexes[indexName(this.cnt)] = index;
-        children.push(this.cnt);
-        this.cnt++;
-
-        if (obj.children && obj.children.length) {
-          walk(obj.children, index);
-        }
-      });
-      parent.children = children;
-
-      children.forEach(function (id, i) {
-        const index = indexes[indexName(id)];
-        if (i > 0) {
-          index.prev = children[i - 1];
-        }
-        if (i < children.length - 1) {
-          index.next = children[i + 1];
-        }
-      });
-    };
-
-    if (obj.children && obj.children.length) {
-      walk(obj.children, index);
-    }
-
-    return index;
-  }
-
-  getIndex(id: Trees.Id) {
-    return this.indexes[indexName(id)];
-  }
-
-  removeIndex(index: Trees.Index<N>) {
-    const del = (index: Trees.Index<N>) => {
-      delete this.indexes[indexName(index.id)];
-      if (index.children && index.children.length) {
-        index.children.forEach((child) => {
-          del(this.getIndex(child));
-        });
-      }
-    };
-    del(index);
-  }
-
-  get(id: Trees.Id) {
-    return this.getIndex(id).node;
-  }
-
-  remove(id: Trees.Id) {
-    const index = this.getIndex(id);
-    const node = this.get(id);
-
-    const parentIndex = this.getIndex(index.parent);
-    const parentNode = this.get(index.parent);
-
-    parentNode.children.splice(parentNode.children.indexOf(node), 1);
-    parentIndex.children.splice(parentIndex.children.indexOf(id), 1);
-
-    this.removeIndex(index);
-    this.updateChildren(parentIndex.children);
-
-    return node;
-  }
-
-  updateChildren(children: Trees.Id[]) {
-    children.forEach((id, i) => {
-      const index = this.getIndex(id);
-      index.prev = index.next = null;
-      if (i > 0) {
-        index.prev = children[i - 1];
-      }
-      if (i < children.length - 1) {
-        index.next = children[i + 1];
-      }
-    });
-  }
-
-  insert(obj: N, parentId: Trees.Id, i: number) {
-    const parentIndex = this.getIndex(parentId);
-    const parentNode = this.get(parentId);
-
-    const index = this.build(obj);
-    index.parent = parentId;
-
-    parentNode.children = parentNode.children || [];
-    parentIndex.children = parentIndex.children || [];
-
-    parentNode.children.splice(i, 0, obj);
-    parentIndex.children.splice(i, 0, index.id);
-
-    this.updateChildren(parentIndex.children);
-    if (parentIndex.parent) {
-      this.updateChildren(this.getIndex(parentIndex.parent).children);
-    }
-
-    return index;
-  }
-
-  insertBefore(obj: N, destId: Trees.Id) {
-    const destIndex = this.getIndex(destId);
-    const parentId = destIndex.parent;
-    const i = this.getIndex(parentId).children.indexOf(destId);
-    return this.insert(obj, parentId, i);
-  }
-
-  insertAfter(obj: N, destId: Trees.Id) {
-    const destIndex = this.getIndex(destId);
-    const parentId = destIndex.parent;
-    const i = this.getIndex(parentId).children.indexOf(destId);
-    return this.insert(obj, parentId, i + 1);
-  }
-
-  prepend(obj: N, destId: Trees.Id) {
-    return this.insert(obj, destId, 0);
-  }
-
-  append(obj: N, destId: Trees.Id) {
-    const destIndex = this.getIndex(destId);
-    destIndex.children = destIndex.children || [];
-    return this.insert(obj, destId, destIndex.children.length);
-  }
-
-  // react-ui-tree methods
-
-  updateNodesPosition() {
-    let top = 1;
-    let left = 1;
-    const root = this.getIndex(1);
-
-    root.top = top++;
-    root.left = left++;
-
-    const walk = (
-      children: Trees.Id[],
-      parent: Trees.Index<N>,
-      left: number,
-      collapsed: boolean
-    ) => {
-      let height = 1;
-      children.forEach((id: Trees.Id) => {
-        const node = this.getIndex(id);
-        if (collapsed) {
-          node.top = null;
-          node.left = null;
-        } else {
-          node.top = top++;
-          node.left = left;
-        }
-
-        if (node.children && node.children.length) {
-          height += walk(
-            node.children,
-            node,
-            left + 1,
-            collapsed || node.node.collapsed
-          );
-        } else {
-          node.height = 1;
-          height += 1;
-        }
-      });
-
-      if (parent.node.collapsed) parent.height = 1;
-      else parent.height = height;
-      return parent.height;
-    };
-
-    if (root.children && root.children.length) {
-      walk(root.children, root, left, root.node.collapsed);
-    }
-  }
-
-  move(fromId: Trees.Id, toId: Trees.Id, placement: MovePlacement) {
-    if (fromId === toId || toId === 1) {
-      return;
-    }
-
-    const obj = this.remove(fromId);
-    let index: Trees.Index<N>;
-
-    if (placement === "before") {
-      index = this.insertBefore(obj, toId);
-    } else if (placement === "after") {
-      index = this.insertAfter(obj, toId);
-    } else if (placement === "prepend") {
-      index = this.prepend(obj, toId);
-    } else if (placement === "append") {
-      index = this.append(obj, toId);
-    }
-
-    // todo: perf
-    this.updateNodesPosition();
-    return index;
-  }
-
-  getParent(id: string) {
-    const indexes = this.indexes;
-    if (Object.prototype.hasOwnProperty.call(indexes, id)) {
-      return this.getIndex(indexes[id].parent);
-    }
-  }
-
-  getNodeByTop(top: Trees.Id) {
-    const indexes = this.indexes;
-    for (const id in indexes) {
-      if (Object.prototype.hasOwnProperty.call(indexes, id)) {
-        if (indexes[id].top === top) {
-          return indexes[id];
-        }
-      }
-    }
-  }
-}

data/app/javascript/types/Trees.ts

@@ -1,19 +0,0 @@
-export type Id = number | string;
-
-export interface Node {
-  children: Array<Node>;
-  collapsed: boolean;
-  root?: boolean;
-}
-
-export interface Index<T extends Node = Node> {
-  id: number;
-  node: T;
-  children?: Id[];
-  parent?: Id;
-  top?: number;
-  height?: number;
-  next?: Id;
-  prev?: Id;
-  left?: number;
-}

data/app/views/sitemaps/show.xml.builder

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-xml.instruct!
-xml.urlset xmlns: "http://www.sitemaps.org/schemas/sitemap/0.9" do |urlset|
-  @entries.each do |entry|
-    urlset.url do |url|
-      url.loc entry[:loc]
-      url.lastmod entry[:lastmod]
-    end
-  end
-end