diff --git a/app/views/components/widget/_fba.js.erb b/app/views/components/widget/_fba.js.erb index ebefad59d..f7e1b4075 100644 --- a/app/views/components/widget/_fba.js.erb +++ b/app/views/components/widget/_fba.js.erb @@ -370,12 +370,7 @@ function FBAform(d, N) { // Add the fixed, floating tab button <%# FEATURE FLAG %> - if(this.options.legacyLink) { - this.buttonEl = d.createElement('a'); - this.buttonEl.setAttribute('href', 'javascript:void(0)'); - } else { - this.buttonEl = d.createElement('button'); - } + this.buttonEl = d.createElement('button'); this.buttonEl.setAttribute('id', 'fba-button'); this.buttonEl.setAttribute('data-id', this.options.formId); this.buttonEl.setAttribute('class', 'fba-button fixed-tab-button usa-button'); @@ -645,7 +640,6 @@ function FBAform(d, N) { // Specify the options for your form const touchpointFormOptions<%= form.short_uuid %> = { - 'legacyLink': <%= form.legacy_link_feature_flag? %>, 'formId': "<%= form.short_uuid %>", 'modalButtonText': "<%= form.modal_button_text %>", 'elementSelector': "<%= form.element_selector %>", diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb index f4ce0edc2..61f0b3f97 100644 --- a/config/initializers/rack_attack.rb +++ b/config/initializers/rack_attack.rb @@ -15,7 +15,7 @@ class Rack::Attack # Is the request to the form submission route? def self.submission_route?(req) - !!(req.path =~ %r{^/submissions/[\h]{1,8}\.json$}i) + !!(req.path =~ %r{^/touchpoints/[\h]{1,8}/submissions\.json$}i) end # Response for throttled requests diff --git a/db/migrate/20250227193906_rm_form_legacy_link_option.rb b/db/migrate/20250227193906_rm_form_legacy_link_option.rb new file mode 100644 index 000000000..71d6e0440 --- /dev/null +++ b/db/migrate/20250227193906_rm_form_legacy_link_option.rb @@ -0,0 +1,5 @@ +class RmFormLegacyLinkOption < ActiveRecord::Migration[8.0] + def change + remove_column :forms, :legacy_link_feature_flag + end +end diff --git a/db/schema.rb b/db/schema.rb index 7c941841d..cd63ff1f6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_02_26_221548) do +ActiveRecord::Schema[8.0].define(version: 2025_02_27_193906) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" @@ -311,7 +311,6 @@ t.string "short_uuid", limit: 8 t.boolean "enforce_new_submission_validations", default: true t.integer "service_stage_id" - t.boolean "legacy_link_feature_flag", default: false, comment: "when true, render fba-button as an A, otherwise render as BUTTON" t.index ["legacy_touchpoint_id"], name: "index_forms_on_legacy_touchpoint_id" t.index ["legacy_touchpoint_uuid"], name: "index_forms_on_legacy_touchpoint_uuid" t.index ["organization_id"], name: "index_forms_on_organization_id" diff --git a/spec/features/embedded_touchpoints_spec.rb b/spec/features/embedded_touchpoints_spec.rb index c582f4e23..a08b49edd 100644 --- a/spec/features/embedded_touchpoints_spec.rb +++ b/spec/features/embedded_touchpoints_spec.rb @@ -6,9 +6,8 @@ let(:organization) { FactoryBot.create(:organization) } let!(:user) { FactoryBot.create(:user, :admin, organization:) } - [true, false].each do |legacy_link_feature_flag_setting| context "as Admin" do - let!(:form) { FactoryBot.create(:form, :kitchen_sink, organization:, legacy_link_feature_flag: legacy_link_feature_flag_setting) } + let!(:form) { FactoryBot.create(:form, :kitchen_sink, organization:) } describe '/forms/:id/example' do before do @@ -97,5 +96,4 @@ end end end - end # legacy_link_feature_flag_setting end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index e8c28c2f5..592926e72 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -107,6 +107,14 @@ DatabaseCleaner.start end + # Disable Rack throttling for feature specs + config.before(:each, type: :feature) do + Rack::Attack.enabled = false + end + config.after(:each, type: :feature) do + Rack::Attack.enabled = true + end + config.after(:each, js: true) do errors = page.driver.browser.logs.get(:browser) if errors.present? diff --git a/spec/requests/rack_attack_spec.rb b/spec/requests/rack_attack_spec.rb index 1833ce6e1..b94ecda71 100644 --- a/spec/requests/rack_attack_spec.rb +++ b/spec/requests/rack_attack_spec.rb @@ -7,7 +7,7 @@ let(:ip) { '1.2.3.4' } let(:headers) { { 'REMOTE_ADDR' => ip } } - let(:valid_submission_path) { "/submissions/1234abcd.json" } + let(:valid_submission_path) { "/touchpoints/1234abcd/submissions.json" } it 'allows up to 10 requests per minute' do 10.times do