decidim-core 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2453a9bbdce8672d049e4c565544c3f809252f01710147d0792277a4a79bb650
-  data.tar.gz: 3b37667ec67ef19011efc303778de6d39d2757c90b97d856cabac4028ea68a6a
+  metadata.gz: 931fb1b72ccd0a7d3563d338a988b082dc9bc26c13e462cd03a0c9c042d205d0
+  data.tar.gz: 89ab2b09df5a82b23cf40d3c69b2593eb7667d0642ad13ea1697fe39d12cdd89
 SHA512:
-  metadata.gz: bad99139ead8606062236e98a45ee804971df92adc36af58ba8e4949d93bc2a806ebec7adbcd0e7fb074eba88e914ab4c4bd81531c890d29588ebea9f836c087
-  data.tar.gz: 0d46adbf892ec04676869d7dc63bcf961bf3f7f56c864aac726e5dc97d11ce2778cde3456d7500a9d8df1444b27418d1c4d8c892ff41ee2b5995596af823f9a1
+  metadata.gz: fe29ab20d8a68e4afda789588568601bd4478947955e26ccc0328b4f51182933cd26002427b3588866f735d6740d0fbdaca981a95f17fdab0e2cd0c6e52700bc
+  data.tar.gz: 428f907b755d91de5f357f8443c9b0af42c734cf33abda5a0e0ee46548b39c8dca5941186ddc8a6aa071efe5df1771b41b10148c91d6bdda289dbd98793b596e

data/README.md

