decidim-core 0.9.3 → 0.10.0

data/app/types/decidim/core/component_type.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    ComponentType = GraphQL::ObjectType.define do
+      interfaces [-> { ComponentInterface }]
+
+      name "Component"
+      description "A base component with no particular specificities."
+    end
+  end
+end

data/app/types/decidim/core/date_time_type.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    DateTimeType = GraphQL::ScalarType.define do
+      name "DateTime"
+      description "An ISO8601 date with time"
+      coerce_input ->(value, _ctx) { Time.iso8601(value) }
+      coerce_result ->(value, _ctx) { value.to_datetime.iso8601 }
+    end
+  end
+end

data/app/types/decidim/core/date_type.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    DateType = GraphQL::ScalarType.define do
+      name "Date"
+      description "An ISO8601 date"
+
+      coerce_input ->(value, _ctx) { Date.iso8601(value) }
+      coerce_result ->(value, _ctx) { value.to_date.iso8601 }
+    end
+  end
+end

data/app/types/decidim/core/decidim_type.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents a Decidim's global property.
+    DecidimType = GraphQL::ObjectType.define do
+      name "Decidim"
+      description "Decidim's framework-related properties."
+
+      field :version, !types.String, "The current decidim's version of this deployment." do
+        resolve ->(obj, _args, _ctx) { obj.version }
+      end
+
+      field :applicationName, !types.String, "The current installation's name." do
+        resolve ->(obj, _args, _ctx) { obj.application_name }
+      end
+
+      field :rubyVersion, !types.String, "The current ruby version" do
+        resolve ->(_, _, _) { RUBY_VERSION }
+      end
+    end
+  end
+end

data/app/types/decidim/core/localized_string_type.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents a localized string in a single language.
+    LocalizedStringType = GraphQL::ObjectType.define do
+      name "LocalizedString"
+      description "Represents a particular translation of a LocalizedStringType"
+
+      field :locale, !types.String, "The standard locale of this translation."
+      field :text, types.String, "The content of this translation."
+    end
+  end
+end

data/app/types/decidim/core/organization_type.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    OrganizationType = GraphQL::ObjectType.define do
+      name "Organization"
+      description "The current organization"
+
+      field :name, types.String, "The name of the current organization"
+
+      field :stats do
+        type types[Core::StatisticType]
+        description "The statistics associated to this object"
+        resolve ->(object, _args, _ctx) {
+          Decidim.stats.with_context(object)
+        }
+      end
+    end
+  end
+end

data/app/types/decidim/core/participatory_space_type.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    ParticipatorySpaceType = GraphQL::ObjectType.define do
+      interfaces [-> { ParticipatorySpaceInterface }]
+
+      name "ParticipatorySpace"
+      description "A participatory space"
+    end
+  end
+end

data/app/types/decidim/core/session_type.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents the current user session.
+    SessionType = GraphQL::ObjectType.define do
+      name "Session"
+      description "The current session"
+
+      field :user, UserType, "The current user" do
+        resolve ->(obj, _args, _ctx) { obj }
+      end
+
+      field :verifiedUserGroups, !types[!UserGroupType], "The current user verified user groups" do
+        resolve ->(obj, _args, _ctx) { obj.user_groups.verified }
+      end
+    end
+  end
+end

data/app/types/decidim/core/statistic_type.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    StatisticType = GraphQL::ObjectType.define do
+      name "Statistic"
+      description "Represents a single statistic"
+
+      field :name, !types.String, "The name of the statistic" do
+        resolve ->(statistic, _args, _ctx) {
+          statistic[0]
+        }
+      end
+
+      field :value, !types.Int, "The actual value of the statistic" do
+        resolve ->(statistic, _args, _ctx) {
+          statistic[1]
+        }
+      end
+    end
+  end
+end

data/app/types/decidim/core/translated_field_type.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents a translated field in multiple languages.
+    TranslatedFieldType = GraphQL::ObjectType.define do
+      name "TranslatedField"
+      description "A translated field"
+
+      field :locales do
+        type types[types.String]
+        description "Lists all the locales in which this translation is available"
+        resolve ->(obj, _args, _ctx) { obj.keys }
+      end
+
+      field :translations do
+        type !types[LocalizedStringType]
+        description "All the localized strings for this translation."
+
+        argument :locales do
+          type types[!types.String]
+          description "A list of locales to scope the translations to."
+        end
+
+        resolve lambda { |obj, args, _ctx|
+          translations = obj.stringify_keys
+          translations = translations.slice(*args["locales"]) if args["locales"]
+
+          translations.map { |locale, text| OpenStruct.new(locale: locale, text: text) }
+        }
+      end
+
+      field :translation do
+        type types.String
+        description "Returns a single translation given a locale."
+        argument :locale, !types.String, "A locale to search for"
+
+        resolve lambda { |obj, args, _ctx|
+          translations = obj.stringify_keys
+          translations[args["locale"]]
+        }
+      end
+    end
+  end
+end

