decidim-pages 0.29.1 → 0.30.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f8b3e6cd6a2d3bc2ef92f81fdfdb8bc19744e0a3e7ec02cc1cf194b97480dba
-  data.tar.gz: 04cd864c1e40a888342f58d1f8c52259978212e04a491443e5d4b1eb4250aaf5
+  metadata.gz: 4d57802de4318336eccd86b14427d5987d7a5f4156218bc899974ad4d89135cf
+  data.tar.gz: 5042f4bcf4e8f5bbe691df4c9f6a985bebc43a3533bc31588425498d38924532
 SHA512:
-  metadata.gz: fdccbd5a9878de70fc24d886e6f4560fbf2fe811266875aeb483338fc98c8b7f4027792b4e0cea295fa2ade12e9eae03c6c0c29e59ba7ccc2a1557b4b1acd9ca
-  data.tar.gz: dc4f669d2a8ed276abffedc3d58e77a27ae2f18c415302eb4c3e15000898aaa7afe2eca4ba709f7d0792f09fb7b4bd2d5498d5a8e7cc308787a3b2cbf9ba4720
+  metadata.gz: 579e6f47310ed5891cc2d0cea4377481d2a8b83277ad0669cbd511aa7126190b4383411bf9800875d76776ef0c6830154da8fd36c123df5c3d05a529734c0f6d
+  data.tar.gz: d013f69bf9063a281440b1c44cfb52252440ffd4e55ebe8aaaedee52327aed20077eaaa096e44941baa50469ad18ecc28d8f8570eaec06df5524f9df896e9499

data/app/controllers/decidim/pages/admin/pages_controller.rb

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # This controller allows the user to update a Page.
       class PagesController < Admin::ApplicationController
+        include Decidim::Admin::HasTrashableResources
+
         def edit
           enforce_permission_to :update, :page
 
@@ -31,9 +33,15 @@ module Decidim
 
         private
 
+        def trashable_deleted_resource_type
+          :page
+        end
+
         def page
           @page ||= Pages::Page.find_by(component: current_component)
         end
+
+        alias trashable_deleted_resource current_component
       end
     end
   end

data/app/forms/decidim/pages/admin/page_form.rb

@@ -7,7 +7,7 @@ module Decidim
       class PageForm < Decidim::Form
         include TranslatableAttributes
 
-        translatable_attribute :body, String
+        translatable_attribute :body, Decidim::Attributes::RichText
       end
     end
   end

data/app/views/decidim/pages/application/show.html.erb

@@ -1,7 +1,7 @@
-<% add_decidim_page_title(translated_attribute(@page.title)) %>
-<% add_decidim_meta_tags({
-                           description: translated_attribute(@page.body)
-                         }) %>
+<% add_decidim_meta_tags(
+  title: translated_attribute(@page.title),
+  description: translated_attribute(@page.body),
+  resource: @page) %>
 
 <%= render layout:"layouts/decidim/shared/layout_center" do %>
   <div class="py-12 space-y-12">

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1 @@
+bs:

data/config/locales/ca.yml

@@ -17,6 +17,17 @@ ca:
             announcement: Avís
           step:
             announcement: Avís
+    open_data:
+      help:
+        pages:
+          body: El contingut de la pàgina
+          component: El component al qual pertany la pàgina
+          created_at: La data en què es va crear aquesta pàgina
+          id: L'identificador únic d'aquesta pàgina
+          participatory_space: A quin espai pertany aquesta pàgina (procés participatiu, assemblea, etc.)
+          title: El títol de la pàgina
+          updated_at: La data de la darrera actualització d'aquesta pàgina
+          url: L'URL d'aquesta pàgina
     pages:
       admin:
         models:

data/config/locales/cs.yml

@@ -19,6 +19,17 @@ cs:
             announcement: Oznámení
           step:
             announcement: Oznámení
+    open_data:
+      help:
+        pages:
+          body: Tělo stránky
+          component: Komponenta, ke které stránka patří,
+          created_at: Datum, kdy byla stránka vytvořena
+          id: Jedinečný identifikátor této stránky
+          participatory_space: Do kterého prostoru (např. účastnický proces nebo Shromáždění) patří tato schůzka
+          title: Název stránky
+          updated_at: Poslední datum aktualizace této stránky
+          url: URL pro tuto stránku
     pages:
       admin:
         models:

data/config/locales/de.yml