@@ -20,6 +20,19 @@ And then execute:
 bundle
 ```
 
+## Amendments
+
+Core implements an Amendment feature that can be activated in the components. As of now, it's only implemented in the proposal component.
+
+This feature makes it possible for anyone to edit the text of an amendable resource and create a child resource as an amendment. This child resource may receive support and the author of the amendable resource may accept or reject the amendment (or child proposal). In case of rejection, the author of the rejected emendation may raise the child resource to an independent resource.
+
+### Key artifacts for Amendments
+
+- `Amendable` module: A concern with the features needed when you want a model to be amendable.
+- `Amendment` class: The ApplicationRecord that includes the polymorphic associations to make the model amendable.
+
+Models that want to be amendable must include `Amendable` and declare an `amendable` configuration for the model.
+
 ## Global Search
 
 Core implements a Search Engine that indexes models from all modules globally.
@@ -29,7 +42,7 @@ This module also includes the following models to Decidim's Global Search:
 
 - `Users`
 
-### Key artifacts
+### Key artifacts for Global Search
 
 - `Searchable` module: A concern with the features needed when you want a model to be searchable.
 - `SearchableResource` class: The ActiveRecord that finally includes PgSearch and maps the indexed documents into a model.

data/app/assets/config/decidim_core_manifest.js

@@ -1,12 +1,14 @@
-//= link decidim/email.css
-//= link_directory ../fonts/decidim/
-//= link_tree ../images/decidim/
-//= link decidim/filters
-//= link decidim/orders
-//= link decidim/map.js
-//= link decidim/map.css
-//= link decidim/notifications.js
-//= link decidim/slug_form.js
-//= link_directory ../../../vendor/assets/javascripts/datepicker-locales
-//= link decidim/widget.js
-//= link decidim/impersonation.js
+// = link decidim/email.css
+// = link decidim/conference-diploma.css
+// = link_directory ../fonts/decidim/
+// = link_tree ../images/decidim/
+// = link decidim/filters
+// = link decidim/orders
+// = link decidim/map.js
+// = link decidim/map.css
+// = link decidim/notifications.js
+// = link decidim/slug_form.js
+// = link_directory ../../../vendor/assets/javascripts/datepicker-locales
+// = link decidim/widget.js
+// = link decidim/impersonation.js
+// = link decidim/floating_help.js

data/app/assets/javascripts/decidim.js.es6

@@ -19,8 +19,12 @@
 // = require decidim/input_hashtags
 // = require decidim/ajax_modals
 // = require decidim/conferences
+// = require decidim/tooltip_keep_on_hover
 // = require_tree ./decidim/vizzs
 
+// = require_self
+// = require decidim/floating_help
+
 /* globals svg4everybody */
 
 window.Decidim = window.Decidim || {};

data/app/assets/javascripts/decidim/floating_help.js.es6

@@ -0,0 +1,40 @@
+$(function() {
+  if (!window.localStorage) {
+    return;
+  }
+
+  let getDismissedHelpers = () => {
+    let serialized = localStorage.getItem("dismissedHelpers");
+    if (!serialized) {
+      return [];
+    }
+
+    return serialized.split(",");
+  };
+
+  let addDismissedHelper = (id) => {
+    let dismissedHelpers = getDismissedHelpers();
+
+    if (!dismissedHelpers.includes(id)) {
+      localStorage.setItem(
+        "dismissedHelpers",
+        [...dismissedHelpers, id].join(",")
+      );
+    }
+  };
+
+  let dismissedHelpers = getDismissedHelpers();
+
+  $(".floating-helper-container").each((_index, elem) => {
+    let id = $(elem).data("help-id");
+
+    if (!dismissedHelpers.includes(id)) {
+      $(".floating-helper", elem).foundation("toggle");
+      $(".floating-helper__wrapper", elem).foundation("toggle");
+
+      $(".floating-helper", elem).on("off.zf.toggler", () => {
+        addDismissedHelper(id);
+      });
+    }
+  });
+});

data/app/assets/javascripts/decidim/input_hashtags.js.es6

@@ -4,6 +4,11 @@ $(() => {
   const $hashtagContainer = $(".js-hashtags");
   const nodatafound = $hashtagContainer.attr("data-noresults");
 
+  let noMatchTemplate = null
+  if (nodatafound) {
+    noMatchTemplate = () => `<li>${nodatafound}</li>`;
+  }
+
   // Listener for the event triggered by quilljs
   let cursor = "";
   $hashtagContainer.on("quill-position", function(event) {
@@ -44,7 +49,7 @@ $(() => {
     positionMenu: true,
     menuContainer: null,
     fillAttr: "name",
-    noMatchTemplate: () => `<li>${nodatafound}</li>`,
+    noMatchTemplate: noMatchTemplate,
     lookup: (item) => item.name,
     selectTemplate: function(item) {
       if (typeof item === "undefined") {
@@ -98,14 +103,11 @@ $(() => {
   });
   $hashtagContainer.on("input", (event) => {
     let $parent = $(event.target).parent();
-    $parent.removeAttr("style");
 
     if (tribute.isActive) {
       // We need to move the container to the wrapper selected
       let $tribute = $(".tribute-container");
-      $tribute.removeAttr("style");
       $tribute.appendTo($parent);
-      // Remove the inline styles, relative to absolute positioning
       // Parent adaptation
       $parent.addClass("is-active");
     } else {

data/app/assets/javascripts/decidim/notifications.js.es6

@@ -1,6 +1,6 @@
 $(() => {
   const $notificationsBellIcon = $(".title-bar .topbar__notifications");
-  const $wrapper = $(".tabs-content");
+  const $wrapper = $(".wrapper");
   const $section = $wrapper.find("#notifications");
   const $noNotificationsText = $(".empty-notifications");
   const $pagination = $wrapper.find("ul.pagination");

data/app/assets/javascripts/decidim/tooltip_keep_on_hover.js.es6

@@ -0,0 +1,18 @@
+/* eslint-disable no-invalid-this */
+
+$(() => {
+
+  // Foundation requires plugins to be initializated
+  setTimeout(function() {
+
+    const $tooltips = $(".tooltip")
+
+    $tooltips.
+      on("mouseover", function() {
+        $(`[data-keep-on-hover='true'][data-toggle='${this.id}']`).foundation("show");
+      }).
+      on("mouseout", function() {
+        $(`[data-keep-on-hover='true'][data-toggle='${this.id}']`).foundation("hide");
+      })
+  }, 0);
+});

data/app/assets/javascripts/decidim/vizzs/areachart.js.es6

@@ -1,5 +1,5 @@
 /* global d3 */
-/* eslint-disable id-length, no-unused-vars, multiline-ternary, no-ternary, no-nested-ternary, no-invalid-this */
+/* eslint-disable id-length, no-undefined, no-unused-vars, multiline-ternary, no-ternary, no-nested-ternary, no-invalid-this */
 /* eslint prefer-reflect: ["error", { "exceptions": ["call"] }] */
 /* eslint dot-location: ["error", "property"] */
 
@@ -33,9 +33,9 @@ const areachart = (opts = {}) => {
   let objectName = opts.objectName || ""
   let container = d3.select(opts.container)
   let showAxis = opts.axis || false
-  let ratio = opts.ratio || (4 / 3)
-  let showTooltip = opts.tip !== "false"
-  let cumulative = opts.cumulative || false
+  let ratio = (opts.ratio || "").split(":").reduce((a, b) => a / b) || (4 / 3)
+  let showTooltip = Object.is(opts.tip, undefined) ? true : opts.tip
+  let cumulative = opts.agg || false
 
   if (cumulative) {
     data = aggregate(data)
@@ -189,15 +189,57 @@ const areachart = (opts = {}) => {
       .attr("text-anchor", "start")
       .attr("transform", `translate(${titlePadding},${titlePadding})`)
 
-    g.append("text")
-      .attr("x", 0)
-      .attr("y", 0)
-      .attr("class", "title")
-      .text(title)
+    let titleLines = 0
+
+    if (title.length) {
+      g.append("text")
+        .attr("x", 0)
+        .attr("y", 0)
+        .attr("class", "title")
+        .text(title)
+        .call(function(fulltext, wrapwidth, start = 0) {
+          fulltext.each(function() {
+            let text = d3.select(this)
+            let word = ""
+            let words = text.text().split(/\s+/).reverse()
+            let line = []
+            let lineNumber = 0
+            let lineHeight = 1.1
+            let _x = text.attr("x")
+            let _y = text.attr("y")
+            let dy = 0
+            let tspan = text.text(null)
+              .append("tspan")
+              .attr("x", _x)
+              .attr("y", _y)
+              .attr("dy", `${dy}em`)
+
+            /* eslint-disable no-cond-assign, no-plusplus */
+            while (word = words.pop()) {
+              line.push(word);
+              tspan.text(line.join(" "));
+              if (tspan.node().getComputedTextLength() > wrapwidth) {
+                line.pop()
+                tspan.text(line.join(" "))
+                line = [word]
+                tspan = text.append("tspan")
+                  .attr("x", _x)
+                  .attr("y", _y)
+                  .attr("dy", `${(++lineNumber * lineHeight) + dy}em`)
+                  .text(word);
+              }
+            }
+
+            titleLines = lineNumber * lineHeight
+          });
+        }, width - (titlePadding * 2))
+    }
+
+    let fontSize = parseFloat(getComputedStyle(g.node()).fontSize);
 
     g.append("text")
       .attr("x", 0)
-      .attr("dy", titlePadding * 2)
+      .attr("dy", title.length ? (titlePadding * 2) + (titleLines * fontSize) : (titlePadding * 1.25))
       .attr("class", "sum")
       .text(data[data.length - 1].value.toLocaleString())
   }

data/app/assets/javascripts/decidim/vizzs/metrics.js.es6

@@ -1,36 +1,82 @@
+/* eslint-disable no-console */
 /* global areachart */
 
+const metricsData = {};
+
 $(() => {
-  const query = (metrics) => {
-    let metricsQuery = `metrics(names: [${metrics.join(" ")}]) { name history { key value } }`;
+
+  const metricsContainer = {};
+  const metricsParams = {};
+
+  const query = () => {
+    let metricsQuery = `metrics(names: [${metricsParams.names}], space_type: "${metricsParams.spaceType}", space_id: ${metricsParams.spaceId}) { name history { key value } }`;
     return {query: `{ ${metricsQuery} }`};
   }
 
-  const fetch = (metrics) => $.post("api", query(metrics))
+  const parameterize = (metrics) => {
+    metricsParams.names = metrics.join(" ");
+    metricsParams.spaceType = $("#metrics #metrics-space_type").val() || null;
+    metricsParams.spaceId = $("#metrics #metrics-space_id").val() || null;
+  }
+
+  const fetch = (metrics) => $.post("/api", query(metrics));
 
-  const metrics = {};
+  const downloadMetricData = (event) => {
+    event.preventDefault();
+    let metricName = $(event.target).parents(".metric-downloader").data("metric");
+    let csvContent = "data:text/csv;charset=utf-8,";
 
-  $(".metric-chart:visible").each((index, container) => {
-    metrics[$(container).data("metric")] = container;
+    csvContent += "key,value\r\n";
+    metricsData[metricName].forEach((metricData)  => {
+      csvContent += `${metricData.key},${metricData.value}\r\n`;
+    });
+
+    // Required for FF
+    let link = document.createElement("a");
+    link.setAttribute("href", encodeURI(csvContent));
+    link.setAttribute("download", `${metricName}_metric_data.csv`);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  }
+
+  $(".metric-chart:visible").each((_index, container) => {
+    metricsContainer[$(container).data("metric")] = container;
+  });
+  $(".metric-downloader").each((_index, container) => {
+    container.onclick = downloadMetricData;
   });
 
-  if (!$.isEmptyObject(metrics)) {
-    fetch(Object.keys(metrics)).then((response) => {
-      $.each(response.data.metrics, (_index, metricData) => {
-        let container = metrics[metricData.name];
-        if (metricData.history.length === 0) {
-          $(container).remove();
-          return;
-        }
-        let info = $(container).data("info");
-
-        areachart({
-          container: `#${container.id}`,
-          data: metricData.history,
-          title: info.title,
-          objectName: info.object
+  if (!$.isEmptyObject(metricsContainer)) {
+    parameterize(Object.keys(metricsContainer))
+    fetch().then((response) => {
+      if (response.data) {
+        $.each(response.data.metrics, (_index, metricData) => {
+          let container = metricsContainer[metricData.name];
+          if (metricData.history.length === 0) {
+            $(container).remove();
+            return;
+          }
+          let info = $(container).data("info");
+          metricsData[metricData.name] = $.extend(true, [], metricData.history);
+          areachart({
+            container: `#${container.id}`,
+            data: metricData.history,
+            title: info.title,
+            objectName: info.object,
+            ...$(container).data()
+          });
+        });
+      } else if (response.errors) {
+        console.log("Something wrong happened when fetching metrics:");
+        $.each(response.errors, (_index, error) => {
+          console.log(error.message);
         });
-      });
+        $("#metrics").remove();
+      }
+    }).fail((err) => {
+      console.log(`Something wrong happened when fetching metrics: ${err.statusText}`);
+      $("#metrics").remove();
     });
   }
 });

