decidim-core 0.13.1 → 0.14.1

data/app/cells/decidim/conversation_header_cell.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ConversationHeaderCell < Decidim::ViewModel
+    include Decidim::IconHelper
+    include Decidim::Core::Engine.routes.url_helpers
+
+    def show
+      render :show
+    end
+
+    def recipient
+      @recipient ||= Decidim::UserPresenter.new(model)
+    end
+  end
+end

data/app/cells/decidim/conversations/show.erb

@@ -0,0 +1,45 @@
+<% if conversations.empty? %>
+  <div class="callout secondary">
+    <p><%= t("decidim.messaging.conversations.index.no_conversations") %></p>
+  </div>
+<% else %>
+    <div class="conversations">
+    <% conversations.each do |conversation| %>
+      <% interlocutor = Decidim::UserPresenter.new(conversation.interlocutors(current_user).first) %>
+      <div class="card card--widget conversation">
+        <ul class="card-data">
+          <li class="card-data__item">
+            <div class="card__link text-center">
+              <%= link_to interlocutor.profile_path, class: "user-header__avatar" do %>
+                <%= image_tag interlocutor.avatar_url %>
+              <% end %>
+              <span class="text-medium mt-xs">
+                <%= conversation.last_message.friendly_created_at %>
+              </span>
+            </div>
+          </li>
+          <%= link_to decidim.conversation_path(conversation), "data-tabs-target": "conversations" do %>
+            <li class="card-data__item card-data__item--expand absolutes">
+              <div class="mr-s">
+                <%= t("decidim.messaging.conversations.index.from") %> <strong><%= interlocutor.name %></strong>
+                <br />
+                <span class="muted">
+                  <%= truncate conversation.last_message.body, length: 150 %>
+                </span>
+                <br />
+                <span class="text-small">
+                  <%= t("decidim.messaging.conversations.index.last_message_html", time: time_ago_in_words(conversation.last_message.created_at)) %>
+                </span>
+              </div>
+              <div class="right center mr-s">
+                <%= link_to decidim.conversation_path(conversation), class: "user-header__avatar", "data-tabs-target": "conversations" do %>
+                  <%= icon "chevron-right", class: "card__link icon--big" %>
+                <% end %>
+              </div>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/cells/decidim/conversations_cell.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ConversationsCell < Decidim::ViewModel
+    include Decidim::CellsPaginateHelper
+    include Decidim::IconHelper
+    include Decidim::Core::Engine.routes.url_helpers
+    include ActionView::Helpers::DateHelper
+
+    helper_method :conversations
+
+    delegate :current_user, to: :controller
+
+    def show
+      render :show
+    end
+
+    private
+
+    def conversations
+      @conversations ||= Decidim::Messaging::UserConversations.for(current_user)
+    end
+  end
+end

data/app/cells/decidim/follow_button/show.erb

@@ -1,14 +1,14 @@
 <div id="<%= dom_id(model, :follow) %>">
   <% if current_user %>
     <% if current_user.follows?(model) %>
-      <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? }}, data: { disable: true }, method: :delete, remote: true do %>
+      <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } }, data: { disable: true }, method: :delete, remote: true do %>
         <%= icon "bell", icon_options %>
         <span>
           <%= t("follows.destroy.button", scope: "decidim") %>
         </span>
       <% end %>
     <% else %>
-      <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? }}, data: { disable: true }, remote: true do %>
+      <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } }, data: { disable: true }, remote: true do %>
         <%= icon "bell", icon_options %>
         <span>
           <%= t("follows.create.button", scope: "decidim") %>
@@ -19,7 +19,7 @@
     <%= button_to(
       decidim.follow_path,
       class: button_classes,
-      params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? }},
+      params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } },
       data: { tooltip: true, disable_hover: false },
       :'aria-haspopup' => true,
       title: t("decidim.shared.follow_button.sign_in_before_follow"),

data/app/cells/decidim/follow_button_cell.rb

@@ -16,12 +16,8 @@ module Decidim
       context[:current_user]
     end
 
-    def decidim
-      Decidim::Core::Engine.routes.url_helpers
-    end
-
     def button_classes
-      return "card__button secondary text-uppercase follow-button" if inline?
+      return "card__button secondary text-uppercase follow-button mb-none" if inline?
       "button secondary hollow expanded small button--icon follow-button"
     end
 

data/app/cells/decidim/following_cell.rb

@@ -12,13 +12,7 @@ module Decidim
     end
 
     def followings
-      @followings ||= Kaminari.paginate_array(following_users).page(params[:page]).per(20)
-    end
-
-    def following_users
-      @following_users ||= model.following.select do |following|
-        following.is_a?(Decidim::User)
-      end
+      @followings ||= Kaminari.paginate_array(model.following_users).page(params[:page]).per(20)
     end
   end
 end

data/app/cells/decidim/message/show.erb

