diff --git a/app/controllers/episode_media_controller.rb b/app/controllers/episode_media_controller.rb index a8b595ede..7b6e608bb 100644 --- a/app/controllers/episode_media_controller.rb +++ b/app/controllers/episode_media_controller.rb @@ -49,8 +49,6 @@ def update format.html { render :show, status: :unprocessable_entity } end end - rescue ActiveRecord::StaleObjectError - render :show, status: :conflict end private @@ -58,13 +56,11 @@ def update def set_episode @episode = Episode.find_by_guid!(params[:episode_id]) @episode.strict_validations = true - @episode.locking_enabled = true @podcast = @episode.podcast end def episode_params nilify params.fetch(:episode, {}).permit( - :lock_version, :medium, :ad_breaks, contents_attributes: %i[id position original_url file_size _destroy _retry], diff --git a/app/controllers/episodes_controller.rb b/app/controllers/episodes_controller.rb index 3219f5a3b..b4ff223bf 100644 --- a/app/controllers/episodes_controller.rb +++ b/app/controllers/episodes_controller.rb @@ -84,8 +84,6 @@ def update format.html { render :edit, status: :unprocessable_entity } end end - rescue ActiveRecord::StaleObjectError - render :edit, status: :conflict end # DELETE /episodes/1 @@ -110,7 +108,6 @@ def destroy def set_episode @episode = Episode.find_by_guid!(params[:id]) @episode.strict_validations = true - @episode.locking_enabled = true end def set_podcast @@ -139,7 +136,6 @@ def episodes_query def episode_params nilify(params.fetch(:episode, {}).permit( - :lock_version, :title, :clean_title, :subtitle, diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb index 238826bc0..f17344b9e 100644 --- a/app/controllers/feeds_controller.rb +++ b/app/controllers/feeds_controller.rb @@ -59,8 +59,6 @@ def update end end end - rescue ActiveRecord::StaleObjectError - render :show, status: :conflict end # DELETE /feeds/1 @@ -96,7 +94,6 @@ def set_feeds # Use callbacks to share common setup or constraints between actions. def set_feed @feed = Feed.find(params[:id]) - @feed.locking_enabled = true end # Only allow a list of trusted parameters through. @@ -106,7 +103,6 @@ def feed_params def nilified_feed_params nilify params.fetch(:feed, {}).permit( - :lock_version, :file_name, :title, :subtitle, diff --git a/app/controllers/podcast_engagement_controller.rb b/app/controllers/podcast_engagement_controller.rb index b68856399..17857b2c7 100644 --- a/app/controllers/podcast_engagement_controller.rb +++ b/app/controllers/podcast_engagement_controller.rb @@ -17,8 +17,6 @@ def update format.html { render :show, status: :unprocessable_entity } end end - rescue ActiveRecord::StaleObjectError - render :show, status: :conflict end private @@ -26,7 +24,6 @@ def update # Use callbacks to share common setup or constraints between actions. def set_podcast @podcast = Podcast.find(params[:podcast_id]) - @podcast.locking_enabled = true authorize @podcast end @@ -35,7 +32,6 @@ def set_podcast ### TODO include params for socmed and podcast apps def podcast_engagement_params nilify params.fetch(:podcast, {}).permit( - :lock_version, :donation_url, :payment_pointer ) diff --git a/app/controllers/podcasts_controller.rb b/app/controllers/podcasts_controller.rb index 2478ae334..217d49d24 100644 --- a/app/controllers/podcasts_controller.rb +++ b/app/controllers/podcasts_controller.rb @@ -76,8 +76,6 @@ def update format.html { render :edit, status: :unprocessable_entity } end end - rescue ActiveRecord::StaleObjectError - render :edit, status: :conflict end # DELETE /podcasts/1 @@ -100,7 +98,6 @@ def destroy def set_podcast @podcast = Podcast.find(params[:id]) - @podcast.locking_enabled = true end def published_episodes(date_range) @@ -110,7 +107,6 @@ def published_episodes(date_range) def podcast_params nilify params.fetch(:podcast, {}).permit( - :lock_version, :title, :prx_account_uri, :link, diff --git a/app/javascript/controllers/toggle_value_controller.js b/app/javascript/controllers/toggle_value_controller.js deleted file mode 100644 index 534aa890f..000000000 --- a/app/javascript/controllers/toggle_value_controller.js +++ /dev/null @@ -1,12 +0,0 @@ -import { Controller } from "@hotwired/stimulus" - -export default class extends Controller { - static targets = ["field"] - static values = { next: String } - - toggle() { - const prev = this.fieldTarget.value - this.fieldTarget.value = this.nextValue - this.nextValue = prev - } -} diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 3d0fdaa61..a5afea259 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -11,14 +11,4 @@ def self.alias_error_messages(to_field, from_field) def error_message_aliases @@error_message_aliases end - - def locking_enabled? - !!(super && @locking_enabled) - end - - attr_writer :locking_enabled - - def stale? - try(:lock_version_changed?) || false - end end diff --git a/app/views/episode_media/_form.html.erb b/app/views/episode_media/_form.html.erb index 2cbc4328c..fd48329e5 100644 --- a/app/views/episode_media/_form.html.erb +++ b/app/views/episode_media/_form.html.erb @@ -35,5 +35,4 @@ <% end %> - <%= render "layouts/stale_record_modal", form: form, discard_path: episode_media_path(episode) %> <% end %> diff --git a/app/views/episode_media/_form_status.html.erb b/app/views/episode_media/_form_status.html.erb index b8ede9130..fcd2c684b 100644 --- a/app/views/episode_media/_form_status.html.erb +++ b/app/views/episode_media/_form_status.html.erb @@ -2,7 +2,6 @@

<%= t(".title") %>

- <%= render "layouts/stale_record_field", form: form %>

<%= t(".updated_at_hint") %>
<%= l(episode.updated_at) %>

diff --git a/app/views/episodes/_form.html.erb b/app/views/episodes/_form.html.erb index aa31cda05..71d13c1a0 100644 --- a/app/views/episodes/_form.html.erb +++ b/app/views/episodes/_form.html.erb @@ -22,6 +22,4 @@
<%= render "confirm_destroy", episode: episode %> - - <%= render "layouts/stale_record_modal", form: form, discard_path: edit_episode_path(episode) if episode.persisted? %> <% end %> diff --git a/app/views/episodes/_form_status.html.erb b/app/views/episodes/_form_status.html.erb index 18d90aca2..7c6e34805 100644 --- a/app/views/episodes/_form_status.html.erb +++ b/app/views/episodes/_form_status.html.erb @@ -45,8 +45,6 @@ <% end %> - <%= render "layouts/stale_record_field", form: form %> -
<% if episode.persisted? %>

<%= t(".updated_at_hint") %>
<%= local_time_ago(episode.updated_at) %>

diff --git a/app/views/feeds/_form.html.erb b/app/views/feeds/_form.html.erb index ffc518817..c105330aa 100644 --- a/app/views/feeds/_form.html.erb +++ b/app/views/feeds/_form.html.erb @@ -30,6 +30,4 @@
<%= render "confirm_destroy", podcast: podcast, feed: feed %> - - <%= render "layouts/stale_record_modal", form: form, discard_path: podcast_feed_path(podcast, feed) if feed.persisted? %> <% end %> diff --git a/app/views/feeds/_form_status.html.erb b/app/views/feeds/_form_status.html.erb index 9bfac9231..249323f5b 100644 --- a/app/views/feeds/_form_status.html.erb +++ b/app/views/feeds/_form_status.html.erb @@ -2,9 +2,6 @@

<%= t(".title") %>

- - <%= render "layouts/stale_record_field", form: form %> -
<% if feed.persisted? %>

<%= t(".updated_at_hint") %>
<%= local_time_ago(feed.updated_at) %>

diff --git a/app/views/layouts/_stale_record_field.html.erb b/app/views/layouts/_stale_record_field.html.erb deleted file mode 100644 index 4a507f8d7..000000000 --- a/app/views/layouts/_stale_record_field.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -<% if form.object.stale? %> -
-
- <%= form.hidden_field :lock_version, data: {toggle_value_target: "field"} %> - -
- -
-
-
-<% else %> - <%= form.hidden_field :lock_version %> -<% end %> diff --git a/app/views/layouts/_stale_record_modal.html.erb b/app/views/layouts/_stale_record_modal.html.erb deleted file mode 100644 index 6d52e578a..000000000 --- a/app/views/layouts/_stale_record_modal.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -<% if form.object.stale? %> - - - <%# click hidden button to immediately show modal %> - -<% end %> diff --git a/app/views/podcast_engagement/_form.html.erb b/app/views/podcast_engagement/_form.html.erb index 30e28b174..f3998de1d 100644 --- a/app/views/podcast_engagement/_form.html.erb +++ b/app/views/podcast_engagement/_form.html.erb @@ -20,5 +20,4 @@
- <%= render "layouts/stale_record_modal", form: form, discard_path: podcast_engagement_path(podcast) %> <% end %> diff --git a/app/views/podcast_engagement/_form_status.html.erb b/app/views/podcast_engagement/_form_status.html.erb index 18b1a21da..64c142244 100644 --- a/app/views/podcast_engagement/_form_status.html.erb +++ b/app/views/podcast_engagement/_form_status.html.erb @@ -2,9 +2,6 @@

<%= t(".title") %>

- - <%= render "layouts/stale_record_field", form: form %> -

<%= t(".updated_at_hint") %>
<%= local_time_ago(podcast.updated_at) %>

diff --git a/app/views/podcasts/_form.html.erb b/app/views/podcasts/_form.html.erb index 8bde20222..18d1aa2ac 100644 --- a/app/views/podcasts/_form.html.erb +++ b/app/views/podcasts/_form.html.erb @@ -19,6 +19,4 @@
<%= render "confirm_destroy", podcast: podcast %> - - <%= render "layouts/stale_record_modal", form: form, discard_path: edit_podcast_path(podcast) if podcast.persisted? %> <% end %> diff --git a/app/views/podcasts/_form_status.html.erb b/app/views/podcasts/_form_status.html.erb index 8a57f62f5..88836a9c1 100644 --- a/app/views/podcasts/_form_status.html.erb +++ b/app/views/podcasts/_form_status.html.erb @@ -2,9 +2,6 @@

<%= t(".title") %>

- - <%= render "layouts/stale_record_field", form: form %> -
<% if podcast.persisted? %>

<%= t(".updated_at_hint") %>
<%= local_time_ago(podcast.updated_at) %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 7fa431b4d..bfbf27bac 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -918,14 +918,6 @@ en: privacy: Privacy status: Status terms: Terms - stale_record_field: - aside: (Not Recommended) - label: Overwrite - stale_record_modal: - body_html: Another user updated this %{model} %{ago}.

You can either discard your changes and make them again in a fresh form, or continue editing at your own risk. - continue: Continue Editing - discard: Discard changes - title: Warning! Another user has updated this form. podcasts: confirm_destroy: <<: *form_status diff --git a/db/migrate/20240424214558_add_locking_columns.rb b/db/migrate/20240424214558_add_locking_columns.rb deleted file mode 100644 index 0b684f7ed..000000000 --- a/db/migrate/20240424214558_add_locking_columns.rb +++ /dev/null @@ -1,7 +0,0 @@ -class AddLockingColumns < ActiveRecord::Migration[7.0] - def change - add_column :episodes, :lock_version, :integer - add_column :feeds, :lock_version, :integer - add_column :podcasts, :lock_version, :integer - end -end diff --git a/db/schema.rb b/db/schema.rb index df346da87..726ac6665 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[7.0].define(version: 2024_04_24_214558) do +ActiveRecord::Schema[7.0].define(version: 2024_04_10_212602) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" enable_extension "uuid-ossp" @@ -164,7 +164,6 @@ t.integer "segment_count" t.text "production_notes" t.integer "medium" - t.integer "lock_version" t.index ["guid"], name: "index_episodes_on_guid", unique: true t.index ["keyword_xid"], name: "index_episodes_on_keyword_xid", unique: true t.index ["original_guid", "podcast_id"], name: "index_episodes_on_original_guid_and_podcast_id", unique: true, where: "((deleted_at IS NULL) AND (original_guid IS NOT NULL))" @@ -229,7 +228,6 @@ t.boolean "include_donation_url", default: true t.text "exclude_tags" t.datetime "deleted_at", precision: nil - t.integer "lock_version" t.index ["podcast_id", "slug"], name: "index_feeds_on_podcast_id_and_slug", unique: true, where: "(slug IS NOT NULL)" t.index ["podcast_id"], name: "index_feeds_on_podcast_id" t.index ["podcast_id"], name: "index_feeds_on_podcast_id_default", unique: true, where: "(slug IS NULL)" @@ -357,7 +355,6 @@ t.text "restrictions" t.string "payment_pointer" t.string "donation_url" - t.integer "lock_version" t.index ["path"], name: "index_podcasts_on_path", unique: true t.index ["prx_uri"], name: "index_podcasts_on_prx_uri", unique: true t.index ["source_url"], name: "index_podcasts_on_source_url", unique: true, where: "((deleted_at IS NULL) AND (source_url IS NOT NULL))" diff --git a/test/controllers/episodes_controller_test.rb b/test/controllers/episodes_controller_test.rb index c17d22575..146f8b503 100644 --- a/test/controllers/episodes_controller_test.rb +++ b/test/controllers/episodes_controller_test.rb @@ -71,11 +71,6 @@ class EpisodesControllerTest < ActionDispatch::IntegrationTest assert_response :unprocessable_entity end - test "optimistically locks updating episodes" do - patch episode_url(episode), params: {episode: {lock_version: episode.lock_version - 1}} - assert_response :conflict - end - test "should destroy episode" do assert episode diff --git a/test/controllers/feeds_controller_test.rb b/test/controllers/feeds_controller_test.rb index 8d32639ac..4f5e7e27b 100644 --- a/test/controllers/feeds_controller_test.rb +++ b/test/controllers/feeds_controller_test.rb @@ -71,11 +71,6 @@ class FeedsControllerTest < ActionDispatch::IntegrationTest assert_response :unprocessable_entity end - test "optimistically locks updating feeds" do - patch podcast_feed_url(podcast, feed), params: {feed: {lock_version: feed.lock_version - 1}} - assert_response :conflict - end - test "should destroy feed" do assert podcast assert feed diff --git a/test/controllers/podcasts_controller_test.rb b/test/controllers/podcasts_controller_test.rb index 184398e58..f77dc00cc 100644 --- a/test/controllers/podcasts_controller_test.rb +++ b/test/controllers/podcasts_controller_test.rb @@ -77,11 +77,6 @@ class PodcastsControllerTest < ActionDispatch::IntegrationTest assert_response :unprocessable_entity end - test "optimistically locks updating podcasts" do - patch podcast_url(podcast), params: {podcast: {lock_version: podcast.lock_version - 1}} - assert_response :conflict - end - test "should destroy podcast" do assert podcast