data/app/assets/javascripts/decidim/vizzs/orgchart.js.es6

@@ -40,6 +40,7 @@
         fakeRoot: false,
         nodeGutter: { x: 16, y: 8 },
         childrenIndicatorRadius: 15,
+        fakeBorderWidth: 32,
         data: null
       }
 
@@ -98,7 +99,7 @@
             let fakeRadius = (diagonal / 2)
 
             // return d3.max([attrs.nodeDistance * 3, fakeRadius])
-            return fakeRadius * 1.2
+            return fakeRadius * 1.5
           })
 
           // manually set x positions (which is calculated using custom radial layout)
@@ -305,23 +306,19 @@
 
           // tick handler
           function ticked() {
+            const fakeBorderWidth = attrs.fakeBorderWidth
+            const maxXValueAvailable = (value) => Math.max(Math.min(calc.chartWidth - fakeBorderWidth, value), fakeBorderWidth)
+            const maxYValueAvailable = (value) => Math.max(Math.min(calc.chartHeight - fakeBorderWidth, value), fakeBorderWidth)
             // set links position
             links
-              .attr("x1", function (d) { return d.source.x; })
-              .attr("y1", function (d) { return d.source.y; })
-              .attr("x2", function (d) { return d.target.x; })
-              .attr("y2", function (d) { return d.target.y; })
+              .attr("x1", (d) => maxXValueAvailable(d.source.x))
+              .attr("y1", (d) => maxYValueAvailable(d.source.y))
+              .attr("x2", (d) => maxXValueAvailable(d.target.x))
+              .attr("y2", (d) => maxYValueAvailable(d.target.y))
 
             // set nodes position
             svg.selectAll(".node")
-              .attr("transform", (d) => {
-                let bounds = {
-                  x: Math.max(Math.min(calc.chartWidth, d.x), 0),
-                  y: Math.max(Math.min(calc.chartHeight, d.y), 0)
-                }
-
-                return `translate(${bounds.x},${bounds.y})`
-              })
+              .attr("transform", (d) => `translate(${maxXValueAvailable(d.x)},${maxYValueAvailable(d.y)})`)
           }
 
           // handler drag start event

