Merge branch 'main' into improve-reader-ui-part-2

Author: manuthecoder

.erb_lint.yml

@@ -4,6 +4,8 @@ exclude:
   - app/views/ach_transfers/_form.html.erb # erb-lint _really_ doesn't like Alpine
   - app/views/wires/new_v2.html.erb # erb-lint _really_ doesn't like Alpine
   - app/views/increase_checks/new_v2.html.erb # erb-lint _really_ doesn't like Alpine
+  - app/views/events/sub_organizations.html.erb # erb-lint _really_ doesn't like Alpine
+  - app/views/events/scoped_tags/_scoped_tag_option.html.erb # erb-lint _really_ doesn't like Alpine
   - app/views/doorkeeper/authorizations/new.html.erb
 linters:
   ErbSafety:

Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby File.read(File.join(File.dirname(__FILE__), ".ruby-version")).strip
+ruby file: ".ruby-version"
 
 gem "dotenv-rails", groups: [:development, :test]
 

app/controllers/api/v4/stripe_cards_controller.rb

@@ -27,7 +27,7 @@ def transactions
         @hcb_codes = @hcb_codes.select(&:missing_receipt?) if params[:missing_receipts] == "true"
 
         @total_count = @hcb_codes.size
-        @has_more = false # TODO: implement pagination
+        @hcb_codes = paginate_hcb_codes(@hcb_codes)
       end
 
       def create

app/controllers/api/v4/transactions_controller.rb

@@ -27,7 +27,7 @@ def missing_receipt
         @hcb_codes = HcbCode.where(id: hcb_codes_missing_ids).order(created_at: :desc)
 
         @total_count = @hcb_codes.size
-        @has_more = false # TODO: implement pagination
+        @hcb_codes = paginate_hcb_codes(@hcb_codes)
       end
 
       def update

app/controllers/event/scoped_tags_controller.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+class Event
+  class ScopedTagsController < ApplicationController
+    include SetEvent
+
+    before_action :set_scoped_tag, except: :create
+    before_action :set_event
+
+    def create
+      @scoped_tag = @event.subevent_scoped_tags.build(name: params[:name])
+
+      authorize @scoped_tag
+
+      if @scoped_tag.save
+        if params[:subevent_id]
+          subevent = Event.find(params[:subevent_id])
+
+          if @scoped_tag.parent_event.subevents.include?(subevent)
+            subevent.scoped_tags << @scoped_tag
+          end
+        end
+
+        respond_to do |format|
+          format.turbo_stream { render turbo_stream: turbo_stream.append_all(".scoped_tag_results", partial: "events/scoped_tags/scoped_tag_option", locals: { scoped_tag: @scoped_tag }) }
+          format.any do
+            flash[:success] = "Successfully created new sub-organization tag"
+            redirect_back fallback_location: event_sub_organizations_path(@event)
+          end
+        end
+      else
+        flash[:error] = "Failed to create new sub-organization tag"
+        redirect_to event_sub_organizations_path(@event)
+      end
+    end
+
+    def destroy
+      authorize @scoped_tag
+
+      @scoped_tag.destroy!
+
+      respond_to do |format|
+        format.turbo_stream do
+          streams = [turbo_stream.remove_all("[data-scoped-tag='#{@scoped_tag.id}']")]
+          streams << turbo_stream.remove_all(".scoped-tags__divider") if @event.subevent_scoped_tags.none?
+          render turbo_stream: streams
+        end
+        format.any { redirect_back fallback_location: event_sub_organizations_path(@scoped_tag.parent_event) }
+      end
+    end
+
+    def toggle_tag
+      authorize @scoped_tag
+
+      unless @scoped_tag.parent_event.subevents.include?(@event)
+        flash[:error] = "Cannot add tag of a different parent organization to this organization"
+        return redirect_to event_sub_organizations_path(@scoped_tag.parent_event)
+      end
+
+      if @event.scoped_tags.exists?(@scoped_tag.id)
+        removed = true
+        @event.scoped_tags.destroy(@scoped_tag)
+      else
+        @event.scoped_tags << @scoped_tag
+      end
+
+      respond_to do |format|
+        format.turbo_stream do
+          if removed
+            render partial: "events/scoped_tags/destroy", locals: { scoped_tag: @scoped_tag, subevent: @event }
+          else
+            render partial: "events/scoped_tags/create", locals: { scoped_tag: @scoped_tag, subevent: @event }
+          end
+        end
+        format.any { redirect_back fallback_location: event_sub_organizations_path(@scoped_tag.parent_event) }
+      end
+    end
+
+    private
+
+    def set_scoped_tag
+      @scoped_tag = Event::ScopedTag.find(params[:id])
+    end
+
+  end
+
+end