data/app/types/decidim/core/user_group_type.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents a UserGroup
+    UserGroupType = GraphQL::ObjectType.define do
+      name "UserGroup"
+      description "A user group"
+
+      interfaces [
+        -> { Decidim::Core::AuthorInterface }
+      ]
+
+      field :id, !types.ID, "The user group's id"
+
+      field :name, !types.String, "The user group's name"
+
+      field :nickname, !types.String, "User groups have no nickname" do
+        resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).nickname }
+      end
+
+      field :avatarUrl, !types.String, "The user's avatar url" do
+        resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).avatar_url }
+      end
+
+      field :profilePath, !types.String, "The user's profile url" do
+        resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).profile_path }
+      end
+
+      field :deleted, !types.Boolean, "Whether the user group's has been deleted or not" do
+        resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).deleted? }
+      end
+
+      field :badge, !types.String, "A badge for the user group" do
+        resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).badge }
+      end
+    end
+  end
+end

data/app/types/decidim/core/user_type.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents a User.
+    UserType = GraphQL::ObjectType.define do
+      name "User"
+      description "A user"
+
+      interfaces [
+        Decidim::Core::AuthorInterface
+      ]
+
+      field :name, !types.String, "The user's name"
+
+      field :nickname, !types.String, "The user's nickname" do
+        resolve ->(obj, _args, _ctx) { UserPresenter.new(obj).nickname }
+      end
+
+      field :avatarUrl, !types.String, "The user's avatar url" do
+        resolve ->(obj, _args, _ctx) { UserPresenter.new(obj).avatar_url(:thumb) }
+      end
+
+      field :profilePath, !types.String, "The user's profile url" do
+        resolve ->(obj, _args, _ctx) { UserPresenter.new(obj).profile_path }
+      end
+
+      field :organizationName, !types.String, "The user's organization name" do
+        resolve ->(obj, _args, _ctx) { obj.organization.name }
+      end
+
+      field :deleted, !types.Boolean, "Whether the user's account has been deleted or not" do
+        resolve ->(obj, _args, _ctx) { UserPresenter.new(obj).deleted? }
+      end
+
+      field :badge, !types.String, "A badge for the user group" do
+        resolve ->(obj, _args, _ctx) { UserPresenter.new(obj).badge }
+      end
+    end
+  end
+end

data/app/validators/etiquette_validator.rb

@@ -31,7 +31,7 @@ class EtiquetteValidator < ActiveModel::EachValidator
   end
 
   def validate_caps_first(record, attribute, value)
-    return if value.scan(/^[a-z]{1}/).empty?
+    return if value.scan(/\A[a-z]{1}/).empty?
     record.errors.add(attribute, options[:message] || :must_start_with_caps)
   end
 

data/app/views/decidim/application/_attachments.html.erb

@@ -2,6 +2,10 @@
   <div class="row attachments">
     <div class="columns large-12">
       <%= render partial: "documents", locals: { documents: attached_to.documents } %>
+    </div>
+  </div>
+  <div class="row attachments">
+    <div class="columns large-12">
       <%= render partial: "photos", locals: { photos: attached_to.photos } %>
     </div>
   </div>

data/app/views/decidim/application/_collection.html.erb

@@ -0,0 +1,14 @@
+<% unless attachment_collection.unused? %>
+  <div class="docs__container">
+    <h6 data-toggle="docs-collection-<%= attachment_collection.id %>"><%= icon "caret-right", class: "icon--small" %>&nbsp
+      <strong><%= translated_attribute(attachment_collection.name) %></strong>
+      <small>(<%= attachment_collection.attachments.count %> <%= t(".documents", count: attachment_collection.attachments.count) %>)</small>
+    </h6>
+    <div id="docs-collection-<%= attachment_collection.id %>" class="docs__content hide" data-toggler=".hide">
+      <p><%= translated_attribute(attachment_collection.description)  %></p>
+      <div class="card card--list">
+        <%= render partial: "document", collection: documents %>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/decidim/application/_document.html.erb