@@ -0,0 +1,15 @@
+<div class="conversation-chat<%= " conversation-chat--offset" if own_message? %>">
+  <%= link_to sender.profile_path do %>
+    <%= image_tag sender.avatar_url %>
+  <% end %>
+  <div>
+    <article class="card">
+      <div class="p-s">
+        <%= simple_format(message.body) %>
+      </div>
+    </article>
+    <time datetime="<%= message.created_at.utc %>" class="text-small<%= " pull-right" if own_message? %>">
+      <%= message.friendly_created_at %>
+    </time>
+  </div>
+</div>

data/app/cells/decidim/message_cell.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  class MessageCell < Decidim::ViewModel
+    delegate :current_user, to: :controller
+
+    def show
+      render :show
+    end
+
+    def message
+      @message ||= model
+    end
+
+    def sender
+      @sender ||= Decidim::UserPresenter.new(message.sender)
+    end
+
+    def own_message?
+      message.sender == current_user
+    end
+  end
+end

data/app/cells/decidim/new_conversation/show.erb

@@ -0,0 +1,19 @@
+<div class="conversation">
+  <%= cell "decidim/conversation_header", form.recipient %>
+
+  <div id="messages">
+  </div>
+
+  <div class="conversation-reply conversation-reply--offset">
+    <h2 class="section-heading">
+      <%= t("decidim.messaging.conversations.start.title") %>
+    </h2>
+
+    <%= form_for form, url: decidim.conversations_path do |f| %>
+      <%= f.hidden_field :recipient_id %>
+      <%= f.text_area :body, label: false, rows: 4, required: true %>
+
+      <%= f.submit t("decidim.messaging.conversations.start.send"), data: { disable: true }, class: "button secondary light pull-right" %>
+    <% end %>
+  </div>
+</div>

data/app/cells/decidim/new_conversation_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  class NewConversationCell < Decidim::ViewModel
+    include Decidim::IconHelper
+    include Decidim::Core::Engine.routes.url_helpers
+    include ActionView::Helpers::DateHelper
+
+    delegate :current_organization, to: :controller
+
+    def show
+      render :show
+    end
+
+    def form
+      context[:form]
+    end
+  end
+end

data/app/cells/decidim/notifications/show.erb

@@ -21,7 +21,7 @@
         <li class="card-data__item">
           <div class="card__link text-center">
             <%= resource_icon notification.resource, class: "icon--large" %>
-            <span class="text-medium mt-xs"><%= notification.created_at.strftime("%a %e") %></span>
+            <span class="text-medium mt-xs"><%= l notification.created_at, format: :day_of_week_long %></span>
           </div>
         </li>
         <li class="card-data__item card-data__item--expand absolutes">

data/app/cells/decidim/profile/show.erb

@@ -0,0 +1,27 @@
+<main class="wrapper">
+  <div class="row">
+    <div class="columns medium-9 medium-offset-3">
+      <ul class="tabs" id="profile-tabs">
+        <% if own_profile? %>
+          <%= user_profile_tab t("decidim.profiles.show.notifications"), notifications_path %>
+          <%= user_profile_tab t("decidim.profiles.show.conversations"), conversations_path %>
+        <% end %>
+        <%= user_profile_tab t("decidim.profiles.show.following"), profile_following_path(nickname: user.nickname) %>
+        <%= user_profile_tab t("decidim.profiles.show.followers"), profile_followers_path(nickname: user.nickname) %>
+        <%= user_profile_tab t("decidim.profiles.show.badges"), profile_badges_path(nickname: user.nickname) %>
+      </ul>
+    </div>
+  </div>
+  <div class="row">
+    <div class="columns medium-3">
+      <%= cell "decidim/profile_sidebar", user %>
+    </div>
+    <div class="columns medium-9">
+      <div class="tabs-content" data-tabs-content="profile-tabs">
+        <div class="tabs-panel is-active">
+          <%= cell content_cell, user, context %>
+        </div>
+      </div>
+    </div>
+  </div>
+</main>

data/app/cells/decidim/profile_cell.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ProfileCell < Decidim::ViewModel
+    include Decidim::ApplicationHelper
+    include Decidim::Core::Engine.routes.url_helpers
+    include Decidim::UserProfileHelper
+    include Decidim::AriaSelectedLinkToHelper
+    include ActiveLinkTo
+
+    delegate :current_organization, :current_user, to: :controller
+
+    def show
+      render :show
+    end
+
+    def user
+      model
+    end
+
+    def content_cell
+      context[:content_cell]
+    end
+
+    def active_content
+      context[:active_content]
+    end
+
+    def own_profile?
+      current_user && current_user == user
+    end
+  end
+end

data/app/cells/decidim/profile_sidebar/show.erb