app/controllers/events_controller.rb

@@ -837,11 +837,18 @@ def sub_organizations
     respond_to do |format|
       format.html do
         search = params[:q] || params[:search]
+        scoped_tag = Event::ScopedTag.find_by(name: params[:tag])
 
         relation = @event.subevents
         relation = relation.where("name ILIKE ?", "%#{search}%") if search.present?
+        relation = relation.joins(:scoped_tags).where("event_scoped_tags.id = #{scoped_tag.id}") if scoped_tag.present?
         relation = relation.order(created_at: :desc)
 
+        @filter_options = [
+          { key: "tag", label: "Tag", type: "select", options: @event.subevent_scoped_tags.map(&:name) }
+        ]
+        @has_filter = helpers.check_filters?(@filter_options, params)
+
         @sub_organizations = relation
       end
 
@@ -883,7 +890,8 @@ def create_sub_organization
       is_public: @event.is_public,
       plan: @event.config.subevent_plan.presence,
       risk_level: @event.risk_level,
-      parent_event: @event
+      parent_event: @event,
+      scoped_tags: params[:scoped_tags]
     ).run
 
     redirect_to subevent

app/controllers/hcb_codes_controller.rb

@@ -246,7 +246,7 @@ def invoice_as_personal_transaction
 
     authorize hcb_code
 
-    if hcb_code.amount_cents >= -100
+    if hcb_code.amount_cents > -100
       flash[:error] = "Invoices can only be generated for charges of $1.00 or more."
       return redirect_to hcb_code
     end

app/helpers/api/v4/application_helper.rb

@@ -13,6 +13,23 @@ def pagination_metadata(json)
         json.has_more @has_more
       end
 
+      def paginate_hcb_codes(hcb_codes)
+        limit = params[:limit]&.to_i || 25
+        return render json: { error: "invalid_operation", messages: "Limit is capped at 100. '#{params[:limit]}' is invalid." }, status: :bad_request if limit > 100
+
+        start_index = if params[:after]
+                        index = hcb_codes.index { |hcb_code| hcb_code.public_id == params[:after] }
+                        return render json: { error: "invalid_operation", messages: "After parameter '#{params[:after]}' not found" }, status: :bad_request if index.nil?
+
+                        index + 1
+                      else
+                        0
+                      end
+        @has_more = hcb_codes.length > start_index + limit
+
+        hcb_codes.slice(start_index, limit)
+      end
+
       def transaction_amount(tx, event: nil)
         return tx.amount.cents if !tx.is_a?(HcbCode)
 

app/javascript/controllers/menu_controller.js

@@ -16,6 +16,7 @@ export default class extends Controller {
     appendTo: String,
     placement: { type: String, default: 'bottom-start' },
     contentId: String,
+    updateOnResize: { type: Boolean, default: false }, // See https://github.com/hackclub/hcb/issues/8588
   }
 
   initialize() {
@@ -60,7 +61,7 @@ export default class extends Controller {
       this.content,
       this.computePosition.bind(this, false),
       {
-        elementResize: false, // See https://github.com/hackclub/hcb/issues/8588
+        elementResize: this.updateOnResizeValue,
       }
     )
   }

app/javascript/controllers/text_filter_controller.js

@@ -62,7 +62,7 @@ export default class extends Controller {
   get listboxElement() {
     const listbox = this.comboboxElement.getAttribute('aria-controls')
 
-    return document.getElementById(listbox)
+    return document.querySelector(listbox)
   }
 
   get optionElements() {