Merge 8d3326196a into 74fc4dbacf

refactor: Only remove pointer-events when necessary (#35390 )
Extract BaseFilter class to hold common components for filters
2025-07-18 02:08:16 +00:00 · 2025-07-15 17:05:58 +00:00 · 2025-07-15 15:57:31 +00:00 · 2025-07-03 18:28:19 -04:00
5 changed files with 12 additions and 16 deletions
--- a/app/filters/announcement_filter.rb
+++ b/app/filters/announcement_filter.rb
@ -1,17 +1,11 @@
 # frozen_string_literal: true

-class AnnouncementFilter
+class AnnouncementFilter < BaseFilter
  KEYS = %i(
    published
    unpublished
  ).freeze

-  attr_reader :params
-
-  def initialize(params)
-    @params = params
-  end
-
  def results
    scope = Announcement.unscoped

--- a/app/filters/base_filter.rb
+++ b/app/filters/base_filter.rb
@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class BaseFilter
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+end
--- a/app/filters/invite_filter.rb
+++ b/app/filters/invite_filter.rb
@ -1,17 +1,11 @@
 # frozen_string_literal: true

-class InviteFilter
+class InviteFilter < BaseFilter
  KEYS = %i(
    available
    expired
  ).freeze

-  attr_reader :params
-
-  def initialize(params)
-    @params = params
-  end
-
  def results
    scope = Invite.order(created_at: :desc)

--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2848,7 +2848,6 @@ a.account__display-name {
    &__pane {
      height: 100%;
      overflow: hidden;
-      pointer-events: none;
      display: flex;
      justify-content: flex-end;
      min-width: 285px;
@ -2860,7 +2859,6 @@ a.account__display-name {
      &__inner {
        position: fixed;
        width: 285px;
-        pointer-events: auto;
        height: 100%;
      }
    }
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@ -18,6 +18,7 @@ if ENV.fetch('COVERAGE', false)

    add_filter 'lib/linter'

+    add_group 'Filters', 'app/filters'
    add_group 'Libraries', 'lib'
    add_group 'Policies', 'app/policies'
    add_group 'Presenters', 'app/presenters'
Author	SHA1	Message	Date
Matt Jankowski	cf30c015e2	Merge `8d3326196a` into `74fc4dbacf`	2025-07-15 17:05:58 +00:00
diondiondion	74fc4dbacf	refactor: Only remove pointer-events when necessary (#35390 ) Some checks failed Check i18n / check-i18n (push) Waiting to run Details Chromatic / Run Chromatic (push) Waiting to run Details CodeQL / Analyze (javascript) (push) Waiting to run Details CodeQL / Analyze (ruby) (push) Waiting to run Details Check formatting / lint (push) Waiting to run Details CSS Linting / lint (push) Waiting to run Details Ruby Testing / build (production) (push) Waiting to run Details Ruby Testing / build (test) (push) Waiting to run Details Ruby Testing / test (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / test (3.2) (push) Blocked by required conditions Details Ruby Testing / test (3.3) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (3.2) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (3.3) (push) Blocked by required conditions Details Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions Details Ruby Testing / End to End testing (3.3) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Crowdin / Upload translations / upload-translations (push) Has been cancelled Details Haml Linting / lint (push) Has been cancelled Details Ruby Linting / lint (push) Has been cancelled Details Historical data migration test / test (14-alpine) (push) Has been cancelled Details Historical data migration test / test (15-alpine) (push) Has been cancelled Details Historical data migration test / test (16-alpine) (push) Has been cancelled Details Historical data migration test / test (17-alpine) (push) Has been cancelled Details	2025-07-15 15:57:31 +00:00
Matt Jankowski	8d3326196a	Extract `BaseFilter` class to hold common components for filters	2025-07-03 18:28:19 -04:00