pages_core 3.6.2 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 537e618c3f5f182e0e23ccd5178037c2a71a89e61ca0950a862a1801b0f23ce9
-  data.tar.gz: be1896eb7eafd63271d6d25821b7ca386980bdd0b69347db27bfb947e5a41c9b
+  metadata.gz: cba48a2b0698e8cd5316c0a6ff4ac970acea8abafb22cafb9963bda731c1ff8c
+  data.tar.gz: 9496d0d7a91a8109461bdf0481e612dc5fa164ca9f429a1a020a5f0113a96a42
 SHA512:
-  metadata.gz: e41a054282acbdd004aad81c839bffebf9c55c05b3a47bd1c98d08dd8af3bb8ce227f77a11ae3a1bb8c680f72f8b3e34c5ac2f1710aef3b34bae1a59c5e03afb
-  data.tar.gz: d06e26f9d9f20990f1a982f29fba091d24a9c43b8962a98c4209bbecfb9540a5f3c1fda8c462e1f412f832334d811ec29771a1ffa9831c95cf6cb43850bc2190
+  metadata.gz: 2e6907a2509eac3121bc1afb5a77a4aca368c624bbb26499ba4cca59301e706471f72a6f06fbff0e024a402805e5ddf09f932b723a30dca0e617b363a6389b03
+  data.tar.gz: aea50ccfcbbc65d5ec92f0e8dcb7d55e4088c2d71cce24d6d1b1a627545532c5d3b70496c5954612f83b46bcce794e1f55bb9ef7493dfbd3bd5c4bd16fa19c7b

data/README.md