data/app/assets/stylesheets/decidim/conference-diploma.css.scss

@@ -0,0 +1,61 @@
+.conference-diploma{
+  text-align: center;
+}
+
+.conference-diploma .diploma__border{
+  margin: 4rem;
+
+  /* Border pattern */
+  -moz-border-image: image-url("decidim/pattern.png") 20 repeat;
+  -webkit-border-image: image-url("decidim/pattern.png") 20 repeat;
+  -o-border-image: image-url("decidim/pattern.png") 20 repeat;
+  border-image: image-url("decidim/pattern.png") 20 repeat;
+  border-style: solid;
+  border-width: 1rem;
+}
+
+.conference-diploma .diploma__border .diploma__content{
+  padding: 3rem;
+}
+
+.conference-diploma .diploma__attendance{
+  text-align: center;
+  font-size: rem-calc(14);
+}
+
+.conference-diploma .diploma__attendance > *{
+  display: block;
+}
+
+.conference-diploma .diploma__name{
+  margin-top: 4rem;
+  font-size: rem-calc(18);
+}
+
+.conference-diploma .diploma__name p{
+  margin-top: 1rem;
+}
+
+.conference-diploma .diploma__logo{
+  border: 1px solid #333;
+  padding: 2rem;
+}
+
+@media print{
+  @page{
+    size: A4 landscape;
+    max-height: 100%;
+    max-width: 100%;
+    margin: 0;
+  }
+
+  .conference-diploma .diploma__border{
+    margin: 0;
+    -moz-border-image: image-url("decidim/pattern.png") 20 repeat;
+    -webkit-border-image: image-url("decidim/pattern.png") 20 repeat;
+    -o-border-image: image-url("decidim/pattern.png") 20 repeat;
+    border-image: image-url("decidim/pattern.png") 20 repeat;
+    border-style: solid;
+    border-width: 1rem;
+  }
+}