Fix broken dashboard action logs under certain conditions

decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb

@@ -34,8 +34,8 @@ def action_string
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb

@@ -43,8 +43,8 @@ def action_string
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb

@@ -70,8 +70,8 @@ def action_string
           end
         end
 
-        def has_diff?
-          action == "unpublish" || super
+        def diff_actions
+          super + %w(unpublish)
         end
       end
     end

decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter.rb

@@ -44,8 +44,8 @@ def changeset
           ).changeset
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

decidim-assemblies/spec/presenters/decidim/assemblies/admin_log/assemblies_type_presenter_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::AdminLog::AssembliesTypePresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:admin_log_resource) { create(:assemblies_type, organization: organization) }
+    let(:action) { "delete" }
+  end
+end

decidim-assemblies/spec/presenters/decidim/assemblies/admin_log/assembly_member_presenter_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::AdminLog::AssemblyMemberPresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:assembly) { create(:assembly, organization: organization) }
+    let(:admin_log_resource) { create(:assembly_member, assembly: assembly) }
+    let(:action) { "delete" }
+  end
+end

decidim-assemblies/spec/presenters/decidim/assemblies/admin_log/assembly_presenter_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::AdminLog::AssemblyPresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:admin_log_resource) { create(:assembly, organization: organization) }
+    let(:action) { "unpublish" }
+  end
+end

decidim-assemblies/spec/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Assemblies::AdminLog::AssemblyUserRolePresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:admin_log_resource) { create(:assembly_user_role, user: user) }
+    let(:action) { "delete" }
+  end
+end

decidim-conferences/app/presenters/decidim/conferences/admin_log/conferences_presenter.rb → decidim-conferences/app/presenters/decidim/conferences/admin_log/conference_presenter.rb

@@ -48,8 +48,8 @@ def action_string
           end
         end
 
-        def has_diff?
-          action == "unpublish" || super
+        def diff_actions
+          super + %w(unpublish)
         end
       end
     end

decidim-conferences/app/presenters/decidim/conferences/admin_log/conference_registration_presenter.rb

@@ -34,8 +34,8 @@ def action_string
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

decidim-conferences/app/presenters/decidim/conferences/admin_log/conference_speaker_presenter.rb

@@ -43,8 +43,8 @@ def action_string
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

decidim-conferences/app/presenters/decidim/conferences/admin_log/conferences_user_role_presenter.rb → decidim-conferences/app/presenters/decidim/conferences/admin_log/conference_user_role_presenter.rb

@@ -44,8 +44,8 @@ def changeset
           ).changeset
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

decidim-conferences/app/presenters/decidim/conferences/admin_log/media_link_presenter.rb

@@ -36,8 +36,8 @@ def action_string
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

decidim-conferences/app/presenters/decidim/conferences/admin_log/partner_presenter.rb

@@ -38,8 +38,8 @@ def action_string
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

decidim-conferences/app/presenters/decidim/conferences/admin_log/registration_type_presenter.rb

@@ -36,8 +36,8 @@ def action_string
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

decidim-conferences/spec/presenters/decidim/conferences/admin_log/conference_presenter_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Conferences::AdminLog::ConferencePresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:admin_log_resource) { create(:conference, organization: organization) }
+    let(:action) { "unpublish" }
+  end
+end

decidim-conferences/spec/presenters/decidim/conferences/admin_log/conference_registration_presenter_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Conferences::AdminLog::ConferenceRegistrationPresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:conference) { create(:conference, organization: organization) }
+    let(:admin_log_resource) { create(:conference_registration, conference: conference) }
+    let(:action) { "delete" }
+  end
+end

decidim-conferences/spec/presenters/decidim/conferences/admin_log/conference_speaker_presenter_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Conferences::AdminLog::ConferenceSpeakerPresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:conference) { create(:conference, organization: organization) }
+    let(:admin_log_resource) { create(:conference_speaker, conference: conference) }
+    let(:action) { "delete" }
+  end
+end

decidim-conferences/spec/presenters/decidim/conferences/admin_log/conference_user_role_presenter_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Conferences::AdminLog::ConferenceUserRolePresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:conference) { create(:conference, organization: organization) }
+    let(:admin_log_resource) { create(:conference_user_role, conference: conference, user: user) }
+    let(:action) { "delete" }
+  end
+end

decidim-conferences/spec/presenters/decidim/conferences/admin_log/media_link_presenter_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Conferences::AdminLog::MediaLinkPresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:conference) { create(:conference, organization: organization) }
+    let(:admin_log_resource) { create(:media_link, conference: conference) }
+    let(:action) { "delete" }
+  end
+end

