decidim-design 0.28.2 → 0.29.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf958f02ec8f91f9701fbb43d9d26e137bcbb7b81d1678460b34a6fbe95ee9e0
-  data.tar.gz: 0d05ac687dc66378f2ed3b8e062bd2218df0a90b9b3230a7b51eaddf13b3189e
+  metadata.gz: d16bb236fc9559de5e73b7a36071a5f1dfc5750536c53a5644b54585f73d3a25
+  data.tar.gz: e8735eb18daf97b2f59f1d325c4b204ccd11728dd1f9c90af28f938514cee37b
 SHA512:
-  metadata.gz: aecb9546c71584a3a8cbab2c3ae1a83a1cb25cf349ddba8f2968182de4a1de51e59d908090397d50266e08528d276bf934bfa730ead57e55fa6bffb3b348accb
-  data.tar.gz: 2b48d5e93029eac19ec07930510895036e20569530268d652864af0787b4fb26da94a168e98fc636900ff32a7b2cd4b757762a9e3ebdd0de884e5ac7b7a85a9e
+  metadata.gz: 98d3e9296142ccab349dd77bc0a3691f6084b65799d05b4069ce8cfb2692eb5b79ff180d8f9df7eff260794b269de5fcab000527a031500e7c3a58cca83e7c38
+  data.tar.gz: d3983fd3de8e02ac90cddb069fa9a398673dcfe972514193746db402c447a1e218fe07ff2230b071cbd82a45c03e686edd9796b18550bdf12023de169f9a509e

data/app/helpers/decidim/design/activities_helper.rb