@@ -17,6 +17,17 @@ de:
             announcement: Ankündigung
           step:
             announcement: Ankündigung
+    open_data:
+      help:
+        pages:
+          body: Der Inhalt der Seite
+          component: Die Komponente, zu der die Seite gehört
+          created_at: Erstellungsdatum dieser Seite
+          id: Die eindeutige Bezeichnung des Seite
+          participatory_space: Zu welchem Bereich diese Seite gehört (z.B. Partizipationsprozesse oder Gremien)
+          title: Der Seitentitel
+          updated_at: Letztes Aktualisierungsdatum dieser Seite
+          url: Die URL für diese Seite
     pages:
       admin:
         models:

data/config/locales/en.yml

@@ -17,6 +17,17 @@ en:
             announcement: Announcement
           step:
             announcement: Announcement
+    open_data:
+      help:
+        pages:
+          body: The body of the page
+          component: The component that the page belongs to
+          created_at: The date this page was created
+          id: The unique identifier of this page
+          participatory_space: To which space (e.g. Participatory Process, or Assembly) this page belongs to
+          title: The page title
+          updated_at: The last date this page was updated
+          url: The URL for this page
     pages:
       admin:
         models:

data/config/locales/es-MX.yml

@@ -17,6 +17,17 @@ es-MX:
             announcement: Aviso
           step:
             announcement: Aviso
+    open_data:
+      help:
+        pages:
+          body: El contenido de la página
+          component: El componente al que pertenece la página
+          created_at: La fecha en la que se creó esta página
+          id: El identificador único de esta página
+          participatory_space: A qué espacio pertenece esta página (proceso participativo, asamblea, etc.)
+          title: El título de la página
+          updated_at: La fecha de la última actualización de esta página
+          url: La URL para esta página
     pages:
       admin:
         models:

data/config/locales/es-PY.yml

@@ -17,6 +17,17 @@ es-PY:
             announcement: Aviso
           step:
             announcement: Aviso
+    open_data:
+      help:
+        pages:
+          body: El contenido de la página
+          component: El componente al que pertenece la página
+          created_at: La fecha en la que se creó esta página
+          id: El identificador único de esta página
+          participatory_space: A qué espacio pertenece esta página (proceso participativo, asamblea, etc.)
+          title: El título de la página
+          updated_at: La fecha de la última actualización de esta página
+          url: La URL para esta página
     pages:
       admin:
         models:

data/config/locales/es.yml

@@ -17,6 +17,17 @@ es:
             announcement: Aviso
           step:
             announcement: Aviso
+    open_data:
+      help:
+        pages:
+          body: El contenido de la página
+          component: El componente al que pertenece la página
+          created_at: La fecha en la que se creó esta página
+          id: El identificador único de esta página
+          participatory_space: A qué espacio pertenece esta página (proceso participativo, asamblea, etc.)
+          title: El título de la página
+          updated_at: La fecha de la última actualización de esta página
+          url: La URL para esta página
     pages:
       admin:
         models:

data/config/locales/eu.yml

@@ -17,6 +17,17 @@ eu:
             announcement: Oharra
           step:
             announcement: Oharra
+    open_data:
+      help:
+        pages:
+          body: Orriaren gorputza
+          component: Orriaren osagaia honi dagokio
+          created_at: Zein datatan sortu zen orri hau
+          id: Orri honen identifikatzaile bakarra
+          participatory_space: Zein espaziori dagokio (adibidez, Prozesu Parte-hartzailea edo Batzarra) orri hau
+          title: Orriaren izenburua
+          updated_at: Zein egunetan eguneratu zen azken aldiz orri hau
+          url: Orri honetarakko URLa
     pages:
       admin:
         models:

data/config/locales/fi-plain.yml

@@ -17,6 +17,17 @@ fi-pl:
             announcement: Ilmoitus
           step:
             announcement: Ilmoitus
+    open_data:
+      help:
+        pages:
+          body: Sivun tekstisisältö
+          component: Sivun komponentti
+          created_at: Sivun laatimisaika
+          id: Sivun yksilöivä tunniste
+          participatory_space: Mihin osallistumistilaan (esim. prosessi tai ryhmä) tämä sivu kuuluu
+          title: Sivun otsikko
+          updated_at: Sivun viimeisimmän päivityksen ajankohta
+          url: Sivun URL-osoite
     pages:
       admin:
         models:

data/config/locales/fi.yml