decidim-conferences/spec/presenters/decidim/conferences/admin_log/partner_presenter_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Conferences::AdminLog::PartnerPresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:conference) { create(:conference, organization: organization) }
+    let(:admin_log_resource) { create(:partner, conference: conference) }
+    let(:action) { "delete" }
+  end
+end

decidim-conferences/spec/presenters/decidim/conferences/admin_log/registration_type_presenter_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Conferences::AdminLog::RegistrationTypePresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:conference) { create(:conference, organization: organization) }
+    let(:admin_log_resource) { create(:registration_type, conference: conference) }
+    let(:action) { "delete" }
+  end
+end

decidim-core/app/presenters/decidim/admin_log/component_presenter.rb

@@ -35,8 +35,8 @@ def action_string
         end
       end
 
-      def has_diff?
-        action == "unpublish" || super
+      def diff_actions
+        super + %w(unpublish)
       end
     end
   end

decidim-core/app/presenters/decidim/admin_log/moderation_presenter.rb

@@ -40,8 +40,8 @@ def i18n_params
         )
       end
 
-      def has_diff?
-        action == "unreport" || super
+      def diff_actions
+        super + %w(unreport)
       end
     end
   end

decidim-core/app/presenters/decidim/admin_log/organization_presenter.rb

@@ -88,8 +88,8 @@ def i18n_labels_scope
         "activemodel.attributes.organization"
       end
 
-      def has_diff?
-        action == "update_id_documents_config" || super
+      def diff_actions
+        super + %w(update_id_documents_config)
       end
     end
   end

decidim-core/app/presenters/decidim/admin_log/user_presenter.rb

@@ -51,8 +51,8 @@ def changeset
       end
 
       # If the action is officialization, then we want to show the diff
-      def has_diff?
-        %w(officialize unofficialize).include?(action)
+      def diff_actions
+        %w(officialize unofficialize)
       end
     end
   end

decidim-core/app/presenters/decidim/log/base_presenter.rb

@@ -199,7 +199,15 @@ def i18n_params
       #
       # Returns a Boolean.
       def has_diff?
-        %w(update create).include?(action.to_s) && action_log.version.present?
+        diff_actions.include?(action.to_s) && action_log.version.present?
+      end
+
+      # Private: Lists the log actions for which the diff changeset should be
+      # shown.
+      #
+      # Returns a Boolean.
+      def diff_actions
+        %w(update create)
       end
 
       # Private: Calculates whether the diff should show the previous value

decidim-core/lib/decidim/core/test.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/shared_examples/acts_as_author_examples"
+require "decidim/core/test/shared_examples/admin_log_presenter_examples"
 require "decidim/core/test/shared_examples/authorable"
 require "decidim/core/test/shared_examples/coauthorable"
 require "decidim/core/test/shared_examples/publicable"

decidim-core/lib/decidim/core/test/shared_examples/admin_log_presenter_examples.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples "present admin log entry" do
+  subject(:presenter) { described_class.new(action_log, helper) }
+
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, organization: organization) }
+  let(:action) { "create" }
+  let(:action_log) do
+    create(
+      :action_log,
+      user: user,
+      action: action,
+      resource: admin_log_resource
+    )
+  end
+
+  before do
+    helper.extend(Decidim::ApplicationHelper)
+    helper.extend(Decidim::TranslationsHelper)
+  end
+
+  describe "#present" do
+    subject { presenter.present }
+
+    context "when the logged action is one that shows diff and the action log does not have an associated version" do
+      it "returns an empty diff" do
+        expect(subject).not_to include("class=\"logs__log__diff\"")
+      end
+    end
+  end
+end

decidim-core/spec/presenters/decidim/admin_log/component_presenter_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::AdminLog::ComponentPresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:admin_log_resource) { create(:component, organization: organization) }
+    let(:action) { "unpublish" }
+  end
+end

decidim-core/spec/presenters/decidim/admin_log/moderation_presenter_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::AdminLog::ModerationPresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:component) { create(:component, manifest_name: "dummy", organization: organization) }
+    let(:reportable) { create(:dummy_resource, component: component) }
+    let(:moderation) { create(:moderation, reportable: reportable) }
+    let(:admin_log_resource) { create(:report, moderation: moderation) }
+    let(:action) { "unreport" }
+  end
+end

decidim-core/spec/presenters/decidim/admin_log/organization_presenter_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::AdminLog::OrganizationPresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:admin_log_resource) { organization }
+    let(:action) { "update_id_documents_config" }
+  end
+end

decidim-core/spec/presenters/decidim/admin_log/user_presenter_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::AdminLog::UserPresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:admin_log_resource) { organization }
+    let(:action) { "officialize" }
+  end
+end