@@ -6,29 +6,28 @@ module Decidim
       def activities_sections
         [
           {
-            id: "demo",
+            id: t("decidim.design.helpers.demo"),
             contents: [
               {
                 type: :text,
-                values: ["This cell receives a model of LastActivity items and displays the following elements:"]
+                values: [t("decidim.design.helpers.demo_text")]
               },
               {
                 type: :partial,
-                template: "decidim/design/components/activities/static-activities"
+                template: "decidim/design/components/activities/static-activity"
               },
               {
                 type: :text,
-                values: ["Used by the last activity page, in a content block and within the dropdowns."]
+                values: [t("decidim.design.helpers.demo_text_2")]
               }
             ]
           },
           {
-            id: "variations",
+            id: t("decidim.design.helpers.variations"),
             contents: [
               {
                 type: :text,
-                values: ["Regarding the type of activity, the cell could show different content, reporting the distinct resources,
-                          whether belong to a participatory space or not, has an author or not."]
+                values: [t("decidim.design.helpers.variations_text")]
               },
               {
                 type: :partial,
@@ -37,29 +36,30 @@ module Decidim
             ]
           },
           {
-            id: "sourcecode",
+            id: t("decidim.design.helpers.source_code"),
             contents: [
               {
-                type: :table,
-                options: { headings: %w(Cell Code) },
-                items: activities_table(
-                  { name: "Activities", url: "https://github.com/decidim/decidim/blob/develop/decidim-core/app/cells/decidim/activities_cell.rb" },
-                  { name: "Activitiy", url: "https://github.com/decidim/decidim/blob/develop/decidim-core/app/cells/decidim/activity_cell.rb" }
-                )
+                type: :cell_table,
+                options: { headings: [t("decidim.design.components.activities.activities")] },
+                cell_snippet: {
+                  cell: "decidim/activities",
+                  args: [Decidim::ActionLog.where(resource_type: "Decidim::ParticipatoryProcess", organization: current_organization).first(5)],
+                  call_string: 'cell("decidim/activities", _ACTION_LOG_ITEMS_LIST)'
+                }
+              },
+              {
+                type: :cell_table,
+                options: { headings: [t("decidim.design.helpers.activity")] },
+                cell_snippet: {
+                  cell: "decidim/activity",
+                  args: [Decidim::ActionLog.where(resource_type: "Decidim::ParticipatoryProcess", organization: current_organization).last],
+                  call_string: 'cell("decidim/activity", _ACTION_LOG_ITEM_)'
+                }
               }
             ]
           }
         ]
       end
-
-      def activities_table(*table_rows, **_opts)
-        table_rows.map do |table_cell|
-          row = []
-          row << table_cell[:name]
-          row << link_to(table_cell[:url].split("/").last, table_cell[:url], target: "_blank", class: "text-secondary underline", rel: "noopener")
-          row
-        end
-      end
     end
   end
 end

data/app/helpers/decidim/design/address_helper.rb

@@ -6,54 +6,79 @@ module Decidim
       def address_sections
         [
           {
-            id: "demo",
+            id: t("decidim.design.helpers.demo"),
             contents: [
               {
                 type: :text,
                 values: [
-                  "Address cell receives a resource, and searches the geolocalizable attributes to render an specific markup."
+                  t("decidim.design.helpers.address_description")
                 ]
               },
               {
-                type: :partial,
-                template: "decidim/design/components/address/static-address-person"
+                values: cell("decidim/address", address_item)
               },
               {
                 type: :text,
                 values: [
-                  "Depending of the type of the content, the address could be an online url.
-                    For such cases, the displayed information is quite the same but shaped to fit."
+                  t("decidim.design.helpers.address_description_2")
                 ]
               },
               {
-                type: :partial,
-                template: "decidim/design/components/address/static-address-online"
+                values: cell("decidim/address", online_item, online: true)
               }
             ]
           },
           {
-            id: "sourcecode",
+            id: t("decidim.design.helpers.source_code"),
             contents: [
               {
-                type: :table,
-                options: { headings: %w(Cell Code) },
-                items: address_table(
-                  { name: "Address", url: "https://github.com/decidim/decidim/blob/develop/decidim-core/app/cells/decidim/address_cell.rb" }
-                )
+                type: :text,
+                values: [""],
+                cell_snippet: {
+                  cell: "decidim/address",
+                  args: [address_item],
+                  call_string: [
+                    'cell("decidim/address", _RESOURCE_)',
+                    'cell("decidim/address", _RESOURCE_, online: true)'
+                  ]
+                }
               }
             ]
           }
         ]
       end
 
-      def address_table(*table_rows, **_opts)
-        table_rows.map do |table_cell|
-          row = []
-          row << table_cell[:name]
-          row << link_to(table_cell[:url].split("/").last, table_cell[:url], target: "_blank", class: "text-secondary underline", rel: "noopener")
-          row
+      def addressable_class
+        Class.new(ApplicationRecord) do
+          self.table_name = Decidim::Pages::Page.table_name
+
+          attr_accessor :organization, :location, :address, :latitude, :longitude, :online_meeting_url, :type_of_meeting, :start_time, :end_time
+
+          geocoded_by :address
         end
       end
+
+      def address_item
+        addressable_class.new(
+          organization: current_organization,
+          location: "Barcelona",
+          address: "Carrer del Pare Llaurador, 113",
+          latitude: 40.1234,
+          longitude: 2.1234,
+          start_time: 2.days.from_now,
+          end_time: 2.days.from_now + 4.hours
+        )
+      end
+
+      def online_item
+        addressable_class.new(
+          organization: current_organization,
+          type_of_meeting: "online",
+          online_meeting_url: "https://meet.jit.si/DecidimTry",
+          start_time: 2.days.from_now,
+          end_time: 2.days.from_now + 4.hours
+        )
+      end
     end
   end
 end

data/app/helpers/decidim/design/announcement_helper.rb

@@ -6,52 +6,76 @@ module Decidim
       def announcement_sections
         [
           {
-            id: "callout_class",
+            title: t("decidim.design.helpers.callout_class"),
             contents: [
               {
                 type: :text,
-                values: ["This attribute applies an status to the announcement. By default, it uses secondary color."]
+                values: [t("decidim.design.helpers.callout_description")]
               },
               {
                 type: :table,
-                options: { headings: ["Announcement", "Callout class"] },
+                options: { headings: [t("decidim.design.components.announcement.title"), t("decidim.design.helpers.callout_class")] },
                 items: announcement_table(
-                  { text: "I am an announcement", callout_class: nil },
-                  { text: "I am an announcement", callout_class: "alert" },
-                  { text: "I am an announcement", callout_class: "warning" },
-                  { text: "I am an announcement", callout_class: "success" }
+                  { text: t("decidim.design.components.announcement.iam_an_announcement"), callout_class: "success" },
+                  { text: t("decidim.design.components.announcement.iam_an_announcement"), callout_class: "warning" },
+                  { text: t("decidim.design.components.announcement.iam_an_announcement"), callout_class: "alert" },
+                  { text: t("decidim.design.components.announcement.iam_an_announcement"), callout_class: "secondary" },
+                  { text: t("decidim.design.components.announcement.iam_an_announcement"), callout_class: nil }
                 ),
                 cell_snippet: {
                   cell: "decidim/announcement",
-                  args: ["I am an annoucement"]
+                  args: [t("decidim.design.components.announcement.iam_an_announcement"), { callout_class: "success" }],
+                  call_string: [
+                    'cell("decidim/announcement", "I am an announcement", callout_class: "success")',
+                    'cell("decidim/announcement", "I am an announcement", callout_class: "warning")',
+                    'cell("decidim/announcement", "I am an announcement", callout_class: "alert")',
+                    'cell("decidim/announcement", "I am an announcement", callout_class: "secondary")',
+                    'cell("decidim/announcement", "I am an announcement")'
+                  ]
                 }
               }
             ]
           },
           {
-            id: "plain_text_vs_hash",
+            title: t("decidim.design.helpers.plain_text_vs_hash"),
             contents: [
               {
                 type: :text,
-                values: ["You can provide as first argument both a plain text and a hash object"]
+                values: [t("decidim.design.helpers.plain_text_description")]
               },
               {
                 type: :table,
-                options: { headings: ["Announcement", "Callout class", "Argument"] },
+                options: { headings: [t("decidim.design.components.announcement.title"), t("decidim.design.helpers.callout_class"), t("decidim.design.helpers.argument")] },
                 items: announcement_table(
-                  { text: "I am just plain text", callout_class: "secondary", argument: '"I am just plain text"' },
-                  { text: { title: "This is the title", body: "This is the body" }, callout_class: "secondary",
+                  { text: { title: t("decidim.design.components.announcement.this_is_the_title"), body: t("decidim.design.components.announcement.this_is_the_body") },
+                    callout_class: "success",
+                    argument: '{ title: "This is the title", body: "This is the body" }, callout_class: "success"' },
+                  { text: { title: t("decidim.design.components.announcement.this_is_the_title"), body: t("decidim.design.components.announcement.this_is_the_body") },
+                    callout_class: "warning",
+                    argument: '{ title: "This is the title", body: "This is the body" }, callout_class: "warning"' },
+                  { text: { title: t("decidim.design.components.announcement.this_is_the_title"), body: t("decidim.design.components.announcement.this_is_the_body") },
+                    callout_class: "alert",
+                    argument: '{ title: "This is the title", body: "This is the body" }, callout_class: "alert"' },
+                  { text: { title: t("decidim.design.components.announcement.this_is_the_title"), body: t("decidim.design.components.announcement.this_is_the_body") },
+                    callout_class: "secondary",
+                    argument: '{ title: "This is the title", body: "This is the body" }, callout_class: "secondary"' },
+                  { text: { title: t("decidim.design.components.announcement.this_is_the_title"), body: t("decidim.design.components.announcement.this_is_the_body") },
+                    callout_class: nil,
                     argument: '{ title: "This is the title", body: "This is the body" }' },
-                  { text: { title: "This is the title", body: "This is the body" }, callout_class: "warning",
-                    argument: '{ text: { title: "This is the title", body: "This is the body" }, callout_class: "warning" }' },
-                  { text: { title: "This is the title", body: "This is the body" }, callout_class: "alert",
-                    argument: '{ text: { title: "This is the title", body: "This is the body" }, callout_class: "alert" }' },
-                  { text: { title: "This is the title", body: "This is the body" }, callout_class: "success",
-                    argument: '{ text: { title: "This is the title", body: "This is the body" }, callout_class: "success" }' }
+                  { text: t("decidim.design.helpers.plain_text"), callout_class: nil, argument: '"I am just plain text"' }
                 ),
                 cell_snippet: {
                   cell: "decidim/announcement",
-                  args: [{ title: "This is the title", body: "This is the body" }]
+                  args: [{ title: t("decidim.design.components.announcement.this_is_the_title"), body: t("decidim.design.components.announcement.this_is_the_body") },
+                         { callout_class: "success" }],
+                  call_string: [
+                    %{cell("decidim/announcement", { title: "This is the title", body: "This is the body" }, callout_class: "success")},
+                    'cell("decidim/announcement", { title: "This is the title", body: "This is the body" }, callout_class: "warning")',
+                    'cell("decidim/announcement", { title: "This is the title", body: "This is the body" }, callout_class: "alert")',
+                    'cell("decidim/announcement", { title: "This is the title", body: "This is the body" }, callout_class: "secondary")',
+                    'cell("decidim/announcement", { title: "This is the title", body: "This is the body" })',
+                    'cell("decidim/announcement", "I am just plain text")'
+                  ]
                 }
               }
             ]
@@ -63,7 +87,7 @@ module Decidim
         table_rows.each_with_index.map do |table_cell, _ix|
           row = []
           row << { method: :cell, args: ["decidim/announcement", table_cell[:text], { callout_class: table_cell[:callout_class] }] }
-          row << table_cell[:callout_class] if table_cell[:callout_class].present?
+          row << table_cell[:callout_class]
           row << table_cell[:argument] if table_cell[:argument].present?
           row
         end

data/app/helpers/decidim/design/application_helper.rb

@@ -33,6 +33,8 @@ module Decidim
             html += content_tag(:p, value.html_safe, class: content[:class])
           end
           html.html_safe
+        when :cell_table
+          render partial: "decidim/design/shared/cell_table", locals: content.slice(:cell_snippet).merge(content[:options] || {})
         when :table
           render partial: "decidim/design/shared/table", locals: content.slice(:items).merge(content[:options] || {})
         when :partial
@@ -63,17 +65,34 @@ module Decidim
       def render_cell_snippet(content)
         return "" if content[:cell_snippet].blank?
 
-        render partial: "decidim/design/shared/cell_snippet", locals: cell_snippet_locals(content[:cell_snippet][:cell], content[:cell_snippet][:args])
+        render partial: "decidim/design/shared/cell_snippet", locals: cell_snippet_locals(content[:cell_snippet])
       end
 
-      def cell_snippet_locals(cell, args)
-        path = args.delete(:path) || File.join("decidim-core/app/cells/", cell)
-        {
-          text: path,
-          url: "https://github.com/decidim/decidim/blob/#{RELEASE_ID}/#{path}_cell.rb",
-          cell:,
-          args:
-        }
+      def render_cell_call_textarea(cell_data)
+        render partial: "decidim/design/shared/cell_call_textarea", locals: cell_snippet_locals(cell_data)
+      end
+
+      def cell_snippet_locals(args)
+        path = args.delete(:path) || File.join("decidim-core/app/cells/", args[:cell])
+        url = "https://github.com/decidim/decidim/blob/#{RELEASE_ID}/#{path}_cell.rb"
+        call_string = args.delete(:call_string) || ""
+        args_texts = call_string.present? ? [] : inspect_args(args[:args])
+
+        args.merge(text: path, url:, call_string:, args_texts:)
+      end
+
+      def inspect_args(args = [])
+        return ["nil"] if args.blank?
+
+        args.map do |arg|
+          next arg.inspect if arg.is_a?(String)
+          next arg.except(:context).inspect if arg.is_a?(Hash)
+
+          class_name = arg.class.name
+          next "#{class_name}.take" if arg.is_a?(Decidim::ApplicationRecord)
+
+          class_name
+        end
       end
 
       def render_row(row)

data/app/helpers/decidim/design/author_helper.rb

@@ -6,86 +6,108 @@ module Decidim
       def author_sections
         [
           {
-            id: "context",
+            title: t("decidim.design.helpers.context"),
             contents: [
               {
                 type: :text,
                 values: [
-                  "This cell display some information about a user. It a visual help to identify the resource/content creator.
-                    Hovering with the mouse displays a tooltip with further info and links to its profile",
-                  "For resources, this cell appears beneath the main heading. For other contents, it appears next to the content itself."
+                  t("decidim.design.helpers.context_description"),
+                  t("decidim.design.helpers.context_description_2")
                 ]
               }
             ]
           },
           {
-            id: "variations",
+            title: t("decidim.design.helpers.variations"),
             contents: [
               {
                 type: :text,
-                values: ["There are three different versions of this cell. Each one fits better regarding the context it is being displayed."]
+                values: [t("decidim.design.helpers.variations_description")]
               },
               {
-                values: section_subtitle(title: "Default")
+                values: section_subtitle(title: t("decidim.design.helpers.default"))
               },
               {
-                type: :partial,
-                template: "decidim/design/components/author/static-default"
+                values: cell("decidim/author", user_item)
               },
               {
                 type: :text,
-                values: ["Calling the cell with no extra arguments, but the user itself."]
+                values: [t("decidim.design.helpers.default_description")]
               },
               {
-                values: section_subtitle(title: "Compact")
+                values: section_subtitle(title: t("decidim.design.helpers.compact"))
               },
               {
-                type: :partial,
-                template: "decidim/design/components/author/static-compact"
+                values: cell("decidim/author", user_item, from: authored_item, context_actions: [:date], layout: :compact)
               },
               {
                 type: :text,
-                values: ["This author version is the common way to identify the resource creator."]
+                values: [t("decidim.design.helpers.compact_description")]
               },
               {
-                values: section_subtitle(title: "Avatar")
+                values: section_subtitle(title: t("decidim.design.helpers.avatar"))
               },
               {
-                type: :partial,
-                template: "decidim/design/components/author/static-avatar"
+                values: cell("decidim/author", user_item, layout: :avatar)
               },
               {
                 type: :text,
-                values: ["It is used when there are narrow spaces, where the author is a secondary information."]
+                values: [t("decidim.design.helpers.avatar_description")]
               }
             ]
           },
           {
-            id: "source_code",
+            title: t("decidim.design.helpers.source_code"),
             contents: [
-              type: :table,
-              options: { headings: %w(Card Code Usage) },
-              items: author_table(
-                { name: "Default", url: "https://github.com/decidim/decidim/tree/develop/decidim-core/app/cells/decidim/author",
-                  usage: "https://github.com/decidim/decidim/blob/develop/decidim-core/app/cells/decidim/card_l/author.erb" },
-                { name: "Compact", url: "https://github.com/decidim/decidim/tree/develop/decidim-core/app/cells/decidim/author",
-                  usage: "https://github.com/decidim/decidim/blob/develop/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb" },
-                { name: "Avatar", url: "https://github.com/decidim/decidim/tree/develop/decidim-core/app/cells/decidim/author", usage: "https://github.com/decidim/decidim/blob/develop/decidim-core/app/cells/decidim/endorsers_list/show.erb" }
-              )
+              {
+                type: :text,
+                values: [""],
+                cell_snippet: {
+                  cell: "decidim/author",
+                  args: [user_item],
+                  call_string: [
+                    'cell("decidim/author", _USER_PRESENTER_)',
+                    'cell("decidim/author", _USER_PRESENTER_, from: _AUTHORABLE_OR_COAUTHORABLE_RESOURCE_, context_actions: [:date], layout: :compact)',
+                    'cell("decidim/author", _USER_PRESENTER_, layout: :avatar)'
+                  ]
+                }
+              }
             ]
           }
         ]
       end
 
-      def author_table(*table_rows, **_opts)
-        table_rows.map do |table_cell|
-          row = []
-          row << table_cell[:name]
-          row << link_to(table_cell[:url].split("/").last, table_cell[:url], target: "_blank", class: "text-secondary underline", rel: "noopener")
-          row << link_to(table_cell[:usage].split("/").last, table_cell[:usage], target: "_blank", class: "text-secondary underline", rel: "noopener")
-          row
+      def user_item
+        Decidim::User.new(
+          organization: current_organization,
+          id: 2000,
+          email: "alan_smith@example.org",
+          confirmed_at: Time.current,
+          name: "Alan Smith",
+          nickname: "alan_smith",
+          personal_url: "https://alan.example.org",
+          about: "Hi, I am Alan",
+          accepted_tos_version: Time.current
+        ).presenter
+      end
+
+      class AuthoredItem
+        ATTRS = [:published_at].freeze
+
+        attr_reader(*ATTRS)
+
+        def initialize(args = {})
+          args.slice(*ATTRS).each do |var, val|
+            instance_variable_set(:"@#{var}", val)
+          end
         end
       end
+
+      def authored_item
+        AuthoredItem.new(
+          published_at: 1.day.ago
+        )
+      end
     end
   end
 end