decidim 0.4.2 → 0.4.3

data/decidim-admin/app/controllers/decidim/admin/participatory_process_attachments_controller.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing all the attachments for a participatory
     # process.
     #
-    class ParticipatoryProcessAttachmentsController < ApplicationController
+    class ParticipatoryProcessAttachmentsController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
       include Concerns::HasAttachments
 

data/decidim-admin/app/controllers/decidim/admin/participatory_process_copies_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing participatory processes.
     #
-    class ParticipatoryProcessCopiesController < ApplicationController
+    class ParticipatoryProcessCopiesController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
       def new
@@ -30,12 +28,6 @@ module Decidim
           end
         end
       end
-
-      private
-
-      def collection
-        @collection ||= Decidim::ParticipatoryProcessesWithUserRole.for(current_user, :admin)
-      end
     end
   end
 end

data/decidim-admin/app/controllers/decidim/admin/participatory_process_groups_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing participatory process groups.
     #
-    class ParticipatoryProcessGroupsController < ApplicationController
+    class ParticipatoryProcessGroupsController < Decidim::Admin::ApplicationController
       helper_method :collection, :participatory_process_group
 
       def index

data/decidim-admin/app/controllers/decidim/admin/participatory_process_publications_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing participatory process publications.
     #
-    class ParticipatoryProcessPublicationsController < ApplicationController
+    class ParticipatoryProcessPublicationsController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
       def create

data/decidim-admin/app/controllers/decidim/admin/participatory_process_step_activations_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing participatory process step activations.
     #
-    class ParticipatoryProcessStepActivationsController < ApplicationController
+    class ParticipatoryProcessStepActivationsController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
       def create

data/decidim-admin/app/controllers/decidim/admin/participatory_process_step_ordering_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing participatory process step ordering.
     #
-    class ParticipatoryProcessStepOrderingController < ApplicationController
+    class ParticipatoryProcessStepOrderingController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
       def create

data/decidim-admin/app/controllers/decidim/admin/participatory_process_steps_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing participatory process steps.
     #
-    class ParticipatoryProcessStepsController < ApplicationController
+    class ParticipatoryProcessStepsController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
       def index

data/decidim-admin/app/controllers/decidim/admin/participatory_process_user_roles_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing participatory process user roles.
     #
-    class ParticipatoryProcessUserRolesController < ApplicationController
+    class ParticipatoryProcessUserRolesController < Decidim::Admin::ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
       def index
@@ -38,7 +36,7 @@ module Decidim
       def edit
         @user_role = collection.find(params[:id])
         authorize! :update, @user_role
-        @form = form(ParticipatoryProcessUserRoleForm).from_model(@user_role.user, current_process: current_participatory_process)
+        @form = form(ParticipatoryProcessUserRoleForm).from_model(@user_role.user)
       end
 
       def update

data/decidim-admin/app/controllers/decidim/admin/participatory_processes_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing participatory processes.
     #
-    class ParticipatoryProcessesController < ApplicationController
+    class ParticipatoryProcessesController < Decidim::Admin::ApplicationController
       helper Decidim::OrganizationScopesHelper
       helper_method :current_participatory_process
 

data/decidim-admin/app/controllers/decidim/admin/scopes_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing all scopes at the admin panel.
     #
-    class ScopesController < ApplicationController
+    class ScopesController < Decidim::Admin::ApplicationController
       layout "decidim/admin/settings"
 
       def index

data/decidim-admin/app/controllers/decidim/admin/static_pages_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing all pages at the admin panel.
     #
-    class StaticPagesController < ApplicationController
+    class StaticPagesController < Decidim::Admin::ApplicationController
       layout "decidim/admin/pages"
 
       def index

data/decidim-admin/app/controllers/decidim/admin/users_controller.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Admin
     # Controller that allows managing all admins at the admin panel.
     #
-    class UsersController < Admin::ApplicationController
+    class UsersController < Decidim::Admin::ApplicationController
       def index
         authorize! :index, :admin_users
         @users = collection.page(params[:page]).per(15)

data/decidim-admin/app/forms/decidim/admin/participatory_process_form.rb

@@ -31,6 +31,7 @@ module Decidim
       attribute :banner_image
       attribute :remove_banner_image
       attribute :participatory_process_group_id, Integer
+      attribute :show_statistics, Boolean
 
       validates :slug, presence: true
       validates :title, :subtitle, :description, :short_description, translatable_presence: true

data/decidim-admin/app/views/decidim/admin/participatory_processes/_form.html.erb