@@ -17,6 +17,17 @@ fi:
             announcement: Ilmoitus
           step:
             announcement: Ilmoitus
+    open_data:
+      help:
+        pages:
+          body: Sivun tekstisisältö
+          component: Sivun komponentti
+          created_at: Sivun laatimisaika
+          id: Sivun yksilöivä tunniste
+          participatory_space: Mihin osallistumistilaan (esim. prosessi tai ryhmä) tämä sivu kuuluu
+          title: Sivun otsikko
+          updated_at: Sivun viimeisimmän päivityksen ajankohta
+          url: Sivun URL-osoite
     pages:
       admin:
         models:

data/config/locales/fr-CA.yml

@@ -17,6 +17,17 @@ fr-CA:
             announcement: Message d'annonce
           step:
             announcement: Message d'annonce
+    open_data:
+      help:
+        pages:
+          body: Le corps de la page
+          component: Le composant auquel appartient la page
+          created_at: La date de création de cette page
+          id: L'identifiant unique de cette page
+          participatory_space: À quel espace appartient la page (par exemple Processus participatif, ou Assemblée)
+          title: Le titre de la page
+          updated_at: La dernière date de mise à jour de cette page
+          url: L'URL de cette page
     pages:
       admin:
         models:

data/config/locales/fr.yml

@@ -17,6 +17,17 @@ fr:
             announcement: Message d'annonce
           step:
             announcement: Message d'annonce
+    open_data:
+      help:
+        pages:
+          body: Le corps de la page
+          component: Le composant auquel appartient la page
+          created_at: La date de création de cette page
+          id: L'identifiant unique de cette page
+          participatory_space: À quel espace appartient la page (par exemple Processus participatif, ou Assemblée)
+          title: Le titre de la page
+          updated_at: La dernière date de mise à jour de cette page
+          url: L'URL de cette page
     pages:
       admin:
         models:

data/config/locales/ja.yml

@@ -16,6 +16,17 @@ ja:
             announcement: お知らせ
           step:
             announcement: お知らせ
+    open_data:
+      help:
+        pages:
+          body: ページの本文
+          component: ページが属するコンポーネント
+          created_at: このページの作成日時
+          id: ページの固有ID
+          participatory_space: このページが所属するスペース（参加型プロセス、参加スペースなど）
+          title: ページタイトル
+          updated_at: このページの最終更新日時
+          url: このページの URL
     pages:
       admin:
         models:

data/db/migrate/20240828103537_add_deleted_at_to_decidim_pages_pages.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddDeletedAtToDecidimPagesPages < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_pages_pages, :deleted_at, :datetime
+    add_index :decidim_pages_pages, :deleted_at
+  end
+end

data/decidim-pages.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Pages.version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
-  s.license = "AGPL-3.0"
+  s.license = "AGPL-3.0-or-later"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-pages"
   s.summary = "Decidim pages module"

data/lib/decidim/api/page_type.rb

@@ -3,13 +3,13 @@
 module Decidim
   module Pages
     class PageType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::TimestampsInterface
+
       description "A page"
 
-      field :id, GraphQL::Types::ID, null: false
-      field :title, Decidim::Core::TranslatedFieldType, "The title of this page (same as the component name).", null: false
       field :body, Decidim::Core::TranslatedFieldType, "The body of this page.", null: true
-      field :created_at, Decidim::Core::DateTimeType, "The time this page was created", null: false
-      field :updated_at, Decidim::Core::DateTimeType, "The time this page was updated", null: false
+      field :id, GraphQL::Types::ID, "The id of the page", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title of this page (same as the component name).", null: false
     end
   end
 end

data/lib/decidim/api/pages_type.rb

@@ -2,22 +2,19 @@
 
 module Decidim
   module Pages
-    class PagesType < Decidim::Api::Types::BaseObject
-      implements Decidim::Core::ComponentInterface
-
+    class PagesType < Decidim::Core::ComponentType
       graphql_name "Pages"
       description "A pages component of a participatory space."
 
-      field :pages, Decidim::Pages::PageType.connection_type, null: true, connection: true
+      field :page, Decidim::Pages::PageType, "A single Page object", null: true do
+        argument :id, GraphQL::Types::ID, "The id of the Page requested", required: true
+      end
+      field :pages, Decidim::Pages::PageType.connection_type, "A collection of Pages", null: true, connection: true
 
       def pages
         Page.where(component: object).includes(:component)
       end
 
