add share_token to consultations, fix tests

Author: antopalidi

.github/workflows/ci_core_tasks.yml

@@ -17,7 +17,7 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 3.0.2
+  RUBY_VERSION: 3.0.6
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-core
   CODECOV_TOKEN: bc15b944-6b42-420a-b3f9-a5a8fb214326

.github/workflows/ci_core_tasks_webpacker.yml

@@ -17,7 +17,7 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 3.0.2
+  RUBY_VERSION: 3.0.6
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-core
   CODECOV_TOKEN: bc15b944-6b42-420a-b3f9-a5a8fb214326

decidim-consultations/app/controllers/concerns/decidim/consultations/needs_consultation.rb

@@ -32,13 +32,22 @@ def current_consultation
           @current_consultation ||= detect_consultation
         end
 
+        def current_component
+          @current_component ||= Decidim::Component.find_by(id: params[:component_id])
+        end
+
+        def current_question
+          @current_question ||= Decidim::Consultations::Question.find_by(slug: params[:question_slug])
+        end
+
         alias current_participatory_space current_consultation
 
         private
 
         def detect_consultation
-          request.env["current_consultation"] ||
-            organization_consultations.find_by!(slug: params[:consultation_slug] || params[:slug])
+          current_question&.consultation ||
+            request.env["current_consultation"] ||
+            organization_consultations.find_by(slug: params[:consultation_slug] || params[:slug])
         end
 
         def organization_consultations

decidim-consultations/app/controllers/decidim/consultations/admin/component_share_tokens_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    module Admin
+      class ComponentShareTokensController < Decidim::Admin::ShareTokensController
+        include ConsultationAdmin
+
+        helper_method :current_participatory_space
+
+        def resource
+          @resource ||= current_question.components.find(params[:component_id])
+        end
+      end
+    end
+  end
+end

decidim-consultations/app/controllers/decidim/consultations/admin/consultation_share_tokens_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    module Admin
+      class ConsultationShareTokensController < Decidim::Admin::ShareTokensController
+        include ConsultationAdmin
+
+        helper_method :current_participatory_space
+
+        def resource
+          current_consultation
+        end
+      end
+    end
+  end
+end

decidim-consultations/app/models/decidim/consultation.rb

@@ -15,6 +15,7 @@ class Consultation < ApplicationRecord
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
     include Decidim::FilterableResource
+    include Decidim::ShareableWithToken
 
     translatable_fields :title, :subtitle, :description
 
@@ -116,5 +117,9 @@ def closed?
     def self.ransackable_scopes(_auth_object = nil)
       [:with_any_date]
     end
+
+    def shareable_url(share_token)
+      EngineRouter.main_proxy(self).consultation_url(self, share_token: share_token.token)
+    end
   end
 end

decidim-consultations/app/permissions/decidim/consultations/admin/permissions.rb

@@ -28,6 +28,7 @@ def permissions
           allowed_question_action?
           allowed_response_action?
           allowed_response_group_action?
+          share_tokens_action?
 
           permission_action
         end
@@ -106,6 +107,12 @@ def allowed_response_group_action?
           end
         end
 
+        def share_tokens_action?
+          return unless permission_action.subject == :share_tokens
+
+          allow!
+        end
+
         # Only admin users can enter the consultations area.
         def user_can_enter_space_area?
           return unless permission_action.action == :enter &&

decidim-consultations/lib/decidim/consultations/admin_engine.rb

@@ -18,6 +18,7 @@ class AdminEngine < ::Rails::Engine
           get :results, on: :member
           resource :publish, controller: "consultation_publications", only: [:create, :destroy]
           resource :publish_results, controller: "consultation_results_publications", only: [:create, :destroy]
+          resources :consultation_share_tokens, except: [:show], path: "share_tokens", as: "share_tokens"
           resources :questions, param: :slug, except: :show, shallow: true do
             resource :publish, controller: "question_publications", only: [:create, :destroy]
             resource :permissions, controller: "question_permissions"
@@ -35,6 +36,7 @@ class AdminEngine < ::Rails::Engine
               get :share
             end
             resources :exports, only: :create
+            resources :component_share_tokens, except: [:show], path: "share_tokens", as: "share_tokens"
           end
 
           resources :question_attachments
@@ -73,6 +75,12 @@ class AdminEngine < ::Rails::Engine
                         position: 1.0,
                         active: is_active_link?(decidim_admin_consultations.results_consultation_path(current_consultation)),
                         if: allowed_to?(:read, :question)
+          menu.add_item :consultation_share_tokens,
+                        I18n.t("menu.share_tokens", scope: "decidim.admin"),
+                        decidim_admin_consultations.consultation_share_tokens_path(current_consultation),
+                        position: 1.2,
+                        active: is_active_link?(decidim_admin_consultations.consultation_share_tokens_path(current_consultation)),
+                        if: allowed_to?(:read, :share_tokens, consultation: current_consultation)
         end
       end
       initializer "decidim_consultations.admin_menu" do

decidim-initiatives/spec/system/filter_initiatives_spec.rb

@@ -80,7 +80,8 @@
 
         within ".order-by__dropdown" do
           expect(page).to have_selector("ul[data-dropdown-menu$=dropdown-menu]", text: "Random")
-          page.find("a", text: "Random", visible: true).click
+          page.find("a", text: "Random").click
+          expect(page).to have_link("Most commented")
           click_link "Most commented"
         end
 
@@ -200,7 +201,7 @@
       end
 
       it "doesn't display TYPE filter" do
-        expect(page).not_to have_content(/Type/i)
+        expect(page).not_to have_css("legend", text: /Type/i)
         expect(page).not_to have_css(".filters__section.with_any_type_check_boxes_tree_filter")
       end
 
@@ -220,7 +221,7 @@
 
       it "can be filtered by type" do
         within "form.new_filter" do
-          expect(page).to have_content(/Type/i)
+          expect(page).to have_css("legend", text: /Type/i)
         end
       end
 

decidim-participatory_processes/spec/system/admin/invite_process_admin_spec.rb

@@ -42,7 +42,7 @@
       end
 
       within ".secondary-nav" do
-        expect(page.text).to eq "View public page\nInfo\nPhases\nComponents\nCategories\nAttachments\nFolders\nFiles\nProcess admins\nPrivate participants\nModerations"
+        expect(page.text).to eq "View public page\nInfo\nPhases\nComponents\nCategories\nAttachments\nFolders\nFiles\nProcess admins\nPrivate participants\nModerations\nShare tokens"
       end
     end
   end
@@ -72,7 +72,7 @@
       end
 
       within ".secondary-nav" do
-        expect(page.text).to eq "View public page\nInfo\nPhases\nComponents\nCategories\nAttachments\nFolders\nFiles\nProcess admins\nPrivate participants\nModerations"
+        expect(page.text).to eq "View public page\nInfo\nPhases\nComponents\nCategories\nAttachments\nFolders\nFiles\nProcess admins\nPrivate participants\nModerations\nShare tokens"
       end
     end
   end