@@ -3,7 +3,6 @@
 [![Code Climate](https://codeclimate.com/github/anyone-oslo/pages/badges/gpa.svg)](https://codeclimate.com/github/anyone-oslo/pages)
 [![Test Coverage](https://codeclimate.com/github/anyone-oslo/pages/badges/coverage.svg)](https://codeclimate.com/github/anyone-oslo/pages)
 [![Inline docs](http://inch-ci.org/github/anyone-oslo/pages.svg)](http://inch-ci.org/github/anyone-oslo/pages)
-[![Security](https://hakiri.io/github/anyone-oslo/pages/master.svg)](https://hakiri.io/github/anyone-oslo/pages/master)
 
 # Pages
 

data/Rakefile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-APP_RAKEFILE = "spec/internal/Rakefile".freeze
+APP_RAKEFILE = "spec/internal/Rakefile"
 load "rails/tasks/engine.rake"
 
 RSpec::Core::RakeTask.new

data/app/assets/javascripts/pages/admin/components/grid_image.jsx

@@ -56,7 +56,7 @@ class GridImage extends React.Component {
                      locales={this.props.locales}
                      csrf_token={this.props.csrf_token}
                      onUpdate={this.props.onUpdate} />
-    )
+    );
   }
 
   renderPlaceholder() {

data/app/assets/javascripts/pages/admin/components/image_editor.jsx

@@ -40,7 +40,7 @@ class ImageEditor extends React.Component {
     this.img = new Image;
     this.img.onload = function() {
       component.setState({ croppedImage: component.getCroppedImage() });
-    }
+    };
     this.img.src = this.props.image.uncropped_url;
     window.addEventListener("resize", this.handleResize);
     this.handleResize();
@@ -89,7 +89,7 @@ class ImageEditor extends React.Component {
           crop_width,
           crop_height,
           crop_gravity_x,
-          crop_gravity_y } = this.state
+          crop_gravity_y } = this.state;
 
     // Disable focal point if it's out of bounds.
     if (crop_gravity_x < crop_start_x ||
@@ -177,7 +177,7 @@ class ImageEditor extends React.Component {
                    crop_start_x: image.real_width * (crop.x / 100),
                    crop_start_y: image.real_height * (crop.y / 100),
                    crop_width:   image.real_width * (crop.width / 100),
-                   crop_height:  image.real_height * (crop.height / 100)})
+                   crop_height:  image.real_height * (crop.height / 100)});
   }
 
   getFocal() {
@@ -263,11 +263,11 @@ class ImageEditor extends React.Component {
   renderToolbar() {
     let component = this;
     let cropping = this.state.cropping;
-    let image = this.props.image
+    let image = this.props.image;
     let updateAspect = function (evt, aspect) {
       evt.preventDefault();
       component.setAspect(aspect);
-    }
+    };
 
 
     return (

data/app/assets/javascripts/pages/admin/components/image_grid.jsx

@@ -268,11 +268,16 @@ class ImageGrid extends DragUploader {
 
     data.append("image[file]", file);
     this.postFile("/admin/images.json", data, function (json) {
-      let preloader = new Image();
-      obj.file = null;
-      obj.image = json;
-      preloader.onload = () => component.setState({});
-      preloader.src = obj.image.thumbnail_url;
+      if (json.status === "error") {
+        ToastActions.error("Error uploading image: " + json.error.join(" "));
+        component.deleteImage(obj);
+      } else {
+        let preloader = new Image();
+        obj.file = null;
+        obj.image = json;
+        preloader.onload = () => component.setState({});
+        preloader.src = obj.image.thumbnail_url;
+      }
     });
 
     return obj;

data/app/assets/javascripts/pages/admin/components/image_uploader.jsx

@@ -154,16 +154,21 @@ class ImageUploader extends React.Component {
     this.setState({ image: null, src: null, dragover: false, uploading: true });
     data.append("image[file]", file);
     locales.forEach((l) => {
-      data.append(`image[alternative][${l}]`, this.props.alternative);
+      data.append(`image[alternative][${l}]`, (this.props.alternative || ""));
     });
     xhr.open("POST", "/admin/images.json");
     xhr.setRequestHeader("X-CSRF-Token", this.props.csrf_token);
     xhr.addEventListener("load", function (evt) {
       if (xhr.readyState == 4 && xhr.status == "200") {
-        let image = JSON.parse(xhr.responseText);
-        component.setState({ uploading: false,
-                             image: image,
-                             src: image.thumbnail_url });
+        let response = JSON.parse(xhr.responseText);
+        if (response.status === "error") {
+          ToastActions.error("Error uploading image: " + response.error.join(" "));
+          component.setState({ uploading: false });
+        } else {
+          component.setState({ uploading: false,
+                               image: response,
+                               src: response.thumbnail_url });
+        }
       }
     });
     xhr.send(data);

data/app/assets/javascripts/pages/admin/components/page_tree.jsx

@@ -190,7 +190,7 @@ class PageTree extends Reflux.Component {
     if (diffX < 0) {
       // left
       if (index.parent && !index.next) {
-        newIndex = tree.move(index.id, index.parent, 'after');
+        newIndex = tree.move(index.id, index.parent, "after");
       }
     } else if (diffX > paddingLeft) {
       // right
@@ -198,7 +198,7 @@ class PageTree extends Reflux.Component {
         var prev = tree.getIndex(index.prev);
 
         if (!prev.node.leaf && !prev.node.collapsed) {
-          newIndex = tree.move(index.id, index.prev, 'append');
+          newIndex = tree.move(index.id, index.prev, "append");
         }
       }
     }
@@ -212,7 +212,7 @@ class PageTree extends Reflux.Component {
     if (diffY < (0 - dragging.h * 0.5)) {
       // up
       var above = tree.getNodeByTop(index.top-1);
-      newIndex = tree.move(index.id, above.id, 'before');
+      newIndex = tree.move(index.id, above.id, "before");
     } else if (diffY > dragging.h * 1.5) {
       // down
       let below = index.next ?
@@ -221,9 +221,9 @@ class PageTree extends Reflux.Component {
 
       if (below && below.parent !== index.id) {
         if (below.children && below.children.length && !below.node.collapsed) {
-          newIndex = tree.move(index.id, below.id, 'prepend');
+          newIndex = tree.move(index.id, below.id, "prepend");
         } else {
-          newIndex = tree.move(index.id, below.id, 'after');
+          newIndex = tree.move(index.id, below.id, "after");
         }
       }
     }
@@ -265,8 +265,8 @@ class PageTree extends Reflux.Component {
     this._dragListener = (e) => self.drag(e);
     this._dragEndListener = () => self.dragEnd();
 
-    window.addEventListener('mousemove', this._dragListener);
-    window.addEventListener('mouseup', this._dragEndListener);
+    window.addEventListener("mousemove", this._dragListener);
+    window.addEventListener("mouseup", this._dragEndListener);
   }
 
   dragEnd() {
@@ -279,8 +279,8 @@ class PageTree extends Reflux.Component {
       dragging: this.initDragging()
     });
 
-    window.removeEventListener('mousemove', this._dragListener);
-    window.removeEventListener('mouseup', this._dragEndListener);
+    window.removeEventListener("mousemove", this._dragListener);
+    window.removeEventListener("mouseup", this._dragEndListener);
   }
 
   toggleCollapse(nodeId) {

data/app/assets/javascripts/pages/admin/components/page_tree_node.jsx

@@ -93,7 +93,7 @@ class PageTreeNode extends React.Component {
       if (self.props.addChild) {
         self.props.addChild(self.props.index);
       }
-    }
+    };
 
     if (!node.collapsed &&
         this.permitted("create") &&
@@ -128,9 +128,9 @@ class PageTreeNode extends React.Component {
     if (index.children && index.children.length && !index.node.collapsed) {
       var childrenStyles = {};
       if (index.node.collapsed) {
-        childrenStyles.display = 'none';
+        childrenStyles.display = "none";
       }
-      childrenStyles['paddingLeft'] = this.props.paddingLeft + 'px';
+      childrenStyles["paddingLeft"] = this.props.paddingLeft + "px";
 
       return (
         <div className="children" style={childrenStyles}>
@@ -172,7 +172,7 @@ class PageTreeNode extends React.Component {
       if (self.props.onCollapse) {
         self.props.onCollapse(nodeId);
       }
-    }
+    };
 
     if (this.visibleChildren().length > 0) {
       let collapsed = index.node.collapsed;
@@ -186,7 +186,7 @@ class PageTreeNode extends React.Component {
 
       return (
         <i className={classnames}
-           onMouseDown={function(e) {e.stopPropagation()}}
+           onMouseDown={function(e) {e.stopPropagation();}}
            onClick={handleCollapse} />
       );
     }
@@ -220,7 +220,7 @@ class PageTreeNode extends React.Component {
   }
 
   editUrl(page) {
-    return(`/admin/${page.locale}/pages/${page.param}/edit`)
+    return(`/admin/${page.locale}/pages/${page.param}/edit`);
   }
 
   node() {
@@ -253,7 +253,7 @@ class PageTreeNode extends React.Component {
       if (self.permitted("edit") && !editing && props.onDragStart) {
         props.onDragStart(props.index.id, self.refs.inner, e);
       }
-    }
+    };
 
     if (this.node().status != 4) {
       return (
@@ -276,7 +276,7 @@ class PageTreeNode extends React.Component {
 
     let handleNameChange = function(event) {
       self.setState({newName: event.target.value});
-    }
+    };
 
     let performEdit = function(event) {
       event.preventDefault();
@@ -284,12 +284,12 @@ class PageTreeNode extends React.Component {
         name: self.state.newName,
         editing: false
       });
-    }
+    };
 
     let cancelEdit = function(e) {
       self.setState({newName: self.node().name});
       self.updatePage({editing: false});
-    }
+    };
 
     return (
       <div className="page edit">
@@ -338,7 +338,7 @@ class PageTreeNode extends React.Component {
     if (node.id && node.starts_at) {
       dateLabel = <span className="date">
         {node.starts_at}
-      </span>
+      </span>;
     }
 
     if (node.news_page) {

data/app/assets/javascripts/pages/admin/components/rich_text_area.jsx

@@ -2,7 +2,7 @@ class RichTextArea extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      value: props.value,
+      value: props.value || "",
       rows: props.rows || 5
     };
     this.inputRef = React.createRef();
@@ -33,7 +33,7 @@ class RichTextArea extends React.Component {
       selectionStart + prefix.length + replacement.length
     );
     this.setValue(textarea.value);
-  };
+  }
 
   handleChange(evt) {
     this.setValue(evt.target.value);
@@ -41,10 +41,11 @@ class RichTextArea extends React.Component {
 
   render() {
     let { value, rows } = this.state;
-    let { id, name } = this.props;
+    let { id, name, simple } = this.props;
     return (
       <div className="rich-text-area">
-        <RichTextToolbar getSelection={this.getSelection}
+        <RichTextToolbar simple={simple}
+                         getSelection={this.getSelection}
                          replaceSelection={this.replaceSelection} />
         <textarea className="rich"
                   ref={this.inputRef}

data/app/assets/javascripts/pages/admin/components/rich_text_toolbar.jsx

@@ -1,20 +1,44 @@
 class RichTextToolbar extends React.Component {
   constructor(props) {
     super(props);
+    this.link = this.link.bind(this);
+  }
+
+  relativeUrl(str) {
+    let url = null;
+
+    if (!str.match(/^https:\/\//) || !document || !document.location) {
+      return str;
+    }
+
+    try {
+      url = new URL(str);
+    } catch (error) {
+      console.log("Error parsing URL: ", error);
+    }
+
+    if (url &&
+        url.hostname == document.location.hostname &&
+        (document.location.port || "80") == (url.port || "80")) {
+      return url.pathname;
+    }
+    return str;
   }
 
   link(selection) {
     let name = selection.length > 0 ? selection : "Link text";
     var url = prompt("Enter link URL", "");
-    url = url.length > 0 ? url : "http://example.com/";
-    url = url.replace(/^(?!(f|ht)tps?:\/\/)/, 'http://');
-    return ["\"", name, `\":${url}`];
+    if (url) {
+      return ["\"", name, `":${this.relativeUrl(url)}`];
+    } else {
+      return ["", name, ""];
+    }
   }
 
   emailLink(selection) {
     var address = prompt("Enter email address", "");
     let name = selection.length > 0 ? selection : address;
-    return ["\"", name, `\":mailto:${address}`];
+    return ["\"", name, `":mailto:${address}`];
   }
 
   strToList(str, prefix) {
@@ -35,24 +59,33 @@ class RichTextToolbar extends React.Component {
         <i className={"fa fa-" + className} />
       </a>
     );
-  };
+  }
 
   render() {
-    return (
-      <div className="rich-text toolbar">
-        {this.button("Bold", "bold", (str) => ["<b>", str, "</b>"])}
-        {this.button("Italics", "italic", (str) => ["<i>", str, "</i>"])}
-        {this.button("Heading 2", "header h2", (str) => ["h2. ", str, ""])}
-        {this.button("Heading 3", "header h3", (str) => ["h3. ", str, ""])}
-        {this.button("Heading 4", "header h4", (str) => ["h4. ", str, ""])}
-        {this.button("Blockquote", "quote-left", (str) => ["bq. ", str, ""])}
-        {this.button("List", "list-ul",
-                     (str) => ["", this.strToList(str, "*"), ""])}
-        {this.button("Ordered list", "list-ol",
-                     (str) => ["", this.strToList(str, "#"), ""])}
-        {this.button("Link", "link", this.link)}
-        {this.button("Email link", "envelope", this.emailLink)}
-      </div>
-    );
+    if (this.props.simple) {
+      return (
+        <div className="rich-text toolbar">
+          {this.button("Bold", "bold", (str) => ["<b>", str, "</b>"])}
+          {this.button("Italics", "italic", (str) => ["<i>", str, "</i>"])}
+        </div>
+      );
+    } else {
+      return (
+        <div className="rich-text toolbar">
+          {this.button("Bold", "bold", (str) => ["<b>", str, "</b>"])}
+          {this.button("Italics", "italic", (str) => ["<i>", str, "</i>"])}
+          {this.button("Heading 2", "header h2", (str) => ["h2. ", str, ""])}
+          {this.button("Heading 3", "header h3", (str) => ["h3. ", str, ""])}
+          {this.button("Heading 4", "header h4", (str) => ["h4. ", str, ""])}
+          {this.button("Blockquote", "quote-left", (str) => ["bq. ", str, ""])}
+          {this.button("List", "list-ul",
+                       (str) => ["", this.strToList(str, "*"), ""])}
+          {this.button("Ordered list", "list-ol",
+                       (str) => ["", this.strToList(str, "#"), ""])}
+          {this.button("Link", "link", this.link)}
+          {this.button("Email link", "envelope", this.emailLink)}
+        </div>
+      );
+    }
   }
 }

data/app/assets/javascripts/pages/admin/components/toast.jsx

@@ -10,9 +10,6 @@ class Toast extends Reflux.Component {
     }
   }
 
-  componentWillUnmount() {
-  }
-
   render() {
     let toast = this.state.current;
     let classNames = ["toast"];

data/app/assets/javascripts/pages/admin/components/toast_store.jsx

@@ -20,7 +20,7 @@ class ToastStore extends Reflux.Store {
       this.setState({ queue: [...this.state.queue, entry] });
     } else {
       this.showToast(entry, this.state.queue);
-    };
+    }
   }
 
   showToast(entry, queue) {

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

@@ -49,7 +49,7 @@ class EditPage {
     $("#previewButton").click(function() {
       var button = this;
       var form = $(button).closest("form").get(0);
-      var previewUrl = $(this).data('url');
+      var previewUrl = $(this).data("url");
 
       // Rewrite the form and submit
       form.oldAction = form.action;
@@ -91,7 +91,7 @@ class EditPage {
 }
 
 $(function () {
-  $('.edit-page').each(function() {
-    new EditPage(this)}
+  $(".edit-page").each(function() {
+    new EditPage(this);}
   );
 });