@@ -0,0 +1,19 @@
+<div class="card--list__item">
+  <div class="card--list__text">
+    <div>
+      <a href="<%= document.url %>" class="card__link">
+        <h6 class="card--list__heading heading6">
+          <%= attachment_title(document) %> <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
+        </h6>
+        <% if document.description.present? %>
+            <span class="text-small"><%= translated_attribute(document.description) %></span>
+        <% end %>
+      </a>
+    </div>
+  </div>
+  <div class="card--list__data">
+    <%= link_to document.url, class: "card--list__data__icon" do %>
+        <%= icon "cloud-download" %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/application/_documents.html.erb

@@ -1,28 +1,13 @@
 <% if documents.any? %>
   <div class="section documents">
     <h4 class="section-heading"><%= t(".related_documents") %></h4>
-    <div class="card card--list">
-      <% documents.each do |document| %>
-        <div class="card--list__item">
-          <div class="card--list__text">
-            <div>
-              <a href="<%= document.url %>" class="card__link">
-                <h6 class="card--list__heading heading6">
-                  <%= attachment_title(document) %> <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
-                </h6>
-                <% if document.description.present? %>
-                  <span class="text-small"><%= translated_attribute(document.description) %></span>
-                <% end %>
-              </a>
-            </div>
-          </div>
-          <div class="card--list__data">
-            <%= link_to document.url, class: "card--list__data__icon" do %>
-              <%= icon "cloud-download" %>
-            <% end %>
-          </div>
-        </div>
-      <% end %>
-    </div>
+    <% if (documents_without_collection = documents.reject(&:attachment_collection_id?)).any? %>
+      <div class="card card--list">
+        <%= render partial: "document", collection: documents_without_collection %>
+      </div>
+    <% end %>
+    <% documents.select(&:attachment_collection_id?).group_by(&:attachment_collection).sort_by { |c, d| c.weight }.each do |collection, documents| %>
+      <%= render partial: "collection", locals: { attachment_collection: collection, documents: documents } %>
+    <% end %>
   </div>
 <% end %>

data/app/views/decidim/shared/_announcement.html.erb

@@ -1,5 +1,6 @@
 <div class="row column">
-  <div class="callout secondary announcement">
+  <% callout_class ||= "secondary" %>
+  <%= content_tag :div, class: "callout announcement mb-sm #{callout_class}" do %>
     <%= decidim_sanitize translated_attribute announcement %>
-  </div>
+  <% end %>
 </div>

data/app/views/decidim/shared/_tags.html.erb

@@ -3,6 +3,7 @@
     <% if resource.category.present? %>
       <li><%= link_to translated_attribute(resource.category.name), resource_locator(resource).index(filter: { category_id: resource.category.id }) %></li>
     <% end %>
+
     <% if has_visible_scopes?(resource) %>
       <li><%= link_to translated_attribute(resource.scope.name), resource_locator(resource).index(filter: { scope_id: [resource.scope.id] }) %></li>
     <% end %>

data/app/views/decidim/widgets/_data_picker.html.erb

@@ -0,0 +1,6 @@
+<div id="<%=picker_options[:id]%>" class="data-picker <%=picker_options[:class]%>" data-picker-name="<%=picker_options[:name]%>">
+  <div class="picker-values"><% items.each do |item, params| %>
+    <div><a href="<%=params[:url]%>" data-picker-value="<%=item.id%>"><%=params[:text]%></a></div>
+  <% end %></div>
+  <div class="picker-prompt"><a href="<%=prompt_params[:url]%>"><%=prompt_params[:text]%></a></div>
+</div>

data/app/views/layouts/decidim/mailer.html.erb

@@ -94,9 +94,9 @@
                       <th class="small-12 first columns cityhall-bar">
                         <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
                           <% if @custom_url_for_mail_root.present? %>
-                            <%= link_to @organization.name, @custom_url_for_mail_root %>
+                            <%= link_to @organization.name.html_safe, @custom_url_for_mail_root %>
                           <% else %>
-                            <%= link_to @organization.name, decidim.root_url(host: @organization.host) %>
+                            <%= link_to @organization.name.html_safe, decidim.root_url(host: @organization.host) %>
                           <% end %>
                         </div>
                       </th>

data/config/initializers/devise.rb

@@ -323,9 +323,9 @@ Devise.setup do |config|
   # If you want to use other strategies, that are not supported by Devise, or
   # change the failure app, you can configure them inside the config.warden block.
   #
-  config.warden do |manager|
-    manager.failure_app = Decidim::DeviseFailureApp
-  end
+  # config.warden do |manager|
+  #   manager.failure_app = Decidim::DeviseFailureApp
+  # end
 
   # ==> Mountable engine configurations
   # When using Devise inside an engine, let's call it `MyEngine`, and this engine