@@ -88,5 +88,9 @@
         <%= form.select :participatory_process_group_id, process_groups_for_select, prompt: I18n.t("decidim.participatory_processes.participatory_process_groups.none") %>
       <% end %>
     </div>
+
+    <div class="row column">
+      <%= form.check_box :show_statistics %>
+    </div>
   </div>
 </div>

data/decidim-admin/spec/commands/update_participatory_process_spec.rb

@@ -33,7 +33,8 @@ module Decidim
               current_organization: my_process.organization,
               scope: my_process.scope,
               errors: my_process.errors,
-              participatory_process_group: my_process.participatory_process_group
+              participatory_process_group: my_process.participatory_process_group,
+              show_statistics: my_process.show_statistics
             }
           }
         end

data/decidim-admin/spec/factories.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/factories"
-require "decidim/admin/test/factories"

data/decidim-admin/spec/features/admin_manages_participatory_processes_spec.rb

@@ -80,7 +80,7 @@ describe "Admin manage participatory processes", type: :feature do
 
     it "update a participatory process without images does not delete them" do
       click_link translated(participatory_process3.title)
-      click_processes_menu_link "Info"
+      click_submenu_link "Info"
       click_button "Update"
 
       within ".callout-wrapper" do

data/decidim-admin/spec/forms/participatory_process_form_spec.rb

@@ -35,7 +35,8 @@ module Decidim
         }
       end
       let(:slug) { "slug" }
-      let(:attachment) { test_file("city.jpeg", "image/jpeg") }
+      let(:attachment) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+      let(:show_statistics) { true }
       let(:attributes) do
         {
           "participatory_process" => {
@@ -53,7 +54,8 @@ module Decidim
             "short_description_ca" => short_description[:ca],
             "hero_image" => attachment,
             "banner_image" => attachment,
-            "slug" => slug
+            "slug" => slug,
+            "show_statistics" => show_statistics
           }
         }
       end
@@ -86,7 +88,7 @@ module Decidim
       end
 
       context "when images are not the expected type" do
-        let(:attachment) { test_file("Exampledocument.pdf", "application/pdf") }
+        let(:attachment) { Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf") }
 
         it { is_expected.not_to be_valid }
       end

data/decidim-admin/spec/forms/participatory_process_group_form_spec.rb

@@ -21,7 +21,7 @@ module Decidim
           ca: "Descripció"
         }
       end