-      field :page, Decidim::Pages::PageType, null: true do
-        argument :id, GraphQL::Types::ID, required: true
-      end
-
       def page(**args)
         Page.where(component: object).find_by(id: args[:id])
       end

data/lib/decidim/pages/component.rb

@@ -32,8 +32,8 @@ Decidim.register_component(:pages) do |component|
 
   component.register_stat :pages_count do |components, start_at, end_at|
     pages = Decidim::Pages::Page.where(component: components)
-    pages = pages.where("created_at >= ?", start_at) if start_at.present?
-    pages = pages.where("created_at <= ?", end_at) if end_at.present?
+    pages = pages.where(created_at: start_at..) if start_at.present?
+    pages = pages.where(created_at: ..end_at) if end_at.present?
     pages.count
   end
 
@@ -49,6 +49,18 @@ Decidim.register_component(:pages) do |component|
     resource.model_class_name = "Decidim::Pages::Page"
   end
 
+  component.exports :pages do |exports|
+    exports.collection do |component_instance|
+      Decidim::Pages::Page
+        .where(component: component_instance)
+        .includes(component: { participatory_space: :organization })
+    end
+
+    exports.include_in_open_data = true
+
+    exports.serializer Decidim::Pages::PageSerializer
+  end
+
   component.seeds do |participatory_space|
     require "decidim/pages/seeds"
 

data/lib/decidim/pages/page_serializer.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Pages
+    # This class serializes a Page so can be exported to CSV, JSON or other
+    # formats.
+    class PageSerializer < Decidim::Exporters::Serializer
+      include Decidim::ApplicationHelper
+      include Decidim::ResourceHelper
+
+      # Public: Initializes the serializer with a page.
+      def initialize(page)
+        @page = page
+      end
+
+      # Public: Exports a hash with the serialized data for this page.
+      def serialize
+        {
+          id: page.id,
+          title: page.title,
+          body: page.body,
+          created_at: page.created_at,
+          updated_at: page.updated_at,
+          participatory_space: {
+            id: page.participatory_space.id,
+            url: Decidim::ResourceLocatorPresenter.new(page.participatory_space).url
+          },
+          component: { id: component.id },
+          url:
+        }
+      end
+
+      private
+
+      attr_reader :page
+      alias resource page
+
+      def url
+        Decidim::ResourceLocatorPresenter.new(page).url
+      end
+
+      def author_fields
+        {
+          id: resource.author.id,
+          name: author_name(resource.author),
+          url: author_url(resource.author)
+        }
+      end
+
+      def author_name(author)
+        translated_attribute(author.name)
+      end
+
+      def author_url(author)
+        if author.respond_to?(:nickname)
+          profile_url(author) # is a Decidim::User or Decidim::UserGroup
+        else
+          root_url # is a Decidim::Organization
+        end
+      end
+    end
+  end
+end

data/lib/decidim/pages/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Pages
     def self.version
-      "0.29.1"
+      "0.30.0.rc1"
     end
   end
 end

data/lib/decidim/pages.rb

@@ -10,5 +10,6 @@ module Decidim
   # This namespace holds the logic of the `Pages` component. This component
   # allows the admins to create a custom page for a participatory process.
   module Pages
+    autoload :PageSerializer, "decidim/pages/page_serializer"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-pages
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.30.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0.rc1
 description: A pages component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -91,6 +91,8 @@ files:
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - config/locales/bg.yml
+- config/locales/bn-BD.yml
+- config/locales/bs-BA.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -171,6 +173,7 @@ files:
 - db/migrate/20170110145040_remove_commentable_flag_from_pages.rb
 - db/migrate/20170220091402_remove_page_feature_titles.rb
 - db/migrate/20180305133658_rename_features_to_components_at_pages.rb
+- db/migrate/20240828103537_add_deleted_at_to_decidim_pages_pages.rb
 - decidim-pages.gemspec
 - lib/decidim/api/page_type.rb
 - lib/decidim/api/pages_type.rb
@@ -180,11 +183,12 @@ files:
 - lib/decidim/pages/api.rb
 - lib/decidim/pages/component.rb
 - lib/decidim/pages/engine.rb
+- lib/decidim/pages/page_serializer.rb
 - lib/decidim/pages/seeds.rb
 - lib/decidim/pages/version.rb
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0
+- AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/
@@ -199,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Decidim pages module