@@ -0,0 +1,57 @@
+<div class="card">
+  <%= image_tag profile_user.avatar_url(:profile), class: "card__image card__image--larger" %>
+  <div class="card__content">
+    <h5>
+      <div><strong><%= profile_user.name %></strong></div>
+      <span class="text-small"><%= profile_user.nickname %></span>
+      <% if can_contact_user? %>
+        <span class="user-contact_link">
+          <%= link_to_current_or_new_conversation_with(user) %>
+        </span>
+      <% end %>
+    </h5>
+    <p><%= profile_user.about %></p>
+    <% if profile_user.personal_url.present? %>
+      <%= link_to html_truncate(profile_user.personal_url.gsub(%r{https?\:\/\/}, ""), length: 30), profile_user.personal_url %>
+    <% end %>
+  </div>
+  <% if profile_user.badge.present? %>
+    <div class="badge-card__content">
+      <span>
+        <%= icon profile_user.badge, class: "author__verified" %>
+      </span>
+      <span>
+        <%= translated_attribute(profile_user.officialized_as).presence || t("decidim.profiles.default_officialization_text") %>
+      </span>
+    </div>
+  <% end %>
+  <%= render_hook(:user_profile_bottom) %>
+  <div class="card__footer card__footer--transparent">
+    <div class="flex--cc p-s text-center">
+      <div class="mr-s">
+        <%= link_to profile_followers_path(nickname: user.nickname) do %>
+          <%= t("decidim.profiles.show.followers") %>
+          <h1 class="heading1"><%= profile_user.followers_count %></h1>
+        <% end %>
+      </div>
+      <div class="ml-s">
+        <%= link_to profile_following_path(nickname: user.nickname) do %>
+          <%= t("decidim.profiles.show.following") %>
+          <h1 class="heading1"><%= profile_user.following_count %></h1>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<% if own_profile? %>
+  <div class="text-center">
+    <%= link_to decidim.account_path, class: "button" do %>
+      <span>
+        <%= t("decidim.profiles.user.edit_profile") %>
+      </span>
+    <% end %>
+  </div>
+<% elsif logged_in? %>
+  <%= cell "decidim/follow_button", user, inline: false, context: { current_user: current_user } %>
+<% end %>

data/app/cells/decidim/profile_sidebar_cell.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ProfileSidebarCell < Decidim::ProfileCell
+    include Decidim::Messaging::ConversationHelper
+    include Decidim::IconHelper
+    include Decidim::ViewHooksHelper
+
+    helper_method :profile_user, :logged_in?, :current_user
+
+    delegate :user_signed_in?, to: :controller
+
+    def show
+      render :show
+    end
+
+    private
+
+    def logged_in?
+      current_user.present?
+    end
+
+    def profile_user
+      @profile_user ||= Decidim::UserPresenter.new(model)
+    end
+
+    def can_contact_user?
+      !current_user || (current_user && current_user != model)
+    end
+  end
+end

data/app/cells/decidim/tos_page_cell.rb

@@ -31,9 +31,5 @@ module Decidim
       }
       args
     end
-
-    def decidim
-      Decidim::Core::Engine.routes.url_helpers
-    end
   end
 end

data/app/cells/decidim/user_profile/header.erb

@@ -16,5 +16,5 @@
     </div>
   </div>
 
-  <%= render :author if has_author? %>
+  <%= render_authorship if has_authors? %>
 </div>

data/app/controllers/concerns/decidim/action_authorization.rb

@@ -7,51 +7,26 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
-      helper_method :authorize_action_path, :action_authorization
+      helper_method :action_authorized_to
     end
 
-    # Public: Authorizes an action of a component given an action name.
-    #
-    # action_name  - The action name to authorize. Actions are set up on the
-    #                component's permissions panel.
-    # redirect_url - Url to be redirected to when the authorization is finished.
-    def authorize_action!(action_name, redirect_url: nil)
-      status = action_authorization(action_name)
+    private
 
-      return if status.ok?
-      raise Unauthorized if status.code == :unauthorized
-
-      redirect_to authorize_action_path(action_name, redirect_url: redirect_url)
-    end
-
-    # Public: Returns the authorization object for an authorization.
-    #
-    # action_name - The action to authorize against.
-    #
-    # Returns an ActionAuthorizer::AuthorizationStatus
-    def action_authorization(action_name)
-      @action_authorizations ||= {}
-
-      @action_authorizations[action_name] = _action_authorizer(action_name).authorize
+    def action_authorized_to(action, resource: nil)
+      action_authorization_cache[action_authorization_cache_key(action, resource)] ||=
+        ::Decidim::ActionAuthorizer.new(current_user, action, resource&.component || current_component, resource).authorize
     end
 
-    # Public: Returns the authorization path for a failed authorization with
-    # the populated redirect url.
-    #
-    # action_name - The action name to authorize against.
-    # redirect_url - The url to redirect to when finished.
-    #
-    # Returns a String.
-    def authorize_action_path(action_name, redirect_url: nil)
-      redirect_url ||= request.path
-
-      action_authorization(action_name).current_path(redirect_url: redirect_url)
+    def action_authorization_cache
+      request.env["decidim.action_authorization_cache"] ||= {}
     end
 
-    def _action_authorizer(action_name)
-      ::Decidim::ActionAuthorizer.new(current_user, current_component, action_name)
+    def action_authorization_cache_key(action, resource)
+      if resource && !resource.permissions.nil?
+        "#{action}-#{resource.component.id}-#{resource.resource_manifest.name}-#{resource.id}"
+      else
+        "#{action}-#{current_component.id}"
+      end
     end
-
-    class Unauthorized < StandardError; end
   end
 end