-      let(:attachment) { test_file("city.jpeg", "image/jpeg") }
+      let(:attachment) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
 
       let(:attributes) do
         {
@@ -56,7 +56,7 @@ module Decidim
       end
 
       context "when images are not the expected type" do
-        let(:attachment) { test_file("Exampledocument.pdf", "application/pdf") }
+        let(:attachment) { Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf") }
 
         it { is_expected.not_to be_valid }
       end

data/decidim-admin/spec/shared/participatory_admin_shared_context.rb

@@ -3,19 +3,14 @@
 RSpec.shared_context "participatory process admin" do
   let(:organization) { create(:organization) }
   let!(:user) { create(:user, :admin, :confirmed, organization: organization) }
+
   let(:participatory_process) { create(:participatory_process, organization: organization) }
-  let(:process_admin) { create :user, :confirmed, organization: organization }
-  let!(:user_role) { create :participatory_process_user_role, user: process_admin, participatory_process: participatory_process }
+  let!(:process_admin) { create :user, :process_admin, :confirmed, organization: organization, participatory_process: participatory_process }
+
   let(:image1_filename) { "city.jpeg" }
-  let(:image1_path) do
-    File.expand_path(File.join(__dir__, "..", "..", "..", "decidim-dev", "spec", "support", image1_filename))
-  end
+  let(:image1_path) { Decidim::Dev.asset(image1_filename) }
   let(:image2_filename) { "city2.jpeg" }
-  let(:image2_path) do
-    File.expand_path(File.join(__dir__, "..", "..", "..", "decidim-dev", "spec", "support", image2_filename))
-  end
+  let(:image2_path) { Decidim::Dev.asset(image2_filename) }
   let(:image3_filename) { "city3.jpeg" }
-  let(:image3_path) do
-    File.expand_path(File.join(__dir__, "..", "..", "..", "decidim-dev", "spec", "support", image3_filename))
-  end
+  let(:image3_path) { Decidim::Dev.asset(image3_filename) }
 end

data/decidim-admin/spec/spec_helper.rb

@@ -7,9 +7,3 @@ ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
 
 require "decidim/dev/test/base_spec_helper"
-
-Dir["#{__dir__}/support/**/*.rb"].each { |f| require f }
-
-RSpec.configure do |config|
-  config.include ProcessesMenuLinksHelpers
-end

data/decidim-budgets/lib/decidim/budgets/feature.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/features/namer"
+require "decidim/features/namer"
 
 Decidim.register_feature(:budgets) do |feature|
   feature.engine = Decidim::Budgets::Engine
@@ -19,10 +19,17 @@ Decidim.register_feature(:budgets) do |feature|
     resource.template = "decidim/budgets/projects/linked_projects"
   end
 
-  feature.register_stat :projects_count, primary: true do |features, start_at, end_at|
+  feature.register_stat :projects_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, start_at, end_at|
     Decidim::Budgets::FilteredProjects.for(features, start_at, end_at).count
   end
 
+  feature.register_stat :orders_count do |features, start_at, end_at|
+    orders = Decidim::Budgets::Order.where(feature: features)
+    orders = orders.where("created_at >= ?", start_at) if start_at.present?
+    orders = orders.where("created_at <= ?", end_at) if end_at.present?
+    orders.count
+  end
+
   feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
     projects = Decidim::Budgets::FilteredProjects.for(features, start_at, end_at)
     Decidim::Comments::Comment.where(root_commentable: projects).count

data/decidim-budgets/spec/factories.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/factories"
-require "decidim/admin/test/factories"
-require "decidim/budgets/test/factories"
 require "decidim/proposals/test/factories"
+require "decidim/comments/test/factories"
+
+require "decidim/budgets/test/factories"

data/decidim-comments/README.md

@@ -52,18 +52,18 @@ The frontend code can be found in the folder `app/frontend` instead of `app/asse
 
 #### Developing React components
 
-You need to execute `yarn start` in a separate terminal, in the `decidim` root folder while you are developing this module. When you are finished you can build the project for production like this: `yarn build:prod`. We are checking in the bundle into the repository.
+You need to execute `npm start` in a separate terminal, in the `decidim` root folder while you are developing this module. When you are finished you can build the project for production like this: `npm run build:prod`. We are checking in the bundle into the repository.
 
 #### Run tests
 
-You can execute `yarn test` to run the javascript test suite or you can run `yarn test:watch` to listen for file changes.
+You can execute `npm test` to run the javascript test suite or you can run `npm test:watch` to listen for file changes.
 
 #### GraphQL schema and Typescript
 
 Since we are using Typescript we can generate interfaces and types from our schema using the following command:
 
 ```bash
-  yarn run graphql:generate_schema_types
+  npm run graphql:generate_schema_types
 ```
 
 This command will create a file called `app/frontend/support/schema.ts` that can be used to strict type checking in our components.

data/decidim-comments/app/frontend/comments/down_vote_button.component.tsx

@@ -74,7 +74,7 @@ const DownVoteButtonWithMutation = graphql<DownVoteMutation, DownVoteButtonProps
               },
             },
           },
-          update: (store, result: DownVoteMutation) => {
+          update: (store, { data }: { data: DownVoteMutation }) => {
             const variables = {
               commentableId: ownProps.rootCommentable.id,
               commentableType: ownProps.rootCommentable.type,
@@ -84,8 +84,8 @@ const DownVoteButtonWithMutation = graphql<DownVoteMutation, DownVoteButtonProps
             const commentReducer = (comment: CommentFragment): CommentFragment => {
               const replies = comment.comments || [];
 
-              if (comment.id === ownProps.comment.id && result.comment) {
-                return result.comment.downVote;
+              if (comment.id === ownProps.comment.id && data.comment) {
+                return data.comment.downVote;
               }
 
               return {

data/decidim-comments/app/frontend/comments/up_vote_button.component.tsx

@@ -72,7 +72,7 @@ const UpVoteButtonWithMutation = graphql(upVoteMutation, {
           },
         },
       },
-      update: (store, result: UpVoteMutation) => {
+      update: (store, { data }: { data: UpVoteMutation }) => {
         const variables = {
           commentableId: ownProps.rootCommentable.id,
           commentableType: ownProps.rootCommentable.type,
@@ -82,8 +82,8 @@ const UpVoteButtonWithMutation = graphql(upVoteMutation, {
         const commentReducer = (comment: CommentFragment): CommentFragment => {
           const replies = comment.comments || [];
 
-          if (comment.id === ownProps.comment.id && result.comment) {
-            return result.comment.upVote;
+          if (comment.id === ownProps.comment.id && data.comment) {
+            return data.comment.upVote;
           }
 
           return {

data/decidim-comments/lib/decidim/comments/test/factories.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "decidim/core/test/factories"
-require "decidim/admin/test/factories"
-
 FactoryGirl.define do
   factory :comment, class: "Decidim::Comments::Comment" do
     author { build(:user, organization: commentable.organization) }